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

Commit 611efc5f authored by Shishir Agrawal's avatar Shishir Agrawal
Browse files

DO NOT MERGE : Unhiding MSIM APIs. 

1. Unhide MSIM APIs in TelephonyManager that already have non-MSIM equivalent
   APIs public.
2. Make MSIM API naming consistent (overloaded, no suffix).
3. Unhide APIs in SubscriptionManager that are necessary for MSIM.

Bug: 26772894
Change-Id: I7a1826255370e9a8c7c62516eb49725dce377c8c
parent 6c296d3b

src/com/android/server/telecom/PhoneAccountRegistrar.java

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ public final class PhoneAccountRegistrar { 


    boolean isUserSelectedSmsPhoneAccount(PhoneAccountHandle accountHandle) {

        return getSubscriptionIdForPhoneAccount(accountHandle) ==

                SubscriptionManager.getDefaultSmsSubId();

                SubscriptionManager.getDefaultSmsSubscriptionId();

    }



    /**

src/com/android/server/telecom/TelecomServiceImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ public class TelecomServiceImpl { 
                        return null;

                    }



                    int subId = SubscriptionManager.getDefaultVoiceSubId();

                    int subId = SubscriptionManager.getDefaultVoiceSubscriptionId();

                    if (accountHandle != null) {

                        subId = mPhoneAccountRegistrar

                                .getSubscriptionIdForPhoneAccount(accountHandle);
@@ -453,7 +453,7 @@ public class TelecomServiceImpl { 
                try {

                    int subId =

                            mPhoneAccountRegistrar.getSubscriptionIdForPhoneAccount(accountHandle);

                    return getTelephonyManager().getLine1NumberForSubscriber(subId);

                    return getTelephonyManager().getLine1Number(subId);

                } catch (Exception e) {

                    Log.e(this, e, "getSubscriptionIdForPhoneAccount");

                    throw e;