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

Merge "Add null check if shared user not found." into tm-dev

Browse Source
This commit is contained in:
Alex Buynytskyy
2022-03-01 05:16:34 +00:00
committed by Android (Google) Code Review
parent 852f130119 be62ae7d35
commit 0153cbf9c4
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/pm/Settings.java
View File

@@ -3906,13 +3906,17 @@ public final class Settings implements Watchable, Snappable {
} else if (tagName.equals(TAG_PERMISSIONS)) { } else if (tagName.equals(TAG_PERMISSIONS)) {
final LegacyPermissionState legacyState; final LegacyPermissionState legacyState;
if (packageSetting.hasSharedUser()) { if (packageSetting.hasSharedUser()) {
legacyState = getSettingLPr( final SettingBase sharedUserSettings = getSettingLPr(
packageSetting.getSharedUserAppId()).getLegacyPermissionState(); packageSetting.getSharedUserAppId());
legacyState = sharedUserSettings != null
? sharedUserSettings.getLegacyPermissionState() : null;
} else { } else {
legacyState = packageSetting.getLegacyPermissionState(); legacyState = packageSetting.getLegacyPermissionState();
} }
if (legacyState != null) {
readInstallPermissionsLPr(parser, legacyState, users); readInstallPermissionsLPr(parser, legacyState, users);
packageSetting.setInstallPermissionsFixed(true); packageSetting.setInstallPermissionsFixed(true);
}
} else if (tagName.equals("proper-signing-keyset")) { } else if (tagName.equals("proper-signing-keyset")) {
long id = parser.getAttributeLong(null, "identifier"); long id = parser.getAttributeLong(null, "identifier");
Integer refCt = mKeySetRefs.get(id); Integer refCt = mKeySetRefs.get(id);