commit f50c60d1ba1a6e0e32a85b9301ae4683b4af1176
author Stephanie Bak <dasol@google.com> Mon Apr 18 22:26:18 2022 +0000
committer Stephanie Bak <dasol@google.com> Mon Apr 18 22:26:18 2022 +0000
tree 2656c537b9f1843d2250ee546963b56f46b854c1
parent 456aed0fe5455b2c3cdbdaa3e3252544cc4c50c8

Use internal config for creator uid check

Bug: 229657454
Test: atest com.android.server.wifi
Change-Id: Ic8214f33aa912901efdcbddeb4c05cacb9d5ad0e

service/java/com/android/server/wifi/WifiConfigManager.java

diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java
index 66bffc4..ae28752 100644
--- a/service/java/com/android/server/wifi/WifiConfigManager.java
+++ b/service/java/com/android/server/wifi/WifiConfigManager.java
@@ -1362,7 +1362,8 @@
                 && !(newInternalConfig.isPasspoint() && uid == newInternalConfig.creatorUid)
                 && !config.fromWifiNetworkSuggestion
                 && !mWifiPermissionsUtil.isDeviceInDemoMode(mContext)
-                && !(mWifiPermissionsUtil.isAdmin(uid, packageName) && uid == config.creatorUid)) {
+                && !(mWifiPermissionsUtil.isAdmin(uid, packageName)
+                && uid == newInternalConfig.creatorUid)) {
             Log.e(TAG, "UID " + uid + " does not have permission to modify MAC randomization "
                     + "Settings " + config.getProfileKey() + ". Must have "
                     + "NETWORK_SETTINGS or NETWORK_SETUP_WIZARD or be in Demo Mode "