diff options
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 739b9dc60e53..ce01cce536bb 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -2708,18 +2708,12 @@ public class ConnectivityManager { public static final int CALLBACK_CAP_CHANGED = BASE + 6; /** @hide */ public static final int CALLBACK_IP_CHANGED = BASE + 7; - // TODO: consider deleting CALLBACK_RELEASED and shifting following enum codes down by 1. - /** @hide */ - public static final int CALLBACK_RELEASED = BASE + 8; - // TODO: consider deleting CALLBACK_EXIT and shifting following enum codes down by 1. - /** @hide */ - public static final int CALLBACK_EXIT = BASE + 9; /** @hide obj = NetworkCapabilities, arg1 = seq number */ - private static final int EXPIRE_LEGACY_REQUEST = BASE + 10; + private static final int EXPIRE_LEGACY_REQUEST = BASE + 8; /** @hide */ - public static final int CALLBACK_SUSPENDED = BASE + 11; + public static final int CALLBACK_SUSPENDED = BASE + 9; /** @hide */ - public static final int CALLBACK_RESUMED = BASE + 12; + public static final int CALLBACK_RESUMED = BASE + 10; /** @hide */ public static String getCallbackName(int whichCallback) { @@ -2731,8 +2725,6 @@ public class ConnectivityManager { case CALLBACK_UNAVAIL: return "CALLBACK_UNAVAIL"; case CALLBACK_CAP_CHANGED: return "CALLBACK_CAP_CHANGED"; case CALLBACK_IP_CHANGED: return "CALLBACK_IP_CHANGED"; - case CALLBACK_RELEASED: return "CALLBACK_RELEASED"; - case CALLBACK_EXIT: return "CALLBACK_EXIT"; case EXPIRE_LEGACY_REQUEST: return "EXPIRE_LEGACY_REQUEST"; case CALLBACK_SUSPENDED: return "CALLBACK_SUSPENDED"; case CALLBACK_RESUMED: return "CALLBACK_RESUMED"; @@ -2826,12 +2818,6 @@ public class ConnectivityManager { } break; } - case CALLBACK_RELEASED: { - break; - } - case CALLBACK_EXIT: { - break; - } case EXPIRE_LEGACY_REQUEST: { expireRequest((NetworkCapabilities)message.obj, message.arg1); break; |