commit e801b3b0d73499697ad8648faf3bfbbe5cfe2793
author Andrew Lee <anwlee@google.com> Wed Oct 28 16:22:02 2015 -0700
committer Andrew Lee <anwlee@google.com> Fri Oct 30 12:49:25 2015 -0700
tree 95e46948fa2da2904e35dc8ddea3664a20aa890f
parent 5979b85b1f521b5774a33be4fc4f83204207b40d

Cleanup isBlockedNumber calls.

Bug: 25343277
Change-Id: Ie087e6cf231384dee07b4d93f86d2d69dc85f482

InCallUI/src/com/android/incallui/InCallPresenter.java

diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java
index 0e2edd2..791242e 100644
--- a/InCallUI/src/com/android/incallui/InCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/InCallPresenter.java
@@ -172,8 +172,8 @@
             if (state == TelephonyManager.CALL_STATE_RINGING) {
                 // Check if the number is blocked, to silence the ringer.
                 String countryIso = GeoUtil.getCurrentCountryIso(mContext);
-                mFilteredQueryHandler.startBlockedQuery(
-                        mOnCheckBlockedListener, null, incomingNumber, countryIso);
+                mFilteredQueryHandler.isBlockedNumber(
+                        mOnCheckBlockedListener, incomingNumber, countryIso);
             }
         }
     };
@@ -556,9 +556,9 @@
             }
         };
 
-        boolean isInvalidNumber = mFilteredQueryHandler.startBlockedQuery(
-                onCheckBlockedListener, null, number, countryIso);
-        if (isInvalidNumber) {
+        final boolean success = mFilteredQueryHandler.isBlockedNumber(
+                onCheckBlockedListener, number, countryIso);
+        if (!success) {
             Log.d(this, "checkForBlockedCall: invalid number, skipping block checking");
             if (!hasTimedOut.get()) {
                 handler.removeCallbacks(runnable);