commit db82c9e00ee9eefab68f6b8fff5db60736583490
author Alan Viverette <alanv@google.com> Mon Dec 08 21:29:02 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 08 21:29:04 2014 +0000
tree 00e9b46e479b8cfe56746ad8b68a705a62bab223
parent 381a423634a293d53f972a0ce4abd7fe7cf7d703
parent 01a09630060eccc471ba3d8d83b34a602871d5c1

Merge "Fix regression, don't NPE if Switch doesn't have a thumb set" into lmp-mr1-dev

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();