diff options
| author | 2015-01-28 17:50:38 +0000 | |
|---|---|---|
| committer | 2015-01-28 17:50:39 +0000 | |
| commit | 1061652a37e18683c994f9d4b872ecf990125a05 (patch) | |
| tree | b9c2ffbc9714934f3f948223bec9dd308b40cfbf | |
| parent | e2f4ab930fa4526cf989624356051b99008c23a6 (diff) | |
| parent | 034dc3839f2dced12d89e6ebbb93e6e288cfa9bf (diff) | |
Merge "Revert "Make THEATER_MODE_ON setting a system api."" into lmp-mr1-dev
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 0fff00d00ab8..56edc72cb79c 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -26872,7 +26872,6 @@ package android.provider { field public static final java.lang.String SHOW_PROCESSES = "show_processes"; field public static final java.lang.String STAY_ON_WHILE_PLUGGED_IN = "stay_on_while_plugged_in"; field public static final java.lang.String SYS_PROP_SETTING_VERSION = "sys.settings_global_version"; - field public static final java.lang.String THEATER_MODE_ON = "theater_mode_on"; field public static final java.lang.String TRANSITION_ANIMATION_SCALE = "transition_animation_scale"; field public static final java.lang.String USB_MASS_STORAGE_ENABLED = "usb_mass_storage_enabled"; field public static final java.lang.String USE_GOOGLE_MAIL = "use_google_mail"; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 9234933804f3..838686a53ec2 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -5101,7 +5101,6 @@ public final class Settings { * Whether Theater Mode is on. * {@hide} */ - @SystemApi public static final String THEATER_MODE_ON = "theater_mode_on"; /** |