Snap for 12164422 from 58098d7b4de33e936e582b12ff191a5beac66a90 to 24Q4-release (2950eeff) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -99,7 +99,6 @@ aconfig_declarations_group {
	"framework_graphics_flags_java_lib",		"framework_graphics_flags_java_lib",
	"hwui_flags_java_lib",		"hwui_flags_java_lib",
	"libcore_exported_aconfig_flags_lib",		"libcore_exported_aconfig_flags_lib",
	"libgui_flags_java_lib",
	"power_flags_lib",		"power_flags_lib",
	"sdk_sandbox_flags_lib",		"sdk_sandbox_flags_lib",
	"surfaceflinger_flags_java_lib",		"surfaceflinger_flags_java_lib",
	@@ -1209,12 +1208,6 @@ java_aconfig_library {
	defaults: ["framework-minus-apex-aconfig-java-defaults"],		defaults: ["framework-minus-apex-aconfig-java-defaults"],
	}		}

	java_aconfig_library {
	name: "libgui_flags_java_lib",
	aconfig_declarations: "libgui_flags",
	defaults: ["framework-minus-apex-aconfig-java-defaults"],
	}

	// Content Capture		// Content Capture
	aconfig_declarations {		aconfig_declarations {
	name: "android.view.contentcapture.flags-aconfig",		name: "android.view.contentcapture.flags-aconfig",

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

+2 −0

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

			import org.junit.Ignore;
	import org.junit.Rule;		import org.junit.Rule;
	import org.junit.Test;		import org.junit.Test;
	import org.junit.runner.RunWith;		import org.junit.runner.RunWith;
	@@ -196,6 +197,7 @@ public final class ClientSocketPerfTest {
	*/		*/
	@Test		@Test
	@Parameters(method = "getParams")		@Parameters(method = "getParams")
			@Ignore("b/351034205")
	public void time(Config config) throws Exception {		public void time(Config config) throws Exception {
	reset();		reset();
	setup(config);		setup(config);

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -43,6 +43,7 @@ import androidx.test.filters.LargeTest;
	import junitparams.JUnitParamsRunner;		import junitparams.JUnitParamsRunner;
	import junitparams.Parameters;		import junitparams.Parameters;

			import org.junit.Ignore;
	import org.junit.Rule;		import org.junit.Rule;
	import org.junit.Test;		import org.junit.Test;
	import org.junit.runner.RunWith;		import org.junit.runner.RunWith;
	@@ -201,6 +202,7 @@ public final class ServerSocketPerfTest {

	@Test		@Test
	@Parameters(method = "getParams")		@Parameters(method = "getParams")
			@Ignore("b/351034205")
	public void throughput(Config config) throws Exception {		public void throughput(Config config) throws Exception {
	setup(config);		setup(config);
	BenchmarkState state = mPerfStatusReporter.getBenchmarkState();		BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

core/java/android/app/AppCompatTaskInfo.java

+12 −12

core/java/android/content/pm/multiuser.aconfig

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -170,6 +170,16 @@ flag {
	}		}
	}		}

			flag {
			name: "fix_disabling_of_mu_toggle_when_restriction_applied"
			namespace: "multiuser"
			description: "When no_user_switch is set but no EnforcedAdmin is present, the toggle has to be disabled"
			bug: "356387759"
			metadata {
			purpose: PURPOSE_BUGFIX
			}
			}

	flag {		flag {
	name: "cache_quiet_mode_state"		name: "cache_quiet_mode_state"
	namespace: "multiuser"		namespace: "multiuser"

Original line number	Original line	Diff line number	Diff line
	@@ -32,7 +32,7 @@ public class AppCompatTaskInfo implements Parcelable {
	public boolean topActivityEligibleForLetterboxEducation;		public boolean topActivityEligibleForLetterboxEducation;

	/**		/**
	* Whether the letterbox education is enabled		* Whether the letterbox education is enabled.
	*/		*/
	public boolean isLetterboxEducationEnabled;		public boolean isLetterboxEducationEnabled;

	@@ -73,26 +73,26 @@ public class AppCompatTaskInfo implements Parcelable {
	public boolean isFromLetterboxDoubleTap;		public boolean isFromLetterboxDoubleTap;

	/**		/**
	* If {@link isLetterboxDoubleTapEnabled} it contains the current letterbox vertical position or		* If {@link #isLetterboxDoubleTapEnabled} it contains the current letterbox vertical position
	* {@link TaskInfo.PROPERTY_VALUE_UNSET} otherwise.		* or {@link TaskInfo#PROPERTY_VALUE_UNSET} otherwise.
	*/		*/
	public int topActivityLetterboxVerticalPosition;		public int topActivityLetterboxVerticalPosition;

	/**		/**
	* If {@link isLetterboxDoubleTapEnabled} it contains the current letterbox vertical position or		* If {@link #isLetterboxDoubleTapEnabled} it contains the current letterbox vertical position
	* {@link TaskInfo.PROPERTY_VALUE_UNSET} otherwise.		* or {@link TaskInfo#PROPERTY_VALUE_UNSET} otherwise.
	*/		*/
	public int topActivityLetterboxHorizontalPosition;		public int topActivityLetterboxHorizontalPosition;

	/**		/**
	* If {@link isLetterboxDoubleTapEnabled} it contains the current width of the letterboxed		* If {@link #isLetterboxDoubleTapEnabled} it contains the current width of the letterboxed
	* activity or {@link TaskInfo.PROPERTY_VALUE_UNSET} otherwise.		* activity or {@link TaskInfo#PROPERTY_VALUE_UNSET} otherwise.
	*/		*/
	public int topActivityLetterboxWidth;		public int topActivityLetterboxWidth;

	/**		/**
	* If {@link isLetterboxDoubleTapEnabled} it contains the current height of the letterboxed		* If {@link #isLetterboxDoubleTapEnabled} it contains the current height of the letterboxed
	* activity or {@link TaskInfo.PROPERTY_VALUE_UNSET} otherwise.		* activity or {@link TaskInfo#PROPERTY_VALUE_UNSET} otherwise.
	*/		*/
	public int topActivityLetterboxHeight;		public int topActivityLetterboxHeight;

	@@ -133,7 +133,7 @@ public class AppCompatTaskInfo implements Parcelable {
	};		};

	/**		/**
	* @return {@value true} if the task has some compat ui.		* @return {@code true} if the task has some compat ui.