joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "ConnectivityManager: remove obsolete callback types"

Browse source
This commit is contained in:
Hugo Benichi 2017-04-20 12:38:27 +00:00 • committed by Gerrit Code Review
commit 3cd509d943
1 changed files with 37 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

20
core/java/android/net/ConnectivityManager.java
View file

@ -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;