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

Commit ecc8c368 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... 

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

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



Change-Id: I147b47d6e5432cfc83d3afbd379bd2c628bcca32
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 90670ab7 e85351f1

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

+1 −1
Original line number Diff line number Diff line
@@ -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