diff options
| author | 2025-03-17 20:52:14 -0700 | |
|---|---|---|
| committer | 2025-03-17 20:52:14 -0700 | |
| commit | ecc8c3680cba99cb1ad3b16b6031abd4de2088cf (patch) | |
| tree | f8b6cd43c6cd443fab20e9920d3ab38c27e51936 | |
| parent | 90670ab7ffa6e6ab59cc7e6b38806187b85d9e27 (diff) | |
| parent | e85351f15693c7e356389e8190c522760c88a384 (diff) | |
Merge "Use the getName method of PackageSetting to aviod NPE problem." into main am: 4a545ed1bb am: e85351f156
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3538719
Change-Id: I147b47d6e5432cfc83d3afbd379bd2c628bcca32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/pm/DeletePackageHelper.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/DeletePackageHelper.java b/services/core/java/com/android/server/pm/DeletePackageHelper.java index 38aa57f785e5..bbee77ce58ad 100644 --- a/services/core/java/com/android/server/pm/DeletePackageHelper.java +++ b/services/core/java/com/android/server/pm/DeletePackageHelper.java @@ -425,7 +425,7 @@ final class DeletePackageHelper { user == null || user.getIdentifier() == USER_ALL; if ((!deleteSystem || deleteAllUsers) && disabledPs == null) { Slog.w(TAG, "Attempt to delete unknown system package " - + ps.getPkg().getPackageName()); + + ps.getName()); return null; } // Confirmed if the system package has been updated |