Merge "Add null bg check to switch"

2014-04-23 19:54:03 +00:00
parent 5c1d432729 aec98fee14
commit 6f6e64a7a3
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/widget/Switch.java
+++ b/core/java/android/widget/Switch.java
@@ -799,7 +799,7 @@ public class Switch extends CompoundButton {
        thumbDrawable.setBounds(thumbLeft, switchTop, thumbRight, switchBottom);

        final Drawable background = getBackground();
-        if (background.supportsHotspots()) {
+        if (background != null && background.supportsHotspots()) {
            background.setHotspotBounds(thumbLeft, switchTop, thumbRight, switchBottom);
        }