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

Commit 72ea5eeb 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

Change-Id: I2221e3f75471b88b7bcfcc7de34c29294ae601d0
parents e91051b2 ec3f8409

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

+3 −1
Original line number Diff line number Diff line
@@ -1214,7 +1214,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);