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

Merge "[pm] fix potential NPE in system server" into udc-dev am: e6ce51f316

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

Change-Id: I5ca3b0282c9b31b6c3db5b1ee202efb2cdfcd494
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Song Chun Fan
2023-06-02 20:27:54 +00:00
committed by Automerger Merge Worker
parent 8258c7a6f8 e6ce51f316
commit 96f1ec2127
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2145,7 +2145,7 @@ final class InstallPackageHelper {
final String pkgName = pkg.getPackageName(); final String pkgName = pkg.getPackageName();
final int[] installedForUsers = installRequest.getOriginUsers(); final int[] installedForUsers = installRequest.getOriginUsers();
final int installReason = installRequest.getInstallReason(); final int installReason = installRequest.getInstallReason();
final String installerPackageName = installRequest.getSourceInstallerPackageName(); final String installerPackageName = installRequest.getInstallerPackageName();
if (DEBUG_INSTALL) Slog.d(TAG, "New package installed in " + pkg.getPath()); if (DEBUG_INSTALL) Slog.d(TAG, "New package installed in " + pkg.getPath());
synchronized (mPm.mLock) { synchronized (mPm.mLock) {

6
services/core/java/com/android/server/pm/InstallRequest.java
View File

@@ -366,12 +366,6 @@ final class InstallRequest {
public String getApexModuleName() { public String getApexModuleName() {
return mApexModuleName; return mApexModuleName;
} }
@Nullable
public String getSourceInstallerPackageName() {
return mInstallArgs.mInstallSource.mInstallerPackageName;
}
public boolean isRollback() { public boolean isRollback() {
return mInstallArgs != null return mInstallArgs != null
&& mInstallArgs.mInstallReason == PackageManager.INSTALL_REASON_ROLLBACK; && mInstallArgs.mInstallReason == PackageManager.INSTALL_REASON_ROLLBACK;