summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jan Nordqvist <jannq@google.com> 2016-02-03 23:06:58 +0000
committer android-build-merger <android-build-merger@google.com> 2016-02-03 23:06:58 +0000
commite678624958a63be5c05705a2f75eb22bcec3376b (patch)
tree93c7bef099253f728d4af67d0f47832f47d3745d
parentb5649ecdcee09cf28aab53ed9edb66feb0a36af6 (diff)
parent7a504417f23a1388d2a9bf53f0871d274e70c6b2 (diff)
Fixed bad serialization code in ScanResult.
am: 7a504417f2 * commit '7a504417f23a1388d2a9bf53f0871d274e70c6b2': Fixed bad serialization code in ScanResult.
-rw-r--r--wifi/java/android/net/wifi/ScanResult.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/ScanResult.java b/wifi/java/android/net/wifi/ScanResult.java
index 22a84ebf9cb2..4a86c59542ab 100644
--- a/wifi/java/android/net/wifi/ScanResult.java
+++ b/wifi/java/android/net/wifi/ScanResult.java
@@ -569,6 +569,9 @@ public class ScanResult implements Parcelable {
dest.writeString(anqpLines.get(i));
}
}
+ else {
+ dest.writeInt(0);
+ }
if (anqpElements != null) {
dest.writeInt(anqpElements.length);
for (AnqpInformationElement element : anqpElements) {
@@ -647,7 +650,7 @@ public class ScanResult implements Parcelable {
int len = in.readInt();
byte[] payload = new byte[len];
in.readByteArray(payload);
- sr.anqpElements[n] =
+ sr.anqpElements[i] =
new AnqpInformationElement(vendorId, elementId, payload);
}
}