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

Commit ad3fa417 authored by Steve Kondik's avatar Steve Kondik
Browse files

packagemanager: Fix bootloop if packages.xml is deleted 

 * Deleting packages.xml will cause a lot of carnage due to
   an NPE here. Try to handle it.

Change-Id: I7ad47f23c3ff62116243374f0cb1e02e393d4cd1
parent bf2ddee4

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

+9 −4
Original line number Diff line number Diff line
@@ -2459,11 +2459,16 @@ final class Settings { 
    private void readPrebundledPackagesForUserFromFileLPr(int userId, File file) {

        BufferedReader reader = null;

        try {

            HashSet<String> ppkg = mPrebundledPackages.get(userId);

            if (ppkg == null) {

                Slog.e(PackageManagerService.TAG, "Unable to get packages for user " + userId);

                return;

            }

            reader = new BufferedReader(new FileReader(file));

            String packageName = reader.readLine();

            while (packageName != null) {

                if (!TextUtils.isEmpty(packageName)) {

                    mPrebundledPackages.get(userId).add(packageName);

                    ppkg.add(packageName);

                }

                packageName = reader.readLine();

            }