commit 6e1e05c9cfcc938af37d297d1fdf2191a6c2ee04
author android-build-team Robot <android-build-team-robot@google.com> Thu Mar 19 23:15:03 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Mar 19 23:15:03 2020 +0000
tree 527ccbd2d8e9efcf3eda5fcf9ff194a7398a08cf
parent cfef7cdd3b48fded88c59347f44d3e694743a22c
parent cefa4768017ae42c5a25a80241833448d4477c58

Snap for 6313343 from cefa4768017ae42c5a25a80241833448d4477c58 to qt-qpr3-release

Change-Id: I1a31beed7663ec61f1a2429fc4d0290285a5d486

src/com/android/server/telecom/PhoneNumberUtilsAdapterImpl.java

diff --git a/src/com/android/server/telecom/PhoneNumberUtilsAdapterImpl.java b/src/com/android/server/telecom/PhoneNumberUtilsAdapterImpl.java
index 8b3c856..0b19f09 100644
--- a/src/com/android/server/telecom/PhoneNumberUtilsAdapterImpl.java
+++ b/src/com/android/server/telecom/PhoneNumberUtilsAdapterImpl.java
@@ -24,16 +24,24 @@
 public class PhoneNumberUtilsAdapterImpl implements PhoneNumberUtilsAdapter {
     @Override
     public boolean isLocalEmergencyNumber(Context context, String number) {
-        TelephonyManager tm = (TelephonyManager) context.getSystemService(
-                Context.TELEPHONY_SERVICE);
-        return tm.isEmergencyNumber(number);
+        try {
+            TelephonyManager tm = (TelephonyManager) context.getSystemService(
+                    Context.TELEPHONY_SERVICE);
+            return tm.isEmergencyNumber(number);
+        } catch (IllegalStateException ise) {
+            return false;
+        }
     }
 
     @Override
     public boolean isPotentialLocalEmergencyNumber(Context context, String number) {
-        TelephonyManager tm = (TelephonyManager) context.getSystemService(
-                Context.TELEPHONY_SERVICE);
-        return tm.isPotentialEmergencyNumber(number);
+        try {
+            TelephonyManager tm = (TelephonyManager) context.getSystemService(
+                    Context.TELEPHONY_SERVICE);
+            return tm.isPotentialEmergencyNumber(number);
+        } catch (IllegalStateException ise) {
+            return false;
+        }
     }
 
     @Override
@@ -60,4 +68,4 @@
     public String stripSeparators(String number) {
         return PhoneNumberUtils.stripSeparators(number);
     }
-}
\ No newline at end of file
+}

src/com/android/server/telecom/TelephonyUtil.java

diff --git a/src/com/android/server/telecom/TelephonyUtil.java b/src/com/android/server/telecom/TelephonyUtil.java
index 70f774f..7eb08d7 100644
--- a/src/com/android/server/telecom/TelephonyUtil.java
+++ b/src/com/android/server/telecom/TelephonyUtil.java
@@ -70,8 +70,12 @@
     }
 
     public static boolean shouldProcessAsEmergency(Context context, Uri handle) {
-        TelephonyManager tm = (TelephonyManager) context.getSystemService(
-                Context.TELEPHONY_SERVICE);
-        return handle != null && tm.isEmergencyNumber(handle.getSchemeSpecificPart());
+        try {
+            TelephonyManager tm = (TelephonyManager) context.getSystemService(
+                    Context.TELEPHONY_SERVICE);
+            return handle != null && tm.isEmergencyNumber(handle.getSchemeSpecificPart());
+        } catch (IllegalStateException ise) {
+            return false;
+        }
     }
 }