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

Commit 67f951cf authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge "Add TrustManagerServiceTest to postsubmit" into main am: f7dbfc60 am:...

Merge "Add TrustManagerServiceTest to postsubmit" into main am: f7dbfc60 am: 7fa405dd am: abaf0f7e

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



Change-Id: I11f4a64c974e47ff9212ac8b023e9ddeb5504982
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 80f1c82c abaf0f7e
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -12,6 +12,19 @@
        ]
      }
    ],
    "postsubmit": [
      {
        "name": "FrameworksMockingServicesTests",
        "options": [
          {
            "include-filter": "com.android.server.trust"
          },
          {
            "exclude-annotation": "androidx.test.filters.FlakyTest"
          }
        ]
      }
    ],
    "trust-tablet": [
      {
        "name": "TrustTests",