From 7a504417f23a1388d2a9bf53f0871d274e70c6b2 Mon Sep 17 00:00:00 2001
From: Jan Nordqvist <jannq@google.com>
Date: Wed, 3 Feb 2016 14:26:21 -0800
Subject: [PATCH] Fixed bad serialization code in ScanResult.

Bug: 26964162
Change-Id: Ie9ad65936ab5173533773e5a711bcb81799acfb5
---
 wifi/java/android/net/wifi/ScanResult.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wifi/java/android/net/wifi/ScanResult.java b/wifi/java/android/net/wifi/ScanResult.java
index 22a84ebf9cb2c..4a86c59542abe 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);
                     }
                 }