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

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

am 4de86f85: am f0d40256: am 6044798e: Merge "Allow... 

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

* commit '4de86f85':
  Allow getChangingConfigurations() on DrawableWrapper with null drawable
parents 5f402f81 4de86f85

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

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


        @Override

        public int getChangingConfigurations() {

            return mChangingConfigurations | mDrawableState.getChangingConfigurations();

            return mChangingConfigurations

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

        }



        public boolean canConstantState() {