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

Commit 1d704213 authored by Adrian Roos's avatar Adrian Roos Committed by Automerger Merge Worker
Browse files

Merge "FrameworksInputMethodSystemServerTests: Add to fw/base presubmit" into...

Merge "FrameworksInputMethodSystemServerTests: Add to fw/base presubmit" into udc-dev am: 388ddde5 am: 370f87fb

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



Change-Id: I98e6c6a23fe4b67c86351a61a698bfbfb89aab82
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 62a69cf4 370f87fb
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -64,6 +64,15 @@
        }
      ]
    },
    {
      "name": "FrameworksInputMethodSystemServerTests",
      "options": [
        {"include-filter": "com.android.server.inputmethod"},
        {"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
        {"exclude-annotation": "androidx.test.filters.FlakyTest"},
        {"exclude-annotation": "org.junit.Ignore"}
      ]
    },
    {
      "name": "ExtServicesUnitTests",
      "options": [