commit 29f0350da3b7ad029471ef51010f9e12224b2cd3
author Treehugger Robot <treehugger-gerrit@google.com> Thu Oct 14 06:13:54 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 14 06:13:54 2021 +0000
tree 8c831130a459f05d9c181b42cb8188d98c30dca7
parent 6b6d2eb75b34d2b8271668e7a44acf79496208da
parent be994246f4803412b2754e31c617eec6aaac3a97

Merge "Update Permission only if the network is created"

service/src/com/android/server/ConnectivityService.java

diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java
index 74ed94f..408dba3 100644
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -3938,10 +3938,12 @@
         }
 
         // 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);
     }