From 3c782f76452fdd5b581b64df06de5fd8c46ca31c Mon Sep 17 00:00:00 2001 From: Sunny Shao Date: Wed, 24 Jun 2020 18:11:13 +0800 Subject: [PATCH] SQLiteCursor must be closed before throwing exception Fixes: 159694902 Test: manual test Change-Id: I11b422e90b3155f47f53b4247eacf9f1b424b0ab --- src/com/android/settings/slices/SlicesDatabaseAccessor.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/com/android/settings/slices/SlicesDatabaseAccessor.java b/src/com/android/settings/slices/SlicesDatabaseAccessor.java index e31715d3858..c0bb8de63da 100644 --- a/src/com/android/settings/slices/SlicesDatabaseAccessor.java +++ b/src/com/android/settings/slices/SlicesDatabaseAccessor.java @@ -127,10 +127,12 @@ public class SlicesDatabaseAccessor { 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); }