commit 35a86eef3c0eef760f7e61c52a343327ba601630
author Samuel Tan <samueltan@google.com> Mon Jul 18 09:49:59 2016 -0700
committer gitbuildkicker <android-build@google.com> Fri Aug 26 10:40:58 2016 -0700
tree 5c927d1acc8f860effa89044bf16ac504e2ff118
parent c2905409c20c8692d4396b8531b09e7ec81fa3fb

VenueNameElement: fix off-by-one enum bounds check

Fix the off-by-one error in the conditionals that check
whether the Venue Group and Venue Type codes in the ANQP
element are in the "Reserved" range.

BUG: 30169673
BUG: 29464811
TEST: Manually set up AP with Hotspot 2.0 support, broadcasting
      Venue Group value 0xc, and ensure that device does not
      crash when in range of this AP.

Change-Id: I14adc3a919e19b67fc0f46bf09d0cffb88b5354e
(cherry picked from commit 48ee5f1e1c6e2a2dc63e9cb84c42f532c8a6847a)

service/java/com/android/server/wifi/anqp/VenueNameElement.java

diff --git a/service/java/com/android/server/wifi/anqp/VenueNameElement.java b/service/java/com/android/server/wifi/anqp/VenueNameElement.java
index f0b27dd..f944c40 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 @@
         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 @@
         UtilityMiscellaneous,
         Vehicular,
         Outdoor,
-        Reserved
+        Reserved  // Note: this must be the last enum constant
     }
 
     public enum VenueType {
@@ -164,7 +164,7 @@
         BusStop,
         Kiosk,
 
-        Reserved
+        Reserved  // Note: this must be the last enum constant
     }
 
     private static final VenueType[] PerGroup =