summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-07-29 01:34:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-29 01:34:40 +0000
commit745329af0bf1fc409b0d14dbcf8ef68628b18a5f (patch)
tree56217c46306b3dfeff9eda260218fcf053a2503d
parent3a95857ad2b03ec7bfa55a0c519d2b78e1b0cedd (diff)
parentaf7899163012fbcd6921cc6f031470a9c0185d14 (diff)
downloadpackages_apps_Dialer-745329af0bf1fc409b0d14dbcf8ef68628b18a5f.tar.gz
packages_apps_Dialer-745329af0bf1fc409b0d14dbcf8ef68628b18a5f.tar.bz2
packages_apps_Dialer-745329af0bf1fc409b0d14dbcf8ef68628b18a5f.zip
am af789916: am 59308086: am 2b83b0f0: Merge "Don\'t update call log in CallerInfoQueryThread without permission" into mnc-dev
* commit 'af7899163012fbcd6921cc6f031470a9c0185d14': Don't update call log in CallerInfoQueryThread without permission
-rw-r--r--src/com/android/dialer/calllog/ContactInfoHelper.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/dialer/calllog/ContactInfoHelper.java b/src/com/android/dialer/calllog/ContactInfoHelper.java
index 9a660e1ae..20d33a003 100644
--- a/src/com/android/dialer/calllog/ContactInfoHelper.java
+++ b/src/com/android/dialer/calllog/ContactInfoHelper.java
@@ -298,6 +298,10 @@ public class ContactInfoHelper {
*/
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;