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

Commit a46e2b91 authored by John Wu's avatar John Wu Committed by Android (Google) Code Review
Browse files

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

parents 5dc38453 e4c314cd

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