Merge "Fix failing Libcore benchmarks." am: 9b62bec021 am: 0f38154c3d am: 6f60adb665 am: 8169ac1d66 am: 25b1ce216b

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

Change-Id: Id492dd934ee8ce236dd00fb70f45ad387247ea80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2 files changed, 0 insertions, 62 deletions

diff --git a/apct-tests/perftests/core/src/android/libcore/nor_ready/JarFilePerfTest.java b/apct-tests/perftests/core/src/android/libcore/nor_ready/JarFilePerfTest.java
deleted file mode 100644
index 5ad5eea60aae..000000000000
--- a/apct-tests/perftests/core/src/android/libcore/nor_ready/JarFilePerfTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.libcore.regression;
-
-import android.perftests.utils.BenchmarkState;
-import android.perftests.utils.PerfStatusReporter;
-import android.test.suitebuilder.annotation.LargeTest;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.jar.JarFile;
-import java.util.jar.Manifest;
-
-@RunWith(Parameterized.class)
-@LargeTest
-public class JarFilePerfTest {
-    @Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();
-
-    @Parameters(name = "mFilename={0}")
-    public static Collection<Object[]> data() {
-        return Arrays.asList(
-                new Object[][] {
-                    {"/system/framework/core-oj.jar"}, {"/system/priv-app/Phonesky/Phonesky.apk"}
-                });
-    }
-
-    @Parameterized.Parameter(0)
-    public String mFilename;
-
-    @Test
-    public void time() throws Exception {
-        File f = new File(mFilename);
-        BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
-        while (state.keepRunning()) {
-            JarFile jf = new JarFile(f);
-            Manifest m = jf.getManifest();
-            jf.close();
-        }
-    }
-}
diff --git a/apct-tests/perftests/core/src/android/libcore/regression/SignaturePerfTest.java b/apct-tests/perftests/core/src/android/libcore/regression/SignaturePerfTest.java
index a1899b92cff7..96e7cb27afef 100644
--- a/apct-tests/perftests/core/src/android/libcore/regression/SignaturePerfTest.java
+++ b/apct-tests/perftests/core/src/android/libcore/regression/SignaturePerfTest.java
@@ -51,7 +51,6 @@ public class SignaturePerfTest {
                     {Algorithm.SHA256WithRSA, Implementation.OpenSSL},
                     {Algorithm.SHA384WithRSA, Implementation.OpenSSL},
                     {Algorithm.SHA512WithRSA, Implementation.OpenSSL},
-                    {Algorithm.SHA1withDSA, Implementation.OpenSSL},
                     {Algorithm.SHA1withDSA, Implementation.BouncyCastle}
                 });
     }