diff options
11 files changed, 83 insertions, 67 deletions
diff --git a/apct-tests/perftests/core/src/android/conscrypt/conscrypt/ClientSocketPerfTest.java b/apct-tests/perftests/core/src/android/conscrypt/conscrypt/ClientSocketPerfTest.java index 9e45c4ae23b5..bcc0a3b70dfa 100644 --- a/apct-tests/perftests/core/src/android/conscrypt/conscrypt/ClientSocketPerfTest.java +++ b/apct-tests/perftests/core/src/android/conscrypt/conscrypt/ClientSocketPerfTest.java @@ -112,36 +112,20 @@ public final class ClientSocketPerfTest { for (EndpointFactory endpointFactory : EndpointFactory.values()) { for (ChannelType channelType : ChannelType.values()) { for (PerfTestProtocol protocol : PerfTestProtocol.values()) { - params.add( - new Object[] { - new Config( - endpointFactory, - endpointFactory, - 64, - "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", - channelType, - protocol) - }); - params.add( - new Object[] { - new Config( - endpointFactory, - endpointFactory, - 512, - "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", - channelType, - protocol) - }); - params.add( - new Object[] { - new Config( - endpointFactory, - endpointFactory, - 4096, - "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", - channelType, - protocol) - }); + for (int messageSize : ConscryptParams.messageSizes) { + for (String cipher : ConscryptParams.ciphers) { + params.add( + new Object[] { + new Config( + endpointFactory, + endpointFactory, + messageSize, + cipher, + channelType, + protocol) + }); + } + } } } } diff --git a/apct-tests/perftests/core/src/android/conscrypt/conscrypt/ConscryptParams.java b/apct-tests/perftests/core/src/android/conscrypt/conscrypt/ConscryptParams.java new file mode 100644 index 000000000000..e5131b82cd8d --- /dev/null +++ b/apct-tests/perftests/core/src/android/conscrypt/conscrypt/ConscryptParams.java @@ -0,0 +1,35 @@ +/* + * Copyright 2025 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.conscrypt; + +import java.util.List; + +public class ConscryptParams { + public static final List<String> ciphers = List.of( + "TLS_RSA_WITH_AES_128_GCM_SHA256", + "TLS_RSA_WITH_AES_256_GCM_SHA384", + "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", + "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384", + "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256" + ); + + public static final List<Integer> messageSizes = List.of( + 64, + 512, + 4096 + ); +}
\ No newline at end of file diff --git a/apct-tests/perftests/core/src/android/conscrypt/conscrypt/EngineHandshakePerfTest.java b/apct-tests/perftests/core/src/android/conscrypt/conscrypt/EngineHandshakePerfTest.java index cd0ac96b41de..341d8e608c0c 100644 --- a/apct-tests/perftests/core/src/android/conscrypt/conscrypt/EngineHandshakePerfTest.java +++ b/apct-tests/perftests/core/src/android/conscrypt/conscrypt/EngineHandshakePerfTest.java @@ -87,11 +87,13 @@ public final class EngineHandshakePerfTest { } } + public Collection getParams() { final List<Object[]> params = new ArrayList<>(); for (BufferType bufferType : BufferType.values()) { - params.add(new Object[] {new Config(bufferType, - "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", 100)}); + for (String cipher : ConscryptParams.ciphers) { + params.add(new Object[] {new Config(bufferType, cipher, 100)}); + } } return params; } diff --git a/apct-tests/perftests/core/src/android/conscrypt/conscrypt/EngineWrapPerfTest.java b/apct-tests/perftests/core/src/android/conscrypt/conscrypt/EngineWrapPerfTest.java index 1fee2183b11e..23b642ee9537 100644 --- a/apct-tests/perftests/core/src/android/conscrypt/conscrypt/EngineWrapPerfTest.java +++ b/apct-tests/perftests/core/src/android/conscrypt/conscrypt/EngineWrapPerfTest.java @@ -37,10 +37,10 @@ import static org.conscrypt.TestUtils.newTextMessage; import static org.junit.Assert.assertEquals; import java.nio.ByteBuffer; -import java.util.Locale; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Locale; import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLEngineResult; import javax.net.ssl.SSLException; @@ -94,12 +94,11 @@ public final class EngineWrapPerfTest { public Collection getParams() { final List<Object[]> params = new ArrayList<>(); for (BufferType bufferType : BufferType.values()) { - params.add(new Object[] {new Config(bufferType, 64, - "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256")}); - params.add(new Object[] {new Config(bufferType, 512, - "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256")}); - params.add(new Object[] {new Config(bufferType, 4096, - "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256")}); + for (int messageSize : ConscryptParams.messageSizes) { + for (String cipher : ConscryptParams.ciphers) { + params.add(new Object[] {new Config(bufferType, messageSize, cipher)}); + } + } } return params; } diff --git a/apct-tests/perftests/core/src/android/conscrypt/conscrypt/ServerSocketPerfTest.java b/apct-tests/perftests/core/src/android/conscrypt/conscrypt/ServerSocketPerfTest.java index 90a87ce0c69d..343bb1294af7 100644 --- a/apct-tests/perftests/core/src/android/conscrypt/conscrypt/ServerSocketPerfTest.java +++ b/apct-tests/perftests/core/src/android/conscrypt/conscrypt/ServerSocketPerfTest.java @@ -102,15 +102,12 @@ public final class ServerSocketPerfTest { final List<Object[]> params = new ArrayList<>(); for (EndpointFactory endpointFactory : EndpointFactory.values()) { for (ChannelType channelType : ChannelType.values()) { - params.add(new Object[] {new Config(endpointFactory, - endpointFactory, 64, - "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", channelType)}); - params.add(new Object[] {new Config(endpointFactory, - endpointFactory, 512, - "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", channelType)}); - params.add(new Object[] {new Config(endpointFactory, - endpointFactory, 4096, - "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", channelType)}); + for (int messageSize : ConscryptParams.messageSizes) { + for (String cipher : ConscryptParams.ciphers) { + params.add(new Object[] {new Config(endpointFactory, + endpointFactory, messageSize, cipher, channelType)}); + } + } } } return params; diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp index 61c287b9633c..ae54c18eb135 100644 --- a/media/jni/android_media_MediaCodec.cpp +++ b/media/jni/android_media_MediaCodec.cpp @@ -2990,11 +2990,16 @@ static void extractMemoryFromContext( } *memory = context->toHidlMemory(); } - if (context->mBlock == nullptr || context->mReadWriteMapping == nullptr) { - ALOGW("extractMemoryFromContext: Cannot extract memory as C2Block is not created/mapped"); + if (context->mBlock == nullptr) { + // this should be ok as we may only have IMemory/hidlMemory + // e.g. video codecs may only have IMemory and no mBlock return; } - if (context->mReadWriteMapping->error() != C2_OK) { + + // if we have mBlock and memory, then we will copy data from mBlock to hidlMemory + // e.g. audio codecs may only have mBlock and wanted to decrypt using hidlMemory + // and also wanted to re-use mBlock + if (context->mReadWriteMapping == nullptr || context->mReadWriteMapping->error() != C2_OK) { ALOGW("extractMemoryFromContext: failed to map C2Block (%d)", context->mReadWriteMapping->error()); return; diff --git a/packages/SystemUI/tests/src/com/android/systemui/stylus/StylusManagerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/stylus/StylusManagerTest.kt index 0b3dd660532b..10503aa08e13 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/stylus/StylusManagerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/stylus/StylusManagerTest.kt @@ -28,6 +28,7 @@ import com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession import com.android.dx.mockito.inline.extended.ExtendedMockito.never import com.android.dx.mockito.inline.extended.ExtendedMockito.times import com.android.dx.mockito.inline.extended.ExtendedMockito.verify +import com.android.dx.mockito.inline.extended.MockedVoidMethod import com.android.dx.mockito.inline.extended.StaticMockitoSession import com.android.internal.logging.InstanceId import com.android.internal.logging.UiEventLogger @@ -246,7 +247,7 @@ class StylusManagerTest : SysuiTestCase() { @Test fun onInputDeviceAdded_btStylus_firstUsed_setsFlag() { stylusManager.onInputDeviceAdded(BT_STYLUS_DEVICE_ID) - verify({ InputSettings.setStylusEverUsed(mContext, true) }, times(1)) + verify(MockedVoidMethod { InputSettings.setStylusEverUsed(mContext, true) }, times(1)) } @Test @@ -512,7 +513,7 @@ class StylusManagerTest : SysuiTestCase() { stylusManager.onBatteryStateChanged(STYLUS_DEVICE_ID, 1, batteryState) - verify({ InputSettings.setStylusEverUsed(mContext, true) }, times(1)) + verify(MockedVoidMethod { InputSettings.setStylusEverUsed(mContext, true) }, times(1)) } @Test @@ -613,7 +614,7 @@ class StylusManagerTest : SysuiTestCase() { stylusManager.onBatteryStateChanged(STYLUS_DEVICE_ID, 1, batteryState) - verify({ InputSettings.setStylusEverUsed(mContext, true) }, never()) + verify(MockedVoidMethod { InputSettings.setStylusEverUsed(mContext, true) }, never()) } @Test diff --git a/services/tests/mockingservicestests/src/com/android/server/am/CachedAppOptimizerTest.java b/services/tests/mockingservicestests/src/com/android/server/am/CachedAppOptimizerTest.java index d203de537b81..cf83396d059a 100644 --- a/services/tests/mockingservicestests/src/com/android/server/am/CachedAppOptimizerTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/am/CachedAppOptimizerTest.java @@ -397,6 +397,12 @@ public final class CachedAppOptimizerTest { // When we override new reasonable throttle values after init... mCountDown = new CountDownLatch(8); DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, + CachedAppOptimizer.KEY_COMPACT_THROTTLE_MIN_OOM_ADJ, + Long.toString(CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_MIN_OOM_ADJ + 1), false); + DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, + CachedAppOptimizer.KEY_COMPACT_THROTTLE_MAX_OOM_ADJ, + Long.toString(CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_MAX_OOM_ADJ - 1), false); + DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, CachedAppOptimizer.KEY_COMPACT_THROTTLE_1, Long.toString(CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_1 + 1), false); DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, @@ -414,12 +420,6 @@ public final class CachedAppOptimizerTest { DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, CachedAppOptimizer.KEY_COMPACT_THROTTLE_6, Long.toString(CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_6 + 1), false); - DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, - CachedAppOptimizer.KEY_COMPACT_THROTTLE_MIN_OOM_ADJ, - Long.toString(CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_MIN_OOM_ADJ + 1), false); - DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER, - CachedAppOptimizer.KEY_COMPACT_THROTTLE_MAX_OOM_ADJ, - Long.toString(CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_MAX_OOM_ADJ - 1), false); assertThat(mCountDown.await(7, TimeUnit.SECONDS)).isTrue(); // Then those flags values are reflected in the compactor. diff --git a/services/tests/servicestests/Android.bp b/services/tests/servicestests/Android.bp index 2620ea250ca5..d8b5a07ae9f0 100644 --- a/services/tests/servicestests/Android.bp +++ b/services/tests/servicestests/Android.bp @@ -33,9 +33,6 @@ android_test { "test-apps/DisplayManagerTestApp/src/**/*.java", ], - kotlincflags: [ - "-Werror", - ], static_libs: [ "a11ychecker", "aatf", diff --git a/tests/Codegen/OWNERS b/tests/Codegen/OWNERS index da723b3b67da..e69de29bb2d1 100644 --- a/tests/Codegen/OWNERS +++ b/tests/Codegen/OWNERS @@ -1 +0,0 @@ -eugenesusla@google.com
\ No newline at end of file diff --git a/tests/Input/Android.bp b/tests/Input/Android.bp index 6742cbe1f19a..bacb5eb1cfdf 100644 --- a/tests/Input/Android.bp +++ b/tests/Input/Android.bp @@ -19,9 +19,6 @@ android_test { "src/**/*.kt", ], asset_dirs: ["assets"], - kotlincflags: [ - "-Werror", - ], platform_apis: true, certificate: "platform", static_libs: [ |