diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-10-06 11:50:30 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-10-06 11:50:30 -0700 |
| commit | e9e7aedfb2b136b1576bd89d365704d5f76b8816 (patch) | |
| tree | 106ed4355db835714d46ce6ae041c7d3ecb68733 /service/java/com/android/server/wifi/anqp/VenueNameElement.java | |
| parent | 19adf4868804c246816504493c7d08b224258150 (diff) | |
| parent | 47c5adba752a951243ee696ce5f1ee3f302a42ab (diff) | |
| download | android_frameworks_opt_net_wifi-e9e7aedfb2b136b1576bd89d365704d5f76b8816.tar.gz android_frameworks_opt_net_wifi-e9e7aedfb2b136b1576bd89d365704d5f76b8816.tar.bz2 android_frameworks_opt_net_wifi-e9e7aedfb2b136b1576bd89d365704d5f76b8816.zip | |
Merge tag 'android-6.0.1_r72' into HEAD
Android 6.0.1 Release 72 (M4B30X)
# gpg: Signature made Tue 04 Oct 2016 09:47:41 AM PDT using DSA key ID 9AB10E78
# gpg: Can't check signature: public key not found
Diffstat (limited to 'service/java/com/android/server/wifi/anqp/VenueNameElement.java')
| -rw-r--r-- | service/java/com/android/server/wifi/anqp/VenueNameElement.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/service/java/com/android/server/wifi/anqp/VenueNameElement.java b/service/java/com/android/server/wifi/anqp/VenueNameElement.java index f0b27dd33..f944c4098 100644 --- a/service/java/com/android/server/wifi/anqp/VenueNameElement.java +++ b/service/java/com/android/server/wifi/anqp/VenueNameElement.java @@ -29,13 +29,13 @@ public class VenueNameElement extends ANQPElement { int group = payload.get() & Constants.BYTE_MASK; int type = payload.get() & Constants.BYTE_MASK; - if (group >= VenueGroup.values().length) { + if (group >= VenueGroup.Reserved.ordinal()) { mGroup = VenueGroup.Reserved; mType = VenueType.Reserved; } else { mGroup = VenueGroup.values()[group]; type += sGroupBases.get(mGroup); - if (type >= VenueType.values().length) { + if (type >= VenueType.Reserved.ordinal()) { mType = VenueType.Reserved; } else { mType = VenueType.values()[type]; @@ -82,7 +82,7 @@ public class VenueNameElement extends ANQPElement { UtilityMiscellaneous, Vehicular, Outdoor, - Reserved + Reserved // Note: this must be the last enum constant } public enum VenueType { @@ -164,7 +164,7 @@ public class VenueNameElement extends ANQPElement { BusStop, Kiosk, - Reserved + Reserved // Note: this must be the last enum constant } private static final VenueType[] PerGroup = |