From 8786016e859c639de1d3722c1911b5389ef8fc39 Mon Sep 17 00:00:00 2001 From: Alex Johnston Date: Mon, 29 Mar 2021 13:51:38 +0100 Subject: Block recent work profile apps content capture Stop data exposure of work profile by blocking content capture of recents apps when the work profile is locked. Manual testing steps * Set up work profile * Set personal and work pattern * Open work app, enter work pattern and verify content capture is possible * Lock device * Go to Recents and select already opened work app. Verify content capture is not possible until work pattern is entered. Bug: 168802517 Test: manual testing Change-Id: I3e6ba1d8645335785e8e26cdc895ea9c0017a0fd Merged-In: I3e6ba1d8645335785e8e26cdc895ea9c0017a0fd --- .../src/com/android/quickstep/TaskOverlayFactory.java | 2 +- .../src/com/android/quickstep/views/TaskThumbnailView.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java index e9614d1351..1eaacd30bb 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java @@ -146,7 +146,7 @@ public class TaskOverlayFactory implements ResourceBasedOverride { */ public void initOverlay(Task task, ThumbnailData thumbnail, Matrix matrix, boolean rotated) { - final boolean isAllowedByPolicy = thumbnail.isRealSnapshot; + final boolean isAllowedByPolicy = mThumbnailView.isRealSnapshot(); getActionsView().updateDisabledFlags(DISABLED_ROTATED, rotated); diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java index b2f937f8c2..dbea80adbc 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java @@ -447,13 +447,14 @@ public class TaskThumbnailView extends View implements PluginListener