summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/searchfragment
diff options
context:
space:
mode:
authorcalderwoodra <calderwoodra@google.com>2017-10-04 17:08:27 -0700
committerEric Erfanian <erfanian@google.com>2017-10-05 08:08:11 -0700
commit71216ca5347800ffa2fefc1869bcedbee6e35a6b (patch)
treea9b695e0e4fa2cffac0faf4c45430e721022ee15 /java/com/android/dialer/searchfragment
parent20f7f275f373c0637f53064903b66aaef4b0dc0b (diff)
No longer close cursors manually after onLoadFinished is called.
Documentation clearly states that cursor loaders will close all cursors for you. This CL removes all calls to cursor.close() after onLoaderFinished is called. Bug: 66902052 Test: n/a PiperOrigin-RevId: 171087171 Change-Id: If771fbea52e03ffdd3652af2699c393cc7424de3
Diffstat (limited to 'java/com/android/dialer/searchfragment')
-rw-r--r--java/com/android/dialer/searchfragment/list/SearchCursorManager.java29
1 files changed, 3 insertions, 26 deletions
diff --git a/java/com/android/dialer/searchfragment/list/SearchCursorManager.java b/java/com/android/dialer/searchfragment/list/SearchCursorManager.java
index c6aca8e68..364e97b8c 100644
--- a/java/com/android/dialer/searchfragment/list/SearchCursorManager.java
+++ b/java/com/android/dialer/searchfragment/list/SearchCursorManager.java
@@ -101,10 +101,6 @@ public final class SearchCursorManager {
return false;
}
- if (contactsCursor != null && !contactsCursor.isClosed()) {
- contactsCursor.close();
- }
-
if (cursor != null) {
contactsCursor = cursor;
} else {
@@ -119,10 +115,6 @@ public final class SearchCursorManager {
return false;
}
- if (nearbyPlacesCursor != null && !nearbyPlacesCursor.isClosed()) {
- nearbyPlacesCursor.close();
- }
-
if (cursor != null) {
nearbyPlacesCursor = cursor;
} else {
@@ -146,10 +138,6 @@ public final class SearchCursorManager {
return false;
}
- if (corpDirectoryCursor != null && !corpDirectoryCursor.isClosed()) {
- corpDirectoryCursor.close();
- }
-
if (cursor != null) {
corpDirectoryCursor = cursor;
} else {
@@ -286,20 +274,9 @@ public final class SearchCursorManager {
/** removes all cursors. */
void clear() {
- if (contactsCursor != null) {
- contactsCursor.close();
- contactsCursor = null;
- }
-
- if (nearbyPlacesCursor != null) {
- nearbyPlacesCursor.close();
- nearbyPlacesCursor = null;
- }
-
- if (corpDirectoryCursor != null) {
- corpDirectoryCursor.close();
- corpDirectoryCursor = null;
- }
+ contactsCursor = null;
+ nearbyPlacesCursor = null;
+ corpDirectoryCursor = null;
}
/**