diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-08 13:19:26 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-08-08 13:19:26 -0700 |
| commit | 5d72b2726797374e402943182d8132045ed32d3a (patch) | |
| tree | 970c4f2b30d1e2dbb8dbbde6cd1a607ed85a9682 /src/com | |
| parent | 9ad4a89877363a6f1128b258f6535b29d2f778e2 (diff) | |
| parent | b4e84f34e095ad423b854f66f75aeb36514d49f0 (diff) | |
| download | packages_apps_settings-5d72b2726797374e402943182d8132045ed32d3a.zip packages_apps_settings-5d72b2726797374e402943182d8132045ed32d3a.tar.gz packages_apps_settings-5d72b2726797374e402943182d8132045ed32d3a.tar.bz2 | |
Merge "Add support for SE Android to the Settings app."
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/settings/DeviceInfoSettings.java | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java index c25a466..152b8e2 100644 --- a/src/com/android/settings/DeviceInfoSettings.java +++ b/src/com/android/settings/DeviceInfoSettings.java @@ -23,6 +23,7 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Build; import android.os.Bundle; +import android.os.SELinux; import android.os.SystemClock; import android.os.SystemProperties; import android.preference.Preference; @@ -53,9 +54,11 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { private static final String KEY_COPYRIGHT = "copyright"; private static final String KEY_SYSTEM_UPDATE_SETTINGS = "system_update_settings"; private static final String PROPERTY_URL_SAFETYLEGAL = "ro.url.safetylegal"; + private static final String PROPERTY_SELINUX_STATUS = "ro.build.selinux"; private static final String KEY_KERNEL_VERSION = "kernel_version"; private static final String KEY_BUILD_NUMBER = "build_number"; private static final String KEY_DEVICE_MODEL = "device_model"; + private static final String KEY_SELINUX_STATUS = "selinux_status"; private static final String KEY_BASEBAND_VERSION = "baseband_version"; private static final String KEY_FIRMWARE_VERSION = "firmware_version"; private static final String KEY_UPDATE_SETTING = "additional_system_update_settings"; @@ -75,6 +78,18 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { setStringSummary(KEY_BUILD_NUMBER, Build.DISPLAY); findPreference(KEY_KERNEL_VERSION).setSummary(getFormattedKernelVersion()); + if (!SELinux.isSELinuxEnabled()) { + String status = getResources().getString(R.string.selinux_status_disabled); + setStringSummary(KEY_SELINUX_STATUS, status); + } else if (!SELinux.isSELinuxEnforced()) { + String status = getResources().getString(R.string.selinux_status_permissive); + setStringSummary(KEY_SELINUX_STATUS, status); + } + + // Remove selinux information if property is not present + removePreferenceIfPropertyMissing(getPreferenceScreen(), KEY_SELINUX_STATUS, + PROPERTY_SELINUX_STATUS); + // Remove Safety information preference if PROPERTY_URL_SAFETYLEGAL is not set removePreferenceIfPropertyMissing(getPreferenceScreen(), "safetylegal", PROPERTY_URL_SAFETYLEGAL); |