commit b605a4e2013337774a4e9b04eca5bf388c437234
author Phil Weaver <pweaver@google.com> Fri Jul 28 11:05:40 2017 -0700
committer Phil Weaver <pweaver@google.com> Wed Aug 02 17:24:34 2017 +0000
tree 941ff60b488657824b86d7062879389fd196df12
parent 446c5b08b1d674ab69b13a40135dd64759d21b15

Ensure a11y ids for LabeledSeekBar are in bounds

Bug: 64124736
Test: I just played with it with TalkBack on. The crash
was difficult to reproduce before, and I can't make it
fail now. I believe I got it.

Change-Id: I17ffe8d83e21e716d1c0cadea52afcf09bff6e97
(cherry picked from commit 54ee713dfbe7c9d62ad732f34ce6e1ee3164964e)

src/com/android/settings/widget/LabeledSeekBar.java

diff --git a/src/com/android/settings/widget/LabeledSeekBar.java b/src/com/android/settings/widget/LabeledSeekBar.java
index f1a6788..8e5a30b 100644
--- a/src/com/android/settings/widget/LabeledSeekBar.java
+++ b/src/com/android/settings/widget/LabeledSeekBar.java
@@ -201,6 +201,7 @@
             int posBase = Math.max(0,
                     ((int) x - LabeledSeekBar.this.getPaddingStart()) / getHalfVirtualViewWidth());
             posBase = (posBase + 1) / 2;
+            posBase = Math.min(posBase, LabeledSeekBar.this.getMax());
             return mIsLayoutRtl ? LabeledSeekBar.this.getMax() - posBase : posBase;
         }