Merge "Make getSimCallManager msim aware" (0952103e) · Commits · e / os / android_frameworks_base

telecomm/java/android/telecom/TelecomManager.java

+36 −9

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import android.os.Build;
		import android.os.Bundle;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.telephony.SubscriptionManager;
		import android.telephony.TelephonyManager;
		import android.text.TextUtils;
		import android.util.Log;
		@@ -848,15 +849,40 @@ public class TelecomManager {

		/**
		* Returns the current SIM call manager. Apps must be prepared for this method to return
		* {@code null}, indicating that there currently exists no user-chosen default
		* {@code PhoneAccount}.
		* {@code null}, indicating that there currently exists no SIM call manager {@link PhoneAccount}
		* for the default voice subscription.
		*
		* @return The phone account handle of the current sim call manager.
		* @return The phone account handle of the current sim call manager for the default voice
		* subscription.
		* @see SubscriptionManager#getDefaultVoiceSubscriptionId()
		*/
		public PhoneAccountHandle getSimCallManager() {
		try {
		if (isServiceConnected()) {
		return getTelecomService().getSimCallManager();
		return getTelecomService().getSimCallManager(
		SubscriptionManager.getDefaultSubscriptionId());
		}
		} catch (RemoteException e) {
		Log.e(TAG, "Error calling ITelecomService#getSimCallManager");
		}
		return null;
		}

		/**
		* Returns current SIM call manager for the Telephony Subscription ID specified. Apps must be
		* prepared for this method to return {@code null}, indicating that there currently exists no
		* SIM call manager {@link PhoneAccount} for the subscription specified.
		*
		* @param subscriptionId The Telephony Subscription ID that the SIM call manager should be
		* queried for.
		* @return The phone account handle of the current sim call manager.
		* @see SubscriptionManager#getActiveSubscriptionInfoList()
		* @hide
		*/
		public PhoneAccountHandle getSimCallManagerForSubscription(int subscriptionId) {
		try {
		if (isServiceConnected()) {
		return getTelecomService().getSimCallManager(subscriptionId);
		}
		} catch (RemoteException e) {
		Log.e(TAG, "Error calling ITelecomService#getSimCallManager");
		@@ -865,9 +891,10 @@ public class TelecomManager {
		}

		/**
		* Returns the current SIM call manager for the specified user. Apps must be prepared for this
		* method to return {@code null}, indicating that there currently exists no user-chosen default
		* {@code PhoneAccount}.
		* Returns the current SIM call manager for the user-chosen default Telephony Subscription ID
		* (see {@link SubscriptionManager#getDefaultSubscriptionId()}) and the specified user. Apps
		* must be prepared for this method to return {@code null}, indicating that there currently
		* exists no SIM call manager {@link PhoneAccount} for the default voice subscription.
		*
		* @return The phone account handle of the current sim call manager.
		*
		@@ -888,8 +915,8 @@ public class TelecomManager {

		/**
		* Returns the current connection manager. Apps must be prepared for this method to return
		* {@code null}, indicating that there currently exists no user-chosen default
		* {@code PhoneAccount}.
		* {@code null}, indicating that there currently exists no Connection Manager
		* {@link PhoneAccount} for the default voice subscription.
		*
		* @return The phone account handle of the current connection manager.
		* @hide

telecomm/java/com/android/internal/telecom/ITelecomService.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -97,7 +97,7 @@ interface ITelecomService {
		/**
		* @see TelecomServiceImpl#getSimCallManager
		*/
		PhoneAccountHandle getSimCallManager();
		PhoneAccountHandle getSimCallManager(int subId);

		/**
		* @see TelecomServiceImpl#getSimCallManagerForUser