From 63fe7d73437212323e1b83a9d9e987951979725d Mon Sep 17 00:00:00 2001 From: Miranda Kephart Date: Wed, 15 Sep 2021 15:20:14 -0400 Subject: [PATCH] Fix direct share badges when sharing on work/personal profiles Use the passed-in user instead of the current user to determine whether or not to add the work profile badge to direct share target app icons, so that personal share targets do not have the badge (even when sharing something from the work profile) and work/managed share targets do have it (even when sharing something from the personal profile). Test: manual; tested appearance sharing from personal->work and from work->personal Bug: 197388251 Fix: 197388251 Change-Id: Ieee50d46e8058a92efa5be8aae9859447531c270 --- .../com/android/internal/app/chooser/SelectableTargetInfo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/com/android/internal/app/chooser/SelectableTargetInfo.java b/core/java/com/android/internal/app/chooser/SelectableTargetInfo.java index ce75f45d08970..068b882eb4f7e 100644 --- a/core/java/com/android/internal/app/chooser/SelectableTargetInfo.java +++ b/core/java/com/android/internal/app/chooser/SelectableTargetInfo.java @@ -165,7 +165,7 @@ public final class SelectableTargetInfo implements ChooserTargetInfo { // Now fetch app icon and raster with no badging even in work profile Bitmap appIcon = mSelectableTargetInfoCommunicator.makePresentationGetter(info) - .getIconBitmap(android.os.Process.myUserHandle()); + .getIconBitmap(mContext.getUser()); // Raster target drawable with appIcon as a badge SimpleIconFactory sif = SimpleIconFactory.obtain(mContext);