Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[SettingsProvider] do not close MemoryIntArray if in system server" into udc-dev am: 22e76c5405

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23217745

Change-Id: Ifebcee3fac5853c0de22863cacc263d1895d6c68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-12 22:05:42 +00:00
committed by Automerger Merge Worker
parent 7ea58c221e 22e76c5405
commit c651c8b7c9
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/provider/Settings.java
View File

@@ -3036,7 +3036,9 @@ public final class Settings {
public void destroy() { public void destroy() {
try { try {
if (!mArray.isClosed()) { // If this process is the system server process, mArray is the same object as
// the memory int array kept inside SettingsProvider, so skipping the close()
if (!Settings.isInSystemServer() && !mArray.isClosed()) {
mArray.close(); mArray.close();
} }
} catch (IOException e) { } catch (IOException e) {