commit 40e8b4118fb03a0499b4383ff0d6d582b6d1cf64
author JP Abgrall <jpa@google.com> Thu Sep 08 18:10:05 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 08 18:10:05 2011 -0700
tree 83df6901ae1eb6d7b4d2d7845aad61d8d8a714ad
parent e2ca08765e1e2da8edcbb9e43b0d2c2f79bd5101
parent 6acf39b3c6b67c2d302b6a01a213bd40a8192909

Merge "NetworkManagementService: adjust the qtaguid idx to new kernel"

services/java/com/android/server/NetworkManagementService.java

diff --git a/services/java/com/android/server/NetworkManagementService.java b/services/java/com/android/server/NetworkManagementService.java
index f774dea..349b4d2 100644
--- a/services/java/com/android/server/NetworkManagementService.java
+++ b/services/java/com/android/server/NetworkManagementService.java
@@ -1325,7 +1325,7 @@
         // TODO: remove knownLines check once 5087722 verified
         final HashSet<String> knownLines = Sets.newHashSet();
         // TODO: remove lastIdx check once 5270106 verified
-        int lastIdx = 0;
+        int lastIdx;
 
         final ArrayList<String> keys = Lists.newArrayList();
         final ArrayList<String> values = Lists.newArrayList();
@@ -1339,6 +1339,7 @@
             // parse first line as header
             line = reader.readLine();
             splitLine(line, keys);
+            lastIdx = 1;
 
             // parse remaining lines
             while ((line = reader.readLine()) != null) {
@@ -1350,7 +1351,7 @@
                 }
 
                 final int idx = getParsedInt(parsed, KEY_IDX);
-                if (idx > lastIdx + 1) {
+                if (idx != lastIdx + 1) {
                     throw new IllegalStateException(
                             "inconsistent idx=" + idx + " after lastIdx=" + lastIdx);
                 }