diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index b16df28fbb3fb..0863368408bae 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -18,6 +18,7 @@ package android.provider; import android.accounts.Account; import android.app.Activity; +import android.content.ActivityNotFoundException; import android.content.ContentProviderClient; import android.content.ContentProviderOperation; import android.content.ContentResolver; @@ -40,6 +41,7 @@ import android.text.TextUtils; import android.util.DisplayMetrics; import android.util.Pair; import android.view.View; +import android.widget.Toast; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -7981,7 +7983,7 @@ public final class ContactsContract { // Trigger with obtained rectangle Intent intent = composeQuickContactsIntent(context, target, lookupUri, mode, excludeMimes); - context.startActivity(intent); + startActivityWithErrorToast(context, intent); } /** @@ -8014,7 +8016,16 @@ public final class ContactsContract { String[] excludeMimes) { Intent intent = composeQuickContactsIntent(context, target, lookupUri, mode, excludeMimes); - context.startActivity(intent); + startActivityWithErrorToast(context, intent); + } + + private static void startActivityWithErrorToast(Context context, Intent intent) { + try { + context.startActivity(intent); + } catch (ActivityNotFoundException e) { + Toast.makeText(context, com.android.internal.R.string.quick_contacts_not_available, + Toast.LENGTH_SHORT).show(); + } } } diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 986a0053e8b68..397d3e3ece131 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -932,13 +932,13 @@ Allows the app to retrieve collected application operation statistics. Not for use by normal apps. - + modify app ops statistics Allows the app to modify collected application operation statistics. Not for use by normal apps. - + control system backup and restore @@ -2247,6 +2247,10 @@ Other + + No activity found to view contact. + Type PIN code diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 6d90973c44f24..bface572a7d2f 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -690,6 +690,7 @@ +