am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
* commit '0431bc18b85c410d14bbfd0dbcc87d54edbb1507':
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8438efa..c78a560 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1963,6 +1963,8 @@
<!-- About phone screen, status item label -->
<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-->
<string name="model_number">Model number</string>
<!-- About phone screen, fcc equipment id label-->
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 07abe41..c51d5d3 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -107,6 +107,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 7e94741..903a65a 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -60,6 +60,7 @@
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";
@@ -86,6 +87,13 @@
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);