commit 54e3aebb956780bc2eccb2d37c3c233fd962db3c
author James Mattis <jmattis@google.com> Tue Dec 28 18:24:42 2021 -0800
committer James Mattis <jmattis@google.com> Wed Jan 05 15:00:03 2022 -0800
tree 6c5fa6641e0a4cf7fb82510010b44a9579af39cd
parent a5f724dfdd751cdc9ee1e60a2d77cc30b81a01bc

Using PermissionUtils for common net permissions

Code clean-up to use PermissionUtils for common networking
permissions. Should be a no-op.

Bug: 210485380
Test: make, flash and boot
Change-Id: I4be08243156e9d04f4b3b44ab7328d0f6f7fdda1

service-t/src/com/android/server/ethernet/EthernetServiceImpl.java

diff --git a/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java b/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java
index 3479ea4..f107865 100644
--- a/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java
+++ b/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java
@@ -61,18 +61,6 @@
         mTracker = tracker;
     }
 
-    private void enforceAccessPermission() {
-        mContext.enforceCallingOrSelfPermission(
-                android.Manifest.permission.ACCESS_NETWORK_STATE,
-                "EthernetService");
-    }
-
-    private void enforceUseRestrictedNetworksPermission() {
-        mContext.enforceCallingOrSelfPermission(
-                android.Manifest.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS,
-                "ConnectivityService");
-    }
-
     private void enforceAutomotiveDevice(final @NonNull String methodName) {
         PermissionUtils.enforceSystemFeature(mContext, PackageManager.FEATURE_AUTOMOTIVE,
                 methodName + " is only available on automotive devices.");
@@ -85,9 +73,8 @@
     }
 
     private boolean checkUseRestrictedNetworksPermission() {
-        return mContext.checkCallingOrSelfPermission(
-                android.Manifest.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS)
-                == PackageManager.PERMISSION_GRANTED;
+        return PermissionUtils.checkAnyPermissionOf(mContext,
+                android.Manifest.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS);
     }
 
     public void start() {
@@ -104,8 +91,7 @@
 
     @Override
     public String[] getAvailableInterfaces() throws RemoteException {
-        enforceAccessPermission();
-
+        PermissionUtils.enforceAccessNetworkStatePermission(mContext, TAG);
         return mTracker.getInterfaces(checkUseRestrictedNetworksPermission());
     }
 
@@ -115,10 +101,9 @@
      */
     @Override
     public IpConfiguration getConfiguration(String iface) {
-        enforceAccessPermission();
-
+        PermissionUtils.enforceAccessNetworkStatePermission(mContext, TAG);
         if (mTracker.isRestrictedInterface(iface)) {
-            enforceUseRestrictedNetworksPermission();
+            PermissionUtils.enforceRestrictedNetworkPermission(mContext, TAG);
         }
 
         return new IpConfiguration(mTracker.getIpConfiguration(iface));
@@ -132,9 +117,8 @@
         logIfEthernetNotStarted();
 
         PermissionUtils.enforceNetworkStackPermission(mContext);
-
         if (mTracker.isRestrictedInterface(iface)) {
-            enforceUseRestrictedNetworksPermission();
+            PermissionUtils.enforceRestrictedNetworkPermission(mContext, TAG);
         }
 
         // TODO: this does not check proxy settings, gateways, etc.
@@ -147,10 +131,9 @@
      */
     @Override
     public boolean isAvailable(String iface) {
-        enforceAccessPermission();
-
+        PermissionUtils.enforceAccessNetworkStatePermission(mContext, TAG);
         if (mTracker.isRestrictedInterface(iface)) {
-            enforceUseRestrictedNetworksPermission();
+            PermissionUtils.enforceRestrictedNetworkPermission(mContext, TAG);
         }
 
         return mTracker.isTrackingInterface(iface);
@@ -164,7 +147,7 @@
         if (listener == null) {
             throw new IllegalArgumentException("listener must not be null");
         }
-        enforceAccessPermission();
+        PermissionUtils.enforceAccessNetworkStatePermission(mContext, TAG);
         mTracker.addListener(listener, checkUseRestrictedNetworksPermission());
     }
 
@@ -176,7 +159,7 @@
         if (listener == null) {
             throw new IllegalArgumentException("listener must not be null");
         }
-        enforceAccessPermission();
+        PermissionUtils.enforceAccessNetworkStatePermission(mContext, TAG);
         mTracker.removeListener(listener);
     }