Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9a8e277 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Fix issue #23116383: Include security patch level in Settings 

Change-Id: I003564376a02a70f0245353472544cde355240ac
parent be4df036

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -2122,6 +2122,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



+6
−0






























Original line number
Diff line number
Diff line







@@ -70,6 +70,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



+8
−0






























Original line number
Diff line number
Diff line







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