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 @@
Use device MAC
- Platform
+ SoC Model
Total RAM
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"/>
-
+
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");
}
}