commit 827762dd85fea80780bc0e8c3c34c439fb48f37d
author Jeff Sharkey <jsharkey@android.com> Wed Dec 23 11:06:08 2009 -0800
committer Jeff Sharkey <jsharkey@android.com> Wed Dec 23 11:06:08 2009 -0800
tree d70b40da66a72f7d21ada74ccd1c5e7372712d73
parent f3ea225f847f2a80decee89be81c6540e4d0fa0a

Always dial primary phone instead of ambiguous contact.

Fixes http://b/2270960

src/com/android/contacts/ViewContactActivity.java

diff --git a/src/com/android/contacts/ViewContactActivity.java b/src/com/android/contacts/ViewContactActivity.java
index 2aeb34d..8402b3f 100644
--- a/src/com/android/contacts/ViewContactActivity.java
+++ b/src/com/android/contacts/ViewContactActivity.java
@@ -144,6 +144,8 @@
     protected int mWritableSourcesCnt;
     protected boolean mAllRestricted;
 
+    protected Uri mPrimaryPhoneUri = null;
+
     protected ArrayList<Long> mWritableRawContactIds = new ArrayList<Long>();
 
     private static final int TOKEN_ENTITIES = 0;
@@ -714,15 +716,11 @@
                     if (entry.intent.getAction() == Intent.ACTION_CALL_PRIVILEGED) {
                         startActivity(entry.intent);
                     }
-                } else if (mNumPhoneNumbers != 0) {
+                } else if (mPrimaryPhoneUri != null) {
                     // There isn't anything selected, call the default number
-                    long freshContactId = getRefreshedContactId();
-                    if (freshContactId > 0) {
-                        Uri hardContacUri = ContentUris.withAppendedId(
-                                Contacts.CONTENT_URI, freshContactId);
-                        Intent intent = new Intent(Intent.ACTION_CALL_PRIVILEGED, hardContacUri);
-                        startActivity(intent);
-                    }
+                    final Intent intent = new Intent(Intent.ACTION_CALL_PRIVILEGED,
+                            mPrimaryPhoneUri);
+                    startActivity(intent);
                 }
                 return true;
             }
@@ -787,6 +785,7 @@
         mReadOnlySourcesCnt = 0;
         mWritableSourcesCnt = 0;
         mAllRestricted = true;
+        mPrimaryPhoneUri = null;
 
         mWritableRawContactIds.clear();
 
@@ -845,6 +844,9 @@
                         entry.secondaryIntent = new Intent(Intent.ACTION_SENDTO,
                                 Uri.fromParts(Constants.SCHEME_SMSTO, entry.data, null));
 
+                        // Remember super-primary phone
+                        if (isSuperPrimary) mPrimaryPhoneUri = entry.uri;
+
                         entry.isPrimary = isSuperPrimary;
                         mPhoneEntries.add(entry);