Snap for 12561664 from f8ea5bcc0546b65f0e3a4d4436db2f84c772fcbe to 25Q2-release (31198177) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+6 −1

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ aconfig_declarations_group {
		java_aconfig_libraries: [
		// !!! KEEP THIS LIST ALPHABETICAL !!!
		"aconfig_mediacodec_flags_java_lib",
		"aconfig_trade_in_mode_flags_java_lib",
		"android-sdk-flags-java",
		"android.adaptiveauth.flags-aconfig-java",
		"android.app.appfunctions.flags-aconfig-java",
		@@ -123,7 +124,7 @@ aconfig_declarations_group {

		filegroup {
		name: "framework-minus-apex-aconfig-srcjars",
		srcs: [
		device_common_srcs: [
		":framework-minus-apex-aconfig-declarations{.srcjars}",
		],
		}
		@@ -1559,6 +1560,10 @@ java_aconfig_library {
		name: "android.crashrecovery.flags-aconfig-java",
		aconfig_declarations: "android.crashrecovery.flags-aconfig",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		apex_available: [
		"//apex_available:platform",
		"com.android.crashrecovery",
		],
		}

		java_aconfig_library {

Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ license {

		filegroup {
		name: "framework-non-updatable-sources",
		srcs: [
		device_common_srcs: [
		// Java/AIDL sources under frameworks/base
		":framework-annotations",
		":framework-blobstore-sources",
		@@ -109,7 +109,7 @@ filegroup {
		":android.hardware.radio.voice-V3-java-source",
		":android.hardware.security.keymint-V3-java-source",
		":android.hardware.security.secureclock-V1-java-source",
		":android.hardware.thermal-V2-java-source",
		":android.hardware.thermal-V3-java-source",
		":android.hardware.tv.tuner-V3-java-source",
		":android.security.apc-java-source",
		":android.security.authorization-java-source",

apct-tests/perftests/core/apps/reources_manager/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ android_test_helper_app {
		static_libs: ["androidx.appcompat_appcompat"],
		}

		genrule {
		java_genrule {
		name: "LargeResourcesUncompressed",
		srcs: [":LargeResourcesCompressed"],
		out: ["LargeResourcesUncompressed.apk"],

apct-tests/perftests/tracing/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ android_test {
		"apct-perftests-utils",
		"collector-device-lib",
		"platform-test-annotations",
		"perfetto_trace_java_protos",
		],
		test_suites: [
		"device-tests",

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

+32 −5

Original line number	Diff line number	Diff line
		@@ -17,10 +17,12 @@ package com.android.internal.protolog;

		import android.app.Activity;
		import android.os.Bundle;
		import android.os.ServiceManager.ServiceNotFoundException;
		import android.perftests.utils.Stats;

		import androidx.test.InstrumentationRegistry;

		import com.android.internal.protolog.common.IProtoLog;
		import com.android.internal.protolog.common.IProtoLogGroup;
		import com.android.internal.protolog.common.LogLevel;

		@@ -31,6 +33,8 @@ import org.junit.runner.RunWith;
		import org.junit.runners.Parameterized;
		import org.junit.runners.Parameterized.Parameters;

		import perfetto.protos.ProtologCommon;

		import java.util.ArrayList;
		import java.util.Collection;

		@@ -65,24 +69,48 @@ public class ProtoLogPerfTest {
		};
		}

		private IProtoLog mProcessedProtoLogger;
		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()
		.addGroups(
		perfetto.protos.Protolog.ProtoLogViewerConfig.Group.newBuilder()
		.setId(1)
		.setName(TestProtoLogGroup.TEST_GROUP.toString())
		.setTag(TestProtoLogGroup.TEST_GROUP.getTag())
		).addMessages(
		perfetto.protos.Protolog.ProtoLogViewerConfig.MessageData.newBuilder()
		.setMessageId(123)
		.setMessage("My Test Debug Log Message %b")
		.setLevel(ProtologCommon.ProtoLogLevel.PROTOLOG_LEVEL_DEBUG)
		.setGroupId(1)
		.setLocation("com/test/MyTestClass.java:123")
		).build();

		@BeforeClass
		public static void init() {
		ProtoLog.init(TestProtoLogGroup.values());
		}

		@Before
		public void setUp() {
		public void setUp() throws ServiceNotFoundException {
		TestProtoLogGroup.TEST_GROUP.setLogToProto(mLogToProto);
		TestProtoLogGroup.TEST_GROUP.setLogToLogcat(mLogToLogcat);

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

		@Test
		public void log_Processed_NoArgs() {
		final var protoLog = ProtoLog.getSingleInstance();
		final var perfMonitor = new PerfMonitor();

		while (perfMonitor.keepRunning()) {
		protoLog.log(
		mProcessedProtoLogger.log(
		LogLevel.INFO, TestProtoLogGroup.TEST_GROUP, 123,
		0, (Object[]) null);
		}
		@@ -90,11 +118,10 @@ public class ProtoLogPerfTest {

		@Test
		public void log_Processed_WithArgs() {
		final var protoLog = ProtoLog.getSingleInstance();
		final var perfMonitor = new PerfMonitor();

		while (perfMonitor.keepRunning()) {
		protoLog.log(
		mProcessedProtoLogger.log(
		LogLevel.INFO, TestProtoLogGroup.TEST_GROUP, 123,
		0b1110101001010100,
		new Object[]{"test", 1, 2, 3, 0.4, 0.5, 0.6, true});