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

Commit 6044798e authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Allow getChangingConfigurations() on DrawableWrapper with null drawable" into mnc-dev

parents 21c8a493 e922f49b

graphics/java/android/graphics/drawable/DrawableWrapper.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -432,7 +432,8 @@ public abstract class DrawableWrapper extends Drawable implements Drawable.Callb 




        @Override

        @Override

        public int getChangingConfigurations() {

        public int getChangingConfigurations() {

            return mChangingConfigurations | mDrawableState.getChangingConfigurations();

            return mChangingConfigurations

                    | (mDrawableState != null ? mDrawableState.getChangingConfigurations() : 0);

        }

        }





        public boolean canConstantState() {

        public boolean canConstantState() {