Merge "Replace hidden NMS permission control API"

This commit is contained in:
Treehugger Robot 2020-10-29 07:03:37 +00:00 • committed by Gerrit Code Review
commit 67a478d08d

View file

@ -6256,9 +6256,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
final int newPermission = getNetworkPermission(newNc);
if (oldPermission != newPermission && nai.created && !nai.isVPN()) {
try {
mNMS.setNetworkPermission(nai.network.netId, newPermission);
} catch (RemoteException e) {
loge("Exception in setNetworkPermission: " + e);
mNetd.networkSetPermissionForNetwork(nai.network.netId, newPermission);
} catch (RemoteException | ServiceSpecificException e) {
loge("Exception in networkSetPermissionForNetwork: " + e);
}
}
}