Merge "Added builder for SubscriptionInfo"

This commit is contained in:
TreeHugger Robot
2022-09-17 01:08:31 +00:00
committed by Android (Google) Code Review
2 changed files with 952 additions and 315 deletions

File diff suppressed because it is too large Load Diff

View File

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