diff options
author | Brandon Maxwell <maxwelb@google.com> | 2016-03-21 19:04:31 -0700 |
---|---|---|
committer | Brandon Maxwell <maxwelb@google.com> | 2016-03-21 19:04:31 -0700 |
commit | fd75e4c3b3c1a8f5a6ee5d3ce6a8503cf83ea424 (patch) | |
tree | 4db6f25bdf5d3ae6ff203e501875cfe733f9091e /src/com | |
parent | ac6cd58c8642d22e47a6d4b30295137a61177e85 (diff) |
Updating logic for isBlockedNumber
In the framework blocking, both the e164 and non-e164 formats of a
number can be blocked at the same time; these two formats will still
have the same e164 value. Since the original code expected the e164
column to be unique, in this situation the Dialer thought the number
was not blocked, resulting in a crash when attempting to block the
number a second time.
This CL changes the logic so multiple rows with the same e164 value
are expected.
Change-Id: I90995046df74b8ec2198eab1ef56a13f20dc1398
Fixes: 27724726
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/dialer/database/FilteredNumberAsyncQueryHandler.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/dialer/database/FilteredNumberAsyncQueryHandler.java b/src/com/android/dialer/database/FilteredNumberAsyncQueryHandler.java index 7af1a1339..52ef49ac0 100644 --- a/src/com/android/dialer/database/FilteredNumberAsyncQueryHandler.java +++ b/src/com/android/dialer/database/FilteredNumberAsyncQueryHandler.java @@ -158,7 +158,13 @@ public class FilteredNumberAsyncQueryHandler extends AsyncQueryHandler { new Listener() { @Override protected void onQueryComplete(int token, Object cookie, Cursor cursor) { - if (cursor == null || cursor.getCount() != 1) { + /* + * In the frameworking blocking, numbers can be blocked in both e164 format + * and not, resulting in multiple rows being returned for this query. For + * example, both '16502530000' and '6502530000' can exist at the same time + * and will be returned by this query. + */ + if (cursor == null || cursor.getCount() == 0) { listener.onCheckComplete(null); return; } |