Merge "Add null check if shared user not found." into tm-dev (0153cbf9) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/Settings.java

+8 −4

Original line number	Diff line number	Diff line
		@@ -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();
		}
		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);