commit 490cf9c1c340549ec2d9523d42b0e768cb229a52
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 24 13:01:33 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 24 13:01:33 2020 +0000
tree 654f2d67df1cf7da10db3769bb666ee641d024f4
parent 5784bbd8b2b0e852124b5be110b3efe3dfe9489b
parent 826e63f47ae0d11fd0c734b008551a5c5ce7a844

Merge "SQLiteCursor must be closed before throwing exception" into rvc-dev am: 2d3f5ecd4a am: 826e63f47a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983925

Change-Id: I75db1c3f51c42299f9997acf03f5092c1a48c719

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 e31715d..c0bb8de 100644
--- a/src/com/android/settings/slices/SlicesDatabaseAccessor.java
+++ b/src/com/android/settings/slices/SlicesDatabaseAccessor.java
@@ -127,10 +127,12 @@
         int numResults = resultCursor.getCount();
 
         if (numResults == 0) {
+            resultCursor.close();
             throw new IllegalStateException("Invalid Slices key from path: " + path);
         }
 
         if (numResults > 1) {
+            resultCursor.close();
             throw new IllegalStateException(
                     "Should not match more than 1 slice with path: " + path);
         }