From 5807c64631b0716390bcef08320e8b4865a4246d Mon Sep 17 00:00:00 2001 From: Jared Suttles Date: Tue, 18 Aug 2009 11:52:40 -0500 Subject: [PATCH] Allow optional nested parenthesis in the kernel compiler version string. This fixes parsing of the kernel version string in so that groups 3 and 4 can be shown in About phone. Submitted on behalf of Patrick Auchter Signed-off-by: Jared Suttles --- src/com/android/settings/DeviceInfoSettings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java index be01f7dc57e..7768b7dc7bb 100644 --- a/src/com/android/settings/DeviceInfoSettings.java +++ b/src/com/android/settings/DeviceInfoSettings.java @@ -121,7 +121,7 @@ public class DeviceInfoSettings extends PreferenceActivity { "\\w+\\s+" + /* ignore: version */ "([^\\s]+)\\s+" + /* group 1: 2.6.22-omap1 */ "\\(([^\\s@]+(?:@[^\\s.]+)?)[^)]*\\)\\s+" + /* group 2: (xxxxxx@xxxxx.constant) */ - "\\([^)]+\\)\\s+" + /* ignore: (gcc ..) */ + "\\(.*?(?:\\(.*?\\)).*?\\)\\s+" + /* ignore: (gcc ..) */ "([^\\s]+)\\s+" + /* group 3: #26 */ "(?:PREEMPT\\s+)?" + /* ignore: PREEMPT (optional) */ "(.+)"; /* group 4: date */