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

Commit 1b1b7827 authored by Daniel Nishi's avatar Daniel Nishi Committed by android-build-merger
Browse files

Merge "Flag storage settings cache invalidation time." into oc-mr1-dev am: b53b925f 

am: a5288e7a

Change-Id: I4f82aba1446d3fa959ed8055b7d9fb97cfc69b64
parents 1683efe4 a5288e7a

core/java/android/provider/Settings.java

+9 −0
Original line number Diff line number Diff line
@@ -10233,6 +10233,15 @@ public final class Settings { 
        public static final String EUICC_FACTORY_RESET_TIMEOUT_MILLIS =

                "euicc_factory_reset_timeout_millis";



        /**

         * Flag to set the timeout for when to refresh the storage settings cached data.

         * Type: long

         *

         * @hide

         */

        public static final String STORAGE_SETTINGS_CLOBBER_THRESHOLD =

                "storage_settings_clobber_threshold";



        /**

         * Settings to backup. This is here so that it's in the same place as the settings

         * keys and easy to update.

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

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

                    Settings.Global.SPEED_LABEL_CACHE_EVICTION_AGE_MILLIS,

                    Settings.Global.STORAGE_BENCHMARK_INTERVAL,

                    Settings.Global.STORAGE_SETTINGS_CLOBBER_THRESHOLD,

                    Settings.Global.SYNC_MAX_RETRY_DELAY_IN_SECONDS,

                    Settings.Global.SYS_FREE_STORAGE_LOG_INTERVAL,

                    Settings.Global.SYS_STORAGE_CACHE_MAX_BYTES,