summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorBryce Lee <brycelee@google.com>2015-01-28 17:15:11 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-28 17:15:11 +0000
commitf2d5253bce5ef69cb6cb4da7697a228a47b55904 (patch)
treef5a569a7efcf9d05fda0946f1fe8307480c38623 /core/java
parentda029217c891e989a569f327487b3db7ea7b0d81 (diff)
parentfdb8dff54cf9327089e5ee4d5bf461ef42020fcd (diff)
downloadframeworks_base-f2d5253bce5ef69cb6cb4da7697a228a47b55904.zip
frameworks_base-f2d5253bce5ef69cb6cb4da7697a228a47b55904.tar.gz
frameworks_base-f2d5253bce5ef69cb6cb4da7697a228a47b55904.tar.bz2
am fdb8dff5: am d8cb4040: Merge "Make THEATER_MODE_ON setting a system api." into lmp-mr1-dev
* commit 'fdb8dff54cf9327089e5ee4d5bf461ef42020fcd': Make THEATER_MODE_ON setting a system api.
Diffstat (limited to 'core/java')
-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 3e75460..ef0f72f 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -5101,6 +5101,7 @@ public final class Settings {
* Whether Theater Mode is on.
* {@hide}
*/
+ @SystemApi
public static final String THEATER_MODE_ON = "theater_mode_on";
/**