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

Commit 3c52c4c8 authored by David Brazdil's avatar David Brazdil Committed by android-build-merger
Browse files

Merge \\"Fix NPE in reading package-usage.list file\\" into nyc-dev am: ec3f8409 

am: be880349

Change-Id: I690242d94b1a80a8ad1564215cd4e579614429b2
parents 0b5f923c be880349

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

+3 −1
Original line number Diff line number Diff line
@@ -1219,7 +1219,9 @@ public class PackageManagerService extends IPackageManager.Stub { 
                    StringBuffer sb = new StringBuffer();















                    String firstLine = readLine(in, sb);













                    if (firstLine.equals(USAGE_FILE_MAGIC_VERSION_1)) {













                    if (firstLine == null) {













                        // Empty file. Do nothing.













                    } else if (USAGE_FILE_MAGIC_VERSION_1.equals(firstLine)) {















                        readVersion1LP(in, sb);















                    } else {















                        readVersion0LP(in, sb, firstLine);