Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
John Wu
2022-04-14 15:59:19 +00:00
committed by Android (Google) Code Review
parent 5dc3845396 e4c314cd79
commit a46e2b911c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/pm/InstallPackageHelper.java
View File

@@ -266,11 +266,14 @@ final class InstallPackageHelper {
// Prune unused SharedUserSetting // Prune unused SharedUserSetting
if (mPm.mSettings.checkAndPruneSharedUserLPw(requestSharedUserSetting, false)) { if (mPm.mSettings.checkAndPruneSharedUserLPw(requestSharedUserSetting, false)) {
// Set the app ID in removed info for UID_REMOVED broadcasts // Set the app ID in removed info for UID_REMOVED broadcasts
if (reconciledPkg.mInstallResult != null
&& reconciledPkg.mInstallResult.mRemovedInfo != null) {
reconciledPkg.mInstallResult.mRemovedInfo.mRemovedAppId = reconciledPkg.mInstallResult.mRemovedInfo.mRemovedAppId =
requestSharedUserSetting.mAppId; requestSharedUserSetting.mAppId;
} }
} }
} }
}
if (result.mExistingSettingCopied) { if (result.mExistingSettingCopied) {
pkgSetting = request.mPkgSetting; pkgSetting = request.mPkgSetting;
pkgSetting.updateFrom(result.mPkgSetting); pkgSetting.updateFrom(result.mPkgSetting);