commit 849de7ca9d9b817d3a48e01cd4ed4d62650ed0ec
author Jay Shrauner <shrauner@google.com> Fri Jul 10 22:09:04 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 10 22:09:04 2015 +0000
tree 64275bfebb19faff023d7119e333b140263eb2c5
parent e33dbedbbab4b90360ce0fa52ba15ba5186907ee
parent 9a3ff2ac28326087c28697c675ca124493d55616

am 9a3ff2ac: am bdba5fa2: am f3d6e2ce: am 9ea7848d: Merge "Catch WRITE_CONTACTS SecurityExceptions" into mnc-dev

* commit '9a3ff2ac28326087c28697c675ca124493d55616':
  Catch WRITE_CONTACTS SecurityExceptions

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

diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 7a23632..8b1c00a 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -382,10 +382,14 @@
                         .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");