commit be06e3292b295324b3b47d13f9a40787b666309f
author Fabrice Di Meglio <fdimeglio@google.com> Tue Sep 11 17:42:45 2012 -0700
committer Fabrice Di Meglio <fdimeglio@google.com> Tue Sep 11 17:42:45 2012 -0700
tree 407e583630d24dd399fda1c35b325538793e0301
parent e11dc0ddab438d3b6545bc5d1582e1deddb5d465

Fix bug #7148393 Switch can crash when hierarchyviewer is connected

Change-Id: I1713138a60358cc76f6cf373082a94199e85c717

core/java/android/widget/Switch.java

diff --git a/core/java/android/widget/Switch.java b/core/java/android/widget/Switch.java
index 1f713d4..689bd02 100644
--- a/core/java/android/widget/Switch.java
+++ b/core/java/android/widget/Switch.java
@@ -750,10 +750,11 @@
         mTextPaint.drawableState = getDrawableState();
 
         Layout switchText = getTargetCheckedState() ? mOnLayout : mOffLayout;
-
-        canvas.translate((thumbLeft + thumbRight) / 2 - switchText.getWidth() / 2,
-                (switchInnerTop + switchInnerBottom) / 2 - switchText.getHeight() / 2);
-        switchText.draw(canvas);
+        if (switchText != null) {
+            canvas.translate((thumbLeft + thumbRight) / 2 - switchText.getWidth() / 2,
+                    (switchInnerTop + switchInnerBottom) / 2 - switchText.getHeight() / 2);
+            switchText.draw(canvas);
+        }
 
         canvas.restore();
     }