Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 082e54a5 authored by Miranda Kephart's avatar Miranda Kephart Committed by Automerger Merge Worker
Browse files

Merge "Fix direct share badges when sharing on work/personal profiles" into... 

Merge "Fix direct share badges when sharing on work/personal profiles" into sc-qpr1-dev am: b51d58e6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15839049

Change-Id: I1ac8b7840f29eaa7353b4c744452d428271d6e12
parents 2a15391a b51d58e6

core/java/com/android/internal/app/chooser/SelectableTargetInfo.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -165,7 +165,7 @@ public final class SelectableTargetInfo implements ChooserTargetInfo { 




        // Now fetch app icon and raster with no badging even in work profile

        // Now fetch app icon and raster with no badging even in work profile

        Bitmap appIcon = mSelectableTargetInfoCommunicator.makePresentationGetter(info)

        Bitmap appIcon = mSelectableTargetInfoCommunicator.makePresentationGetter(info)

                .getIconBitmap(android.os.Process.myUserHandle());

                .getIconBitmap(mContext.getUser());





        // Raster target drawable with appIcon as a badge

        // Raster target drawable with appIcon as a badge

        SimpleIconFactory sif = SimpleIconFactory.obtain(mContext);

        SimpleIconFactory sif = SimpleIconFactory.obtain(mContext);