Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix infinite loop during package-usage.list file upgrade" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-04-27 11:02:49 +00:00
committed by Android (Google) Code Review
parent 9c51583daf 14e7acd58c
commit 074e23c37b
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -1217,12 +1217,7 @@ public class PackageManagerService extends IPackageManager.Stub {
// Initial version of the file had no version number and stored one // Initial version of the file had no version number and stored one
// package-timestamp pair per line. // package-timestamp pair per line.
// Note that the first line has already been read from the InputStream. // Note that the first line has already been read from the InputStream.
String line = firstLine; for (String line = firstLine; line != null; line = readLine(in, sb)) {
while (true) {
if (line == null) {
break;
}
String[] tokens = line.split(" "); String[] tokens = line.split(" ");
if (tokens.length != 2) { if (tokens.length != 2) {
throw new IOException("Failed to parse " + line + throw new IOException("Failed to parse " + line +
@@ -1241,8 +1236,6 @@ public class PackageManagerService extends IPackageManager.Stub {
reason++) { reason++) {
pkg.mLastPackageUsageTimeInMills[reason] = timestamp; pkg.mLastPackageUsageTimeInMills[reason] = timestamp;
} }
line = readLine(in, sb);
} }
} }