diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-08-13 00:46:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-13 00:46:58 +0000 |
| commit | f67d0785d006677d2fba3f2192f3f6ea824c5336 (patch) | |
| tree | acbd471c8ea245e3c926435d2cc7fd3bc7e0be12 /src/com/android/settings | |
| parent | 9f879ef009863a0674e891ad0e51b1b216da5beb (diff) | |
| parent | b9a8e277d94827a16e7366d60914de34533b23a6 (diff) | |
| download | packages_apps_Settings-f67d0785d006677d2fba3f2192f3f6ea824c5336.zip packages_apps_Settings-f67d0785d006677d2fba3f2192f3f6ea824c5336.tar.gz packages_apps_Settings-f67d0785d006677d2fba3f2192f3f6ea824c5336.tar.bz2 | |
Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev
Diffstat (limited to 'src/com/android/settings')
| -rw-r--r-- | src/com/android/settings/DeviceInfoSettings.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java index 76b4635..9ead7c6 100644 --- a/src/com/android/settings/DeviceInfoSettings.java +++ b/src/com/android/settings/DeviceInfoSettings.java @@ -69,6 +69,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In 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_SECURITY_PATCH = "security_patch"; private static final String KEY_UPDATE_SETTING = "additional_system_update_settings"; private static final String KEY_EQUIPMENT_ID = "fcc_equipment_id"; private static final String PROPERTY_EQUIPMENT_ID = "ro.ril.fccid"; @@ -99,6 +100,13 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In setStringSummary(KEY_FIRMWARE_VERSION, Build.VERSION.RELEASE); findPreference(KEY_FIRMWARE_VERSION).setEnabled(true); + String patch = Build.VERSION.SECURITY_PATCH; + if (!"".equals(patch)) { + setStringSummary(KEY_SECURITY_PATCH, patch); + } else { + getPreferenceScreen().removePreference(findPreference(KEY_SECURITY_PATCH)); + + } setValueSummary(KEY_BASEBAND_VERSION, "gsm.version.baseband"); setStringSummary(KEY_DEVICE_MODEL, Build.MODEL + getMsvSuffix()); setValueSummary(KEY_EQUIPMENT_ID, PROPERTY_EQUIPMENT_ID); |