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

Commit e85351f1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use the getName method of PackageSetting to aviod NPE problem." into main am: 4a545ed1 

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



Change-Id: I423db94cf7736ea64d17a3b4ace1fa2c61f19070
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e819223b 4a545ed1

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

+1 −1
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ final class DeletePackageHelper { 
                    user == null || user.getIdentifier() == UserHandle.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