commit 7df52bcd6f0d29a525b9f4ddf4fe11bcfeb084b7
author Jay Shrauner <shrauner@google.com> Mon Mar 03 22:09:55 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 03 22:09:55 2014 +0000
tree 744f4db57200023d6ce8487797516a6c9c44e057
parent 0bf8514029561736bebf915e2c4d64170228eedd
parent 0551d8a23550274ae9f54a2551b2b5f9e6beee22

am 0551d8a2: am 2615b7dd: am e30571cf: Merge "Catch ActivityNotFoundException in CallDetailActivity" into klp-dev

* commit '0551d8a23550274ae9f54a2551b2b5f9e6beee22':
  Catch ActivityNotFoundException in CallDetailActivity

src/com/android/dialer/CallDetailActivity.java

diff --git a/src/com/android/dialer/CallDetailActivity.java b/src/com/android/dialer/CallDetailActivity.java
index a24940d..a8d9d6f 100644
--- a/src/com/android/dialer/CallDetailActivity.java
+++ b/src/com/android/dialer/CallDetailActivity.java
@@ -18,6 +18,7 @@
 
 import android.app.Activity;
 import android.app.LoaderManager.LoaderCallbacks;
+import android.content.ActivityNotFoundException;
 import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.ContentValues;
@@ -643,7 +644,13 @@
             mMainActionPushLayerView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    startActivity(actionIntent);
+                    try {
+                        startActivity(actionIntent);
+                    } catch (ActivityNotFoundException e) {
+                        final Toast toast = Toast.makeText(CallDetailActivity.this,
+                                R.string.add_contact_not_available, Toast.LENGTH_SHORT);
+                        toast.show();
+                    }
                 }
             });
             mMainActionPushLayerView.setContentDescription(actionDescription);