commit 971c456210e93c2c085d3c2eba738d391a1028b6
author Paul Hu <paulhu@google.com> Fri Sep 20 00:42:42 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Sep 20 00:42:42 2019 -0700
tree 38d53c113a0962ce1638f674f53ed6efd8402b11
parent 236475f0b4cacc4460d1d873de9a96ccb4a417f0
parent 8d6ab45835bef7825204eb2fdedc9f62c498b4a0

Merge "[Ethernet] Replace internal connectivity checks permission" am: 878b108119
am: 8d6ab45835

Change-Id: I1ccd73bc12ceb18e4b7578454bbfd3428ce8f135

java/com/android/server/ethernet/EthernetServiceImpl.java

diff --git a/java/com/android/server/ethernet/EthernetServiceImpl.java b/java/com/android/server/ethernet/EthernetServiceImpl.java
index d5beec1..fda3c3c 100644
--- a/java/com/android/server/ethernet/EthernetServiceImpl.java
+++ b/java/com/android/server/ethernet/EthernetServiceImpl.java
@@ -21,6 +21,7 @@
 import android.net.IEthernetManager;
 import android.net.IEthernetServiceListener;
 import android.net.IpConfiguration;
+import android.net.NetworkStack;
 import android.os.Binder;
 import android.os.Handler;
 import android.os.HandlerThread;
@@ -57,12 +58,6 @@
                 "EthernetService");
     }
 
-    private void enforceConnectivityInternalPermission() {
-        mContext.enforceCallingOrSelfPermission(
-                android.Manifest.permission.CONNECTIVITY_INTERNAL,
-                "ConnectivityService");
-    }
-
     private void enforceUseRestrictedNetworksPermission() {
         mContext.enforceCallingOrSelfPermission(
                 android.Manifest.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS,
@@ -117,7 +112,7 @@
             Log.w(TAG, "System isn't ready enough to change ethernet configuration");
         }
 
-        enforceConnectivityInternalPermission();
+        NetworkStack.checkNetworkStackPermission(mContext);
 
         if (mTracker.isRestrictedInterface(iface)) {
             enforceUseRestrictedNetworksPermission();