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

Commit e48384c8 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

* commit '1e09e982':
  Fix threading problems with drawables

Change-Id: I06a58a1a9454f9e9c384b9999ef6077cc45cf46f
parents 3a0f4f4b 1e09e982

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;

        }