Proper CPU info parsingreplicant-4.2-0003replicant-4.2-0002

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>

1 files changed, 12 insertions, 3 deletions

diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 23fa672..91be9a4 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -416,15 +416,24 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment {
 
     private String getCPUInfo() {
         String result = null;
+        String line = null;
+        BufferedReader reader = null;
 
         try {
             /* The expected /proc/cpuinfo output is as follows:
              * Processor	: ARMv7 Processor rev 2 (v7l)
              * BogoMIPS	: 272.62
              */
-            String firstLine = readLine(FILENAME_PROC_CPUINFO);
-            if (firstLine != null) {
-                result = firstLine.split(":")[1].trim();
+
+            reader = new BufferedReader(new FileReader(FILENAME_PROC_CPUINFO), 256);
+
+            try {
+                while ((line = reader.readLine()) != null) {
+                    if (line.split(":")[0].trim().equals("model name") || line.split(":")[0].trim().equals("Processor"))
+                        result = line.split(":")[1].trim();
+                }
+            } finally {
+                reader.close();
             }
         } catch (IOException e) {}