commit 483768d275d4046033e6c000083d42e22e357f59
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Mar 17 19:44:19 2025 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 17 19:44:19 2025 -0700
tree 241f0d716d8abb3e5ebc8e0645280088eea4e3a2
parent 440faf35257727adaa6c90e3d2de1221f28d4d21
parent f7982a6666f40343e9a2b2dcbaaa23451f6d4a0f

Merge "Fix NPE caused by null replacedPkgSetting" into main

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

diff --git a/services/core/java/com/android/server/pm/InstallRequest.java b/services/core/java/com/android/server/pm/InstallRequest.java
index 3361dbc..72f2068 100644
--- a/services/core/java/com/android/server/pm/InstallRequest.java
+++ b/services/core/java/com/android/server/pm/InstallRequest.java
@@ -869,6 +869,9 @@
     public void setScannedPackageSettingFirstInstallTimeFromReplaced(
             @Nullable PackageStateInternal replacedPkgSetting, int[] userId) {
         assertScanResultExists();
+        if (replacedPkgSetting == null) {
+            return;
+        }
         mScanResult.mPkgSetting.setFirstInstallTimeFromReplaced(replacedPkgSetting, userId);
     }