diff --git a/api/current.txt b/api/current.txt index ce4cb250e7959..b1092d72f4d12 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index e46bccda84809..17ef4bc8d472d 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -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;