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

This commit is contained in:
vandwalle
2014-08-27 13:51:58 +00:00
committed by Android (Google) Code Review

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];