Merge "Make BaseNetworkObserver available to core code" into klp-dev (10fa8c06) · Commits · e / os / android_frameworks_base

core/java/android/net/EthernetDataTracker.java

+7 −9

Original line number	Diff line number	Diff line
		@@ -27,6 +27,8 @@ import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.util.Log;

		import com.android.server.net.BaseNetworkObserver;

		import java.util.concurrent.atomic.AtomicBoolean;
		import java.util.concurrent.atomic.AtomicInteger;

		@@ -62,7 +64,7 @@ public class EthernetDataTracker implements NetworkStateTracker {

		private INetworkManagementService mNMService;

		private static class InterfaceObserver extends INetworkManagementEventObserver.Stub {
		private static class InterfaceObserver extends BaseNetworkObserver {
		private EthernetDataTracker mTracker;

		InterfaceObserver(EthernetDataTracker tracker) {
		@@ -70,10 +72,12 @@ public class EthernetDataTracker implements NetworkStateTracker {
		mTracker = tracker;
		}

		@Override
		public void interfaceStatusChanged(String iface, boolean up) {
		Log.d(TAG, "Interface status changed: " + iface + (up ? "up" : "down"));
		}

		@Override
		public void interfaceLinkStateChanged(String iface, boolean up) {
		if (mIface.equals(iface)) {
		Log.d(TAG, "Interface " + iface + " link " + (up ? "up" : "down"));
		@@ -89,21 +93,15 @@ public class EthernetDataTracker implements NetworkStateTracker {
		}
		}

		@Override
		public void interfaceAdded(String iface) {
		mTracker.interfaceAdded(iface);
		}

		@Override
		public void interfaceRemoved(String iface) {
		mTracker.interfaceRemoved(iface);
		}

		public void limitReached(String limitName, String iface) {
		// Ignored.
		}

		public void interfaceClassDataActivityChanged(String label, boolean active) {
		// Ignored.
		}
		}

		private EthernetDataTracker() {

services/java/com/android/server/net/BaseNetworkObserver.java→core/java/com/android/server/net/BaseNetworkObserver.java

+0 −0

File moved.

View file

services/java/com/android/server/CommonTimeManagementService.java

+3 −6

Original line number	Diff line number	Diff line
		@@ -40,6 +40,8 @@ import android.os.ServiceManager;
		import android.os.SystemProperties;
		import android.util.Log;

		import com.android.server.net.BaseNetworkObserver;

		/**
		* @hide
		* <p>CommonTimeManagementService manages the configuration of the native Common Time service,
		@@ -104,9 +106,7 @@ class CommonTimeManagementService extends Binder {
		/*
		* Callback handler implementations.
		*/
		private INetworkManagementEventObserver mIfaceObserver =
		new INetworkManagementEventObserver.Stub() {

		private INetworkManagementEventObserver mIfaceObserver = new BaseNetworkObserver() {
		public void interfaceStatusChanged(String iface, boolean up) {
		reevaluateServiceState();
		}
		@@ -119,9 +119,6 @@ class CommonTimeManagementService extends Binder {
		public void interfaceRemoved(String iface) {
		reevaluateServiceState();
		}
		public void limitReached(String limitName, String iface) { }

		public void interfaceClassDataActivityChanged(String label, boolean active) {}
		};

		private BroadcastReceiver mConnectivityMangerObserver = new BroadcastReceiver() {