summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Song Chun Fan <schfan@google.com> 2023-06-03 00:21:53 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-03 00:21:53 +0000
commit26d112a83735e0e94779f8f07efd765a9e1db732 (patch)
treeab96f76287206d4d46461fd9cae6853966a3a3f4
parentafb65f140543d7da54824515d7f9cf692265c82d (diff)
parenta578ff36e79e67ea45696dba971df2f4c6aaa4f7 (diff)
Merge "Disable testCheckSignaturesRotatedAgainstOriginal" into udc-dev am: d043f595f5 am: a578ff36e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23542220 Change-Id: Ibadddd862154b6c873b55966b7c6fc21a78511f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/PackageManagerTests.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/PackageManagerTests.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/PackageManagerTests.java
index dc92376263a6..ca4a4048cc00 100644
--- a/services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/PackageManagerTests.java
+++ b/services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/PackageManagerTests.java
@@ -66,6 +66,7 @@ import android.system.StructStat;
import android.test.AndroidTestCase;
import android.util.Log;
+import androidx.test.filters.FlakyTest;
import androidx.test.filters.LargeTest;
import androidx.test.filters.SmallTest;
import androidx.test.filters.Suppress;
@@ -2506,6 +2507,7 @@ public class PackageManagerTests extends AndroidTestCase {
}
@LargeTest
+ @FlakyTest(bugId = 283797480)
public void testCheckSignaturesRotatedAgainstRotated() throws Exception {
// checkSignatures should be successful when both apps have been signed with the same
// rotated key since the initial signature comparison between the two apps should