diff options
| author | 2016-09-30 09:02:39 +0000 | |
|---|---|---|
| committer | 2016-09-30 09:02:41 +0000 | |
| commit | a04451827ebfb9248fe6897eaa2c09b00f15b09c (patch) | |
| tree | 38246b7b97b251c12473dcfeb8339be253abadde | |
| parent | 26df2bf4f802ab36ccf01abdca4c0dc550f3471e (diff) | |
| parent | 92d0602a7ce9b87a2c712215d97fb8f6df2fd2c2 (diff) | |
Merge "Fix crash if drawable doesn't have constant state" into nyc-mr1-dev
| -rw-r--r-- | core/java/com/android/internal/policy/BackdropFrameRenderer.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/com/android/internal/policy/BackdropFrameRenderer.java b/core/java/com/android/internal/policy/BackdropFrameRenderer.java index 619303f34c32..1abb59b006dd 100644 --- a/core/java/com/android/internal/policy/BackdropFrameRenderer.java +++ b/core/java/com/android/internal/policy/BackdropFrameRenderer.java @@ -110,12 +110,15 @@ public class BackdropFrameRenderer extends Thread implements Choreographer.Frame int statusBarColor, int navigationBarColor) { mDecorView = decorView; mResizingBackgroundDrawable = resizingBackgroundDrawable != null + && resizingBackgroundDrawable.getConstantState() != null ? resizingBackgroundDrawable.getConstantState().newDrawable() : null; mCaptionBackgroundDrawable = captionBackgroundDrawableDrawable != null + && captionBackgroundDrawableDrawable.getConstantState() != null ? captionBackgroundDrawableDrawable.getConstantState().newDrawable() : null; mUserCaptionBackgroundDrawable = userCaptionBackgroundDrawable != null + && userCaptionBackgroundDrawable.getConstantState() != null ? userCaptionBackgroundDrawable.getConstantState().newDrawable() : null; if (mCaptionBackgroundDrawable == null) { |