From 284aaba153530e318130720e98afd7683a590b00 Mon Sep 17 00:00:00 2001 From: Alex Johnston Date: Tue, 23 Mar 2021 13:46:11 +0000 Subject: [PATCH] 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 --- .../src/com/android/quickstep/TaskOverlayFactoryGo.java | 2 +- quickstep/src/com/android/quickstep/TaskOverlayFactory.java | 2 +- .../src/com/android/quickstep/views/TaskThumbnailView.java | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java index b102a394f6..ea808c66f5 100644 --- a/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java +++ b/go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java @@ -78,7 +78,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory { } getActionsView().updateDisabledFlags(DISABLED_ROTATED, rotated); - boolean isAllowedByPolicy = thumbnail.isRealSnapshot; + boolean isAllowedByPolicy = mThumbnailView.isRealSnapshot(); getActionsView().setCallbacks(new OverlayUICallbacksGoImpl(isAllowedByPolicy, task)); } diff --git a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java index 0d2c42e3b0..3d98b9c5bc 100644 --- a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java +++ b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java @@ -152,7 +152,7 @@ public class TaskOverlayFactory implements ResourceBasedOverride { if (thumbnail != null) { getActionsView().updateDisabledFlags(DISABLED_ROTATED, rotated); - boolean isAllowedByPolicy = thumbnail.isRealSnapshot; + boolean isAllowedByPolicy = mThumbnailView.isRealSnapshot(); getActionsView().setCallbacks(new OverlayUICallbacksImpl(isAllowedByPolicy, task)); } } diff --git a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java index 3bd883ddc4..f94acf8bb9 100644 --- a/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java +++ b/quickstep/src/com/android/quickstep/views/TaskThumbnailView.java @@ -445,13 +445,14 @@ public class TaskThumbnailView extends View implements PluginListener