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

Merge "Update Permission only if the network is created" am: 29f0350da3 am: 40ea750175 am: 0109ba492c am: 8dda9eb668

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1827912

Change-Id: I705e8e4aee9203a63238ff13d402cb727e7728a7
This commit is contained in:
Treehugger Robot
2021-10-14 07:02:42 +00:00
committed by Automerger Merge Worker
parent 48723f3ced 8dda9eb668
commit abb09ea697
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
service/src/com/android/server/ConnectivityService.java
View File

@@ -3959,10 +3959,12 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
// Delayed teardown.
try {
mNetd.networkSetPermissionForNetwork(nai.network.netId, INetd.PERMISSION_SYSTEM);
} catch (RemoteException e) {
Log.d(TAG, "Error marking network restricted during teardown: ", e);
if (nai.created) {
try {
mNetd.networkSetPermissionForNetwork(nai.network.netId, INetd.PERMISSION_SYSTEM);
} catch (RemoteException e) {
Log.d(TAG, "Error marking network restricted during teardown: ", e);
}
}
mHandler.postDelayed(() -> destroyNetwork(nai), nai.teardownDelayMs);
}