Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be4b4bec authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Automerger Merge Worker
Browse files

Merge "Add null check if shared user not found." into tm-dev am: 0153cbf9 

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

Change-Id: I08616b62b170f27c7398dd650237d4c3d88340ac
parents 92a69287 0153cbf9

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);