diff options
| author | Brandon Maxwell <maxwelb@google.com> | 2016-03-21 17:03:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-21 17:03:22 +0000 |
| commit | 12c93d5a6e63d9cd4d8457551d41056ae12cd16c (patch) | |
| tree | d300ab3da0e3d94d17632cfe498c0889ed3c08a0 /src/com/android/dialer/calllog | |
| parent | e5c0b968526379d93e82226710c2c32aa291f09f (diff) | |
| parent | 25b094b0473bb52238d7d45d4ba69b0d9949121c (diff) | |
Merge "Only allow primary users to block numbers" into nyc-dev am: c98a563
am: 25b094b
* commit '25b094b0473bb52238d7d45d4ba69b0d9949121c':
Only allow primary users to block numbers
Diffstat (limited to 'src/com/android/dialer/calllog')
| -rw-r--r-- | src/com/android/dialer/calllog/CallLogListItemViewHolder.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/dialer/calllog/CallLogListItemViewHolder.java b/src/com/android/dialer/calllog/CallLogListItemViewHolder.java index 750914bdf..baf2e1ab5 100644 --- a/src/com/android/dialer/calllog/CallLogListItemViewHolder.java +++ b/src/com/android/dialer/calllog/CallLogListItemViewHolder.java @@ -55,7 +55,6 @@ import com.android.dialer.compat.FilteredNumberCompat; import com.android.dialer.database.FilteredNumberAsyncQueryHandler; import com.android.dialer.filterednumber.BlockNumberDialogFragment; import com.android.dialer.filterednumber.FilteredNumbersUtil; -import com.android.dialer.filterednumber.MigrateBlockedNumbersDialogFragment; import com.android.dialer.logging.Logger; import com.android.dialer.logging.ScreenEvent; import com.android.dialer.service.ExtendedBlockingButtonRenderer; @@ -346,7 +345,8 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder .setOnMenuItemClickListener(this); } - if (FilteredNumbersUtil.canBlockNumber(mContext, number, countryIso)) { + if (FilteredNumberCompat.canAttemptBlockOperations(mContext) + && FilteredNumbersUtil.canBlockNumber(mContext, number, countryIso)) { mFilteredNumberAsyncQueryHandler.isBlockedNumber( new FilteredNumberAsyncQueryHandler.OnCheckBlockedListener() { @Override |