am 4c5d4e29: Merge "fix ScanResult read from parcel, this function was broken and causes wifi settings to crash" into lmp-dev

* commit '4c5d4e29e317167947392a5b6280fcb6f2d68b85':
  fix ScanResult read from parcel, this function was broken and causes wifi settings to crash
This commit is contained in:
vandwalle
2014-08-27 14:03:24 +00:00
committed by Android Git Automerger

View File

@@ -354,6 +354,7 @@ public class ScanResult implements Parcelable {
sr.autoJoinStatus = in.readInt();
sr.untrusted = in.readInt() != 0;
sr.numConnection = in.readInt();
sr.numUsage = in.readInt();
int n = in.readInt();
if (n != 0) {
sr.informationElements = new InformationElement[n];