Disable call blocking for SIP numbers.
Bug: 25342525
Change-Id: I9a845ffa25323b53175dc0eac2da1f2b4311abe3
diff --git a/src/com/android/dialer/filterednumber/FilteredNumbersUtil.java b/src/com/android/dialer/filterednumber/FilteredNumbersUtil.java
index 45fa6b7..854a5bb 100644
--- a/src/com/android/dialer/filterednumber/FilteredNumbersUtil.java
+++ b/src/com/android/dialer/filterednumber/FilteredNumbersUtil.java
@@ -33,6 +33,7 @@
import java.util.List;
import com.android.contacts.common.testing.NeededForTesting;
+import com.android.contacts.common.util.PhoneNumberHelper;
import com.android.dialer.R;
import com.android.dialer.database.FilteredNumberAsyncQueryHandler;
import com.android.dialer.database.FilteredNumberContract.FilteredNumber;
@@ -295,7 +296,8 @@
}
public static boolean canBlockNumber(Context context, String number) {
- return !PhoneNumberUtils.isEmergencyNumber(number) && !TextUtils.isEmpty(number);
+ return !TextUtils.isEmpty(number) && !PhoneNumberUtils.isEmergencyNumber(number)
+ && !PhoneNumberHelper.isUriNumber(number);
}
private static long getRecentEmergencyCallThresholdMs(Context context) {
diff --git a/src/com/android/dialer/list/BlockedListSearchFragment.java b/src/com/android/dialer/list/BlockedListSearchFragment.java
index d1490f5..852e7c9 100644
--- a/src/com/android/dialer/list/BlockedListSearchFragment.java
+++ b/src/com/android/dialer/list/BlockedListSearchFragment.java
@@ -133,7 +133,8 @@
protected ContactEntryListAdapter createListAdapter() {
BlockedListSearchAdapter adapter = new BlockedListSearchAdapter(getActivity());
adapter.setDisplayPhotos(true);
- adapter.setUseCallableUri(usesCallableUri());
+ // Don't show SIP addresses.
+ adapter.setUseCallableUri(false);
adapter.setQueryString(mSearchQuery);
return adapter;
}