diff options
| author | Yorke Lee <yorkelee@google.com> | 2013-11-08 09:51:14 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-08 09:51:14 -0800 |
| commit | c317b8363d2369b4651fc4d88fa8c711f45ab23b (patch) | |
| tree | af8a8163a922a9e2acf1abc1f70b515cadcf1a93 | |
| parent | 26a47da6b7d58e6d92eb19ed46ce5dab71a02191 (diff) | |
| parent | 967e0ed38987125bdbdcfc080c90f2d6201f799f (diff) | |
am 967e0ed3: am cce501cb: Fix bug where resuming CallDetailActivity loses the add contact intent
* commit '967e0ed38987125bdbdcfc080c90f2d6201f799f':
Fix bug where resuming CallDetailActivity loses the add contact intent
| -rw-r--r-- | src/com/android/dialer/CallDetailActivity.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/dialer/CallDetailActivity.java b/src/com/android/dialer/CallDetailActivity.java index 2b16a983b..a24940d73 100644 --- a/src/com/android/dialer/CallDetailActivity.java +++ b/src/com/android/dialer/CallDetailActivity.java @@ -489,6 +489,8 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware nameOrNumber = firstDetails.number; } + boolean skipBind = false; + if (contactUri != null && !UriUtils.isEncodedContactUri(contactUri)) { mainActionIntent = new Intent(Intent.ACTION_VIEW, contactUri); // This will launch People's detail contact screen, so we probably want to @@ -505,6 +507,7 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware mainActionIntent = null; mainActionIcon = R.drawable.ic_add_contact_holo_dark; mainActionDescription = getString(R.string.description_add_contact); + skipBind = true; } else if (isVoicemailNumber) { mainActionIntent = null; mainActionIcon = 0; @@ -536,7 +539,10 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware mainActionDescription = null; } - bindContactPhotoAction(mainActionIntent, mainActionIcon, mainActionDescription); + if (!skipBind) { + bindContactPhotoAction(mainActionIntent, mainActionIcon, + mainActionDescription); + } // This action allows to call the number that places the call. if (canPlaceCallsTo) { |