summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Miranda Kephart <mkephart@google.com> 2021-09-15 15:20:14 -0400
committer Miranda Kephart <mkephart@google.com> 2021-09-15 15:20:14 -0400
commit63fe7d73437212323e1b83a9d9e987951979725d (patch)
tree01e1a3d5576e25208d0076829541ea6282dd9d32
parentc72d4fc175be0da866e5b93c80a48e71a8e23cd8 (diff)
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
-rw-r--r--core/java/com/android/internal/app/chooser/SelectableTargetInfo.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/app/chooser/SelectableTargetInfo.java b/core/java/com/android/internal/app/chooser/SelectableTargetInfo.java
index ce75f45d0897..068b882eb4f7 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);