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

Commit 58683e4d authored by Chris Göllner's avatar Chris Göllner Committed by Automerger Merge Worker
Browse files

Merge "Enable SystemUIGoogleScreenshotTests on udc-qpr-dev" into udc-qpr-dev...

Merge "Enable SystemUIGoogleScreenshotTests on udc-qpr-dev" into udc-qpr-dev am: a4ddb0e5 am: b71d3b46

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



Change-Id: Idfb15b26d2b3302c57dab3d5d32ccfc2eef36835
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c2b6ef96 b71d3b46
Loading
Loading
Loading
Loading
+30 −0
Original line number Diff line number Diff line
@@ -52,6 +52,20 @@
        }
      ]
    },
    {
      "name": "SystemUIGoogleScreenshotTests",
      "options": [
        {
          "exclude-annotation": "org.junit.Ignore"
        },
        {
          "exclude-annotation": "androidx.test.filters.FlakyTest"
        },
        {
          "exclude-annotation": "android.platform.test.annotations.Postsubmit"
        }
      ]
    },
    {
      // TODO(b/251476085): Consider merging with SystemUIGoogleScreenshotTests (in U+)
      "name": "SystemUIGoogleBiometricsScreenshotTests",
@@ -131,5 +145,21 @@
        }
      ]
    }
  ],
  "postsubmit": [
   {
      "name": "SystemUIGoogleScreenshotTests",
      "options": [
        {
            "exclude-annotation": "org.junit.Ignore"
        },
        {
            "exclude-annotation": "android.platform.test.annotations.FlakyTest"
        },
        {
            "include-annotation": "android.platform.test.annotations.Postsubmit"
        }
      ]
    }
  ]
}