Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make getSimCallManager msim aware" into qt-dev

Browse Source
This commit is contained in:
Brad Ebinger
2019-05-10 20:17:38 +00:00
committed by Android (Google) Code Review
parent 89ed22cf08 e7833312d7
commit 5152540879
2 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
telecomm/java/android/telecom/TelecomManager.java
View File

@@ -33,6 +33,7 @@ import android.os.Bundle;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.UserHandle;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.Log;
@@ -849,15 +850,18 @@ 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");
@@ -866,9 +870,32 @@ 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 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");
}
return null;
}
/**
* 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.
*
@@ -889,8 +916,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

2
telecomm/java/com/android/internal/telecom/ITelecomService.aidl
View File

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