From 3a7ae660c1dbfc664db147e3c6e12a56957d5292 Mon Sep 17 00:00:00 2001
From: Tim Zimmermann <tim@linux4.de>
Date: Sun, 12 Feb 2023 09:53:42 +0100
Subject: [PATCH] Settings: Show SoC Model rather than value of
 ro.board.platform if available

* These properties were introduced in S, so why not use them?

Change-Id: I2abb584e140841c03f8daa7cc6c0107f24a0e234
---
 res/values/evolution_strings.xml                      |  2 +-
 res/xml/hardware_info.xml                             |  8 ++++----
 ...troller.java => SoCModelPreferenceController.java} | 11 +++++++++--
 3 files changed, 14 insertions(+), 7 deletions(-)
 rename src/com/android/settings/deviceinfo/hardwareinfo/{PlatformRevisionPreferenceController.java => SoCModelPreferenceController.java} (76%)

diff --git a/res/values/evolution_strings.xml b/res/values/evolution_strings.xml
index 0e02b34e857..8fc8d66e41b 100644
--- a/res/values/evolution_strings.xml
+++ b/res/values/evolution_strings.xml
@@ -84,6 +84,6 @@
     <string name="wifi_device_mac_addr">Use device MAC</string>
 
     <!-- Hardware info -->
-    <string name="platform_revision">Platform</string>
+    <string name="soc_model">SoC Model</string>
     <string name="total_ram">Total RAM</string>
 </resources>
diff --git a/res/xml/hardware_info.xml b/res/xml/hardware_info.xml
index 055a62c3b9e..fc4c7b547e8 100644
--- a/res/xml/hardware_info.xml
+++ b/res/xml/hardware_info.xml
@@ -30,13 +30,13 @@
         settings:controller="com.android.settings.deviceinfo.hardwareinfo.DeviceModelPreferenceController"
         settings:enableCopying="true"/>
 
-    <!-- Platform -->
+    <!-- SoC Model -->
     <Preference
-        android:key="hardware_info_platform"
-        android:title="@string/platform_revision"
+        android:key="hardware_info_soc_model"
+        android:title="@string/soc_model"
         android:summary="@string/summary_placeholder"
         android:selectable="false"
-        settings:controller="com.android.settings.deviceinfo.hardwareinfo.PlatformRevisionPreferenceController"
+        settings:controller="com.android.settings.deviceinfo.hardwareinfo.SoCModelPreferenceController"
         settings:enableCopying="true"/>
 
     <!-- Total RAM -->
diff --git a/src/com/android/settings/deviceinfo/hardwareinfo/PlatformRevisionPreferenceController.java b/src/com/android/settings/deviceinfo/hardwareinfo/SoCModelPreferenceController.java
similarity index 76%
rename from src/com/android/settings/deviceinfo/hardwareinfo/PlatformRevisionPreferenceController.java
rename to src/com/android/settings/deviceinfo/hardwareinfo/SoCModelPreferenceController.java
index 90818b28509..c7a4e420629 100644
--- a/src/com/android/settings/deviceinfo/hardwareinfo/PlatformRevisionPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/hardwareinfo/SoCModelPreferenceController.java
@@ -17,15 +17,16 @@
 package com.android.settings.deviceinfo.hardwareinfo;
 
 import android.content.Context;
+import android.os.Build;
 import android.os.SystemProperties;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.slices.Sliceable;
 
-public class PlatformRevisionPreferenceController extends BasePreferenceController {
+public class SoCModelPreferenceController extends BasePreferenceController {
 
-    public PlatformRevisionPreferenceController(Context context, String preferenceKey) {
+    public SoCModelPreferenceController(Context context, String preferenceKey) {
         super(context, preferenceKey);
     }
 
@@ -47,6 +48,12 @@ public class PlatformRevisionPreferenceController extends BasePreferenceControll
 
     @Override
     public CharSequence getSummary() {
+        if (!Build.SOC_MODEL.equals(Build.UNKNOWN)) {
+            if (!Build.SOC_MANUFACTURER.equals(Build.UNKNOWN)) {
+                return Build.SOC_MANUFACTURER + " " + Build.SOC_MODEL;
+            }
+            return Build.SOC_MODEL;
+        }
         return SystemProperties.get("ro.board.platform");
     }
 }