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

Commit 0c059147 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Change getSubIdForPhoneAccountHandle to getSubscriptionId"

parents 88eac847 557393c7
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -45075,8 +45075,8 @@ package android.telephony {
    method @Nullable public CharSequence getSimSpecificCarrierIdName();
    method public int getSimState();
    method public int getSimState(int);
    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int getSubIdForPhoneAccountHandle(@NonNull android.telecom.PhoneAccountHandle);
    method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public String getSubscriberId();
    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int getSubscriptionId(@NonNull android.telecom.PhoneAccountHandle);
    method public int getSupportedModemCount();
    method @Nullable public String getTypeAllocationCode();
    method @Nullable public String getTypeAllocationCode(int);
+3 −3
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ public class TelephonyManager {
     */
    @Nullable
    public TelephonyManager createForPhoneAccountHandle(PhoneAccountHandle phoneAccountHandle) {
        int subId = getSubIdForPhoneAccountHandle(phoneAccountHandle);
        int subId = getSubscriptionId(phoneAccountHandle);
        if (!SubscriptionManager.isValidSubscriptionId(subId)) {
            return null;
        }
@@ -9471,7 +9471,7 @@ public class TelephonyManager {
     *         permission.
     */
    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
    public int getSubIdForPhoneAccountHandle(@NonNull PhoneAccountHandle phoneAccountHandle) {
    public int getSubscriptionId(@NonNull PhoneAccountHandle phoneAccountHandle) {
        int retval = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
        try {
            ITelephony service = getITelephony();
@@ -9480,7 +9480,7 @@ public class TelephonyManager {
                        phoneAccountHandle, mContext.getOpPackageName());
            }
        } catch (RemoteException ex) {
            Log.e(TAG, "getSubIdForPhoneAccountHandle RemoteException", ex);
            Log.e(TAG, "getSubscriptionId RemoteException", ex);
            ex.rethrowAsRuntimeException();
        }
        return retval;