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

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

Browse Source
This commit is contained in:
JP Abgrall
2011-09-08 18:10:05 -07:00
committed by Android (Google) Code Review
parent e2ca08765e 6acf39b3c6
commit 40e8b4118f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/java/com/android/server/NetworkManagementService.java
View File

@@ -1325,7 +1325,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub
// TODO: remove knownLines check once 5087722 verified // TODO: remove knownLines check once 5087722 verified
final HashSet<String> knownLines = Sets.newHashSet(); final HashSet<String> knownLines = Sets.newHashSet();
// TODO: remove lastIdx check once 5270106 verified // TODO: remove lastIdx check once 5270106 verified
int lastIdx = 0; int lastIdx;
final ArrayList<String> keys = Lists.newArrayList(); final ArrayList<String> keys = Lists.newArrayList();
final ArrayList<String> values = Lists.newArrayList(); final ArrayList<String> values = Lists.newArrayList();
@@ -1339,6 +1339,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub
// parse first line as header // parse first line as header
line = reader.readLine(); line = reader.readLine();
splitLine(line, keys); splitLine(line, keys);
lastIdx = 1;
// parse remaining lines // parse remaining lines
while ((line = reader.readLine()) != null) { while ((line = reader.readLine()) != null) {
@@ -1350,7 +1351,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub
} }
final int idx = getParsedInt(parsed, KEY_IDX); final int idx = getParsedInt(parsed, KEY_IDX);
if (idx > lastIdx + 1) { if (idx != lastIdx + 1) {
throw new IllegalStateException( throw new IllegalStateException(
"inconsistent idx=" + idx + " after lastIdx=" + lastIdx); "inconsistent idx=" + idx + " after lastIdx=" + lastIdx);
} }