Merge changes I66342431,I5e579f11,I927711aa,Idd4cc115,If8cdbdfa, ...

* changes:
  Automated rollback of changelist 179615699
  Automated rollback of changelist 179847039
  Differentiate read/unread voicemails in the NUI Voicemail by bolding.
  Use CHAR_TO_KEY_MAPS in DialpadCharMappings in SmartDialMaps.
  Reorganize classes related to smart dial.
  Use the orientation obtained in onFinishInflate as the truth in DialpadView.
  Added context menu for favorite contacts in new speed dial.
  Update assisted dialing extras in preparation for platform implementation.
  Quick fix for bugs on simulator voice call.
  Fixed crash in UiListener when launching activity with screen off.
  Handle contacts which have been disassociated with a number in Cp2PhoneLookup.
  Fixed crash in PinnedShortcuts.
  Bug: 70402588
  Added copySubMessage method to PhoneLookup interface.
  Bubble v2 changes.
  Always have hardware acceration enabled for InCallActivity
  Include inserted calls for consideration in PhoneLookupDataSource.
  Don't use phone number in spam call notifications
  Register content observer when voicemail table changes.
  Add SmartDialMaps for the Bulgarian alphabet and the Ukrainian alphabet.
  Remove voicemail from UI only after delete request.
  Bubble v2 RTL language fixes.
  Implemented SpeedDialEntry Room Database.

1 files changed, 8 insertions, 1 deletions

diff --git a/java/com/android/dialer/shortcuts/PinnedShortcuts.java b/java/com/android/dialer/shortcuts/PinnedShortcuts.java
index bfcc3df81..6e23a5c21 100644
--- a/java/com/android/dialer/shortcuts/PinnedShortcuts.java
+++ b/java/com/android/dialer/shortcuts/PinnedShortcuts.java
@@ -46,7 +46,6 @@ import java.util.Map;
  * <p>When refreshing pinned shortcuts, we check to make sure that pinned contact information is
  * still up to date (e.g. photo and name). We also check to see if the contact has been deleted from
  * the user's contacts, and if so, we disable the pinned shortcut.
- *
  */
 @TargetApi(VERSION_CODES.N_MR1) // Shortcuts introduced in N MR1
 final class PinnedShortcuts {
@@ -107,6 +106,14 @@ final class PinnedShortcuts {
         // setRank is nonsensical for pinned shortcuts and therefore could not be calculated.
         continue;
       }
+      // Exclude shortcuts like the "Phone NUI" shortcut.
+      String action = null;
+      if (shortcutInfo.getIntent() != null) {
+        action = shortcutInfo.getIntent().getAction();
+      }
+      if (action == null || !action.equals("com.android.dialer.shortcuts.CALL_CONTACT")) {
+        continue;
+      }
 
       String lookupKey = DialerShortcut.getLookupKeyFromShortcutInfo(shortcutInfo);
       Uri lookupUri = DialerShortcut.getLookupUriFromShortcutInfo(shortcutInfo);