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 am: 0153cbf9c4

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

Change-Id: I15af61d68604ae115c54662120917dcc661b277e
This commit is contained in:
Alex Buynytskyy
2022-03-01 05:35:38 +00:00
committed by Automerger Merge Worker
parent c70ee0e5fd 0153cbf9c4
commit a2f3b52f75
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
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)) {
final LegacyPermissionState legacyState;
if (packageSetting.hasSharedUser()) {
legacyState = getSettingLPr(
packageSetting.getSharedUserAppId()).getLegacyPermissionState();
final SettingBase sharedUserSettings = getSettingLPr(
packageSetting.getSharedUserAppId());
legacyState = sharedUserSettings != null
? sharedUserSettings.getLegacyPermissionState() : null;
} else {
legacyState = packageSetting.getLegacyPermissionState();
}
readInstallPermissionsLPr(parser, legacyState, users);
packageSetting.setInstallPermissionsFixed(true);
if (legacyState != null) {
readInstallPermissionsLPr(parser, legacyState, users);
packageSetting.setInstallPermissionsFixed(true);
}
} else if (tagName.equals("proper-signing-keyset")) {
long id = parser.getAttributeLong(null, "identifier");
Integer refCt = mKeySetRefs.get(id);