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

Commit 6036a2b5 authored by Alice Sheng's avatar Alice Sheng Committed by android-build-merger
Browse files

Merge "Add setting for disabling swap." into pi-dev 

am: 7384995c

Change-Id: I2a8207237a5cf2e0b2d1be0996aece7542d9b90d
parents 98be440c 7384995c

core/java/android/provider/Settings.java

+10 −0
Original line number Diff line number Diff line
@@ -12490,6 +12490,16 @@ public final class Settings { 
         */

        public static final String BACKUP_AGENT_TIMEOUT_PARAMETERS =

                "backup_agent_timeout_parameters";



        /**

         * Whether we have enabled swapping on this device. For Wear, default is

         * enabled.

         *

         * The value is "1" for enable, "0" for disable.

         * @hide

         */

         public static final String SWAP_ENABLED = "swap_enabled";



    }



    /**

core/tests/coretests/src/android/provider/SettingsBackupTest.java

+1 −0
Original line number Diff line number Diff line
@@ -378,6 +378,7 @@ public class SettingsBackupTest { 
                    Settings.Global.SQLITE_COMPATIBILITY_WAL_FLAGS,

                    Settings.Global.STORAGE_BENCHMARK_INTERVAL,

                    Settings.Global.STORAGE_SETTINGS_CLOBBER_THRESHOLD,

                    Settings.Global.SWAP_ENABLED,

                    Settings.Global.SYNC_MANAGER_CONSTANTS,

                    Settings.Global.SYNC_MAX_RETRY_DELAY_IN_SECONDS,

                    Settings.Global.SYS_FREE_STORAGE_LOG_INTERVAL,