Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1737fcd6 authored by Gilles Debunne's avatar Gilles Debunne Committed by Android (Google) Code Review
Browse files

Merge "Fix for NPE in Switch"

parents 016671fb e724ee4b

core/java/android/widget/Switch.java

+4 −2
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ public class Switch extends CompoundButton { 
        mMinFlingVelocity = config.getScaledMinimumFlingVelocity();



        // Refresh display with current params

        refreshDrawableState();

        setChecked(isChecked());

    }
@@ -632,8 +633,9 @@ public class Switch extends CompoundButton { 
        int[] myDrawableState = getDrawableState();



        // Set the state of the Drawable

        mThumbDrawable.setState(myDrawableState);

        mTrackDrawable.setState(myDrawableState);

        // Drawable may be null when checked state is set from XML, from super constructor

        if (mThumbDrawable != null) mThumbDrawable.setState(myDrawableState);

        if (mTrackDrawable != null) mTrackDrawable.setState(myDrawableState);



        invalidate();

    }