Snap for 10860171 from f78cd538d2d1371db0e1344e2ca4ebaae1f3fe20 to 24Q1-release (9f7cbf63) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+15 −1

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ aconfig_srcjars = [
		":android.permission.flags-aconfig-java{.generated_srcjars}",
		":hwui_flags_java_lib{.generated_srcjars}",
		":display_flags_lib{.generated_srcjars}",
		":android.multiuser.flags-aconfig-java{.generated_srcjars}",
		]

		filegroup {
		@@ -252,7 +253,7 @@ java_aconfig_library {
		aconfig_declarations {
		name: "android.content.pm.flags-aconfig",
		package: "android.content.pm",
		srcs: ["core/java/android/content/pm/*.aconfig"],
		srcs: ["core/java/android/content/pm/flags.aconfig"],
		}

		java_aconfig_library {
		@@ -313,3 +314,16 @@ java_aconfig_library {
		aconfig_declarations: "display_flags",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// Multi user
		aconfig_declarations {
		name: "android.multiuser.flags-aconfig",
		package: "android.multiuser",
		srcs: ["core/java/android/content/pm/multiuser.aconfig"],
		}

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

apct-tests/perftests/core/src/android/accessibility/AccessibilityPerfTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import android.app.Activity;
		import android.app.Instrumentation;
		import android.app.UiAutomation;
		import android.perftests.utils.PerfTestActivity;
		import android.platform.test.annotations.LargeTest;
		import android.view.View;
		import android.view.ViewGroup;
		import android.view.accessibility.AccessibilityEvent;
		@@ -32,6 +31,7 @@ import android.widget.TextView;

		import androidx.benchmark.BenchmarkState;
		import androidx.benchmark.junit4.BenchmarkRule;
		import androidx.test.filters.LargeTest;
		import androidx.test.platform.app.InstrumentationRegistry;
		import androidx.test.rule.ActivityTestRule;

apct-tests/perftests/core/src/android/text/TextViewCursorAnchorInfoPerfTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -22,13 +22,13 @@ import android.content.Context;
		import android.perftests.utils.BenchmarkState;
		import android.perftests.utils.PerfStatusReporter;
		import android.perftests.utils.PerfTestActivity;
		import android.platform.test.annotations.LargeTest;
		import android.util.AttributeSet;
		import android.view.View;
		import android.view.ViewGroup;
		import android.view.inputmethod.CursorAnchorInfo;
		import android.widget.TextView;

		import androidx.test.filters.LargeTest;
		import androidx.test.rule.ActivityTestRule;

		import org.junit.Before;

apct-tests/perftests/surfaceflinger/src/android/surfaceflinger/SurfaceFlingerPerfTest.java

+29 −1

Original line number	Diff line number	Diff line
		@@ -17,12 +17,15 @@
		package android.surfaceflinger;

		import static android.server.wm.CtsWindowInfoUtils.waitForWindowOnTop;
		import static android.provider.Settings.Secure.IMMERSIVE_MODE_CONFIRMATIONS;

		import android.app.Instrumentation;
		import android.content.ContentResolver;
		import android.graphics.Bitmap;
		import android.graphics.Canvas;
		import android.graphics.Color;
		import android.os.Bundle;
		import android.provider.Settings;
		import android.util.Log;
		import android.view.SurfaceControl;
		import android.view.SurfaceHolder;
		@@ -33,9 +36,11 @@ import androidx.test.filters.LargeTest;
		import androidx.test.platform.app.InstrumentationRegistry;
		import androidx.test.runner.AndroidJUnit4;

		import com.android.compatibility.common.util.SystemUtil;
		import com.android.helpers.SimpleperfHelper;

		import org.junit.After;
		import org.junit.AfterClass;
		import org.junit.Before;
		import org.junit.BeforeClass;
		import org.junit.Rule;
		@@ -71,7 +76,7 @@ public class SurfaceFlingerPerfTest {

		private int mTransformHint;
		private SimpleperfHelper mSimpleperfHelper = new SimpleperfHelper();

		private static String sImmersiveModeConfirmationValue;
		/** Start simpleperf sampling. */
		public void startSimpleperf(String subcommand, String arguments) {
		if (!mSimpleperfHelper.startCollecting(subcommand, arguments)) {
		@@ -88,6 +93,17 @@ public class SurfaceFlingerPerfTest {

		@BeforeClass
		public static void suiteSetup() {
		SystemUtil.runWithShellPermissionIdentity(() -> {
		// hide immersive mode confirmation dialog
		final ContentResolver resolver =
		InstrumentationRegistry.getInstrumentation().getContext().getContentResolver();
		sImmersiveModeConfirmationValue =
		Settings.Secure.getString(resolver, IMMERSIVE_MODE_CONFIRMATIONS);
		Settings.Secure.putString(
		resolver,
		IMMERSIVE_MODE_CONFIRMATIONS,
		"confirmed");
		});
		final Bundle arguments = InstrumentationRegistry.getArguments();
		sProfilingIterations = Integer.parseInt(
		arguments.getString(ARGUMENT_PROFILING_ITERATIONS, DEFAULT_PROFILING_ITERATIONS));
		@@ -98,6 +114,18 @@ public class SurfaceFlingerPerfTest {
		.executeShellCommand("service call SurfaceFlinger 1041 i32 -1");
		}

		@AfterClass
		public static void suiteTeardown() {
		SystemUtil.runWithShellPermissionIdentity(() -> {
		// Restore the immersive mode confirmation state.
		Settings.Secure.putString(
		InstrumentationRegistry.getInstrumentation().getContext().getContentResolver(),
		IMMERSIVE_MODE_CONFIRMATIONS,
		sImmersiveModeConfirmationValue);
		});
		}


		@Before
		public void setup() {
		mActivityRule.getScenario().onActivity(activity -> mActivity = activity);

apex/jobscheduler/service/java/com/android/server/job/TEST_MAPPING

+3 −3

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@
		"name": "CtsJobSchedulerTestCases",
		"options": [
		{"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
		{"exclude-annotation": "android.platform.test.annotations.LargeTest"},
		{"exclude-annotation": "androidx.test.filters.LargeTest"},
		{"exclude-annotation": "androidx.test.filters.FlakyTest"},
		{"exclude-annotation": "androidx.test.filters.LargeTest"}
		]
		@@ -14,7 +14,7 @@
		"options": [
		{"include-filter": "com.android.server.job"},
		{"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
		{"exclude-annotation": "android.platform.test.annotations.LargeTest"},
		{"exclude-annotation": "androidx.test.filters.LargeTest"},
		{"exclude-annotation": "androidx.test.filters.FlakyTest"}
		]
		},
		@@ -23,7 +23,7 @@
		"options": [
		{"include-filter": "com.android.server.job"},
		{"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
		{"exclude-annotation": "android.platform.test.annotations.LargeTest"},
		{"exclude-annotation": "androidx.test.filters.LargeTest"},
		{"exclude-annotation": "androidx.test.filters.FlakyTest"}
		]
		}