Merge "Use current label for Sharing Shortcuts in Sharesheet" into rvc-dev am: 9a4ec16d7f

Change-Id: Ib3e124e131c2959225a42413965080ccda94d1bb
2020-05-26 16:01:46 +00:00
parent c33c8aaee7 9a4ec16d7f
commit 41a950e82c
1 changed files with 1 additions and 2 deletions
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -2147,8 +2147,7 @@ public class ChooserActivity extends ResolverActivity implements
            extras.putString(Intent.EXTRA_SHORTCUT_ID, shortcutInfo.getId());

            ChooserTarget chooserTarget = new ChooserTarget(
-                    shortcutInfo.getLongLabel() != null ? shortcutInfo.getLongLabel()
-                            : shortcutInfo.getShortLabel(),
+                    shortcutInfo.getLabel(),
                    null, // Icon will be loaded later if this target is selected to be shown.
                    score, matchingShortcuts.get(i).getTargetComponent().clone(), extras);