From 900aad99247f81c8f8c5724108c5c64a6f465caa Mon Sep 17 00:00:00 2001
From: Amit Mahajan <amitmahajan@google.com>
Date: Fri, 7 Jun 2019 10:40:09 -0700
Subject: [PATCH] Avoid UnsupportedOperationException from
 getDefaultSmsSubscriptionId()

This is basically reverting to earlier behavior.

Test: basic sanity
Bug: 134375393
Change-Id: I44dc66f9f3d5d4dfcab95220d7a6a6be0ed5a825
---
 telephony/java/android/telephony/SmsManager.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/telephony/java/android/telephony/SmsManager.java b/telephony/java/android/telephony/SmsManager.java
index 68602354d3b08..b44e4f179392a 100644
--- 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;
         }
     }