Merge "Avoid UnsupportedOperationException from getDefaultSmsSubscriptionId()" into qt-dev am: be063ffb59

am: 67f8039799 Change-Id: Ide7f75517e06e1c06ab1fe652d6ffb681e13b731
2019-06-07 15:41:03 -07:00
parent e8630bb83e 67f8039799
commit e6913669f9
1 changed files with 3 additions and 1 deletions
--- a/telephony/java/android/telephony/SmsManager.java
+++ b/telephony/java/android/telephony/SmsManager.java
@@ -1975,9 +1975,11 @@ public final class SmsManager {
     */
    public static int getDefaultSmsSubscriptionId() {
        try {
-            return getISmsServiceOrThrow().getPreferredSmsSubscription();
+            return getISmsService().getPreferredSmsSubscription();
        } catch (RemoteException e) {
            return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+        } catch (NullPointerException e) {
+            return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
        }
    }