Snap for 12704449 from d38e45cb33c447d68f38e57fe999d006205d0678 to 25Q2-release (643e66a7) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+14 −11

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@ aconfig_declarations_group {
		"android.media.tv.flags-aconfig-java",
		"android.multiuser.flags-aconfig-java",
		"android.net.platform.flags-aconfig-java",
		"android.net.vcn.flags-aconfig-java",
		"android.net.vcn.flags-aconfig-java-export",
		"android.net.wifi.flags-aconfig-java",
		"android.nfc.flags-aconfig-java",
		"android.os.flags-aconfig-java",
		@@ -100,7 +100,7 @@ aconfig_declarations_group {
		"com.android.media.flags.performance-aconfig-java",
		"com.android.media.flags.projection-aconfig-java",
		"com.android.net.thread.platform.flags-aconfig-java",
		"com.android.ranging.flags.ranging-aconfig-java",
		"com.android.ranging.flags.ranging-aconfig-java-export",
		"com.android.server.contextualsearch.flags-java",
		"com.android.server.flags.services-aconfig-java",
		"com.android.text.flags-aconfig-java",
		@@ -373,6 +373,11 @@ java_aconfig_library {
		name: "android.security.flags-aconfig-java-export",
		aconfig_declarations: "android.security.flags-aconfig",
		mode: "exported",
		min_sdk_version: "30",
		apex_available: [
		"//apex_available:platform",
		"com.android.wifi",
		],
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		@@ -1170,16 +1175,21 @@ java_aconfig_library {
		}

		// VCN
		// TODO:376339506 Move the VCN code, the flag declaration and
		// java_aconfig_library to framework-connectivity-b
		aconfig_declarations {
		name: "android.net.vcn.flags-aconfig",
		package: "android.net.vcn",
		container: "system",
		container: "com.android.tethering",
		exportable: true,
		srcs: ["core/java/android/net/vcn/*.aconfig"],
		}

		java_aconfig_library {
		name: "android.net.vcn.flags-aconfig-java",
		name: "android.net.vcn.flags-aconfig-java-export",
		aconfig_declarations: "android.net.vcn.flags-aconfig",
		mode: "exported",
		min_sdk_version: "35",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		@@ -1646,13 +1656,6 @@ java_aconfig_library {
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// Ranging
		java_aconfig_library {
		name: "com.android.ranging.flags.ranging-aconfig-java",
		aconfig_declarations: "ranging_aconfig_flags",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// System Server
		aconfig_declarations {
		name: "android.systemserver.flags-aconfig",

Android.bp

+13 −11

Original line number	Diff line number	Diff line
		@@ -103,10 +103,10 @@ filegroup {
		":android.hardware.gnss-V2-java-source",
		":android.hardware.graphics.common-V3-java-source",
		":android.hardware.keymaster-V4-java-source",
		":android.hardware.radio-V3-java-source",
		":android.hardware.radio.data-V3-java-source",
		":android.hardware.radio.network-V3-java-source",
		":android.hardware.radio.voice-V3-java-source",
		":android.hardware.radio-V4-java-source",
		":android.hardware.radio.data-V4-java-source",
		":android.hardware.radio.network-V4-java-source",
		":android.hardware.radio.voice-V4-java-source",
		":android.hardware.security.secureclock-V1-java-source",
		":android.hardware.thermal-V3-java-source",
		":android.hardware.tv.tuner-V3-java-source",
		@@ -232,13 +232,13 @@ java_library {
		"android.hardware.gnss-V2.1-java",
		"android.hardware.health-V1.0-java-constants",
		"android.hardware.radio-V1.6-java",
		"android.hardware.radio.data-V3-java",
		"android.hardware.radio.ims-V2-java",
		"android.hardware.radio.messaging-V3-java",
		"android.hardware.radio.modem-V3-java",
		"android.hardware.radio.network-V3-java",
		"android.hardware.radio.sim-V3-java",
		"android.hardware.radio.voice-V3-java",
		"android.hardware.radio.data-V4-java",
		"android.hardware.radio.ims-V3-java",
		"android.hardware.radio.messaging-V4-java",
		"android.hardware.radio.modem-V4-java",
		"android.hardware.radio.network-V4-java",
		"android.hardware.radio.sim-V4-java",
		"android.hardware.radio.voice-V4-java",
		"android.hardware.thermal-V1.0-java-constants",
		"android.hardware.thermal-V1.0-java",
		"android.hardware.thermal-V1.1-java",
		@@ -397,6 +397,8 @@ java_defaults {
		"ext",
		"framework-updatable-stubs-module_libs_api",
		"unsupportedappusage",
		// TODO(b/379770939): remove prod version of flags from other containers in framework
		"aconfig_storage_stub",
		],
		sdk_version: "core_platform",
		static_libs: [

PREUPLOAD.cfg

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp
		tests/
		tools/
		bpfmt = -d
		ktfmt = --kotlinlang-style --include-dirs=services/permission,packages/SystemUI,libs/WindowManager/Shell/src/com/android/wm/shell/freeform
		ktfmt = --kotlinlang-style --include-dirs=services/permission,packages/SystemUI,libs/WindowManager/Shell/src/com/android/wm/shell/freeform,libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/education

		[Hook Scripts]
		checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}

apct-tests/perftests/textclassifier/src/android/view/textclassifier/TextClassificationManagerPerfTest.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -34,6 +34,8 @@ import org.junit.Test;
		public class TextClassificationManagerPerfTest {
		private static final String WRITE_DEVICE_CONFIG_PERMISSION =
		"android.permission.WRITE_DEVICE_CONFIG";
		private static final String WRITE_ALLOWLISTED_DEVICE_CONFIG_PERMISSION =
		"android.permission.WRITE_ALLOWLISTED_DEVICE_CONFIG";

		@Rule
		public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();
		@@ -44,7 +46,7 @@ public class TextClassificationManagerPerfTest {
		public static void setUpClass() {
		InstrumentationRegistry.getInstrumentation().getUiAutomation()
		.adoptShellPermissionIdentity(
		WRITE_DEVICE_CONFIG_PERMISSION);
		WRITE_DEVICE_CONFIG_PERMISSION, WRITE_ALLOWLISTED_DEVICE_CONFIG_PERMISSION);
		}

		@AfterClass

apct-tests/perftests/tracing/src/com/android/internal/protolog/ProtoLogPerfTest.java

+18 −1

Original line number	Diff line number	Diff line
		@@ -19,6 +19,9 @@ import android.app.Activity;
		import android.os.Bundle;
		import android.os.ServiceManager.ServiceNotFoundException;
		import android.perftests.utils.Stats;
		import android.tracing.perfetto.DataSourceParams;
		import android.tracing.perfetto.InitArguments;
		import android.tracing.perfetto.Producer;

		import androidx.test.InstrumentationRegistry;

		@@ -70,6 +73,8 @@ public class ProtoLogPerfTest {
		}

		private IProtoLog mProcessedProtoLogger;
		private static ProtoLogDataSource sTestDataSource;
		private static final String TEST_PROTOLOG_DATASOURCE_NAME = "test.android.protolog";
		private static final String MOCK_TEST_FILE_PATH = "mock/file/path";
		private static final perfetto.protos.Protolog.ProtoLogViewerConfig VIEWER_CONFIG =
		perfetto.protos.Protolog.ProtoLogViewerConfig.newBuilder()
		@@ -89,6 +94,17 @@ public class ProtoLogPerfTest {

		@BeforeClass
		public static void init() {
		Producer.init(InitArguments.DEFAULTS);

		sTestDataSource = new ProtoLogDataSource(TEST_PROTOLOG_DATASOURCE_NAME);
		DataSourceParams params =
		new DataSourceParams.Builder()
		.setBufferExhaustedPolicy(
		DataSourceParams
		.PERFETTO_DS_BUFFER_EXHAUSTED_POLICY_DROP)
		.build();
		sTestDataSource.register(params);

		ProtoLog.init(TestProtoLogGroup.values());
		}

		@@ -98,9 +114,10 @@ public class ProtoLogPerfTest {
		TestProtoLogGroup.TEST_GROUP.setLogToLogcat(mLogToLogcat);

		mProcessedProtoLogger = new ProcessedPerfettoProtoLogImpl(
		sTestDataSource,
		MOCK_TEST_FILE_PATH,
		() -> new AutoClosableProtoInputStream(VIEWER_CONFIG.toByteArray()),
		() -> {},
		(instance) -> {},
		TestProtoLogGroup.values()
		);
		}