commit da361d153aec29bafb01314e42bd70e2f6ebd787
author Sarmad Hashmi <mhashmi@google.com> Thu Apr 14 02:10:31 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 14 02:10:31 2016 +0000
tree 1b28e043778889dde4e2b02e5ea5b0f78ebd37ad
parent 167c6d1c3621f6be96952daaf0e8e7284bdae252
parent 590352b0f2a5e702c01e88066db9cf9545b74117

Merge "Fix crash on call blocking settings open with no contacts permission."

src/com/android/dialer/filterednumber/FilteredNumbersUtil.java

diff --git a/src/com/android/dialer/filterednumber/FilteredNumbersUtil.java b/src/com/android/dialer/filterednumber/FilteredNumbersUtil.java
index 498b10a..35d6f8d 100644
--- a/src/com/android/dialer/filterednumber/FilteredNumbersUtil.java
+++ b/src/com/android/dialer/filterednumber/FilteredNumbersUtil.java
@@ -32,6 +32,7 @@
 import android.widget.Toast;
 
 import com.android.contacts.common.testing.NeededForTesting;
+import com.android.contacts.common.util.PermissionsUtil;
 import com.android.dialer.R;
 import com.android.dialer.compat.FilteredNumberCompat;
 import com.android.dialer.database.FilteredNumberAsyncQueryHandler;
@@ -124,7 +125,7 @@
         final AsyncTask task = new AsyncTask<Object, Void, Boolean>() {
             @Override
             public Boolean doInBackground(Object[]  params) {
-                if (context == null) {
+                if (context == null || !PermissionsUtil.hasContactsPermissions(context)) {
                     return false;
                 }