commit 8e6ee0093b42747ddbb97f7ce33227fd21944f92
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Mar 27 03:09:04 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 27 03:09:04 2020 +0000
tree d3e38435ac7ea5f8c1d6dec88bcdac9f50881482
parent 820aa463ace5be9be9d505a57da0a46c6b38b1e1
parent 678528ed42e98bb3e71d0efc6768ff881d04728c

Merge "Check permissions in INetworkManagementService#setIPv6AddrGenMode" into qt-qpr1-dev

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

diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java
index e5fb506..ab0d2b7 100644
--- a/services/core/java/com/android/server/NetworkManagementService.java
+++ b/services/core/java/com/android/server/NetworkManagementService.java
@@ -55,6 +55,7 @@
 import android.net.LinkAddress;
 import android.net.Network;
 import android.net.NetworkPolicyManager;
+import android.net.NetworkStack;
 import android.net.NetworkStats;
 import android.net.NetworkUtils;
 import android.net.RouteInfo;
@@ -874,6 +875,7 @@
 
     @Override
     public void setIPv6AddrGenMode(String iface, int mode) throws ServiceSpecificException {
+        NetworkStack.checkNetworkStackPermission(mContext);
         try {
             mNetdService.setIPv6AddrGenMode(iface, mode);
         } catch (RemoteException e) {