Merge changes I8373e0f2,I873f179c into rvc-dev am: a809881005

Change-Id: Idd7b41305a57f3d2607ce434e90cfde0550bfc46

2 files changed, 7 insertions, 8 deletions

diff --git a/service/java/com/android/server/wifi/SavedNetworkNominator.java b/service/java/com/android/server/wifi/SavedNetworkNominator.java
index 2d91881a0..a3039096e 100644
--- a/service/java/com/android/server/wifi/SavedNetworkNominator.java
+++ b/service/java/com/android/server/wifi/SavedNetworkNominator.java
@@ -97,7 +97,6 @@ public class SavedNetworkNominator implements WifiNetworkSelector.NetworkNominat
 
             // One ScanResult can be associated with more than one network, hence we calculate all
             // the scores and use the highest one as the ScanResult's score.
-            // TODO(b/112196799): this has side effects, rather not do that in a nominator
             WifiConfiguration network =
                     mWifiConfigManager.getConfiguredNetworkForScanDetailAndCache(scanDetail);
 
@@ -117,20 +116,21 @@ public class SavedNetworkNominator implements WifiNetworkSelector.NetworkNominat
 
             // Ignore networks that the user has disallowed auto-join for.
             if (!network.allowAutojoin) {
+                localLog("Ignoring auto join disabled SSID: " + network.SSID);
                 continue;
             }
 
             WifiConfiguration.NetworkSelectionStatus status =
                     network.getNetworkSelectionStatus();
-            // TODO (b/112196799): another side effect
             status.setSeenInLastQualifiedNetworkSelection(true);
 
             if (mWifiConfigManager.isNetworkTemporarilyDisabledByUser(network.SSID)) {
-                mLocalLog.log("Ignoring user disabled SSID: " + network.SSID);
+                localLog("Ignoring user disabled SSID: " + network.SSID);
                 continue;
             }
 
             if (!status.isNetworkEnabled()) {
+                localLog("Ignoring network selection disabled SSID: " + network.SSID);
                 continue;
             }
             if (network.BSSID != null &&  !network.BSSID.equals("any")
@@ -143,6 +143,7 @@ public class SavedNetworkNominator implements WifiNetworkSelector.NetworkNominat
                 continue;
             }
             if (isNetworkSimBasedCredential(network) && !isSimBasedNetworkAbleToAutoJoin(network)) {
+                localLog("Ignoring SIM auto join disabled SSID: " + network.SSID);
                 continue;
             }
 
diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java
index e6e5f2b36..37f34639e 100644
--- a/service/java/com/android/server/wifi/WifiServiceImpl.java
+++ b/service/java/com/android/server/wifi/WifiServiceImpl.java
@@ -735,10 +735,10 @@ public class WifiServiceImpl extends BaseWifiService {
     private boolean isTargetSdkLessThanQOrPrivileged(String packageName, int pid, int uid) {
         return mWifiPermissionsUtil.isTargetSdkLessThan(packageName, Build.VERSION_CODES.Q, uid)
                 || isPrivileged(pid, uid)
-                // DO/PO apps should be able to add/modify saved networks.
                 || isDeviceOrProfileOwner(uid, packageName)
-                // TODO: Remove this system app bypass once Q is released.
-                || isSystem(packageName, uid);
+                || isSystem(packageName, uid)
+                // TODO(b/140540984): Remove this bypass.
+                || mWifiPermissionsUtil.checkSystemAlertWindowPermission(uid, packageName);
     }
 
     /**
@@ -749,9 +749,7 @@ public class WifiServiceImpl extends BaseWifiService {
     private boolean isTargetSdkLessThanROrPrivileged(String packageName, int pid, int uid) {
         return mWifiPermissionsUtil.isTargetSdkLessThan(packageName, Build.VERSION_CODES.R, uid)
                 || isPrivileged(pid, uid)
-                // DO/PO apps should be able to add/modify saved networks.
                 || isDeviceOrProfileOwner(uid, packageName)
-                // TODO: Remove this system app bypass once R is released.
                 || isSystem(packageName, uid);
     }