Snap for 14040641 from 5ac27115df1d30aa6fd9d0c78b7f6fa064509a52 to 25Q4-release (ae80b8e7) · Commits · e / os / android_frameworks_base

cmds/bmgr/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java

+6 −5

Original line number	Diff line number	Diff line
		@@ -130,6 +130,12 @@ public class Bmgr {
		return;
		}

		// The transport whitelist is a device-scoped property, so we skip isBackupActive check.
		if ("whitelist".equals(op)) {
		doPrintAllowlist();
		return;
		}

		if (!isBackupActive(userId)) {
		return;
		}
		@@ -199,11 +205,6 @@ public class Bmgr {
		return;
		}

		if ("whitelist".equals(op)) {
		doPrintAllowlist();
		return;
		}

		if ("scheduling".equals(op)) {
		setSchedulingEnabled(userId);
		return;

core/api/current.txt

+3 −2

Original line number	Diff line number	Diff line
		@@ -10012,7 +10012,7 @@ package android.app.usage {
		method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public java.util.Map<java.lang.String,android.app.usage.UsageStats> queryAndAggregateUsageStats(long, long);
		method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public java.util.List<android.app.usage.ConfigurationStats> queryConfigurations(int, long, long);
		method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public java.util.List<android.app.usage.EventStats> queryEventStats(int, long, long);
		method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public android.app.usage.UsageEvents queryEvents(long, long);
		method @Deprecated @FlaggedApi("android.app.usage.deprecate_old_query_events_api") @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public android.app.usage.UsageEvents queryEvents(long, long);
		method @FlaggedApi("android.app.usage.filter_based_event_query_api") @Nullable @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public android.app.usage.UsageEvents queryEvents(@NonNull android.app.usage.UsageEventsQuery);
		method public android.app.usage.UsageEvents queryEventsForSelf(long, long);
		method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public java.util.List<android.app.usage.UsageStats> queryUsageStats(int, long, long);
		@@ -45446,6 +45446,7 @@ package android.telephony {
		field public static final String KEY_APN_EXPAND_BOOL = "apn_expand_bool";
		field public static final String KEY_APN_SETTINGS_DEFAULT_APN_TYPES_STRING_ARRAY = "apn_settings_default_apn_types_string_array";
		field public static final String KEY_AUTO_RETRY_ENABLED_BOOL = "auto_retry_enabled_bool";
		field @FlaggedApi("com.android.internal.telephony.flags.support_auto_unhold") public static final String KEY_AUTO_UNHOLD_ON_REMOTE_DISCONNECT_BOOL = "auto_unhold_on_remote_disconnect_bool";
		field @FlaggedApi("android.net.platform.flags.avoid_bad_wifi_from_carrier_config") public static final String KEY_AVOID_BAD_WIFI_BOOL = "avoid_bad_wifi_bool";
		field public static final String KEY_CALL_BARRING_DEFAULT_SERVICE_CLASS_INT = "call_barring_default_service_class_int";
		field public static final String KEY_CALL_BARRING_SUPPORTS_DEACTIVATE_ALL_BOOL = "call_barring_supports_deactivate_all_bool";
		@@ -56453,7 +56454,7 @@ package android.view {
		field public static final String PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED = "android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED";
		field public static final String PROPERTY_CAMERA_COMPAT_ALLOW_FORCE_ROTATION = "android.window.PROPERTY_CAMERA_COMPAT_ALLOW_FORCE_ROTATION";
		field public static final String PROPERTY_CAMERA_COMPAT_ALLOW_REFRESH = "android.window.PROPERTY_CAMERA_COMPAT_ALLOW_REFRESH";
		field @FlaggedApi("com.android.window.flags.enable_camera_compat_for_desktop_windowing_opt_out_api") public static final String PROPERTY_CAMERA_COMPAT_ALLOW_SIMULATE_REQUESTED_ORIENTATION = "android.window.PROPERTY_CAMERA_COMPAT_ALLOW_SIMULATE_REQUESTED_ORIENTATION";
		field public static final String PROPERTY_CAMERA_COMPAT_ALLOW_SIMULATE_REQUESTED_ORIENTATION = "android.window.PROPERTY_CAMERA_COMPAT_ALLOW_SIMULATE_REQUESTED_ORIENTATION";
		field public static final String PROPERTY_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE = "android.window.PROPERTY_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE";
		field public static final String PROPERTY_COMPAT_ALLOW_DISPLAY_ORIENTATION_OVERRIDE = "android.window.PROPERTY_COMPAT_ALLOW_DISPLAY_ORIENTATION_OVERRIDE";
		field @FlaggedApi("com.android.window.flags.app_compat_properties_api") public static final String PROPERTY_COMPAT_ALLOW_IGNORING_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED = "android.window.PROPERTY_COMPAT_ALLOW_IGNORING_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED";

core/api/test-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -1131,7 +1131,7 @@ package android.content.pm {
		field public static final long NEVER_SANDBOX_DISPLAY_APIS = 184838306L; // 0xb0468a2L
		field public static final long OVERRIDE_CAMERA_COMPAT_DISABLE_FORCE_ROTATION = 263959004L; // 0xfbbb1dcL
		field public static final long OVERRIDE_CAMERA_COMPAT_DISABLE_REFRESH = 264304459L; // 0xfc0f74bL
		field @FlaggedApi("com.android.window.flags.enable_camera_compat_for_desktop_windowing_opt_out_api") public static final long OVERRIDE_CAMERA_COMPAT_DISABLE_SIMULATE_REQUESTED_ORIENTATION = 398195815L; // 0x17bbfc67L
		field public static final long OVERRIDE_CAMERA_COMPAT_DISABLE_SIMULATE_REQUESTED_ORIENTATION = 398195815L; // 0x17bbfc67L
		field public static final long OVERRIDE_CAMERA_COMPAT_ENABLE_REFRESH_VIA_PAUSE = 264301586L; // 0xfc0ec12L
		field public static final long OVERRIDE_ENABLE_COMPAT_FAKE_FOCUS = 263259275L; // 0xfb1048bL
		field @FlaggedApi("com.android.window.flags.app_compat_properties_api") public static final long OVERRIDE_ENABLE_COMPAT_IGNORE_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED = 273509367L; // 0x104d6bf7L

core/java/Android.bp

+18 −11

Original line number	Diff line number	Diff line
		@@ -609,17 +609,6 @@ cc_library {
		],
		}

		cc_library {
		name: "libactivity_manager_procstate_aidl-cpp",
		host_supported: true,
		srcs: [
		":activity_manager_procstate_aidl",
		],
		aidl: {
		export_aidl_headers: true,
		},
		}

		// Build Rust bindings for PermissionController. Needed by keystore2.
		aidl_interface {
		name: "android.os.permissions_aidl",
		@@ -865,3 +854,21 @@ aidl_interface {
		},
		},
		}

		aidl_interface {
		name: "libactivity_manager_procstate_aidl",
		srcs: [
		":activity_manager_procstate_aidl",
		],
		host_supported: true,
		unstable: true,
		backend: {
		java: {
		// java code is generated through framework-core-sources.
		enabled: false,
		},
		rust: {
		enabled: true,
		},
		},
		}

core/java/android/app/ActivityManager.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -859,6 +859,8 @@ public class ActivityManager {
		PROCESS_CAPABILITY_BFSL,
		PROCESS_CAPABILITY_USER_RESTRICTED_NETWORK,
		PROCESS_CAPABILITY_FOREGROUND_AUDIO_CONTROL,
		PROCESS_CAPABILITY_CPU_TIME,
		PROCESS_CAPABILITY_IMPLICIT_CPU_TIME,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface ProcessCapability {}