From cfcf1aede6bd5fae87d1f60b26cb1e5185ca7a30 Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Fri, 2 Mar 2018 16:01:10 -0800
Subject: [PATCH] Do not allow ScrimView backgrounds

An external agent is setting the background of the ScrimView.
This causes washed out lock screen and AOD flickering.

It's not clear what's doing this so I'm adding a Log.wtf and keeping the
backbround from being set.

PS: also formatted the xml and removed an unused method

Change-Id: I65dce9ce2b097b572c78605e0524b3854f46457f
Fixes: 71527665
Fixes: 68877998
Test: manually add a ripple to packages/SystemUI/res/layout/super_status_bar.xml
(cherry picked from commit c2aa8d2a2d6e696423206c6a03ef76ba095e14bd)
---
 .../SystemUI/res/layout/super_status_bar.xml    |  6 ++++--
 .../android/systemui/statusbar/ScrimView.java   | 17 +++++------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/packages/SystemUI/res/layout/super_status_bar.xml b/packages/SystemUI/res/layout/super_status_bar.xml
index 029d16e999cc2..ef442e539c0cd 100644
--- a/packages/SystemUI/res/layout/super_status_bar.xml
+++ b/packages/SystemUI/res/layout/super_status_bar.xml
@@ -43,7 +43,8 @@
                    android:visibility="invisible" />
     </com.android.systemui.statusbar.BackDropView>
 
-    <com.android.systemui.statusbar.ScrimView android:id="@+id/scrim_behind"
+    <com.android.systemui.statusbar.ScrimView
+        android:id="@+id/scrim_behind"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:importantForAccessibility="no"
@@ -75,7 +76,8 @@
         android:layout_height="match_parent"
         android:visibility="invisible" />
 
-    <com.android.systemui.statusbar.ScrimView android:id="@+id/scrim_in_front"
+    <com.android.systemui.statusbar.ScrimView
+        android:id="@+id/scrim_in_front"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:importantForAccessibility="no"
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ScrimView.java b/packages/SystemUI/src/com/android/systemui/statusbar/ScrimView.java
index 8830352296dd1..475a6091323e9 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ScrimView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ScrimView.java
@@ -106,6 +106,11 @@ public class ScrimView extends View implements ConfigurationController.Configura
                 Utils.getThemeAttr(mContext, android.R.attr.dialogCornerRadius));
     }
 
+    @Override
+    public void setBackground(Drawable background) {
+        Log.wtfStack(TAG, "ScrimView should never have a background.");
+    }
+
     @Override
     protected void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
@@ -321,18 +326,6 @@ public class ScrimView extends View implements ConfigurationController.Configura
         return mViewAlpha;
     }
 
-    public void animateViewAlpha(float alpha, long durationOut, Interpolator interpolator) {
-        if (mAlphaAnimator != null) {
-            mAlphaAnimator.cancel();
-        }
-        mAlphaAnimator = ValueAnimator.ofFloat(getViewAlpha(), alpha);
-        mAlphaAnimator.addUpdateListener(mAlphaUpdateListener);
-        mAlphaAnimator.addListener(mClearAnimatorListener);
-        mAlphaAnimator.setInterpolator(interpolator);
-        mAlphaAnimator.setDuration(durationOut);
-        mAlphaAnimator.start();
-    }
-
     public void setExcludedArea(Rect area) {
         if (area == null) {
             mHasExcludedArea = false;