diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-05-13 00:13:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-05-13 00:13:07 +0000 |
| commit | ef36e9f960f801eab89be7a3cc839d8ca6f39261 (patch) | |
| tree | 7528ed88893baedb065c9ab559aca4ca267ea6ac | |
| parent | 7f40c4b4ef1a42613091051987ddcc6dbaed0249 (diff) | |
| parent | 0a55e2c85f1ebca267dea2c8e5f5d7126fbed80d (diff) | |
Merge "Move boot test to postsubmit" into sc-dev
| -rw-r--r-- | core/java/android/content/pm/TEST_MAPPING | 6 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/TEST_MAPPING | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/java/android/content/pm/TEST_MAPPING b/core/java/android/content/pm/TEST_MAPPING index aa26520ba0ca..1eb4504bf591 100644 --- a/core/java/android/content/pm/TEST_MAPPING +++ b/core/java/android/content/pm/TEST_MAPPING @@ -39,9 +39,6 @@ "include-filter": "android.incrementalinstall.cts.IncrementalFeatureTest" } ] - }, - { - "name": "CtsPackageManagerBootTestCases" } ], "postsubmit": [ @@ -52,6 +49,9 @@ "include-filter": "android.appsecurity.cts.AppSecurityTests#testPermissionDiffCert" } ] + }, + { + "name": "CtsPackageManagerBootTestCases" } ] } diff --git a/services/core/java/com/android/server/pm/TEST_MAPPING b/services/core/java/com/android/server/pm/TEST_MAPPING index f86eb601e0ae..b7a069e10b67 100644 --- a/services/core/java/com/android/server/pm/TEST_MAPPING +++ b/services/core/java/com/android/server/pm/TEST_MAPPING @@ -94,9 +94,6 @@ "include-filter": "com.android.server.pm.test.OverlayActorVisibilityTest" } ] - }, - { - "name": "CtsPackageManagerBootTestCases" } ], "postsubmit": [ @@ -154,6 +151,9 @@ "include-filter": "com.android.server.pm.parsing.SystemPartitionParseTest" } ] + }, + { + "name": "CtsPackageManagerBootTestCases" } ], "imports": [ |