joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Update Permission only if the network is created"

Browse source
This commit is contained in:
Treehugger Robot 2021-10-14 06:13:54 +00:00 • committed by Gerrit Code Review
commit 29f0350da3
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

@ -3938,10 +3938,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);
}