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

Commit 67f80397 authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

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

am: be063ffb

Change-Id: I221da0882cec481f4f0e892d8eb19c196889db1a
parents eecc28ff be063ffb

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;

        }

    }