Merge "Update Permission only if the network is created"

This commit is contained in:
Treehugger Robot
2021-10-14 06:13:54 +00:00
committed by Gerrit Code Review

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);
}