Snap for 12217053 from 3c50fc43340db96ff97b277df558bd11712691f0 to 24Q4-release (fc728558) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+16 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ aconfig_declarations_group {
		// !!! KEEP THIS LIST ALPHABETICAL !!!
		"aconfig_mediacodec_flags_java_lib",
		"android.adaptiveauth.flags-aconfig-java",
		"android.app.appfunctions.flags-aconfig-java",
		"android.app.contextualsearch.flags-aconfig-java",
		"android.app.flags-aconfig-java",
		"android.app.ondeviceintelligence-aconfig-java",
		@@ -1383,6 +1384,21 @@ java_aconfig_library {
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// AppFunctions
		aconfig_declarations {
		name: "android.app.appfunctions.flags-aconfig",
		exportable: true,
		package: "android.app.appfunctions.flags",
		container: "system",
		srcs: ["core/java/android/app/appfunctions/flags/flags.aconfig"],
		}

		java_aconfig_library {
		name: "android.app.appfunctions.flags-aconfig-java",
		aconfig_declarations: "android.app.appfunctions.flags-aconfig",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// Adaptive Auth
		aconfig_declarations {
		name: "android.adaptiveauth.flags-aconfig",

+1 −0

Original line number	Diff line number	Diff line
		# Bug component: 136048
		# Please assign bugs to android-framework-input-triage@.
		arpitks@google.com
		asmitapoddar@google.com
		hcutts@google.com

+6 −5

Original line number	Diff line number	Diff line
		@@ -137,13 +137,14 @@
		"name": "CtsStrictJavaPackagesTestCases"
		}
		],
		"postsubmit-ravenwood": [
		"ravenwood-presubmit": [
		{
		"name": "CtsUtilTestCasesRavenwood",
		"host": true,
		"file_patterns": [
		"[Rr]avenwood"
		]
		"host": true
		},
		{
		"name": "RavenwoodBivalentTest",
		"host": true
		}
		],
		"postsubmit-managedprofile-stress": [

+1 −3

Original line number	Diff line number	Diff line
		@@ -43,7 +43,6 @@ import java.util.concurrent.atomic.AtomicLong;
		import javax.crypto.Cipher;
		import javax.crypto.NoSuchPaddingException;

		import org.junit.Ignore;
		import org.junit.Rule;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		@@ -143,7 +142,7 @@ public final class ClientSocketPerfTest {

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

		server.setMessageProcessor(new ServerEndpoint.MessageProcessor() {
		@@ -197,7 +196,6 @@ public final class ClientSocketPerfTest {
		*/
		@Test
		@Parameters(method = "getParams")
		@Ignore("b/351034205")
		public void time(Config config) throws Exception {
		reset();
		setup(config);

+2 −2

Original line number	Diff line number	Diff line
		@@ -43,10 +43,10 @@ public enum EndpointFactory {
		factories.clientFactory, channelType, port, protocols, ciphers);
		}

		public ServerEndpoint newServer(ChannelType channelType, int messageSize,
		public ServerEndpoint newServer(int messageSize,
		String[] protocols, String[] ciphers) throws IOException {
		return new ServerEndpoint(factories.serverFactory, factories.serverSocketFactory,
		channelType, messageSize, protocols, ciphers);
		messageSize, protocols, ciphers);
		}

		private static final class Factories {