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

Commit e4c314cd authored by John Wu's avatar John Wu
Browse files

Null check before accessing mRemovedInfo in PMS 

When a system APK removes sharedUserId after an OTA, PMS will crash as
it attempts to access mRemovedInfo. mRemovedInfo will not be set during
boot time, as package broadcasts are not sent for system image changes.

Bug: 229017590
Test: manual
Change-Id: I162675e79bec103420aa26522f164b7f72d7c43f
parent 39eb41b5

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