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

Merge "Fix crashes seen when checking for carrierConfig certificates" into qt-qpr1-dev am: 848df9895f

Browse Source 
am: 92654741c0

Change-Id: Ie2dc1d4750f1b5abcd8908394cb0211d7949ca90
This commit is contained in:
Nazanin Bakhshi
2019-08-30 12:57:43 -07:00
committed by android-build-merger
parent 15acebb039 92654741c0
commit 1aa6877696
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -580,7 +580,8 @@ public class SubscriptionInfo implements Parcelable {
try {
packageInfo = packageManager.getPackageInfo(packageName, PackageManager.GET_SIGNATURES);
} catch (PackageManager.NameNotFoundException e) {
throw new IllegalArgumentException("Unknown package: " + packageName, e);
Log.d("SubscriptionInfo", "canManageSubscription: Unknown package: " + packageName, e);
return false;
}
for (UiccAccessRule rule : allAccessRules) {
if (rule.getCarrierPrivilegeStatus(packageInfo)
@@ -612,7 +613,9 @@ public class SubscriptionInfo implements Parcelable {
*/
public @Nullable List<UiccAccessRule> getAllAccessRules() {
List<UiccAccessRule> merged = new ArrayList<>();
if (mNativeAccessRules != null) merged.addAll(getAccessRules());
if (mNativeAccessRules != null) {
merged.addAll(getAccessRules());
}
if (mCarrierConfigAccessRules != null) {
merged.addAll(Arrays.asList(mCarrierConfigAccessRules));
}

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

@@ -2690,7 +2690,7 @@ public class SubscriptionManager {
* @hide
*/
public boolean canManageSubscription(SubscriptionInfo info, String packageName) {
if (info.getAllAccessRules() == null) {
if (info == null || info.getAllAccessRules() == null) {
return false;
}
PackageManager packageManager = mContext.getPackageManager();
@@ -2698,7 +2698,8 @@ public class SubscriptionManager {
try {
packageInfo = packageManager.getPackageInfo(packageName, PackageManager.GET_SIGNATURES);
} catch (PackageManager.NameNotFoundException e) {
throw new IllegalArgumentException("Unknown package: " + packageName, e);
logd("Unknown package: " + packageName);
return false;
}
for (UiccAccessRule rule : info.getAllAccessRules()) {
if (rule.getCarrierPrivilegeStatus(packageInfo)