Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "change NMS removeNetwork to netd binder variant"

Browse Source 
am: e61ee4198e

Change-Id: I789653740c8cb1bb879215eaa3101f56d5bf7096
This commit is contained in:
Erik Kline
2018-01-15 14:28:48 +00:00
committed by android-build-merger
parent 3c84896ced e61ee4198e
commit b73571b981
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2472,6 +2472,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
private void handleRemoveNetworkRequest(final NetworkRequestInfo nri) { private void handleRemoveNetworkRequest(final NetworkRequestInfo nri) {
nri.unlinkDeathRecipient(); nri.unlinkDeathRecipient();
mNetworkRequests.remove(nri.request); mNetworkRequests.remove(nri.request);
synchronized (mUidToNetworkRequestCount) { synchronized (mUidToNetworkRequestCount) {
int requests = mUidToNetworkRequestCount.get(nri.mUid, 0); int requests = mUidToNetworkRequestCount.get(nri.mUid, 0);
if (requests < 1) { if (requests < 1) {
@@ -2484,6 +2485,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
mUidToNetworkRequestCount.put(nri.mUid, requests - 1); mUidToNetworkRequestCount.put(nri.mUid, requests - 1);
} }
} }
mNetworkRequestInfoLogs.log("RELEASE " + nri); mNetworkRequestInfoLogs.log("RELEASE " + nri);
if (nri.request.isRequest()) { if (nri.request.isRequest()) {
boolean wasKept = false; boolean wasKept = false;

12
services/core/java/com/android/server/NetworkManagementService.java
View File

@@ -2508,12 +2508,16 @@ public class NetworkManagementService extends INetworkManagementService.Stub
@Override @Override
public void removeNetwork(int netId) { public void removeNetwork(int netId) {
mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG); mContext.enforceCallingOrSelfPermission(NETWORK_STACK, TAG);
try { try {
mConnector.execute("network", "destroy", netId); mNetdService.networkDestroy(netId);
} catch (NativeDaemonConnectorException e) { } catch (ServiceSpecificException e) {
throw e.rethrowAsParcelableException(); Log.w(TAG, "removeNetwork(" + netId + "): ", e);
throw e;
} catch (RemoteException e) {
Log.w(TAG, "removeNetwork(" + netId + "): ", e);
throw e.rethrowAsRuntimeException();
} }
} }