From 49a1580248640bfd0ba2bed4c5590d4ef4f3fb26 Mon Sep 17 00:00:00 2001 From: Matt Casey Date: Wed, 23 Nov 2022 19:37:28 +0000 Subject: Log ScreenshotEvent.SCREENSHOT_SAVED_TO_WORK_PROFILE Log after it's saved to a managed user. Bug: 258490918 Test: Build, validate log Change-Id: Ia1370c7a01153af6b99759ed95ddab7d2042b142 --- .../android/systemui/screenshot/ScreenshotController.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java index d94c8277b82c..ee033906dc52 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java @@ -968,13 +968,8 @@ public class ScreenshotController { if (imageData.uri != null) { if (!imageData.owner.equals(Process.myUserHandle())) { - // TODO: Handle non-primary user ownership (e.g. Work Profile) - // This image is owned by another user. Special treatment will be - // required in the UI (badging) as well as sending intents which can - // correctly forward those URIs on to be read (actions). - - Log.d(TAG, "*** Screenshot saved to a non-primary user (" - + imageData.owner + ") as " + imageData.uri); + Log.d(TAG, "Screenshot saved to user " + imageData.owner + " as " + + imageData.uri); } mScreenshotHandler.post(() -> { if (mScreenshotAnimation != null && mScreenshotAnimation.isRunning()) { @@ -1055,6 +1050,11 @@ public class ScreenshotController { R.string.screenshot_failed_to_save_text); } else { mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_SAVED, 0, mPackageName); + if (mFlags.isEnabled(SCREENSHOT_WORK_PROFILE_POLICY) + && mUserManager.isManagedProfile(imageData.owner.getIdentifier())) { + mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_SAVED_TO_WORK_PROFILE, 0, + mPackageName); + } } } -- cgit v1.2.3-59-g8ed1b