commit 51f42d298323849526a9ccf500be8d19183aebe1
author Winson Chung <winsonc@google.com> Thu Feb 01 14:59:38 2018 -0800
committer Winson Chung <winsonc@google.com> Fri Feb 02 11:15:15 2018 -0800
tree 2279907dc9f04dee8ed87b84ccb46d6e72065ec3
parent 9fad6d289a65232db252d5ce40cc718c18a793d6

Enforce an opaque background color when drawing secure window snapshots.

Bug: 72814691
Test: Launch Chrome (65+) incognito window, enter recents and verify that
      a snapshot exists

Change-Id: I99444f68f6ddc28847e3326d5f5e80609506696b

services/core/java/com/android/server/wm/TaskSnapshotController.java

diff --git a/services/core/java/com/android/server/wm/TaskSnapshotController.java b/services/core/java/com/android/server/wm/TaskSnapshotController.java
index 212a0d70..a7a2b53 100644
--- a/services/core/java/com/android/server/wm/TaskSnapshotController.java
+++ b/services/core/java/com/android/server/wm/TaskSnapshotController.java
@@ -27,6 +27,7 @@
 import android.app.ActivityManager.TaskSnapshot;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
+import android.graphics.Color;
 import android.graphics.GraphicBuffer;
 import android.graphics.Rect;
 import android.os.Environment;
@@ -40,6 +41,7 @@
 import android.view.WindowManager.LayoutParams;
 
 import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.graphics.ColorUtils;
 import com.android.server.policy.WindowManagerPolicy.ScreenOffListener;
 import com.android.server.policy.WindowManagerPolicy.StartingSurface;
 import com.android.server.wm.TaskSnapshotSurface.SystemBarBackgroundPainter;
@@ -324,7 +326,8 @@
         if (mainWindow == null) {
             return null;
         }
-        final int color = task.getTaskDescription().getBackgroundColor();
+        final int color = ColorUtils.setAlphaComponent(
+                task.getTaskDescription().getBackgroundColor(), 255);
         final int statusBarColor = task.getTaskDescription().getStatusBarColor();
         final int navigationBarColor = task.getTaskDescription().getNavigationBarColor();
         final LayoutParams attrs = mainWindow.getAttrs();