am e3df2510: am bad5fa1e: am 5e5ce873: Merge "Fix SecurityException crashes in onClick" into lmp-mr1-dev
* commit 'e3df25109cdca430695bc382e332d054d0c6b1df':
Fix SecurityException crashes in onClick
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index b3b6b54..70d3281 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -147,6 +147,7 @@
import com.android.contacts.widget.QuickContactImageView;
import com.google.common.collect.Lists;
+import java.lang.SecurityException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
@@ -368,6 +369,11 @@
mHasIntentLaunched = true;
try {
startActivity(intent);
+ } catch (SecurityException ex) {
+ Toast.makeText(QuickContactActivity.this, R.string.missing_app,
+ Toast.LENGTH_SHORT).show();
+ Log.e(TAG, "QuickContacts does not have permission to launch "
+ + intent);
} catch (ActivityNotFoundException ex) {
Toast.makeText(QuickContactActivity.this, R.string.missing_app,
Toast.LENGTH_SHORT).show();