Remove unused api.
bug:15595155
Change-Id: Ifd79365bd45f20f531782244f471a4cfc32a4135
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 05e179d..f0fadbe 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -1550,28 +1550,6 @@
}
/**
- * 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.
*
diff --git a/core/java/android/net/IConnectivityManager.aidl b/core/java/android/net/IConnectivityManager.aidl
index 5f1ff3e..51d9b8c 100644
--- a/core/java/android/net/IConnectivityManager.aidl
+++ b/core/java/android/net/IConnectivityManager.aidl
@@ -99,8 +99,6 @@
int setUsbTethering(boolean enable);
- void requestNetworkTransitionWakelock(in String forWhom);
-
void reportInetCondition(int networkType, int percentage);
void reportBadNetwork(in Network network);
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 87d28d3..8f6c46f 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3620,12 +3620,11 @@
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;