Make NETWORK_SETTINGS trump CHANGE_WIFI_STATE

NETWORK_SETTINGS is a more powerful permission. If a caller has
NETWORK_SETTINGS than we no longer should check if it has
CHANGE_WIFI_STATE.

Bug: 78228349
Test: compile, unit test
manual test:
flash to device
go to settings -> apps & notifications -> special app access -> Wi-Fi
control
top right corner -> show system
Change permission for every item to "Not allowed"
Restart phone
Observe a successful boot

Change-Id: Ie5543c745aa1f6851eef8d04408c5691dcc54fb0

1 files changed, 3 insertions, 0 deletions

diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java
index 5d4df7df5..1a5e0e27d 100644
--- a/service/java/com/android/server/wifi/WifiServiceImpl.java
+++ b/service/java/com/android/server/wifi/WifiServiceImpl.java
@@ -725,6 +725,9 @@ public class WifiServiceImpl extends IWifiManager.Stub {
      */
     @CheckResult
     private int enforceChangePermission(String callingPackage) {
+        if (checkNetworkSettingsPermission(Binder.getCallingPid(), Binder.getCallingUid())) {
+            return MODE_ALLOWED;
+        }
         mContext.enforceCallingOrSelfPermission(android.Manifest.permission.CHANGE_WIFI_STATE,
                 "WifiService");