am 58981510: am cbdadc7d: am d5410ff7: Merge "Volume: Persist unsafe volume playback time." into lmp-dev

* commit '58981510296ed03f9deee0829461bfe76647996b': Volume: Persist unsafe volume playback time.
2014-07-25 22:27:40 +00:00
parent 7c9a86f129 db5df7afa3
commit 486c89842f
2 changed files with 34 additions and 3 deletions
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -4701,6 +4701,13 @@ public final class Settings {
         */
        public static final String SKIP_FIRST_USE_HINTS = "skip_first_use_hints";

+        /**
+         * Persisted playback time after a user confirmation of an unsafe volume level.
+         *
+         * @hide
+         */
+        public static final String UNSAFE_VOLUME_MUSIC_ACTIVE_MS = "unsafe_volume_music_active_ms";
+
        /**
         * This are the settings to be backed up.
         *