commit 566b2b8a1ba9e5df2ef9ffaf9c6e68cc250fa422
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Feb 05 22:57:45 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 05 22:57:45 2019 +0000
tree 9a9a594637f3a77fd7db03b8e598dbca2fae2b0b
parent 9ffe6f2d7e9660cc6dee3da1348feb1aa1175144
parent b7f5bcb2381a45004b992b6c3c164a9fe531073a

Merge "Close slice cursor when done using."

src/com/android/settings/slices/SlicesDatabaseAccessor.java

diff --git a/src/com/android/settings/slices/SlicesDatabaseAccessor.java b/src/com/android/settings/slices/SlicesDatabaseAccessor.java
index ae77dd2..fcc42e4 100644
--- a/src/com/android/settings/slices/SlicesDatabaseAccessor.java
+++ b/src/com/android/settings/slices/SlicesDatabaseAccessor.java
@@ -75,8 +75,9 @@
         if (pathData == null) {
             throw new IllegalStateException("Invalid Slices uri: " + uri);
         }
-        Cursor cursor = getIndexedSliceData(pathData.second /* key */);
-        return buildSliceData(cursor, uri, pathData.first /* isIntentOnly */);
+        try (Cursor cursor = getIndexedSliceData(pathData.second /* key */)) {
+            return buildSliceData(cursor, uri, pathData.first /* isIntentOnly */);
+        }
     }
 
     /**
@@ -85,8 +86,9 @@
      * Used when handling the action of the {@link Slice}.
      */
     public SliceData getSliceDataFromKey(String key) {
-        Cursor cursor = getIndexedSliceData(key);
-        return buildSliceData(cursor, null /* uri */, false /* isIntentOnly */);
+        try (Cursor cursor = getIndexedSliceData(key)) {
+            return buildSliceData(cursor, null /* uri */, false /* isIntentOnly */);
+        }
     }
 
     /**