Snap for 12858568 from e9f92c9e587ed958de63f56152caf97492a51307 to 25Q2-release (9279ec65) · Commits · e / os / android_frameworks_base

apct-tests/perftests/core/src/android/conscrypt/conscrypt/ClientEndpoint.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import java.io.EOFException;
		import java.io.IOException;
		import java.io.InputStream;
		import java.io.OutputStream;
		import java.lang.AutoCloseable;
		import java.net.InetAddress;
		import java.net.SocketException;
		import java.nio.channels.ClosedChannelException;
		@@ -33,7 +34,7 @@ import org.conscrypt.ChannelType;
		* Client-side endpoint. Provides basic services for sending/receiving messages from the client
		* socket.
		*/
		final class ClientEndpoint {
		final class ClientEndpoint implements AutoCloseable {
		private final SSLSocket socket;
		private InputStream input;
		private OutputStream output;
		@@ -56,6 +57,11 @@ final class ClientEndpoint {
		}
		}

		@Override
		public void close() {
		stop();
		}

		void stop() {
		try {
		socket.close();

apct-tests/perftests/core/src/android/conscrypt/conscrypt/ClientSocketPerfTest.java

+137 −77

Original line number	Diff line number	Diff line
		@@ -44,24 +44,21 @@ import javax.crypto.Cipher;
		import javax.crypto.NoSuchPaddingException;

		import org.junit.Rule;
		import org.junit.After;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import junitparams.JUnitParamsRunner;
		import junitparams.Parameters;
		import android.conscrypt.ServerEndpoint.MessageProcessor;

		/**
		* Benchmark for comparing performance of server socket implementations.
		*/
		/** Benchmark for comparing performance of server socket implementations. */
		@RunWith(JUnitParamsRunner.class)
		@LargeTest
		public final class ClientSocketPerfTest {

		@Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();

		/**
		* Provider for the test configuration
		*/
		/** Provider for the test configuration */
		private class Config {
		EndpointFactory a_clientFactory;
		EndpointFactory b_serverFactory;
		@@ -69,7 +66,9 @@ public final class ClientSocketPerfTest {
		String d_cipher;
		ChannelType e_channelType;
		PerfTestProtocol f_protocol;
		Config(EndpointFactory clientFactory,

		Config(
		EndpointFactory clientFactory,
		EndpointFactory serverFactory,
		int messageSize,
		String cipher,
		@@ -82,6 +81,7 @@ public final class ClientSocketPerfTest {
		e_channelType = channelType;
		f_protocol = protocol;
		}

		public EndpointFactory clientFactory() {
		return a_clientFactory;
		}
		@@ -112,23 +112,43 @@ 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)});
		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)
		});
		}
		}
		}
		return params;
		}

		private ClientEndpoint client;
		private ServerEndpoint server;
		private SocketPair socketPair = new SocketPair();
		private byte[] message;
		private ExecutorService executor;
		private Future<?> sendingFuture;
		@@ -137,15 +157,40 @@ public final class ClientSocketPerfTest {
		private static final AtomicLong bytesCounter = new AtomicLong();
		private AtomicBoolean recording = new AtomicBoolean();

		private static class SocketPair implements AutoCloseable {
		public ClientEndpoint client;
		public ServerEndpoint server;

		SocketPair() {
		client = null;
		server = null;
		}

		@Override
		public void close() {
		if (client != null) {
		client.stop();
		}
		if (server != null) {
		server.stop();
		}
		}
		}

		private void setup(Config config) throws Exception {
		message = newTextMessage(512);

		// Always use the same server for consistency across the benchmarks.
		server = config.serverFactory().newServer(
		config.messageSize(), config.protocol().getProtocols(),
		socketPair.server =
		config.serverFactory()
		.newServer(
		config.messageSize(),
		config.protocol().getProtocols(),
		ciphers(config));
		socketPair.server.init();

		server.setMessageProcessor(new ServerEndpoint.MessageProcessor() {
		socketPair.server.setMessageProcessor(
		new ServerEndpoint.MessageProcessor() {
		@Override
		public void processMessage(byte[] inMessage, int numBytes, OutputStream os) {
		if (recording.get()) {
		@@ -154,26 +199,33 @@ public final class ClientSocketPerfTest {
		}
		}
		});
		Future<?> connectedFuture = server.start();
		Future<?> connectedFuture = socketPair.server.start();

		client = config.clientFactory().newClient(
		config.channelType(), server.port(), config.protocol().getProtocols(), ciphers(config));
		client.start();
		socketPair.client =
		config.clientFactory()
		.newClient(
		config.channelType(),
		socketPair.server.port(),
		config.protocol().getProtocols(),
		ciphers(config));
		socketPair.client.start();

		// Wait for the initial connection to complete.
		connectedFuture.get(5, TimeUnit.SECONDS);

		executor = Executors.newSingleThreadExecutor();
		sendingFuture = executor.submit(new Runnable() {
		sendingFuture =
		executor.submit(
		new Runnable() {
		@Override
		public void run() {
		try {
		Thread thread = Thread.currentThread();
		while (!stopping && !thread.isInterrupted()) {
		client.sendMessage(message);
		socketPair.client.sendMessage(message);
		}
		} finally {
		client.flush();
		socketPair.client.flush();
		}
		}
		});
		@@ -185,29 +237,37 @@ public final class ClientSocketPerfTest {
		// Wait for the sending thread to stop.
		sendingFuture.get(5, TimeUnit.SECONDS);

		client.stop();
		server.stop();
		if (socketPair != null) {
		socketPair.close();
		}
		if (executor != null) {
		executor.shutdown();
		executor.awaitTermination(5, TimeUnit.SECONDS);
		}
		}

		/**
		* Simple benchmark for the amount of time to send a given number of messages
		*/
		/** Simple benchmark for the amount of time to send a given number of messages */
		@Test
		@Parameters(method = "getParams")
		public void time(Config config) throws Exception {
		try {
		reset();
		setup(config);
		recording.set(true);

		BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
		while (state.keepRunning()) {
		while (bytesCounter.get() < config.messageSize()) {
		}
		while (bytesCounter.get() < config.messageSize()) {}
		bytesCounter.set(0);
		}
		recording.set(false);
		} finally {
		close();
		}
		}

		@After
		public void tearDown() throws Exception {
		close();
		}

apct-tests/perftests/core/src/android/conscrypt/conscrypt/ServerEndpoint.java

+15 −2

Original line number	Diff line number	Diff line
		@@ -16,10 +16,14 @@

		package android.conscrypt;

		import static org.conscrypt.TestUtils.getLoopbackAddress;

		import java.io.EOFException;
		import java.io.IOException;
		import java.io.InputStream;
		import java.io.OutputStream;
		import java.lang.AutoCloseable;
		import java.net.InetSocketAddress;
		import java.net.ServerSocket;
		import java.net.SocketException;
		import java.nio.channels.ClosedChannelException;
		@@ -37,7 +41,7 @@ import javax.net.ssl.SSLSocketFactory;
		/**
		* A simple socket-based test server.
		*/
		final class ServerEndpoint {
		final class ServerEndpoint implements AutoCloseable {
		/**
		* A processor for receipt of a single message.
		*/
		@@ -82,7 +86,11 @@ final class ServerEndpoint {
		this.messageSize = messageSize;
		this.protocols = protocols;
		this.cipherSuites = cipherSuites;
		buffer = new byte[messageSize];
		this.buffer = new byte[messageSize];
		}

		void init() throws IOException {
		serverSocket.bind(new InetSocketAddress(getLoopbackAddress(), 0));
		}

		void setMessageProcessor(MessageProcessor messageProcessor) {
		@@ -94,6 +102,11 @@ final class ServerEndpoint {
		return executor.submit(new AcceptTask());
		}

		@Override
		public void close() {
		stop();
		}

		void stop() {
		try {
		stopping = true;

apct-tests/perftests/core/src/android/conscrypt/conscrypt/ServerSocketPerfTest.java

+58 −24

Original line number	Diff line number	Diff line
		@@ -44,6 +44,7 @@ import junitparams.JUnitParamsRunner;
		import junitparams.Parameters;

		import org.junit.Rule;
		import org.junit.After;
		import org.junit.Test;
		import org.junit.runner.RunWith;

		@@ -115,14 +116,33 @@ public final class ServerSocketPerfTest {
		return params;
		}

		private ClientEndpoint client;
		private ServerEndpoint server;
		private SocketPair socketPair = new SocketPair();
		private ExecutorService executor;
		private Future<?> receivingFuture;
		private volatile boolean stopping;
		private static final AtomicLong bytesCounter = new AtomicLong();
		private AtomicBoolean recording = new AtomicBoolean();

		private static class SocketPair implements AutoCloseable {
		public ClientEndpoint client;
		public ServerEndpoint server;

		SocketPair() {
		client = null;
		server = null;
		}

		@Override
		public void close() {
		if (client != null) {
		client.stop();
		}
		if (server != null) {
		server.stop();
		}
		}
		}

		private void setup(final Config config) throws Exception {
		recording.set(false);

		@@ -130,9 +150,10 @@ public final class ServerSocketPerfTest {

		final ChannelType channelType = config.channelType();

		server = config.serverFactory().newServer(config.messageSize(),
		socketPair.server = config.serverFactory().newServer(config.messageSize(),
		new String[] {"TLSv1.3", "TLSv1.2"}, ciphers(config));
		server.setMessageProcessor(new MessageProcessor() {
		socketPair.server.init();
		socketPair.server.setMessageProcessor(new MessageProcessor() {
		@Override
		public void processMessage(byte[] inMessage, int numBytes, OutputStream os) {
		try {
		@@ -151,20 +172,20 @@ public final class ServerSocketPerfTest {
		}
		});

		Future<?> connectedFuture = server.start();
		Future<?> connectedFuture = socketPair.server.start();

		// Always use the same client for consistency across the benchmarks.
		client = config.clientFactory().newClient(
		ChannelType.CHANNEL, server.port(),
		socketPair.client = config.clientFactory().newClient(
		ChannelType.CHANNEL, socketPair.server.port(),
		new String[] {"TLSv1.3", "TLSv1.2"}, ciphers(config));
		client.start();
		socketPair.client.start();

		// Wait for the initial connection to complete.
		connectedFuture.get(5, TimeUnit.SECONDS);

		// Start the server-side streaming by sending a message to the server.
		client.sendMessage(message);
		client.flush();
		socketPair.client.sendMessage(message);
		socketPair.client.flush();

		executor = Executors.newSingleThreadExecutor();
		receivingFuture = executor.submit(new Runnable() {
		@@ -173,7 +194,7 @@ public final class ServerSocketPerfTest {
		Thread thread = Thread.currentThread();
		byte[] buffer = new byte[config.messageSize()];
		while (!stopping && !thread.isInterrupted()) {
		int numBytes = client.readMessage(buffer);
		int numBytes = socketPair.client.readMessage(buffer);
		if (numBytes < 0) {
		return;
		}
		@@ -191,16 +212,22 @@ public final class ServerSocketPerfTest {
		void close() throws Exception {
		stopping = true;
		// Stop and wait for sending to complete.
		server.stop();
		client.stop();
		if (socketPair != null) {
		socketPair.close();
		}
		if (executor != null) {
		executor.shutdown();
		receivingFuture.get(5, TimeUnit.SECONDS);
		executor.awaitTermination(5, TimeUnit.SECONDS);
		}
		if (receivingFuture != null) {
		receivingFuture.get(5, TimeUnit.SECONDS);
		}
		}

		@Test
		@Parameters(method = "getParams")
		public void throughput(Config config) throws Exception {
		try {
		setup(config);
		BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
		while (state.keepRunning()) {
		@@ -210,6 +237,13 @@ public final class ServerSocketPerfTest {
		bytesCounter.set(0);
		recording.set(false);
		}
		} finally {
		close();
		}
		}

		@After
		public void tearDown() throws Exception {
		close();
		}

core/java/android/hardware/input/InputSettings.java

+51 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import static com.android.hardware.input.Flags.keyboardA11yStickyKeysFlag;
		import static com.android.hardware.input.Flags.mouseScrollingAcceleration;
		import static com.android.hardware.input.Flags.mouseReverseVerticalScrolling;
		import static com.android.hardware.input.Flags.mouseSwapPrimaryButton;
		import static com.android.hardware.input.Flags.pointerAcceleration;
		import static com.android.hardware.input.Flags.touchpadSystemGestureDisable;
		import static com.android.hardware.input.Flags.touchpadThreeFingerTapShortcut;
		import static com.android.hardware.input.Flags.touchpadVisualizer;
		@@ -417,6 +418,15 @@ public class InputSettings {
		return mouseSwapPrimaryButton();
		}

		/**
		* Returns true if the feature flag for the pointer acceleration toggle is
		* enabled.
		* @hide
		*/
		public static boolean isPointerAccelerationFeatureFlagEnabled() {
		return pointerAcceleration();
		}

		/**
		* Returns true if the touchpad visualizer is allowed to appear.
		*
		@@ -719,6 +729,47 @@ public class InputSettings {
		UserHandle.USER_CURRENT);
		}

		/**
		* Whether cursor acceleration is enabled or not for connected mice.
		*
		* @param context The application context.
		*
		* @hide
		*/
		public static boolean isMousePointerAccelerationEnabled(@NonNull Context context) {
		if (!isPointerAccelerationFeatureFlagEnabled()) {
		return false;
		}

		return Settings.System.getIntForUser(context.getContentResolver(),
		Settings.System.MOUSE_POINTER_ACCELERATION_ENABLED, 1, UserHandle.USER_CURRENT)
		== 1;
		}

		/**
		* Sets whether mouse acceleration is enabled.
		*
		* When enabled, the mouse cursor moves farther when it is moved faster.
		* When disabled, the mouse cursor speed becomes directly proportional to
		* the speed at which the mouse is moved.
		*
		* @param context The application context.
		* @param enabled Will enable mouse acceleration if true, disable it if
		* false.
		* @hide
		*/
		@RequiresPermission(Manifest.permission.WRITE_SETTINGS)
		public static void setMouseAccelerationEnabled(@NonNull Context context,
		boolean enabled) {
		if (!isPointerAccelerationFeatureFlagEnabled()) {
		return;
		}
		Settings.System.putIntForUser(context.getContentResolver(),
		Settings.System.MOUSE_POINTER_ACCELERATION_ENABLED, enabled ? 1 : 0,
		UserHandle.USER_CURRENT);
		}


		/**
		* Whether Accessibility bounce keys feature is enabled.
		*