summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider
diff options
context:
space:
mode:
authorBryce Lee <brycelee@google.com>2015-01-28 17:22:22 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-28 17:22:22 +0000
commit293465a75c1346ae1c0e32570344fb9423177eea (patch)
treec915bc20319c840c9113b716fb694716eb3bf13c /core/java/android/provider
parent06a8a121b0dc02bea7977c4112eb4319fd1a133f (diff)
parentf2d5253bce5ef69cb6cb4da7697a228a47b55904 (diff)
downloadframeworks_base-293465a75c1346ae1c0e32570344fb9423177eea.zip
frameworks_base-293465a75c1346ae1c0e32570344fb9423177eea.tar.gz
frameworks_base-293465a75c1346ae1c0e32570344fb9423177eea.tar.bz2
am f2d5253b: am fdb8dff5: am d8cb4040: Merge "Make THEATER_MODE_ON setting a system api." into lmp-mr1-dev
* commit 'f2d5253bce5ef69cb6cb4da7697a228a47b55904': Make THEATER_MODE_ON setting a system api.
Diffstat (limited to 'core/java/android/provider')
-rw-r--r--core/java/android/provider/Settings.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index e055203..e98d930 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -5104,6 +5104,7 @@ public final class Settings {
* Whether Theater Mode is on.
* {@hide}
*/
+ @SystemApi
public static final String THEATER_MODE_ON = "theater_mode_on";
/**