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

Commit 4e86d685 authored Jun 02, 2023 by Song Chun Fan Committed by Automerger Merge Worker Jun 02, 2023

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

Merge "[pm] fix potential NPE in system server" into udc-dev am: e6ce51f3 am: 96f1ec21 am: 1d60da66

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

Change-Id: I85a5023ea3d504e982a2c6333f2c7390d09f96c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 1e8d0ac1 1d60da66

services/core/java/com/android/server/pm/InstallPackageHelper.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -2145,7 +2145,7 @@ final class InstallPackageHelper {
		final String pkgName = pkg.getPackageName();
		final int[] installedForUsers = installRequest.getOriginUsers();
		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());
		synchronized (mPm.mLock) {

services/core/java/com/android/server/pm/InstallRequest.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -366,12 +366,6 @@ final class InstallRequest {
		public String getApexModuleName() {
		return mApexModuleName;
		}

		@Nullable
		public String getSourceInstallerPackageName() {
		return mInstallArgs.mInstallSource.mInstallerPackageName;
		}

		public boolean isRollback() {
		return mInstallArgs != null
		&& mInstallArgs.mInstallReason == PackageManager.INSTALL_REASON_ROLLBACK;