From 3502c3c1047ce35960bed99c6d487602d4c05067 Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Sun, 30 Oct 2016 13:14:39 +0100
Subject: Fix off-by-one error in submenu selection handling.

RM-290

Change-Id: I7e0f44110735d8e098abdf9724e89a837b96c3e9
---
 src/com/android/camera/ui/ListSubMenu.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/camera/ui/ListSubMenu.java b/src/com/android/camera/ui/ListSubMenu.java
index 87c99c0fe..1965cec6a 100644
--- a/src/com/android/camera/ui/ListSubMenu.java
+++ b/src/com/android/camera/ui/ListSubMenu.java
@@ -138,6 +138,10 @@ public class ListSubMenu extends ListView implements
     @Override
     public void onItemClick(AdapterView<?> parent, View view,
             int index, long id) {
+        index -= getHeaderViewsCount();
+        if (index < 0 || index >= getAdapter().getCount()) {
+            return;
+        }
         mPreference.setValueIndex(index);
         if (mListener != null)
             mListener.onListPrefChanged(mPreference);
-- 
cgit v1.2.3