Snap for 11520864 from b5cfbf4f2bfd7cad4caef8876adcbee451ba88a3 to 24Q2-release (9effbf3f) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+0 −9

Original line number	Diff line number	Diff line
		@@ -310,8 +310,6 @@ java_aconfig_library {
		aconfig_declarations {
		name: "android.os.flags-aconfig",
		package: "android.os",
		exportable: true,
		container: "system",
		srcs: ["core/java/android/os/*.aconfig"],
		}

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

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

		// VirtualDeviceManager
		cc_aconfig_library {
		name: "android.companion.virtualdevice.flags-aconfig-cc",

Ravenwood.bp

+3 −0

Original line number	Diff line number	Diff line
		@@ -149,6 +149,7 @@ java_library {
		installable: false,
		srcs: [":services.fakes-sources"],
		libs: [
		"ravenwood-framework",
		"services.core.ravenwood",
		],
		jarjar_rules: ":ravenwood-services-jarjar-rules",
		@@ -204,6 +205,7 @@ android_ravenwood_libgroup {
		// Provide runtime versions of utils linked in below
		"junit",
		"truth",
		"ravenwood-framework",
		"ravenwood-junit-impl",
		"mockito-ravenwood-prebuilt",
		"inline-mockito-ravenwood-prebuilt",
		@@ -218,6 +220,7 @@ android_ravenwood_libgroup {
		libs: [
		"junit",
		"truth",
		"ravenwood-framework",
		"ravenwood-junit",
		"mockito-ravenwood-prebuilt",
		"inline-mockito-ravenwood-prebuilt",

core/api/current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -13119,7 +13119,6 @@ package android.content.pm {
		field public static final String FEATURE_CAMERA_LEVEL_FULL = "android.hardware.camera.level.full";
		field public static final String FEATURE_CANT_SAVE_STATE = "android.software.cant_save_state";
		field public static final String FEATURE_COMPANION_DEVICE_SETUP = "android.software.companion_device_setup";
		field @FlaggedApi("android.view.inputmethod.concurrent_input_methods") public static final String FEATURE_CONCURRENT_INPUT_METHODS = "android.software.concurrent_input_methods";
		field @Deprecated public static final String FEATURE_CONNECTION_SERVICE = "android.software.connectionservice";
		field public static final String FEATURE_CONSUMER_IR = "android.hardware.consumerir";
		field public static final String FEATURE_CONTROLS = "android.software.controls";

core/java/android/app/backup/BackupManagerMonitor.java

+28 −0

Original line number	Diff line number	Diff line
		@@ -145,6 +145,25 @@ public class BackupManagerMonitor {
		*/
		public static final String EXTRA_LOG_OPERATION_TYPE = "android.app.backup.extra.OPERATION_TYPE";

		/**
		* List of system components that do not support restore in a V-> U OS downgrade, even if
		* restoreAnyVersion is set to true.
		* Read from Settings.Secure.V_TO_U_RESTORE_DENYLIST
		*
		* @hide
		*/
		public static final String EXTRA_LOG_V_TO_U_DENYLIST = "android.app.backup.extra.V_TO_U_DENYLIST";

		/**
		* List of system components that support restore in a V-> U OS downgrade, even if
		* restoreAnyVersion is set to false.
		* Read from Settings.Secure.V_TO_U_RESTORE_ALLOWLIST
		*
		* @hide
		*/
		public static final String EXTRA_LOG_V_TO_U_ALLOWLIST =
		"android.app.backup.extra.V_TO_U_ALLOWLIST";

		// TODO complete this list with all log messages. And document properly.
		public static final int LOG_EVENT_ID_FULL_BACKUP_CANCEL = 4;
		public static final int LOG_EVENT_ID_ILLEGAL_KEY = 5;
		@@ -241,6 +260,15 @@ public class BackupManagerMonitor {
		/** Agent error during {@link PerformUnifiedRestoreTask#restoreFinished()}
		@hide */
		public static final int LOG_EVENT_ID_AGENT_FAILURE = 69;
		/** V to U restore attempt, pkg is eligible
		@hide */
		public static final int LOG_EVENT_ID_V_TO_U_RESTORE_PKG_ELIGIBLE = 70;
		/** V to U restore attempt, pkg is not eligible
		@hide */
		public static final int LOG_EVENT_ID_V_TO_U_RESTORE_PKG_NOT_ELIGIBLE = 71;
		/** V to U restore attempt, allowlist and denlist are set
		@hide */
		public static final int LOG_EVENT_ID_V_TO_U_RESTORE_SET_LIST = 72;

		/**
		* This method will be called each time something important happens on BackupManager.

core/java/android/content/pm/ILauncherApps.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -67,6 +67,7 @@ interface ILauncherApps {
		List<String> getPreInstalledSystemPackages(in UserHandle user);
		IntentSender getAppMarketActivityIntent(String callingPackage, String packageName,
		in UserHandle user);
		IntentSender getPrivateSpaceSettingsIntent();
		void showAppDetailsAsUser(in IApplicationThread caller, String callingPackage,
		String callingFeatureId, in ComponentName component, in Rect sourceBounds,
		in Bundle opts, in UserHandle user);