diff options
| author | Zach Jang <zachjang@google.com> | 2015-09-21 19:05:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-21 19:05:36 +0000 |
| commit | 564ec9357bac62d571ba8ba9d58957477b8b5209 (patch) | |
| tree | fa8071070f885f177115aa1efe335fb42e775699 | |
| parent | 86d853000feca5a627ef87760cdd7df3c3aea1bb (diff) | |
| parent | 00721b4afa3940138e82cd150bb6670239ec0b5b (diff) | |
| download | packages_apps_Settings-564ec9357bac62d571ba8ba9d58957477b8b5209.zip packages_apps_Settings-564ec9357bac62d571ba8ba9d58957477b8b5209.tar.gz packages_apps_Settings-564ec9357bac62d571ba8ba9d58957477b8b5209.tar.bz2 | |
am 00721b4a: am c87ceb7e: am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '00721b4afa3940138e82cd150bb6670239ec0b5b':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | res/xml/device_info_settings.xml | 6 | ||||
| -rw-r--r-- | src/com/android/settings/DeviceInfoSettings.java | 8 |
3 files changed, 16 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 6af190d..b804ea6 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2146,6 +2146,8 @@ <!-- About phone screen, status item label [CHAR LIMIT=40] --> <string name="firmware_version">Android version</string> + <!-- About phone screen, status item label [CHAR LIMIT=60] --> + <string name="security_patch">Android security patch level</string> <!-- About phone screen, status item label [CHAR LIMIT=40] --> <string name="model_number">Model number</string> <!-- About phone screen, fcc equipment id label [CHAR LIMIT=40] --> diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml index 46992a4..6785a50 100644 --- a/res/xml/device_info_settings.xml +++ b/res/xml/device_info_settings.xml @@ -110,6 +110,12 @@ android:title="@string/firmware_version" android:summary="@string/device_info_default"/> + <!-- Security patch level --> + <Preference android:key="security_patch" + style="?android:preferenceInformationStyle" + android:title="@string/security_patch" + android:summary="@string/device_info_default"/> + <!-- Device FCC equipment id --> <Preference android:key="fcc_equipment_id" style="?android:preferenceInformationStyle" diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java index f79707a..88c77ab 100644 --- a/src/com/android/settings/DeviceInfoSettings.java +++ b/src/com/android/settings/DeviceInfoSettings.java @@ -74,6 +74,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"; @@ -94,6 +95,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); |