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

Merge "Replace hidden NMS permission control API" am: 67a478d08d am: 89f3f29524 am: a5c301c629 am: 1f8a2bda71

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473957

Change-Id: Ib53b5efe2af87f21563de0d883fce86afbdb89d7
This commit is contained in:
Treehugger Robot
2020-10-29 08:47:51 +00:00
committed by Automerger Merge Worker
parent e75400be3d 1f8a2bda71
commit f30a0ed252
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/ConnectivityService.java
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);
}
}
}