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

2023-05-12 21:28:59 +00:00
parent 6a4db881db 457e39b38c
commit 22e76c5405
1 changed files with 3 additions and 1 deletions
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -3036,7 +3036,9 @@ public final class Settings {

        public void destroy() {
            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();
                }
            } catch (IOException e) {