diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-05-15 23:21:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-05-15 23:21:06 +0000 |
| commit | 0c9dbf507b53a12bdf577ff3e55c1686a2e089de (patch) | |
| tree | 3849f2add85d7abe11151436b3f03f99783157a8 /java/com/android/contacts/common/model/ContactLoader.java | |
| parent | e724c7b6376be660abf2113f97c7cbfc34515da8 (diff) | |
| parent | c857f90590e7d7fcffa89511982eb33afd34805f (diff) | |
Merge "Update Dialer to v10 RC32" into oc-dev
Diffstat (limited to 'java/com/android/contacts/common/model/ContactLoader.java')
| -rw-r--r-- | java/com/android/contacts/common/model/ContactLoader.java | 9 |
1 files changed, 7 insertions, 2 deletions
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) { |