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

Commit be063ffb authored by Amit Mahajan's avatar Amit Mahajan Committed by Android (Google) Code Review
Browse files

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

parents 01dbc2cb 900aad99

telephony/java/android/telephony/SmsManager.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -1975,9 +1975,11 @@ public final class SmsManager { 
     */

     */

    public static int getDefaultSmsSubscriptionId() {

    public static int getDefaultSmsSubscriptionId() {

        try {

        try {

            return getISmsServiceOrThrow().getPreferredSmsSubscription();

            return getISmsService().getPreferredSmsSubscription();

        } catch (RemoteException e) {

        } catch (RemoteException e) {

            return SubscriptionManager.INVALID_SUBSCRIPTION_ID;

            return SubscriptionManager.INVALID_SUBSCRIPTION_ID;

        } catch (NullPointerException e) {

            return SubscriptionManager.INVALID_SUBSCRIPTION_ID;

        }

        }

    }

    }