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

Commit 2b587204 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4701683 from aee02cd7 to pi-release 

Change-Id: I99ef25c3126c1aa9854953e0c6bc5e94e69c69a0
parents 127e0392 aee02cd7

src/com/android/contacts/ShortcutIntentBuilder.java

+2 −2
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ public class ShortcutIntentBuilder { 
        final Bitmap icon = generateQuickContactIcon(drawable);

        if (BuildCompat.isAtLeastO()) {

            final IconCompat compatIcon = IconCompat.createWithAdaptiveBitmap(icon);

            compatIcon.addToShortcutIntent(intent);

            compatIcon.addToShortcutIntent(intent, null, mContext);

        } else {

            intent.putExtra(Intent.EXTRA_SHORTCUT_ICON, icon);

        }
@@ -356,7 +356,7 @@ public class ShortcutIntentBuilder { 
        intent = intent == null ? new Intent() : intent;

        // This will be non-null in O and above.

        if (compatAdaptiveIcon != null) {

            compatAdaptiveIcon.addToShortcutIntent(intent);

            compatAdaptiveIcon.addToShortcutIntent(intent, null, mContext);

        } else {

            intent.putExtra(Intent.EXTRA_SHORTCUT_ICON, icon);

        }