From: Paul Scovanner <pscovanner@google.com>
Date: Wed, 17 Apr 2019 16:40:38 +0000 (+0000)
Subject: Revert "Pretend to be having the original background"
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=956bbb7e5da11ac1d0a7e5687d64baec18964147;p=android-x86%2Fframeworks-base.git

Revert "Pretend to be having the original background"

This reverts commit 1ab06de89fa897919e531c3ce2609ce24ef79100.
Bug: b/130586696

Reason for revert: b/130586696 This change causes a major breakage in Maps and blocks droidfood.

Change-Id: I50cde4865f48825b82f27087b8cac6e6527d6d95
---

diff --git a/core/java/com/android/internal/policy/DecorView.java b/core/java/com/android/internal/policy/DecorView.java
index 32fce8f78330..d945e139dd0f 100644
--- a/core/java/com/android/internal/policy/DecorView.java
+++ b/core/java/com/android/internal/policy/DecorView.java
@@ -630,7 +630,7 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
                 drawingBounds.bottom -= framePadding.bottom - frameOffsets.bottom;
             }
 
-            Drawable bg = super.getBackground();
+            Drawable bg = getBackground();
             if (bg != null) {
                 bg.setBounds(drawingBounds);
             }
@@ -1238,11 +1238,6 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind
         mLastOriginalBackgroundDrawable = mOriginalBackgroundDrawable;
     }
 
-    @Override
-    public Drawable getBackground() {
-        return mOriginalBackgroundDrawable;
-    }
-
     private int calculateStatusBarColor() {
         return calculateBarColor(mWindow.getAttributes().flags, FLAG_TRANSLUCENT_STATUS,
                 mSemiTransparentBarColor, mWindow.mStatusBarColor,