diff options
| author | vandwalle <vandwalle@google.com> | 2014-08-27 13:51:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-27 13:51:59 +0000 |
| commit | 58ecda5915c43dca04acebfed3197dfcb2c59256 (patch) | |
| tree | b25e5ec8de196c056c013da467aba48277fa05ff /wifi/java/android | |
| parent | 394ea9eafa4648a9ab92468d2455919534b77e6d (diff) | |
| parent | b1dce0220bec5d81dca0aac645d84854ef4324cb (diff) | |
| download | frameworks_base-58ecda5915c43dca04acebfed3197dfcb2c59256.zip frameworks_base-58ecda5915c43dca04acebfed3197dfcb2c59256.tar.gz frameworks_base-58ecda5915c43dca04acebfed3197dfcb2c59256.tar.bz2 | |
Merge "fix ScanResult read from parcel, this function was broken and causes wifi settings to crash" into lmp-dev
Diffstat (limited to 'wifi/java/android')
| -rw-r--r-- | wifi/java/android/net/wifi/ScanResult.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/ScanResult.java b/wifi/java/android/net/wifi/ScanResult.java index a280348..e80a8f4 100644 --- a/wifi/java/android/net/wifi/ScanResult.java +++ b/wifi/java/android/net/wifi/ScanResult.java @@ -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]; |