commit 01a09630060eccc471ba3d8d83b34a602871d5c1
author Alan Viverette <alanv@google.com> Mon Dec 08 13:02:06 2014 -0800
committer Alan Viverette <alanv@google.com> Mon Dec 08 13:02:06 2014 -0800
tree 90df2955f9613810a2c6089b4b3b0a4f4ebffa9c
parent 2ea3650d18ab0ce4dba2cee101d639400b411452

Fix regression, don't NPE if Switch doesn't have a thumb set

BUG: 18670202
Change-Id: Iecb3498032c121c007ec87740ddebadb8e71c7a3

core/java/android/widget/Switch.java

diff --git a/core/java/android/widget/Switch.java b/core/java/android/widget/Switch.java
index 4c8aa51..7a22224 100644
--- a/core/java/android/widget/Switch.java
+++ b/core/java/android/widget/Switch.java
@@ -689,6 +689,10 @@
      * @return true if (x, y) is within the target area of the switch thumb
      */
     private boolean hitThumb(float x, float y) {
+        if (mThumbDrawable == null) {
+            return false;
+        }
+
         // Relies on mTempRect, MUST be called first!
         final int thumbOffset = getThumbOffset();