Merge "Set up new concurrent MQ field study flag" into main (2c3cd8c1) · Commits · e / os / android_frameworks_base

core/java/android/os/CombinedMessageQueue/MessageQueue.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -156,18 +156,19 @@ public final class MessageQueue {
		return;
		}

		if (Flags.forceConcurrentMessageQueue()) {
		if (Flags.useConcurrentMessageQueueInApps()) {
		// b/379472827: Robolectric tests use reflection to access MessageQueue.mMessages.
		// This is a hack to allow Robolectric tests to use the legacy implementation.
		try {
		Class.forName("org.robolectric.Robolectric");
		// This is a Robolectric test. Concurrent MessageQueue is not supported yet.
		sIsProcessAllowedToUseConcurrent = false;
		return;
		} catch (ClassNotFoundException e) {
		// This is not a Robolectric test.
		sIsProcessAllowedToUseConcurrent = true;
		return;
		}
		// This is a Robolectric test.
		// Continue to the following checks.
		}

		final String processName = Process.myProcessName();

+7 −8

Original line number	Diff line number	Diff line
		@@ -246,14 +246,6 @@ flag {
		bug: "370845648"
		}

		flag {
		name: "force_concurrent_message_queue"
		namespace: "system_performance"
		is_exported: true
		description: "Whether MessageQueue uses the new concurrent implementation"
		bug: "336880969"
		}

		flag {
		name: "get_private_space_settings"
		namespace: "profile_experiences"
		@@ -398,6 +390,13 @@ flag {
		bug: "377557749"
		}

		flag {
		name: "use_concurrent_message_queue_in_apps"
		namespace: "system_performance"
		description: "Whether MessageQueue can use the new concurrent implementation in any process"
		bug: "418770969"
		}

		flag {
		namespace: "system_performance"
		name: "enable_has_binders"