Merge "Merge "Add @hide API to get the phone account handle for a subId." am:... (7dd9ef2b) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+21 −0

Original line number	Diff line number	Diff line
		@@ -8974,6 +8974,27 @@ public class TelephonyManager {
		return retval;
		}

		/**
		* Determines the {@link PhoneAccountHandle} associated with a subscription Id.
		*
		* @param subscriptionId The subscription Id to check.
		* @return The {@link PhoneAccountHandle} associated with a subscription Id, or {@code null} if
		* there is no associated {@link PhoneAccountHandle}.
		* @hide
		*/
		public @Nullable PhoneAccountHandle getPhoneAccountHandleForSubscriptionId(int subscriptionId) {
		PhoneAccountHandle returnValue = null;
		try {
		ITelephony service = getITelephony();
		if (service != null) {
		returnValue = service.getPhoneAccountHandleForSubscriptionId(subscriptionId);
		}
		} catch (RemoteException e) {
		}

		return returnValue;
		}

		private int getSubIdForPhoneAccountHandle(PhoneAccountHandle phoneAccountHandle) {
		int retval = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
		try {

+5 −0

Original line number	Diff line number	Diff line
		@@ -1265,6 +1265,11 @@ interface ITelephony {
		*/
		int getSubIdForPhoneAccount(in PhoneAccount phoneAccount);

		/**
		* Returns the PhoneAccountHandle associated with a subscription ID.
		*/
		PhoneAccountHandle getPhoneAccountHandleForSubscriptionId(int subscriptionId);

		void factoryReset(int subId);

		/**