diff options
| author | Andrew Lee <anwlee@google.com> | 2015-10-16 13:11:38 -0700 |
|---|---|---|
| committer | Andrew Lee <anwlee@google.com> | 2015-10-19 13:10:11 -0700 |
| commit | aa2644748d5977fcd6f0ac87b155a0b41ce6ce30 (patch) | |
| tree | 55a4af894c21786e09166691e26e8d3feed036b0 /src/com/android/dialer/CallDetailActivity.java | |
| parent | fd7dd10a7edc30618c5854f1408250a1b0b40c16 (diff) | |
Don't allow blocking of emergency or VM numbers.
Bug: 24680730
Bug: 24303461
Change-Id: Ibd7d431355ca97eb2ae7f29537809987a8d5f96d
Diffstat (limited to 'src/com/android/dialer/CallDetailActivity.java')
| -rw-r--r-- | src/com/android/dialer/CallDetailActivity.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/dialer/CallDetailActivity.java b/src/com/android/dialer/CallDetailActivity.java index 54367b1ee..ef219800f 100644 --- a/src/com/android/dialer/CallDetailActivity.java +++ b/src/com/android/dialer/CallDetailActivity.java @@ -49,14 +49,15 @@ import com.android.contacts.common.testing.NeededForTesting; import com.android.contacts.common.util.UriUtils; import com.android.dialer.calllog.CallDetailHistoryAdapter; import com.android.dialer.calllog.CallLogAsyncTaskUtil.CallLogAsyncTaskListener; -import com.android.dialer.onboard.OnboardingActivity; import com.android.dialer.calllog.CallLogAsyncTaskUtil; import com.android.dialer.calllog.CallTypeHelper; import com.android.dialer.calllog.ContactInfoHelper; import com.android.dialer.calllog.PhoneAccountUtils; -import com.android.dialer.database.FilteredNumberAsyncQueryHandler; import com.android.dialer.database.FilteredNumberAsyncQueryHandler.OnCheckBlockedListener; +import com.android.dialer.database.FilteredNumberAsyncQueryHandler; import com.android.dialer.filterednumber.FilterNumberDialogFragment; +import com.android.dialer.filterednumber.FilteredNumbersUtil; +import com.android.dialer.onboard.OnboardingActivity; import com.android.dialer.util.DialerUtils; import com.android.dialer.util.IntentUtil.CallIntentBuilder; import com.android.dialer.util.PhoneNumberUtil; @@ -393,7 +394,7 @@ public class CallDetailActivity extends AppCompatActivity } private void updatePhotoAndBlockActionItem() { - if (mDetails == null) { + if (mDetails == null || !FilteredNumbersUtil.canBlockNumber(this, mNumber)) { return; } |