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

Provide all active subscriptions when register default app providers.

Browse Source 
Telecom was using old form SimCallManager getting method which was not
MSIM aware. User may found they don't have necessary permissions to call
if they have both eSIM and pSIM activated. Provide all SimCallManager
for active subscriptions to PermissionManager so that all of them can
get proper permissions.

Bug: 172880421
Test: Manually test call function on MSIM device
Change-Id: I87b26bdb9e99274a8adaa64c72cfac0a61f946bd
This commit is contained in:
Grace Jia
2021-05-03 14:32:17 -07:00
parent c4520f1398
commit 9eef1ea522
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
services/core/java/com/android/server/telecom/TelecomLoaderService.java
View File

@@ -31,6 +31,7 @@ import android.telecom.DefaultDialerManager;
import android.telecom.PhoneAccountHandle;
import android.telecom.TelecomManager;
import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionManager;
import android.util.IntArray;
import android.util.Slog;
@@ -44,6 +45,9 @@ import com.android.server.SystemService;
import com.android.server.pm.UserManagerService;
import com.android.server.pm.permission.PermissionManagerServiceInternal;
import java.util.ArrayList;
import java.util.List;
/**
* Starts the telecom component by binding to its ITelecomService implementation. Telecom is setup
* to run in the system-server process so once it is loaded into memory it will stay running.
@@ -208,13 +212,23 @@ public class TelecomLoaderService extends SystemService {
return null;
}
}
SubscriptionManager subscriptionManager =
mContext.getSystemService(SubscriptionManager.class);
if (subscriptionManager == null) {
return null;
}
TelecomManager telecomManager =
(TelecomManager) mContext.getSystemService(Context.TELECOM_SERVICE);
PhoneAccountHandle phoneAccount = telecomManager.getSimCallManager(userId);
if (phoneAccount != null) {
return new String[]{phoneAccount.getComponentName().getPackageName()};
List<String> packages = new ArrayList<>();
int[] subIds = subscriptionManager.getActiveSubscriptionIdList();
for (int subId : subIds) {
PhoneAccountHandle phoneAccount =
telecomManager.getSimCallManagerForSubscription(subId);
if (phoneAccount != null) {
packages.add(phoneAccount.getComponentName().getPackageName());
}
}
return null;
return packages.toArray(new String[] {});
});
}