commit c4c0bbb8690cc228c2ec4cfdb3910c0bdfc031b8
author Zach Jang <zachjang@google.com> Mon Sep 14 14:03:12 2015 -0700
committer The Android Automerger <android-build@google.com> Wed Oct 21 12:02:19 2015 -0700
tree c8e7dcd511e549dd10204e9ae51a81b3887109d4
parent 109bf6049377aa7457741fa5c9aa16b2b4ff9d38

DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings
CL#3/3

b/23946860

Change-Id: I2cfcfcbc28d6a1391cae55f505a2b981df9ade2c

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index c8e2a1b..c17d2cb 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] -->

res/xml/device_info_settings.xml

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"

src/com/android/settings/DeviceInfoSettings.java

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 @@
     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 @@
 
         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);