Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 821e6b71 authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge "Avoid UnsupportedOperationException from getDefaultSmsSubscriptionId()"... 

Merge "Avoid UnsupportedOperationException from getDefaultSmsSubscriptionId()" into qt-dev am: be063ffb
am: 67f80397

Change-Id: I7a50cbb3ab24d66cc805bb524f00337eff812d17
parents 10194950 67f80397

telephony/java/android/telephony/SmsManager.java

+3 −1
Original line number Diff line number Diff line
@@ -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;

        }

    }