summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Shrauner <shrauner@google.com>2015-07-10 21:41:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-10 21:41:41 +0000
commitbdba5fa234786f8b4aa029397f403dc402b0cd33 (patch)
tree466eabd9fb9bc9bb3962647ab583e7bad505e918
parentdfd9d9e0104605dfe6239faeff75e20797db976a (diff)
parentf3d6e2ce28e622374c99f8a408654ababf339f9e (diff)
downloadpackages_apps_Contacts-bdba5fa234786f8b4aa029397f403dc402b0cd33.tar.gz
packages_apps_Contacts-bdba5fa234786f8b4aa029397f403dc402b0cd33.tar.bz2
packages_apps_Contacts-bdba5fa234786f8b4aa029397f403dc402b0cd33.zip
am f3d6e2ce: am 9ea7848d: Merge "Catch WRITE_CONTACTS SecurityExceptions" into mnc-dev
* commit 'f3d6e2ce28e622374c99f8a408654ababf339f9e': Catch WRITE_CONTACTS SecurityExceptions
-rw-r--r--src/com/android/contacts/quickcontact/QuickContactActivity.java12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 7a2363259..8b1c00aa0 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -382,10 +382,14 @@ public class QuickContactActivity extends ContactsActivity {
.appendPath(String.valueOf(dataId))
.appendQueryParameter(DataUsageFeedback.USAGE_TYPE, usageType)
.build();
- final boolean successful = getContentResolver().update(
- dataUsageUri, new ContentValues(), null, null) > 0;
- if (!successful) {
- Log.w(TAG, "DataUsageFeedback increment failed");
+ try {
+ final boolean successful = getContentResolver().update(
+ dataUsageUri, new ContentValues(), null, null) > 0;
+ if (!successful) {
+ Log.w(TAG, "DataUsageFeedback increment failed");
+ }
+ } catch (SecurityException ex) {
+ Log.w(TAG, "DataUsageFeedback increment failed", ex);
}
} else {
Log.w(TAG, "Invalid Data ID");