commit 58a3b5a7e1f317eee98e842b1c2b4abb56f4f4d4
author Brad Ebinger <breadley@google.com> Tue Apr 09 18:31:18 2019 -0700
committer Hall Liu <hallliu@google.com> Fri Apr 12 22:57:27 2019 +0000
tree 4ef79dad3b60780d5bc374893799fe58bddf5736
parent 313af69448d447993a952aca97f67535f55b5e11

Remove location mccmnc check until valid sources are confirmed

Bug: 130253962
Bug: 130236713
Test: manual
Change-Id: Ibc7457f43660090ef5040834af6d68817c3facd0
Merged-In: I4186ab71e56da68489cb51a61427c8d87634ec2a

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 722a32b..1e689e6 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -4470,14 +4470,15 @@
             }
         }
 
-        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.");
-            }
-        }
+        // 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;
     }