Allow voicemail numbers to be blocked.
Though it is lighter on logic now, it still seems helpful to have
a common helper to return whether it should be possible to proceed
with blocking a number.
Bug: 25230222
Change-Id: I99f93f1cfc09988b3dec77f71541463c96d06225
diff --git a/src/com/android/dialer/filterednumber/FilteredNumbersUtil.java b/src/com/android/dialer/filterednumber/FilteredNumbersUtil.java
index 8bfcea0..d82ee8f 100644
--- a/src/com/android/dialer/filterednumber/FilteredNumbersUtil.java
+++ b/src/com/android/dialer/filterednumber/FilteredNumbersUtil.java
@@ -23,8 +23,6 @@
import android.provider.ContactsContract.CommonDataKinds.Phone;
import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Data;
-import android.telecom.PhoneAccountHandle;
-import android.telecom.TelecomManager;
import android.telephony.PhoneNumberUtils;
import android.text.TextUtils;
import android.util.Log;
@@ -243,19 +241,6 @@
}
public static boolean canBlockNumber(Context context, String number) {
- if (PhoneNumberUtils.isEmergencyNumber(number)) {
- return false;
- }
-
- TelecomManager telecomManager =
- (TelecomManager) context.getSystemService(Context.TELECOM_SERVICE);
- List<PhoneAccountHandle> phoneAccountHandles = telecomManager.getCallCapablePhoneAccounts();
- for (PhoneAccountHandle phoneAccountHandle : phoneAccountHandles) {
- if (telecomManager.isVoiceMailNumber(phoneAccountHandle, number)) {
- return false;
- }
- }
-
- return true;
+ return !PhoneNumberUtils.isEmergencyNumber(number) && !TextUtils.isEmpty(number);
}
}
diff --git a/tests/src/com/android/dialer/filterednumber/FilteredNumbersUtilTest.java b/tests/src/com/android/dialer/filterednumber/FilteredNumbersUtilTest.java
deleted file mode 100644
index a212e0f..0000000
--- a/tests/src/com/android/dialer/filterednumber/FilteredNumbersUtilTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.dialer.filterednumber;
-
-import static org.mockito.Mockito.when;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.telecom.PhoneAccountHandle;
-import android.telecom.TelecomManager;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import org.mockito.Matchers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.util.LinkedList;
-
-@SmallTest
-public class FilteredNumbersUtilTest extends AndroidTestCase {
-
- private static final String NORMAL_PHONE_NUMBER = "555-555-5555";
- private static final String VOICEMAIL_NUMBER = "*555";
-
- @Mock private Context mContext;
- @Mock private TelecomManager mTelecomManager;
- private PhoneAccountHandle mHandle;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- System.setProperty("dexmaker.dexcache", getContext().getCacheDir().toString());
-
- MockitoAnnotations.initMocks(this);
- when(mContext.getSystemService(Context.TELECOM_SERVICE)).thenReturn(mTelecomManager);
-
- LinkedList<PhoneAccountHandle> handles = new LinkedList<PhoneAccountHandle>();
- mHandle = new PhoneAccountHandle(new ComponentName(getContext(), "TestCase"), "0");
- handles.add(mHandle);
-
- when(mTelecomManager.getCallCapablePhoneAccounts()).thenReturn(handles);
- }
-
- public void testCanBlockNormalNumber() {
- assertTrue(FilteredNumbersUtil.canBlockNumber(mContext, NORMAL_PHONE_NUMBER));
- }
-
- public void testCannotBlockVoicemailNumber() {
- when(mTelecomManager.isVoiceMailNumber(Matchers.eq(mHandle), Matchers.anyString()))
- .thenReturn(true);
- assertFalse(FilteredNumbersUtil.canBlockNumber(mContext, VOICEMAIL_NUMBER));
- }
-}