Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix threading problems with drawables" into nyc-dev

Browse Source 
am: 1e09e9826b

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

Change-Id: I06a58a1a9454f9e9c384b9999ef6077cc45cf46f
This commit is contained in:
Jorim Jaggi
2016-05-18 00:28:48 +00:00
committed by android-build-merger
parent 3a0f4f4b64 1e09e9826b
commit e48384c867
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/com/android/internal/policy/BackdropFrameRenderer.java
View File

@@ -109,9 +109,15 @@ public class BackdropFrameRenderer extends Thread implements Choreographer.Frame
Drawable captionBackgroundDrawableDrawable, Drawable userCaptionBackgroundDrawable, Drawable captionBackgroundDrawableDrawable, Drawable userCaptionBackgroundDrawable,
int statusBarColor, int navigationBarColor) { int statusBarColor, int navigationBarColor) {
mDecorView = decorView; mDecorView = decorView;
mResizingBackgroundDrawable = resizingBackgroundDrawable; mResizingBackgroundDrawable = resizingBackgroundDrawable != null
mCaptionBackgroundDrawable = captionBackgroundDrawableDrawable; ? resizingBackgroundDrawable.getConstantState().newDrawable()
mUserCaptionBackgroundDrawable = userCaptionBackgroundDrawable; : null;
mCaptionBackgroundDrawable = captionBackgroundDrawableDrawable != null
? captionBackgroundDrawableDrawable.getConstantState().newDrawable()
: null;
mUserCaptionBackgroundDrawable = userCaptionBackgroundDrawable != null
? userCaptionBackgroundDrawable.getConstantState().newDrawable()
: null;
if (mCaptionBackgroundDrawable == null) { if (mCaptionBackgroundDrawable == null) {
mCaptionBackgroundDrawable = mResizingBackgroundDrawable; mCaptionBackgroundDrawable = mResizingBackgroundDrawable;
} }