commit 04710577a44dc518e4c60e2cc08106b161c865cb
author Treehugger Robot <treehugger-gerrit@google.com> Thu Oct 29 07:03:37 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 29 07:03:37 2020 +0000
tree 238b2ad8cc0109088f77a743d06c2a868541d5bf
parent 716777306064f06d720c93763002786c0056c783
parent edb833a1a59f4619e08aa8abc2500e9299155db5

Merge "Replace hidden NMS permission control API"

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 31872fe..21ad6de 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -6256,9 +6256,9 @@
         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);
             }
         }
     }