Merge "Remove unused api." (620a5466) · Commits · e / os / android_frameworks_base

core/java/android/net/ConnectivityManager.java

+0 −22

Original line number	Diff line number	Diff line
		@@ -1641,28 +1641,6 @@ public class ConnectivityManager {
		}
		}

		/**
		* Try to ensure the device stays awake until we connect with the next network.
		* Actually just holds a wakelock for a number of seconds while we try to connect
		* to any default networks. This will expire if the timeout passes or if we connect
		* to a default after this is called. For internal use only.
		*
		* @param forWhom the name of the network going down for logging purposes
		* @return {@code true} on success, {@code false} on failure
		*
		* <p>This method requires the call to hold the permission
		* {@link android.Manifest.permission#CONNECTIVITY_INTERNAL}.
		* {@hide}
		*/
		public boolean requestNetworkTransitionWakelock(String forWhom) {
		try {
		mService.requestNetworkTransitionWakelock(forWhom);
		return true;
		} catch (RemoteException e) {
		return false;
		}
		}

		/**
		* Report network connectivity status. This is currently used only
		* to alter status bar UI.

+0 −2

Original line number	Diff line number	Diff line
		@@ -99,8 +99,6 @@ interface IConnectivityManager

		int setUsbTethering(boolean enable);

		void requestNetworkTransitionWakelock(in String forWhom);

		void reportInetCondition(int networkType, int percentage);

		void reportBadNetwork(in Network network);

+5 −6

Original line number	Diff line number	Diff line
		@@ -3626,12 +3626,11 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		mTethering.getUpstreamIfaceTypes().length != 0);
		}

		// An API NetworkStateTrackers can call when they lose their network.
		// This will automatically be cleared after X seconds or a network becomes CONNECTED,
		// whichever happens first. The timer is started by the first caller and not
		// restarted by subsequent callers.
		public void requestNetworkTransitionWakelock(String forWhom) {
		enforceConnectivityInternalPermission();
		// Called when we lose the default network and have no replacement yet.
		// This will automatically be cleared after X seconds or a new default network
		// becomes CONNECTED, whichever happens first. The timer is started by the
		// first caller and not restarted by subsequent callers.
		private void requestNetworkTransitionWakelock(String forWhom) {
		int serialNum = 0;
		synchronized (this) {
		if (mNetTransitionWakeLock.isHeld()) return;