commit 5e236776e055100ee050595b40426bf50da9c19d
author Hall Liu <hallliu@google.com> Mon Apr 15 17:07:01 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Apr 15 17:07:01 2019 -0700
tree c6029d58545f2831c4f36e068ac88cc66f89e813
parent 63cb3ce774d0ca18bf7d023c964d14422f2c350d
parent eba1391cf82ae83011e5a157d8de62c393f2ea51

Merge "Use PLMNs from SIM as to filter for network scan" am: b51dd5754d
am: eba1391cf8

Change-Id: Ic2709ce65df49467673cd63180f3620e4f47b473

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 2a5ccc3..6b5319d 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;
     }