Merge "Fix SecurityException crashes in onClick" into lmp-mr1-dev (5e5ce873) · Commits · e / os / android_packages_apps_Contacts

src/com/android/contacts/quickcontact/QuickContactActivity.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -147,6 +147,7 @@ import com.android.contacts.widget.MultiShrinkScroller.MultiShrinkScrollerListen
		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 @@ public class QuickContactActivity extends ContactsActivity {
		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();