summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJay Shrauner <shrauner@google.com>2014-03-03 22:07:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-03 22:07:00 +0000
commit0551d8a23550274ae9f54a2551b2b5f9e6beee22 (patch)
tree744f4db57200023d6ce8487797516a6c9c44e057 /src
parent382114ec8fed1a32157a713360287b00987a41b4 (diff)
parent2615b7dd2557a6129f013d786fa5b312aaa1de59 (diff)
am 2615b7dd: am e30571cf: Merge "Catch ActivityNotFoundException in CallDetailActivity" into klp-dev
* commit '2615b7dd2557a6129f013d786fa5b312aaa1de59': Catch ActivityNotFoundException in CallDetailActivity
Diffstat (limited to 'src')
-rw-r--r--src/com/android/dialer/CallDetailActivity.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/dialer/CallDetailActivity.java b/src/com/android/dialer/CallDetailActivity.java
index a24940d73..a8d9d6fa7 100644
--- a/src/com/android/dialer/CallDetailActivity.java
+++ b/src/com/android/dialer/CallDetailActivity.java
@@ -18,6 +18,7 @@ package com.android.dialer;
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 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware
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);