Snap for 12881634 from 298ddd06aecc47120690b95aaa14d8ea9e20856d to 25Q2-release (acb6c8e5) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+13 −8

Original line number	Diff line number	Diff line
		@@ -107,6 +107,7 @@ aconfig_declarations_group {
		"com.android.server.flags.services-aconfig-java",
		"com.android.text.flags-aconfig-java",
		"com.android.window.flags.window-aconfig-java",
		"configinfra_framework_flags_java_lib",
		"conscrypt_exported_aconfig_flags_lib",
		"device_policy_aconfig_flags_lib",
		"display_flags_lib",
		@@ -522,7 +523,10 @@ aconfig_declarations {
		package: "android.companion.virtualdevice.flags",
		container: "system",
		exportable: true,
		srcs: ["core/java/android/companion/virtual/flags/*.aconfig"],
		srcs: [
		"core/java/android/companion/virtual/flags/flags.aconfig",
		"core/java/android/companion/virtual/flags/launched_flags.aconfig",
		],
		}

		java_aconfig_library {
		@@ -547,7 +551,7 @@ aconfig_declarations {
		name: "android.companion.virtual.flags-aconfig",
		package: "android.companion.virtual.flags",
		container: "system",
		srcs: ["core/java/android/companion/virtual/*.aconfig"],
		srcs: ["core/java/android/companion/virtual/flags/deprecated_flags_do_not_edit.aconfig"],
		}

		// InputMethod
		@@ -1583,6 +1587,13 @@ java_aconfig_library {
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		java_aconfig_library {
		name: "android.app.appfunctions.flags-aconfig-java-host",
		aconfig_declarations: "android.app.appfunctions.flags-aconfig",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		host_supported: true,
		}

		java_aconfig_library {
		name: "android.app.appfunctions.exported-flags-aconfig-java",
		aconfig_declarations: "android.app.appfunctions.flags-aconfig",
		@@ -1824,12 +1835,6 @@ java_aconfig_library {
		min_sdk_version: "30",
		apex_available: [
		"//apex_available:platform",
		"com.android.adservices",
		"com.android.cellbroadcast",
		"com.android.devicelock",
		"com.android.extservices",
		"com.android.healthfitness",
		"com.android.mediaprovider",
		"com.android.permission",
		],
		}

Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -408,7 +408,6 @@ java_defaults {
		"bouncycastle-repackaged-unbundled",
		"com.android.sysprop.foldlockbehavior",
		"com.android.sysprop.view",
		"configinfra_framework_flags_java_lib",
		"framework-internal-utils",
		"dynamic_instrumentation_manager_aidl-java",
		// If MimeMap ever becomes its own APEX, then this dependency would need to be removed

apct-tests/perftests/aconfig/src/android/os/flagging/AconfigPackagePerfTest.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ public class AconfigPackagePerfTest {

		@Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();

		@Parameterized.Parameters(name = "isPlatform={0}")
		@Parameterized.Parameters(name = "isPlatform_{0}")
		public static Collection<Object[]> data() {
		return Arrays.asList(new Object[][] {{false}, {true}});
		}
		@@ -60,10 +60,9 @@ public class AconfigPackagePerfTest {
		}
		}

		@Parameterized.Parameter(0)

		// if this variable is true, then the test query flags from system/product/vendor
		// if this variable is false, then the test query flags from updatable partitions
		@Parameterized.Parameter(0)
		public boolean mIsPlatform;

		@Test

apct-tests/perftests/core/src/android/app/OverlayManagerPerfTest.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ import static org.junit.Assert.assertTrue;

		import android.content.Context;
		import android.content.om.OverlayManager;
		import android.os.UserHandle;
		import android.perftests.utils.BenchmarkState;
		import android.perftests.utils.PerfStatusReporter;
		import android.perftests.utils.TestPackageInstaller;
		@@ -127,7 +126,7 @@ public class OverlayManagerPerfTest {
		private void assertSetEnabled(boolean enabled, Context context, Stream<String> packagesStream) {
		final var overlayPackages = packagesStream.toList();
		overlayPackages.forEach(
		name -> sOverlayManager.setEnabled(name, enabled, UserHandle.SYSTEM));
		name -> sOverlayManager.setEnabled(name, enabled, context.getUser()));

		// Wait for the overlay changes to propagate
		final var endTime = System.nanoTime() + TimeUnit.SECONDS.toNanos(20);
		@@ -174,7 +173,7 @@ public class OverlayManagerPerfTest {
		// Disable the overlay and remove the idmap for the next iteration of the test
		state.pauseTiming();
		assertSetEnabled(false, sContext, packageName);
		sOverlayManager.invalidateCachesForOverlay(packageName, UserHandle.SYSTEM);
		sOverlayManager.invalidateCachesForOverlay(packageName, sContext.getUser());
		state.resumeTiming();
		}
		}
		@@ -189,7 +188,7 @@ public class OverlayManagerPerfTest {
		// Disable the overlay and remove the idmap for the next iteration of the test
		state.pauseTiming();
		assertSetEnabled(false, sContext, packageName);
		sOverlayManager.invalidateCachesForOverlay(packageName, UserHandle.SYSTEM);
		sOverlayManager.invalidateCachesForOverlay(packageName, sContext.getUser());
		state.resumeTiming();
		}
		}

boot/preloaded-classes

+1 −0

Original line number	Diff line number	Diff line
		@@ -6470,6 +6470,7 @@ android.os.connectivity.WifiActivityEnergyInfo
		android.os.connectivity.WifiBatteryStats$1
		android.os.connectivity.WifiBatteryStats
		android.os.flagging.AconfigPackage
		android.os.flagging.PlatformAconfigPackage
		android.os.health.HealthKeys$Constant
		android.os.health.HealthKeys$Constants
		android.os.health.HealthKeys$SortedIntArray