Merge "Accept MAINLINE_NETWORK_STACK permission on register/unregister network provider"

2020-03-04 10:15:41 +00:00
parent bb77aa9ddd b6ba8e84f4
commit 9f1fa12186
2 changed files with 23 additions and 9 deletions
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -2094,9 +2094,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
    }

    private void enforceNetworkFactoryPermission() {
-        mContext.enforceCallingOrSelfPermission(
+        enforceAnyPermissionOf(
                android.Manifest.permission.NETWORK_FACTORY,
-                "ConnectivityService");
+                NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK);
    }

    private boolean checkSettingsPermission() {