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

Commit cb7c0be8 authored by Amit Mahajan's avatar Amit Mahajan Committed by Gerrit Code Review
Browse files

Merge changes I44dc66f9,I72ee7af9 

* changes:
  Avoid UnsupportedOperationException from getDefaultSmsSubscriptionId()
  Fix the default sub id returned by SmsManager.
parents 781ac9ef 15fbc626

telephony/java/android/telephony/SmsManager.java

+14 −6
Original line number Diff line number Diff line
@@ -1958,16 +1958,24 @@ public final class SmsManager { 
    }



    /**

     * Get default sms subscription id

     * Get default sms subscription id.

     *

     * @return the user-defined default SMS subscription id or

     * {@link SubscriptionManager#INVALID_SUBSCRIPTION_ID} if no default is set.

     * <p class="note"><strong>Note:</strong>This returns a value different from

     * {@link SubscriptionManager#getDefaultSmsSubscriptionId} if the user has not chosen a default.

     * In this case it returns the active subscription id if there's only one active subscription

     * available.

     *

     * @return the user-defined default SMS subscription id, or the active subscription id if

     * there's only one active subscription available, otherwise

     * {@link SubscriptionManager#INVALID_SUBSCRIPTION_ID}.

     */

    public static int getDefaultSmsSubscriptionId() {

        try {

            return SubscriptionManager.getDefaultSmsSubscriptionId();

        } catch (NullPointerException ex) {

            return -1;

            return getISmsService().getPreferredSmsSubscription();

        } catch (RemoteException e) {

            return SubscriptionManager.INVALID_SUBSCRIPTION_ID;

        } catch (NullPointerException e) {

            return SubscriptionManager.INVALID_SUBSCRIPTION_ID;

        }

    }