diff options
| author | Stephen Smalley <sds@tycho.nsa.gov> | 2012-03-19 10:41:00 -0400 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-18 20:56:46 +0100 |
| commit | e87ce9fea6c742c09618f7da9004c642c740017a (patch) | |
| tree | e1b3b958e4181bda0ef1ef8bfa2af08423f88277 | |
| parent | e6a337246ee3736727f43ed21a2287a59ed4491c (diff) | |
| download | frameworks_base-e87ce9fea6c742c09618f7da9004c642c740017a.zip frameworks_base-e87ce9fea6c742c09618f7da9004c642c740017a.tar.gz frameworks_base-e87ce9fea6c742c09618f7da9004c642c740017a.tar.bz2 | |
Added SELinux enforcing status and booleans keys to secure system settings.
Conflicts:
core/java/android/provider/Settings.java
Change-Id: I01f2a9084dfe7886087b1497070b0d7f2ad8474e
| -rw-r--r-- | core/java/android/provider/Settings.java | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index dc06167..e1c4361 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -4275,6 +4275,25 @@ public final class Settings { public static final String SETTINGS_CLASSNAME = "settings_classname"; /** + * SELinux enforcing status. + * 1 - SELinux is in enforcing mode. + * 0 - SELinux is in permissive mode. + * + * @hide + */ + public static final String SELINUX_ENFORCING = "selinux_enforcing"; + + /** + * Stores the values of the SELinux booleans. Stored as a comma + * seperated list of values, each value being of the form + * {@code boolean_name:value} where value is 1 if the boolean is set + * and 0 otherwise. Example: {@code bool1:1,bool2:0}. + * + * @hide + */ + public static final String SELINUX_BOOLEANS = "selinux_booleans"; + + /** * @deprecated Use {@link android.provider.Settings.Global#USB_MASS_STORAGE_ENABLED} instead */ @Deprecated @@ -5078,6 +5097,8 @@ public final class Settings { TOUCH_EXPLORATION_ENABLED, ACCESSIBILITY_ENABLED, ACCESSIBILITY_SPEAK_PASSWORD, + SELINUX_ENFORCING, + SELINUX_BOOLEANS, TTS_USE_DEFAULTS, TTS_DEFAULT_RATE, TTS_DEFAULT_PITCH, |