diff options
author | Sarmad Hashmi <mhashmi@google.com> | 2016-04-07 21:02:39 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-04-07 21:02:39 +0000 |
commit | fed48abb93fa0be22c4459c4834f797fd81249b4 (patch) | |
tree | 4dc274522721665ce6876f670c4c9e3f50dde87d /src/com/android | |
parent | 93761a2d2729625380db4b9a7fe8334ff96b654c (diff) | |
parent | c3abe9de14a20dffbe66665baa85973f41548056 (diff) |
Merge "Fix bug where call cards from private number are blank."
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/dialer/calllog/CallLogAdapter.java | 9 | ||||
-rw-r--r-- | src/com/android/dialer/database/FilteredNumberAsyncQueryHandler.java | 1 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java index 0c1bf9e2e..aa0b7c94d 100644 --- a/src/com/android/dialer/calllog/CallLogAdapter.java +++ b/src/com/android/dialer/calllog/CallLogAdapter.java @@ -485,13 +485,11 @@ public class CallLogAdapter extends GroupingListAdapter final String number = c.getString(CallLogQuery.NUMBER); final String countryIso = c.getString(CallLogQuery.COUNTRY_ISO); - - mFilteredNumberAsyncQueryHandler.isBlockedNumber( + final CallLogListItemViewHolder views = (CallLogListItemViewHolder) viewHolder; + boolean success = mFilteredNumberAsyncQueryHandler.isBlockedNumber( new FilteredNumberAsyncQueryHandler.OnCheckBlockedListener() { @Override public void onCheckComplete(Integer id) { - final CallLogListItemViewHolder views = - (CallLogListItemViewHolder) viewHolder; views.blockId = id; if (mExtendedCallInfoService == null) { loadDataAndRender(views); @@ -507,6 +505,9 @@ public class CallLogAdapter extends GroupingListAdapter } } }, number, countryIso); + if (!success) { + loadDataAndRender(views); + } } private void loadDataAndRender(CallLogListItemViewHolder views) { diff --git a/src/com/android/dialer/database/FilteredNumberAsyncQueryHandler.java b/src/com/android/dialer/database/FilteredNumberAsyncQueryHandler.java index e3f8c59c4..52ef49ac0 100644 --- a/src/com/android/dialer/database/FilteredNumberAsyncQueryHandler.java +++ b/src/com/android/dialer/database/FilteredNumberAsyncQueryHandler.java @@ -151,7 +151,6 @@ public class FilteredNumberAsyncQueryHandler extends AsyncQueryHandler { final OnCheckBlockedListener listener, String number, String countryIso) { final String e164Number = PhoneNumberUtils.formatNumberToE164(number, countryIso); if (TextUtils.isEmpty(e164Number)) { - listener.onCheckComplete(null); return false; } |