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

Commit ac141afe authored by John Wu's avatar John Wu Committed by Automerger Merge Worker
Browse files

Merge "Null check before accessing mRemovedInfo in PMS" into tm-dev am: a46e2b91 

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



Change-Id: I043a46dcc08b48a0bbf65f5ba0af32f237b6e20d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4db498cd a46e2b91

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

+5 −2
Original line number Diff line number Diff line
@@ -266,11 +266,14 @@ final class InstallPackageHelper { 
                // Prune unused SharedUserSetting

                if (mPm.mSettings.checkAndPruneSharedUserLPw(requestSharedUserSetting, false)) {

                    // Set the app ID in removed info for UID_REMOVED broadcasts

                    if (reconciledPkg.mInstallResult != null

                            && reconciledPkg.mInstallResult.mRemovedInfo != null) {

                        reconciledPkg.mInstallResult.mRemovedInfo.mRemovedAppId =

                                requestSharedUserSetting.mAppId;

                    }

                }

            }

        }

        if (result.mExistingSettingCopied) {

            pkgSetting = request.mPkgSetting;

            pkgSetting.updateFrom(result.mPkgSetting);