From 19ebb88bfeee27f1da5fedf64953c5befa8b93c6 Mon Sep 17 00:00:00 2001
From: Akhil Narang <akhilnarang.1999@gmail.com>
Date: Tue, 28 Mar 2017 22:27:57 +0530
Subject: [PATCH] Settings: add in AOSP-CAF version

* Show the CAF tag base in About Phone
* Will be shown through a prop "ro.caf.version"

Signed-off-by: Akhil Narang <akhilnarang.1999@gmail.com>
---
 res/values/custom_strings.xml                    | 3 +++
 res/xml/device_info_settings.xml                 | 7 +++++++
 src/com/android/settings/DeviceInfoSettings.java | 3 +++
 3 files changed, 13 insertions(+)

diff --git a/res/values/custom_strings.xml b/res/values/custom_strings.xml
index 4565918d8c..05e89b4c42 100644
--- a/res/values/custom_strings.xml
+++ b/res/values/custom_strings.xml
@@ -48,4 +48,7 @@
     <string name="hardware_keys_action_launch_camera">Open camera</string>
     <string name="hardware_keys_action_last_app">Launch last app</string>
 
+    <!-- AOSP-CAF Version -->
+    <string name="version_title">AOSP-CAF Version</string>
+    <string name="version_default">Unknown</string>
 </resources>
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 2275423ea1..fb9e2958ac 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -88,6 +88,13 @@
                 android:title="@string/firmware_version"
                 android:summary="@string/device_info_default"/>
 
+        <!-- AOSP-CAF Version  -->
+        <Preference android:key="caf_version"
+                android:enabled="false"
+                android:shouldDisableView="false"
+                android:title="@string/version_title"
+                android:summary="@string/version_default"/>
+
         <!-- Security patch level -->
         <PreferenceScreen android:key="security_patch"
                 android:title="@string/security_patch"
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index bba052dbf0..8819dc874d 100755
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -67,6 +67,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_CAF_VERSION = "caf_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";
@@ -114,6 +115,8 @@ public void onCreate(Bundle icicle) {
         setStringSummary(KEY_FIRMWARE_VERSION, Build.VERSION.RELEASE);
         findPreference(KEY_FIRMWARE_VERSION).setEnabled(true);
 
+        setValueSummary(KEY_CAF_VERSION, "ro.caf.version");
+
         final String patch = DeviceInfoUtils.getSecurityPatch();
         if (!TextUtils.isEmpty(patch)) {
             setStringSummary(KEY_SECURITY_PATCH, patch);