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

Commit 8b70e82c authored by Cole Faust's avatar Cole Faust Committed by Automerger Merge Worker
Browse files

Merge "Suppress InvalidPatternSyntax issue instead of demoting" into main am: 0cb5a08b 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2839157



Change-Id: I56b4300353bedfadfd78f662538ba76b2f726925
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 03b56bfa 0cb5a08b

packages/SystemUI/Android.bp

+0 −16
Original line number Diff line number Diff line
@@ -212,11 +212,6 @@ android_library { 
    lint: {

        extra_check_modules: ["SystemUILintChecker"],

    },

    errorprone: {

        javacflags: [

            "-Xep:InvalidPatternSyntax:WARN",

        ],

    },

}



filegroup {
@@ -432,11 +427,6 @@ android_library { 
        test: true,

        extra_check_modules: ["SystemUILintChecker"],

    },

    errorprone: {

        javacflags: [

            "-Xep:InvalidPatternSyntax:WARN",

        ],

    },

}



android_app {
@@ -474,12 +464,6 @@ android_app { 
    },



    plugins: ["dagger2-compiler"],



    errorprone: {

        javacflags: [

            "-Xep:InvalidPatternSyntax:WARN",

        ],

    },

}



android_robolectric_test {

packages/SystemUI/src/com/android/systemui/people/PeopleTileViewHelper.java

+3 −0
Original line number Diff line number Diff line
@@ -165,6 +165,9 @@ public class PeopleTileViewHelper { 
                    + "\\p{Emoji}(\\p{EMod}|\\x{FE0F}\\x{20E3}?|[\\x{E0020}-\\x{E007E}]+\\x{E007F})"

                    + "?)*";



    // Not all JDKs support emoji patterns, including the one errorprone runs under, which

    // makes it think that this is an invalid pattern.

    @SuppressWarnings("InvalidPatternSyntax")

    private static final Pattern EMOJI_PATTERN = Pattern.compile(UNICODE_EMOJI_REGEX);



    public static final String EMPTY_STRING = "";