From 9e3983fbde2f86c116ffbc40491ff7aedd7d2fc7 Mon Sep 17 00:00:00 2001
From: Robert Greenwalt <robdroid@android.com>
Date: Tue, 11 May 2010 07:06:13 -0700
Subject: [PATCH] Fix throttle datafile parsing.

"Optimization" yesterday was buggy.
bug:2674511

Change-Id: I3b1dde35a75b2017117c20905fcd82de405d41b5
---
 .../com/android/server/ThrottleService.java   | 59 +++++++++++--------
 1 file changed, 36 insertions(+), 23 deletions(-)

diff --git a/services/java/com/android/server/ThrottleService.java b/services/java/com/android/server/ThrottleService.java
index 57e3918f7b71d..5e328a7ab26e3 100644
--- a/services/java/com/android/server/ThrottleService.java
+++ b/services/java/com/android/server/ThrottleService.java
@@ -1031,35 +1031,48 @@ public class ThrottleService extends IThrottleManager.Stub {
                 return;
             }
 
-            if (Integer.parseInt(parsed[parsedUsed++]) != DATA_FILE_VERSION) {
-                Slog.e(TAG, "reading data file with bad version - ignoring");
+            int periodCount;
+            long[] periodRxData;
+            long[] periodTxData;
+            int currentPeriod;
+            Calendar periodStart;
+            Calendar periodEnd;
+            try {
+                if (Integer.parseInt(parsed[parsedUsed++]) != DATA_FILE_VERSION) {
+                    Slog.e(TAG, "reading data file with bad version - ignoring");
+                    return;
+                }
+
+                periodCount = Integer.parseInt(parsed[parsedUsed++]);
+                if (parsed.length != 5 + (2 * periodCount)) {
+                    Slog.e(TAG, "reading data file with bad length (" + parsed.length +
+                            " != " + (5 + (2 * periodCount)) + ") - ignoring");
+                    return;
+                }
+                periodRxData = new long[periodCount];
+                for (int i = 0; i < periodCount; i++) {
+                    periodRxData[i] = Long.parseLong(parsed[parsedUsed++]);
+                }
+                periodTxData = new long[periodCount];
+                for (int i = 0; i < periodCount; i++) {
+                    periodTxData[i] = Long.parseLong(parsed[parsedUsed++]);
+                }
+
+                currentPeriod = Integer.parseInt(parsed[parsedUsed++]);
+
+                periodStart = new GregorianCalendar();
+                periodStart.setTimeInMillis(Long.parseLong(parsed[parsedUsed++]));
+                periodEnd = new GregorianCalendar();
+                periodEnd.setTimeInMillis(Long.parseLong(parsed[parsedUsed++]));
+            } catch (Exception e) {
+                Slog.e(TAG, "Error parsing data file - ignoring");
                 return;
             }
-
-            int periodCount = Integer.parseInt(parsed[parsedUsed++]);
-            if (parsed.length != 5 + (2 * periodCount)) {
-                Slog.e(TAG, "reading data file with bad length (" + parsed.length +
-                        " != " + (5 + (2 * periodCount)) + ") - ignoring");
-                return;
-            }
-            long[] periodRxData = new long[periodCount];
-            for (int i = 0; i < periodCount; i++) {
-                periodRxData[i] = Long.parseLong(parsed[parsedUsed++]);
-            }
-            long[] periodTxData = new long[periodCount];
-            for (int i = 0; i < periodCount; i++) {
-                periodTxData[i] = Long.parseLong(parsed[parsedUsed++]);
-            }
-
-            Calendar periodStart = new GregorianCalendar();
-            periodStart.setTimeInMillis(Long.parseLong(parsed[parsedUsed++]));
-            Calendar periodEnd = new GregorianCalendar();
-            periodEnd.setTimeInMillis(Long.parseLong(parsed[parsedUsed++]));
             synchronized (mParent) {
                 mPeriodCount = periodCount;
                 mPeriodRxData = periodRxData;
                 mPeriodTxData = periodTxData;
-                mCurrentPeriod = Integer.parseInt(parsed[parsedUsed++]);
+                mCurrentPeriod = currentPeriod;
                 mPeriodStart = periodStart;
                 mPeriodEnd = periodEnd;
             }