commit 2615b7dd2557a6129f013d786fa5b312aaa1de59
author Jay Shrauner <shrauner@google.com> Mon Mar 03 22:03:45 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 03 22:03:45 2014 +0000
tree 38c0737bd17bef65d87f714dc1bf7635a42b9805
parent e033c37e5fabfbf1065eb5530f2d2a5455dfb322
parent e30571cfbb800512d99e12c672d8f4ada1a0e38f

am e30571cf: Merge "Catch ActivityNotFoundException in CallDetailActivity" into klp-dev

* commit 'e30571cfbb800512d99e12c672d8f4ada1a0e38f':
  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);