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

Commit b6fabddc authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Use the getName method of PackageSetting to aviod NPE problem."... 

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

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