OSDN Git Service

Fix regex for optional nested parentheses in kernel compiler string
authorPatrick Auchter <patrick.auchter@motorola.com>
Wed, 10 Mar 2010 16:39:18 +0000 (10:39 -0600)
committerMike Lockwood <lockwood@android.com>
Sun, 14 Mar 2010 14:49:53 +0000 (10:49 -0400)
Change-Id: Ie171148b3846bf6c4fd6a1bb31c87aba8db0eb6a
Signed-off-by: Patrick Auchter <patrick.auchter@motorola.com>
Signed-off-by: Mike Lockwood <lockwood@android.com>
src/com/android/settings/DeviceInfoSettings.java

index 82b7f28..a769c38 100644 (file)
@@ -140,7 +140,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 */