From c857f90590e7d7fcffa89511982eb33afd34805f Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Mon, 15 May 2017 14:05:33 -0700
Subject: Update Dialer to v10 RC32

This release was created following the instructions at:
go/dialer-aosp-release

Subsequent dialer releases will follow as O bugs are
fixed, until we reach our final RC.

Version: 10
Candidate: RC32
Branch: dialer-android_release_branch/153304843.1
dialer-android_20170416.00/dialer-android_20170416.00_RC32

This release contains the following bug fixes since RC17:
Bug: 33176679 33272455 3646510 36773894 37297649 37413780
37513689 37640315 37680595 37698062 37873639 37901752
37919295 37953423 38062852 38069600 38137349 38173549
38180252 38191514

Test: make, on device
Change-Id: I4e4bb630082758e418ff24892b7db3142c6eb09a
---
 java/com/android/contacts/common/model/ContactLoader.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'java/com/android/contacts/common/model')

diff --git a/java/com/android/contacts/common/model/ContactLoader.java b/java/com/android/contacts/common/model/ContactLoader.java
index 8e9ef9429..55464b161 100644
--- a/java/com/android/contacts/common/model/ContactLoader.java
+++ b/java/com/android/contacts/common/model/ContactLoader.java
@@ -47,6 +47,7 @@ import com.android.contacts.common.util.ContactLoaderUtils;
 import com.android.contacts.common.util.UriUtils;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.location.GeoUtil;
+import com.android.dialer.util.PermissionsUtil;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -688,11 +689,15 @@ public class ContactLoader extends AsyncTaskLoader<Contact> {
       mLookupUri = result.getLookupUri();
 
       if (!result.isDirectoryEntry()) {
-        LogUtil.i(TAG, "Registering content observer for " + mLookupUri);
         if (mObserver == null) {
           mObserver = new ForceLoadContentObserver();
         }
-        getContext().getContentResolver().registerContentObserver(mLookupUri, true, mObserver);
+
+        if (PermissionsUtil.hasContactsReadPermissions(getContext())) {
+          getContext().getContentResolver().registerContentObserver(mLookupUri, true, mObserver);
+        } else {
+          LogUtil.w("ContactLoader.deliverResult", "contacts permission not available");
+        }
       }
 
       if (mPostViewNotification) {
-- 
cgit v1.2.3