summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider/Settings.java
diff options
context:
space:
mode:
authorJulia Reynolds <juliacr@google.com>2015-08-06 13:41:01 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-08-06 13:41:01 +0000
commita3b5a61271bde79ef1072b13ed14525ce53bf62b (patch)
tree5ff7ce77cee8d2b2a27aad51579ae2cafc500846 /core/java/android/provider/Settings.java
parent375c792c176be43720da47db2cfced23613f537c (diff)
parent9b11fdb56dd8b0250e077c1713434b388d8cd523 (diff)
downloadframeworks_base-a3b5a61271bde79ef1072b13ed14525ce53bf62b.zip
frameworks_base-a3b5a61271bde79ef1072b13ed14525ce53bf62b.tar.gz
frameworks_base-a3b5a61271bde79ef1072b13ed14525ce53bf62b.tar.bz2
Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev
Diffstat (limited to 'core/java/android/provider/Settings.java')
-rw-r--r--core/java/android/provider/Settings.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 6f98788..bb09b05 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -7554,6 +7554,13 @@ public final class Settings {
}
/**
+ * Value of the ringer before entering zen mode.
+ *
+ * @hide
+ */
+ public static final String ZEN_MODE_RINGER_LEVEL = "zen_mode_ringer_level";
+
+ /**
* Opaque value, changes when persisted zen mode configuration changes.
*
* @hide