From c857f90590e7d7fcffa89511982eb33afd34805f Mon Sep 17 00:00:00 2001 From: Eric Erfanian 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 --- .../incallui/legacyblocking/BlockedNumberContentObserver.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'java/com/android/incallui/legacyblocking/BlockedNumberContentObserver.java') diff --git a/java/com/android/incallui/legacyblocking/BlockedNumberContentObserver.java b/java/com/android/incallui/legacyblocking/BlockedNumberContentObserver.java index 33e133d7f..d774fc3d4 100644 --- a/java/com/android/incallui/legacyblocking/BlockedNumberContentObserver.java +++ b/java/com/android/incallui/legacyblocking/BlockedNumberContentObserver.java @@ -24,6 +24,7 @@ import android.support.annotation.NonNull; import com.android.dialer.common.LogUtil; import com.android.dialer.common.concurrent.AsyncTaskExecutor; import com.android.dialer.common.concurrent.AsyncTaskExecutors; +import com.android.dialer.util.PermissionsUtil; import java.util.Objects; /** @@ -93,8 +94,13 @@ public class BlockedNumberContentObserver extends ContentObserver */ public void register() { LogUtil.i("BlockedNumberContentObserver.register", null); - context.getContentResolver().registerContentObserver(CallLog.CONTENT_URI, true, this); - handler.postDelayed(timeoutRunnable, TIMEOUT_MS); + if (PermissionsUtil.hasCallLogReadPermissions(context) + && PermissionsUtil.hasCallLogWritePermissions(context)) { + context.getContentResolver().registerContentObserver(CallLog.CONTENT_URI, true, this); + handler.postDelayed(timeoutRunnable, TIMEOUT_MS); + } else { + LogUtil.w("BlockedNumberContentObserver.register", "no call log read/write permissions."); + } } private void unregister() { -- cgit v1.2.3