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

Commit f0d40256 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am 6044798e: Merge "Allow getChangingConfigurations() on DrawableWrapper with... 

am 6044798e: Merge "Allow getChangingConfigurations() on DrawableWrapper with null drawable" into mnc-dev

* commit '6044798e':
  Allow getChangingConfigurations() on DrawableWrapper with null drawable
parents edc3fbb9 6044798e

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() {