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

Merge changes from topics "subscriptionInfo_builder", "subscription_manager_service" am: 20f007c38c am: f3db9c87d3

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2457667

Change-Id: I13061161053f817f06710db94c7704e9ebb1fa1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jack Yu
2023-02-27 21:26:09 +00:00
committed by Automerger Merge Worker
parent a76b2948b3 f3db9c87d3
commit ebc959779c
2 changed files with 953 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1261
telephony/java/android/telephony/SubscriptionInfo.java
View File

File diff suppressed because it is too large Load Diff

4
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -3079,7 +3079,7 @@ public class SubscriptionManager {
@SystemApi @SystemApi
public boolean canManageSubscription(@NonNull SubscriptionInfo info, public boolean canManageSubscription(@NonNull SubscriptionInfo info,
@NonNull String packageName) { @NonNull String packageName) {
if (info == null || info.getAllAccessRules() == null || packageName == null) { if (info == null || info.getAccessRules() == null || packageName == null) {
return false; return false;
} }
PackageManager packageManager = mContext.getPackageManager(); PackageManager packageManager = mContext.getPackageManager();
@@ -3091,7 +3091,7 @@ public class SubscriptionManager {
logd("Unknown package: " + packageName); logd("Unknown package: " + packageName);
return false; return false;
} }
for (UiccAccessRule rule : info.getAllAccessRules()) { for (UiccAccessRule rule : info.getAccessRules()) {
if (rule.getCarrierPrivilegeStatus(packageInfo) if (rule.getCarrierPrivilegeStatus(packageInfo)
== TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) { == TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) {
return true; return true;