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