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

Commit 7fcd6597 authored by Fyodor Kupolov's avatar Fyodor Kupolov
Browse files

Enabled SQLiteCompatibilityWalFlags class 

In system_server, it should be deactivated until InstallSystemProviders
is finished.

Test: SQLiteCompatibilityWalFlagsTest
Test: setting put global ... + verify that dumpsys dbinfo has the new flag
Bug: 70226732
Bug: 70517616
Change-Id: Iec6a5e61a5d7e4cc0ac602f2b630357c54bb4456
parent a629e4c3

core/java/android/database/sqlite/SQLiteCompatibilityWalFlags.java

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ public class SQLiteCompatibilityWalFlags { 


    private static final String TAG = "SQLiteCompatibilityWalFlags";



    private static volatile boolean sInitialized = true; // Temporarily disable flags

    private static volatile boolean sInitialized;

    private static volatile boolean sFlagsSet;

    private static volatile boolean sCompatibilityWalSupported;

    private static volatile String sWALSyncMode;

services/java/com/android/server/SystemServer.java

+5 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.content.Intent; 
import android.content.pm.PackageManager;

import android.content.res.Configuration;

import android.content.res.Resources.Theme;

import android.database.sqlite.SQLiteCompatibilityWalFlags;

import android.os.BaseBundle;

import android.os.Binder;

import android.os.Build;
@@ -327,6 +328,8 @@ public final class SystemServer { 


            // The system server should never make non-oneway calls

            Binder.setWarnOnBlocking(true);

            // Deactivate SQLiteCompatibilityWalFlags until settings provider is initialized

            SQLiteCompatibilityWalFlags.init(null);



            // Here we go!

            Slog.i(TAG, "Entered the Android system server!");
@@ -803,6 +806,8 @@ public final class SystemServer { 


            traceBeginAndSlog("InstallSystemProviders");

            mActivityManagerService.installSystemProviders();

            // Now that SettingsProvider is ready, reactivate SQLiteCompatibilityWalFlags

            SQLiteCompatibilityWalFlags.reset();

            traceEnd();



            traceBeginAndSlog("StartVibratorService");