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

Commit 15fbc626 authored by Amit Mahajan's avatar Amit Mahajan
Browse files

Avoid UnsupportedOperationException from getDefaultSmsSubscriptionId() 

This is basically reverting to earlier behavior.

Test: basic sanity
Bug: 134375393
Merged-in: I44dc66f9f3d5d4dfcab95220d7a6a6be0ed5a825
Change-Id: I44dc66f9f3d5d4dfcab95220d7a6a6be0ed5a825
(cherry picked from commit 900aad99)
parent 2bc637ec

telephony/java/android/telephony/SmsManager.java

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

        }

    }