diff options
author | Eric Erfanian <erfanian@google.com> | 2017-04-06 09:41:50 -0700 |
---|---|---|
committer | Eric Erfanian <erfanian@google.com> | 2017-04-06 09:41:50 -0700 |
commit | d8046e520a866b9948ee9ba47cf642b441ca8e23 (patch) | |
tree | 8d08d4f2292aa84dc435d455891e7ab633d95a25 /java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java | |
parent | cdb1edf966a892abebcba425a85b7d4e47758302 (diff) |
Update AOSP Dialer source from internal google3 repository at
cl/152373142.
Test: make, treehugger
This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/151342913 (3/27/2017) to cl/152373142 (4/06/2017).
This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.
Change-Id: I2fbc88cf6867b90ac8b65f75e5e34468988c7217
Diffstat (limited to 'java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java')
-rw-r--r-- | java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java b/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java index 852e7a0ed..bd4156846 100644 --- a/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java +++ b/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java @@ -56,8 +56,14 @@ public class FilteredNumberAsyncQueryHandler extends AsyncQueryHandler { @Override protected void onQueryComplete(int token, Object cookie, Cursor cursor) { - if (cookie != null) { - ((Listener) cookie).onQueryComplete(token, cookie, cursor); + try { + if (cookie != null) { + ((Listener) cookie).onQueryComplete(token, cookie, cursor); + } + } finally { + if (cursor != null) { + cursor.close(); + } } } @@ -82,7 +88,7 @@ public class FilteredNumberAsyncQueryHandler extends AsyncQueryHandler { } } - public void hasBlockedNumbers(final OnHasBlockedNumbersListener listener) { + void hasBlockedNumbers(final OnHasBlockedNumbersListener listener) { if (!FilteredNumberCompat.canAttemptBlockOperations(context)) { listener.onHasBlockedNumbers(false); return; @@ -405,7 +411,7 @@ public class FilteredNumberAsyncQueryHandler extends AsyncQueryHandler { void onUnblockComplete(int rows, ContentValues values); } - public interface OnHasBlockedNumbersListener { + interface OnHasBlockedNumbersListener { /** * @param hasBlockedNumbers {@code true} if any blocked numbers are stored. {@code false} |