commit aed7fde9b9e87d11a20c63841667166c80479f3d
author Yorke Lee <yorkelee@google.com> Wed Jul 29 02:18:31 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jul 29 02:18:31 2015 +0000
tree 8e359271b233b8d8d515fe5b788bde1ec40f2bba
parent 43b29a487c222259f500de7a142c846e464beb47
parent 87a4f832928f3a795490b8a048aba481bcb5e4b2

am 87a4f832: am 745329af: am af789916: am 59308086: am 2b83b0f0: Merge "Don\'t update call log in CallerInfoQueryThread without permission" into mnc-dev

* commit '87a4f832928f3a795490b8a048aba481bcb5e4b2':
  Don't update call log in CallerInfoQueryThread without permission

src/com/android/dialer/calllog/ContactInfoHelper.java

diff --git a/src/com/android/dialer/calllog/ContactInfoHelper.java b/src/com/android/dialer/calllog/ContactInfoHelper.java
index 9a660e1..20d33a0 100644
--- a/src/com/android/dialer/calllog/ContactInfoHelper.java
+++ b/src/com/android/dialer/calllog/ContactInfoHelper.java
@@ -298,6 +298,10 @@
      */
     public void updateCallLogContactInfo(String number, String countryIso, ContactInfo updatedInfo,
             ContactInfo callLogInfo) {
+        if (!PermissionsUtil.hasPermission(mContext, android.Manifest.permission.WRITE_CALL_LOG)) {
+            return;
+        }
+
         final ContentValues values = new ContentValues();
         boolean needsUpdate = false;