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 am: a46e2b911c

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

Change-Id: I659fbd4e01d7b2c42c041a6703e15cac4b501e7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
John Wu
2022-04-14 16:20:48 +00:00
committed by Automerger Merge Worker
parent a337e3415d a46e2b911c
commit 337dacaf0d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -266,8 +266,11 @@ 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
reconciledPkg.mInstallResult.mRemovedInfo.mRemovedAppId = if (reconciledPkg.mInstallResult != null
requestSharedUserSetting.mAppId; && reconciledPkg.mInstallResult.mRemovedInfo != null) {
reconciledPkg.mInstallResult.mRemovedInfo.mRemovedAppId =
requestSharedUserSetting.mAppId;
}
} }
} }
} }