Merge "Close slice cursor when done using."

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

@@ -75,9 +75,10 @@ public class SlicesDatabaseAccessor {
         if (pathData == null) {
             throw new IllegalStateException("Invalid Slices uri: " + uri);
         }
-        Cursor cursor = getIndexedSliceData(pathData.second /* key */);
+        try (Cursor cursor = getIndexedSliceData(pathData.second /* key */)) {
             return buildSliceData(cursor, uri, pathData.first /* isIntentOnly */);
         }
+    }
 
     /**
      * Query the slices database and return a {@link SliceData} object corresponding to the row
@@ -85,9 +86,10 @@ public class SlicesDatabaseAccessor {
      * Used when handling the action of the {@link Slice}.
      */
     public SliceData getSliceDataFromKey(String key) {
-        Cursor cursor = getIndexedSliceData(key);
+        try (Cursor cursor = getIndexedSliceData(key)) {
             return buildSliceData(cursor, null /* uri */, false /* isIntentOnly */);
         }
+    }
 
     /**
      * @return a list of keys in the Slices database matching on {@param isPlatformSlice}.