Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alan Viverette
2014-12-08 21:29:02 +00:00
committed by Android (Google) Code Review
parent 381a423634 01a0963006
commit db82c9e00e
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/widget/Switch.java
View File

@@ -689,6 +689,10 @@ public class Switch extends CompoundButton {
* @return true if (x, y) is within the target area of the switch thumb * @return true if (x, y) is within the target area of the switch thumb
*/ */
private boolean hitThumb(float x, float y) { private boolean hitThumb(float x, float y) {
if (mThumbDrawable == null) {
return false;
}
// Relies on mTempRect, MUST be called first! // Relies on mTempRect, MUST be called first!
final int thumbOffset = getThumbOffset(); final int thumbOffset = getThumbOffset();