commit 8fdb17f3f7f28fa6af1567a926cfcf26dfbc6fe7
author Hall Liu <hallliu@google.com> Thu Apr 11 16:58:28 2019 -0700
committer Hall Liu <hallliu@google.com> Mon Apr 15 11:46:16 2019 -0700
tree 64cb71305e7ca071189061e4d5caf495ce0b1029
parent c5032e25193e9028f47738d6c7323be008572c5f

Use PLMNs from SIM as to filter for network scan

For location-off network scans, use the EHPLMN and HPLMN fields from the
SIM to filter for network scans

Bug: 130253962
Test: manual
Change-Id: I38e88956aeb81a24de4d11428aae055869a394c6

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 1e689e6..f118133 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -4470,16 +4470,6 @@
             }
         }
 
-        // STOPSHIP Revisit PLMN check (b/130253962).
-        //List<String> allowedMccMncs =
-        //        NetworkScanRequestTracker.getAllowedMccMncsForLocationRestrictedScan(mApp);
-        //for (String mccmnc : request.getPlmns()) {
-        //    if (!allowedMccMncs.contains(mccmnc)) {
-        //        return new SecurityException("Requested mccmnc " + mccmnc + " is not known to the"
-        //                + " device and cannot be scanned for without location access.");
-        //    }
-        //}
-
         return null;
     }