LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ConnectivityManager: remove obsolete callback types

Browse Source 
This patch also:
  - suppresses callback triggers from ConnectivityService for these
    obsolete callback types.
  - marginally refactors callCallbackForRequest().

Test: runtest frameworks-net
Change-Id: Idfb75640732943c599de4975f252f706d21ad594
This commit is contained in:
Hugo Benichi
2017-03-23 22:40:44 +09:00
parent 8d96292e08
commit f8a0f9f873
2 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

@@ -2692,18 +2692,12 @@ public class ConnectivityManager {
public static final int CALLBACK_CAP_CHANGED = BASE + 6; public static final int CALLBACK_CAP_CHANGED = BASE + 6;
/** @hide */ /** @hide */
public static final int CALLBACK_IP_CHANGED = BASE + 7; 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 */ /** @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 */ /** @hide */
public static final int CALLBACK_SUSPENDED = BASE + 11; public static final int CALLBACK_SUSPENDED = BASE + 9;
/** @hide */ /** @hide */
public static final int CALLBACK_RESUMED = BASE + 12; public static final int CALLBACK_RESUMED = BASE + 10;
/** @hide */ /** @hide */
public static String getCallbackName(int whichCallback) { public static String getCallbackName(int whichCallback) {
@@ -2715,8 +2709,6 @@ public class ConnectivityManager {
case CALLBACK_UNAVAIL: return "CALLBACK_UNAVAIL"; case CALLBACK_UNAVAIL: return "CALLBACK_UNAVAIL";
case CALLBACK_CAP_CHANGED: return "CALLBACK_CAP_CHANGED"; case CALLBACK_CAP_CHANGED: return "CALLBACK_CAP_CHANGED";
case CALLBACK_IP_CHANGED: return "CALLBACK_IP_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 EXPIRE_LEGACY_REQUEST: return "EXPIRE_LEGACY_REQUEST";
case CALLBACK_SUSPENDED: return "CALLBACK_SUSPENDED"; case CALLBACK_SUSPENDED: return "CALLBACK_SUSPENDED";
case CALLBACK_RESUMED: return "CALLBACK_RESUMED"; case CALLBACK_RESUMED: return "CALLBACK_RESUMED";
@@ -2810,12 +2802,6 @@ public class ConnectivityManager {
} }
break; break;
} }
case CALLBACK_RELEASED: {
break;
}
case CALLBACK_EXIT: {
break;
}
case EXPIRE_LEGACY_REQUEST: { case EXPIRE_LEGACY_REQUEST: {
expireRequest((NetworkCapabilities)message.obj, message.arg1); expireRequest((NetworkCapabilities)message.obj, message.arg1);
break; break;

58
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -93,6 +93,7 @@ import android.os.Looper;
import android.os.Message; import android.os.Message;
import android.os.Messenger; import android.os.Messenger;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import android.os.Parcelable;
import android.os.PowerManager; import android.os.PowerManager;
import android.os.Process; import android.os.Process;
import android.os.RemoteException; import android.os.RemoteException;
@@ -2550,25 +2551,32 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
private void handleTimedOutNetworkRequest(final NetworkRequestInfo nri) { private void handleTimedOutNetworkRequest(final NetworkRequestInfo nri) {
if (mNetworkRequests.get(nri.request) != null && mNetworkForRequestId.get( if (mNetworkRequests.get(nri.request) == null) {
nri.request.requestId) == null) { return;
handleRemoveNetworkRequest(nri, ConnectivityManager.CALLBACK_UNAVAIL);
} }
if (mNetworkForRequestId.get(nri.request.requestId) != null) {
return;
}
if (VDBG || (DBG && nri.request.isRequest())) {
log("releasing " + nri.request + " (timeout)");
}
handleRemoveNetworkRequest(nri);
callCallbackForRequest(nri, null, ConnectivityManager.CALLBACK_UNAVAIL, 0);
} }
private void handleReleaseNetworkRequest(NetworkRequest request, int callingUid) { private void handleReleaseNetworkRequest(NetworkRequest request, int callingUid) {
final NetworkRequestInfo nri = getNriForAppRequest( final NetworkRequestInfo nri =
request, callingUid, "release NetworkRequest"); getNriForAppRequest(request, callingUid, "release NetworkRequest");
if (nri != null) { if (nri == null) {
handleRemoveNetworkRequest(nri, ConnectivityManager.CALLBACK_RELEASED); return;
} }
if (VDBG || (DBG && nri.request.isRequest())) {
log("releasing " + nri.request + " (release request)");
}
handleRemoveNetworkRequest(nri);
} }
private void handleRemoveNetworkRequest(final NetworkRequestInfo nri, final int whichCallback) { private void handleRemoveNetworkRequest(final NetworkRequestInfo nri) {
final String logCallbackType = ConnectivityManager.getCallbackName(whichCallback);
if (VDBG || (DBG && nri.request.isRequest())) {
log("releasing " + nri.request + " (" + logCallbackType + ")");
}
nri.unlinkDeathRecipient(); nri.unlinkDeathRecipient();
mNetworkRequests.remove(nri.request); mNetworkRequests.remove(nri.request);
synchronized (mUidToNetworkRequestCount) { synchronized (mUidToNetworkRequestCount) {
@@ -2664,7 +2672,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
} }
} }
callCallbackForRequest(nri, null, whichCallback, 0);
} }
@Override @Override
@@ -4722,16 +4729,17 @@ public class ConnectivityService extends IConnectivityManager.Stub
releasePendingNetworkRequestWithDelay(pendingIntent); releasePendingNetworkRequestWithDelay(pendingIntent);
} }
private void callCallbackForRequest(NetworkRequestInfo nri, private static void callCallbackForRequest(NetworkRequestInfo nri,
NetworkAgentInfo networkAgent, int notificationType, int arg1) { NetworkAgentInfo networkAgent, int notificationType, int arg1) {
if (nri.messenger == null) return; // Default request has no msgr if (nri.messenger == null) {
return; // Default request has no msgr
}
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putParcelable(NetworkRequest.class.getSimpleName(), // TODO: check if defensive copies of data is needed.
new NetworkRequest(nri.request)); putParcelable(bundle, new NetworkRequest(nri.request));
Message msg = Message.obtain(); Message msg = Message.obtain();
if (notificationType != ConnectivityManager.CALLBACK_UNAVAIL && if (notificationType != ConnectivityManager.CALLBACK_UNAVAIL) {
notificationType != ConnectivityManager.CALLBACK_RELEASED) { putParcelable(bundle, networkAgent.network);
bundle.putParcelable(Network.class.getSimpleName(), networkAgent.network);
} }
switch (notificationType) { switch (notificationType) {
case ConnectivityManager.CALLBACK_LOSING: { case ConnectivityManager.CALLBACK_LOSING: {
@@ -4739,13 +4747,11 @@ public class ConnectivityService extends IConnectivityManager.Stub
break; break;
} }
case ConnectivityManager.CALLBACK_CAP_CHANGED: { case ConnectivityManager.CALLBACK_CAP_CHANGED: {
bundle.putParcelable(NetworkCapabilities.class.getSimpleName(), putParcelable(bundle, new NetworkCapabilities(networkAgent.networkCapabilities));
new NetworkCapabilities(networkAgent.networkCapabilities));
break; break;
} }
case ConnectivityManager.CALLBACK_IP_CHANGED: { case ConnectivityManager.CALLBACK_IP_CHANGED: {
bundle.putParcelable(LinkProperties.class.getSimpleName(), putParcelable(bundle, new LinkProperties(networkAgent.linkProperties));
new LinkProperties(networkAgent.linkProperties));
break; break;
} }
} }
@@ -4763,6 +4769,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
} }
private static <T extends Parcelable> void putParcelable(Bundle bundle, T t) {
bundle.putParcelable(t.getClass().getSimpleName(), t);
}
private void teardownUnneededNetwork(NetworkAgentInfo nai) { private void teardownUnneededNetwork(NetworkAgentInfo nai) {
if (nai.numRequestNetworkRequests() != 0) { if (nai.numRequestNetworkRequests() != 0) {
for (int i = 0; i < nai.numNetworkRequests(); i++) { for (int i = 0; i < nai.numNetworkRequests(); i++) {