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

Commit 7c81d495 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge "Fix threading problems with drawables" into nyc-dev am: 1e09e982 am: e48384c8 

am: 22507e99

* commit '22507e99':
  Fix threading problems with drawables

Change-Id: I06fa9ebcdd1c0b0006ecc8f4481fcf45a3f5f8fa
parents 4e5b694a 22507e99

core/java/com/android/internal/policy/BackdropFrameRenderer.java

+9 −3
Original line number Diff line number Diff line
@@ -109,9 +109,15 @@ public class BackdropFrameRenderer extends Thread implements Choreographer.Frame 
            Drawable captionBackgroundDrawableDrawable, Drawable userCaptionBackgroundDrawable,

            int statusBarColor, int navigationBarColor) {

        mDecorView = decorView;

        mResizingBackgroundDrawable = resizingBackgroundDrawable;

        mCaptionBackgroundDrawable = captionBackgroundDrawableDrawable;

        mUserCaptionBackgroundDrawable = userCaptionBackgroundDrawable;

        mResizingBackgroundDrawable = resizingBackgroundDrawable != null

                ? resizingBackgroundDrawable.getConstantState().newDrawable()

                : null;

        mCaptionBackgroundDrawable = captionBackgroundDrawableDrawable != null

                ? captionBackgroundDrawableDrawable.getConstantState().newDrawable()

                : null;

        mUserCaptionBackgroundDrawable = userCaptionBackgroundDrawable != null

                ? userCaptionBackgroundDrawable.getConstantState().newDrawable()

                : null;

        if (mCaptionBackgroundDrawable == null) {

            mCaptionBackgroundDrawable = mResizingBackgroundDrawable;

        }