am 5807c646: Allow optional nested parenthesis in the kernel compiler version string.

Merge commit '5807c64631b0716390bcef08320e8b4865a4246d'

* commit '5807c64631b0716390bcef08320e8b4865a4246d':
  Allow optional nested parenthesis in the kernel compiler version string.
This commit is contained in:
Jared Suttles
2009-08-18 10:50:11 -07:00
committed by Android Git Automerger

View File

@@ -121,7 +121,7 @@ public class DeviceInfoSettings extends PreferenceActivity {
"\\w+\\s+" + /* ignore: version */ "\\w+\\s+" + /* ignore: version */
"([^\\s]+)\\s+" + /* group 1: 2.6.22-omap1 */ "([^\\s]+)\\s+" + /* group 1: 2.6.22-omap1 */
"\\(([^\\s@]+(?:@[^\\s.]+)?)[^)]*\\)\\s+" + /* group 2: (xxxxxx@xxxxx.constant) */ "\\(([^\\s@]+(?:@[^\\s.]+)?)[^)]*\\)\\s+" + /* group 2: (xxxxxx@xxxxx.constant) */
"\\([^)]+\\)\\s+" + /* ignore: (gcc ..) */ "\\(.*?(?:\\(.*?\\)).*?\\)\\s+" + /* ignore: (gcc ..) */
"([^\\s]+)\\s+" + /* group 3: #26 */ "([^\\s]+)\\s+" + /* group 3: #26 */
"(?:PREEMPT\\s+)?" + /* ignore: PREEMPT (optional) */ "(?:PREEMPT\\s+)?" + /* ignore: PREEMPT (optional) */
"(.+)"; /* group 4: date */ "(.+)"; /* group 4: date */