Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f0a6683 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DeviceInfoUtils: support clang kernel version"

parents 4b3c3062 7091e2fd

packages/SettingsLib/src/com/android/settingslib/DeviceInfoUtils.java

+4 −5
Original line number Diff line number Diff line
@@ -82,11 +82,10 @@ public class DeviceInfoUtils { 


        final String PROC_VERSION_REGEX =

                "Linux version (\\S+) " + /* group 1: "3.0.31-g6fb96c9" */

                "\\((\\S+?)\\) " +        /* group 2: "x@y.com" (kernel builder) */

                "(?:\\(gcc.+? \\)) " +    /* ignore: GCC version information */

                "(#\\d+) " +              /* group 3: "#1" */

                "(?:.*?)?" +              /* ignore: optional SMP, PREEMPT, and any CONFIG_FLAGS */

                "((Sun|Mon|Tue|Wed|Thu|Fri|Sat).+)"; /* group 4: "Thu Jun 28 11:02:39 PDT 2012" */

                "\\((\\S+)\\)" +          /* group 2: "x@y.com" (kernel builder) */

                ".*(#\\d+)" +             /* group 3: "#1" */

                /* group 4: "Thu Jun 28 11:02:39 PDT 2012" */

                ".*((?:Sun|Mon|Tue|Wed|Thu|Fri|Sat).+)";



        Matcher m = Pattern.compile(PROC_VERSION_REGEX).matcher(rawKernelVersion);

        if (!m.matches()) {