diff options
| author | Narayan Kamath <narayan@google.com> | 2014-11-27 09:57:35 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-11-27 09:57:35 +0000 |
| commit | 1d184acefa7105592134edebf7de4d77843d5791 (patch) | |
| tree | 346dd4cee0791023106d9b85a8013d22a0fa0f7a /core/java/android/provider | |
| parent | 4ebd1e42a78dcb0ee219548b89f3733320bbc029 (diff) | |
| parent | 7377998dac67ce8d486e11b9bd2f159fe0ca501d (diff) | |
| download | frameworks_base-1d184acefa7105592134edebf7de4d77843d5791.zip frameworks_base-1d184acefa7105592134edebf7de4d77843d5791.tar.gz frameworks_base-1d184acefa7105592134edebf7de4d77843d5791.tar.bz2 | |
resolved conflicts for merge of 7377998d to lmp-mr1-dev
Change-Id: I21870e241de7d992e97d7b91e0058f85b5a25fbe
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/Settings.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 3c12e06..5e5fbc7 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -5550,6 +5550,13 @@ public final class Settings { public static final String PACKAGE_VERIFIER_INCLUDE_ADB = "verifier_verify_adb_installs"; /** + * Time since last fstrim (milliseconds) after which we force one to happen + * during device startup. If unset, the default is 3 days. + * @hide + */ + public static final String FSTRIM_MANDATORY_INTERVAL = "fstrim_mandatory_interval"; + + /** * The interval in milliseconds at which to check packet counts on the * mobile data interface when screen is on, to detect possible data * connection problems. |