summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Auchter <patrick.auchter@motorola.com>2010-03-10 10:39:18 -0600
committerMike Lockwood <lockwood@android.com>2010-03-14 10:49:53 -0400
commita6b9dcbb161e9d7ede0573397ee22d6c3f0bbcae (patch)
tree4c607fbaf26e6c6d3b128b89084ab3a7ca8981d5
parentf0ed2f3f3175457825a0b49cab72f9cb78c3b997 (diff)
downloadpackages_apps_settings-a6b9dcbb161e9d7ede0573397ee22d6c3f0bbcae.zip
packages_apps_settings-a6b9dcbb161e9d7ede0573397ee22d6c3f0bbcae.tar.gz
packages_apps_settings-a6b9dcbb161e9d7ede0573397ee22d6c3f0bbcae.tar.bz2
Fix regex for optional nested parentheses in kernel compiler string
Change-Id: Ie171148b3846bf6c4fd6a1bb31c87aba8db0eb6a Signed-off-by: Patrick Auchter <patrick.auchter@motorola.com> Signed-off-by: Mike Lockwood <lockwood@android.com>
-rw-r--r--src/com/android/settings/DeviceInfoSettings.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 82b7f28..a769c38 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -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 */