commit c5032e25193e9028f47738d6c7323be008572c5f
author Treehugger Robot <treehugger-gerrit@google.com> Sat Apr 13 11:47:38 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Apr 13 11:47:38 2019 +0000
tree 0ab976df86f84977e275011e858a548b4fce9d35
parent 9d0a6b7d2a3facc61f0d2ccb9f5a38cab298871b
parent 489ff07e0e70d72bf968fb90fc3b841c0c0fc210

Merge "Import translations. DO NOT MERGE"

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;
     }

src/com/android/services/telephony/DisconnectCauseUtil.java

diff --git a/src/com/android/services/telephony/DisconnectCauseUtil.java b/src/com/android/services/telephony/DisconnectCauseUtil.java
index e3155f3..cf3f913 100644
--- a/src/com/android/services/telephony/DisconnectCauseUtil.java
+++ b/src/com/android/services/telephony/DisconnectCauseUtil.java
@@ -193,6 +193,7 @@
             case android.telephony.DisconnectCause.WIFI_LOST:
             case android.telephony.DisconnectCause.IMS_ACCESS_BLOCKED:
             case android.telephony.DisconnectCause.IMS_SIP_ALTERNATE_EMERGENCY_CALL:
+            case android.telephony.DisconnectCause.MEDIA_TIMEOUT:
                 return DisconnectCause.ERROR;
 
             case android.telephony.DisconnectCause.DIALED_MMI: