From b7f5bcb2381a45004b992b6c3c164a9fe531073a Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Tue, 5 Feb 2019 12:43:51 -0800 Subject: [PATCH] Close slice cursor when done using. Change-Id: I22f2d5fe990fb43e1694879f27d7c0be26675d2b Fixes: 123878106 Test: manual --- .../settings/slices/SlicesDatabaseAccessor.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/slices/SlicesDatabaseAccessor.java b/src/com/android/settings/slices/SlicesDatabaseAccessor.java index ae77dd2a9b9..fcc42e47500 100644 --- a/src/com/android/settings/slices/SlicesDatabaseAccessor.java +++ b/src/com/android/settings/slices/SlicesDatabaseAccessor.java @@ -75,8 +75,9 @@ public class SlicesDatabaseAccessor { 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 @@ public class SlicesDatabaseAccessor { * 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 */); + } } /**