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

Browse Source
This commit is contained in:
Treehugger Robot
2023-05-12 21:28:59 +00:00
committed by Android (Google) Code Review
parent 6a4db881db 457e39b38c
commit 22e76c5405
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) {