Merge "Make generic BaseNetworkObserver." into jb-mr1-dev

Author: jsharkey

services/java/com/android/server/ConnectivityService.java

@@ -83,6 +83,7 @@
 import com.android.server.am.BatteryStatsService;
 import com.android.server.connectivity.Tethering;
 import com.android.server.connectivity.Vpn;
+import com.android.server.net.BaseNetworkObserver;
 import com.google.android.collect.Lists;
 import com.google.android.collect.Sets;
 import dalvik.system.DexClassLoader;
@@ -524,6 +525,7 @@ public ConnectivityService(Context context, INetworkManagementService netd,
         try {
             nmService.registerObserver(mTethering);
             nmService.registerObserver(mVpn);
+            nmService.registerObserver(mDataActivityObserver);
         } catch (RemoteException e) {
             loge("Error registering observer :" + e);
         }
@@ -535,13 +537,6 @@ public ConnectivityService(Context context, INetworkManagementService netd,
         mSettingsObserver = new SettingsObserver(mHandler, EVENT_APPLY_GLOBAL_HTTP_PROXY);
         mSettingsObserver.observe(mContext);
 
-        INetworkManagementEventObserver netdObserver = new NetdObserver();
-        try {
-            mNetd.registerObserver(netdObserver);
-        } catch (RemoteException e) {
-            loge("Error registering observer :" + e);
-        }
-
         loadGlobalProxy();
     }
 
@@ -922,18 +917,13 @@ public boolean setRadio(int netType, boolean turnOn) {
         return tracker != null && tracker.setRadio(turnOn);
     }
 
-    private class NetdObserver extends INetworkManagementEventObserver.Stub {
+    private INetworkManagementEventObserver mDataActivityObserver = new BaseNetworkObserver() {
+        @Override
         public void interfaceClassDataActivityChanged(String label, boolean active) {
             int deviceType = Integer.parseInt(label);
             sendDataActivityBroadcast(deviceType, active);
         }
-
-        public void interfaceStatusChanged(String iface, boolean up) {}
-        public void interfaceLinkStateChanged(String iface, boolean up) {}
-        public void interfaceAdded(String iface) {}
-        public void interfaceRemoved(String iface) {}
-        public void limitReached(String limitName, String iface) {}
-    }
+    };
 
     /**
      * Used to notice when the calling process dies so we can self-expire

…oid/server/net/NetworkAlertObserver.java …roid/server/net/BaseNetworkObserver.javaservices/java/com/android/server/net/NetworkAlertObserver.java renamed to services/java/com/android/server/net/BaseNetworkObserver.java services/java/com/android/server/net/NetworkAlertObserver.java renamed to services/java/com/android/server/net/BaseNetworkObserver.java

@@ -19,29 +19,39 @@
 import android.net.INetworkManagementEventObserver;
 
 /**
+ * Base {@link INetworkManagementEventObserver} that provides no-op
+ * implementations which can be overridden.
+ *
  * @hide
  */
-public abstract class NetworkAlertObserver extends INetworkManagementEventObserver.Stub {
+public class BaseNetworkObserver extends INetworkManagementEventObserver.Stub {
     @Override
     public void interfaceStatusChanged(String iface, boolean up) {
-        // ignored; interface changes come through ConnectivityService
+        // default no-op
     }
 
     @Override
     public void interfaceRemoved(String iface) {
-        // ignored; interface changes come through ConnectivityService
+        // default no-op
     }
 
     @Override
     public void interfaceLinkStateChanged(String iface, boolean up) {
-        // ignored; interface changes come through ConnectivityService
+        // default no-op
     }
 
     @Override
     public void interfaceAdded(String iface) {
-        // ignored; interface changes come through ConnectivityService
+        // default no-op
     }
+
+    @Override
     public void interfaceClassDataActivityChanged(String label, boolean active) {
-        // ignored; interface changes come through ConnectivityService
+        // default no-op
+    }
+
+    @Override
+    public void limitReached(String limitName, String iface) {
+        // default no-op
     }
 }

services/java/com/android/server/net/NetworkPolicyManagerService.java

@@ -570,7 +570,7 @@ public void onReceive(Context context, Intent intent) {
     /**
      * Observer that watches for {@link INetworkManagementService} alerts.
      */
-    private INetworkManagementEventObserver mAlertObserver = new NetworkAlertObserver() {
+    private INetworkManagementEventObserver mAlertObserver = new BaseNetworkObserver() {
         @Override
         public void limitReached(String limitName, String iface) {
             // only someone like NMS should be calling us

services/java/com/android/server/net/NetworkStatsService.java

@@ -763,7 +763,7 @@ public void onReceive(Context context, Intent intent) {
     /**
      * Observer that watches for {@link INetworkManagementService} alerts.
      */
-    private INetworkManagementEventObserver mAlertObserver = new NetworkAlertObserver() {
+    private INetworkManagementEventObserver mAlertObserver = new BaseNetworkObserver() {
         @Override
         public void limitReached(String limitName, String iface) {
             // only someone like NMS should be calling us