commit f5d819fa03df4df63258b58429961119b7b81f78
author Yorke Lee <yorkelee@google.com> Tue Jul 14 16:10:35 2015 -0700
committer Yorke Lee <yorkelee@google.com> Tue Jul 14 16:10:35 2015 -0700
tree ef3afb2e5cff61492cb728fc0c03a718b44c3cda
parent f287bdb737aa232f1fd41bbea01da598dd684790

Check for permissions in ContactPhotoManager

Bug: 22487648
Change-Id: Ibfe11fd3a4ffe0e210ba16efa4e38f0c8dab47db

src/com/android/contacts/common/ContactPhotoManager.java

diff --git a/src/com/android/contacts/common/ContactPhotoManager.java b/src/com/android/contacts/common/ContactPhotoManager.java
index d1c0021..deaf40e 100644
--- a/src/com/android/contacts/common/ContactPhotoManager.java
+++ b/src/com/android/contacts/common/ContactPhotoManager.java
@@ -1456,6 +1456,10 @@
         }
 
         private void loadPhotosInBackground() {
+            if (!PermissionsUtil.hasPermission(mContext,
+                    android.Manifest.permission.READ_CONTACTS)) {
+                return;
+            }
             obtainPhotoIdsAndUrisToLoad(mPhotoIds, mPhotoIdsAsStrings, mPhotoUris);
             loadThumbnails(false);
             loadUriBasedPhotos();