Commit 72098499 authored Dec 09, 2014 by Alan Viverette Committed by Android Git Automerger Dec 09, 2014

am b0efde16: am 5a8b956f: am db82c9e0: Merge "Fix regression, don\'t NPE if...

am b0efde16: am 5a8b956f: am db82c9e0: Merge "Fix regression, don\'t NPE if Switch doesn\'t have a thumb set" into lmp-mr1-dev

* commit 'b0efde16':
  Fix regression, don't NPE if Switch doesn't have a thumb set

parents 70acef7d b0efde16

core/java/android/widget/Switch.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -689,6 +689,10 @@ public class Switch extends CompoundButton {
		* @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();