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

            // 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 +

                        reason++) {

                        reason++) {

                    pkg.mLastPackageUsageTimeInMills[reason] = timestamp;

                    pkg.mLastPackageUsageTimeInMills[reason] = timestamp;

                }

                }

                line = readLine(in, sb);

            }

            }

        }

        }