Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48645e27 authored by Song Chun Fan's avatar Song Chun Fan Committed by Android (Google) Code Review
Browse files

Merge "[SettingsProvider] force close MemoryIntArray before garbage collection" into udc-dev

parents 917d21ac f3af9c52
Loading
Loading
Loading
Loading
+11 −2
Original line number Diff line number Diff line
@@ -3037,14 +3037,23 @@ public final class Settings {
        public void destroy() {
            try {
                // If this process is the system server process, mArray is the same object as
                // the memory int array kept inside SetingsProvider, so skipping the close()
                if (!Settings.isInSystemServer()) {
                // the memory int array kept inside SettingsProvider, so skipping the close()
                if (!Settings.isInSystemServer() && !mArray.isClosed()) {
                    mArray.close();
                }
            } catch (IOException e) {
                Log.e(TAG, "Error closing backing array", e);
            }
        }
        @Override
        protected void finalize() throws Throwable {
            try {
                destroy();
            } finally {
                super.finalize();
            }
        }
    }
    private static final class ContentProviderHolder {