Snap for 12673321 from 54c53d11642e473fe00cb7ca0cfbf961d6e82b84 to 25Q1-release (f84a877b) · Commits · e / os / android_frameworks_base

Android.bp

+11 −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",

apex/jobscheduler/service/java/com/android/server/job/controllers/QuotaController.java

+46 −7

Original line number	Diff line number	Diff line
		@@ -36,10 +36,14 @@ import android.annotation.UserIdInt;
		import android.app.ActivityManager;
		import android.app.AlarmManager;
		import android.app.UidObserver;
		import android.app.compat.CompatChanges;
		import android.app.job.JobInfo;
		import android.app.usage.UsageEvents;
		import android.app.usage.UsageStatsManagerInternal;
		import android.app.usage.UsageStatsManagerInternal.UsageEventListener;
		import android.compat.annotation.ChangeId;
		import android.compat.annotation.Disabled;
		import android.compat.annotation.Overridable;
		import android.content.Context;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.PackageInfo;
		@@ -132,6 +136,27 @@ public final class QuotaController extends StateController {
		return (int) (val ^ (val >>> 32));
		}

		/**
		* When enabled this change id overrides the default quota policy enforcement to the jobs
		* running in the foreground process state.
		*/
		// TODO: b/379681266 - Might need some refactoring for a better app-compat strategy.
		@VisibleForTesting
		@ChangeId
		@Disabled // Disabled by default
		@Overridable // The change can be overridden in user build
		static final long OVERRIDE_QUOTA_ENFORCEMENT_TO_FGS_JOBS = 341201311L;

		/**
		* When enabled this change id overrides the default quota policy enforcement policy
		* the jobs started when app was in the TOP state.
		*/
		@VisibleForTesting
		@ChangeId
		@Disabled // Disabled by default
		@Overridable // The change can be overridden in user build.
		static final long OVERRIDE_QUOTA_ENFORCEMENT_TO_TOP_STARTED_JOBS = 374323858L;

		@VisibleForTesting
		static class ExecutionStats {
		/**
		@@ -622,7 +647,9 @@ public final class QuotaController extends StateController {
		}

		final int uid = jobStatus.getSourceUid();
		if (!Flags.enforceQuotaPolicyToTopStartedJobs() && mTopAppCache.get(uid)) {
		if ((!Flags.enforceQuotaPolicyToTopStartedJobs()
		\|\| CompatChanges.isChangeEnabled(OVERRIDE_QUOTA_ENFORCEMENT_TO_TOP_STARTED_JOBS,
		uid)) && mTopAppCache.get(uid)) {
		if (DEBUG) {
		Slog.d(TAG, jobStatus.toShortString() + " is top started job");
		}
		@@ -659,7 +686,9 @@ public final class QuotaController extends StateController {
		timer.stopTrackingJob(jobStatus);
		}
		}
		if (!Flags.enforceQuotaPolicyToTopStartedJobs()) {
		if (!Flags.enforceQuotaPolicyToTopStartedJobs()
		\|\| CompatChanges.isChangeEnabled(OVERRIDE_QUOTA_ENFORCEMENT_TO_TOP_STARTED_JOBS,
		jobStatus.getSourceUid())) {
		mTopStartedJobs.remove(jobStatus);
		}
		}
		@@ -772,7 +801,13 @@ public final class QuotaController extends StateController {

		/** @return true if the job was started while the app was in the TOP state. */
		private boolean isTopStartedJobLocked(@NonNull final JobStatus jobStatus) {
		return !Flags.enforceQuotaPolicyToTopStartedJobs() && mTopStartedJobs.contains(jobStatus);
		if (!Flags.enforceQuotaPolicyToTopStartedJobs()
		\|\| CompatChanges.isChangeEnabled(OVERRIDE_QUOTA_ENFORCEMENT_TO_TOP_STARTED_JOBS,
		jobStatus.getSourceUid())) {
		return mTopStartedJobs.contains(jobStatus);
		}

		return false;
		}

		/** Returns the maximum amount of time this job could run for. */
		@@ -2634,9 +2669,13 @@ public final class QuotaController extends StateController {
		}

		@VisibleForTesting
		int getProcessStateQuotaFreeThreshold() {
		return Flags.enforceQuotaPolicyToFgsJobs() ? ActivityManager.PROCESS_STATE_BOUND_TOP :
		ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE;
		int getProcessStateQuotaFreeThreshold(int uid) {
		if (Flags.enforceQuotaPolicyToFgsJobs()
		&& !CompatChanges.isChangeEnabled(OVERRIDE_QUOTA_ENFORCEMENT_TO_FGS_JOBS, uid)) {
		return ActivityManager.PROCESS_STATE_BOUND_TOP;
		}

		return ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE;
		}

		private class QcHandler extends Handler {
		@@ -2776,7 +2815,7 @@ public final class QuotaController extends StateController {
		isQuotaFree = true;
		} else {
		final boolean reprocess;
		if (procState <= getProcessStateQuotaFreeThreshold()) {
		if (procState <= getProcessStateQuotaFreeThreshold(uid)) {
		reprocess = !mForegroundUids.get(uid);
		mForegroundUids.put(uid, true);
		isQuotaFree = true;

core/api/current.txt

+6 −5

Original line number	Diff line number	Diff line
		@@ -4614,6 +4614,7 @@ package android.app {
		method public void reportFullyDrawn();
		method public android.view.DragAndDropPermissions requestDragAndDropPermissions(android.view.DragEvent);
		method public void requestFullscreenMode(int, @Nullable android.os.OutcomeReceiver<java.lang.Void,java.lang.Throwable>);
		method @FlaggedApi("com.android.window.flags.enable_desktop_windowing_app_to_web_education") public final void requestOpenInBrowserEducation();
		method public final void requestPermissions(@NonNull String[], int);
		method @FlaggedApi("android.permission.flags.device_aware_permission_apis_enabled") public final void requestPermissions(@NonNull String[], int, int);
		method public final void requestShowKeyboardShortcuts();
		@@ -4639,7 +4640,6 @@ package android.app {
		method public void setInheritShowWhenLocked(boolean);
		method public void setIntent(android.content.Intent);
		method @FlaggedApi("android.security.content_uri_permission_apis") public void setIntent(@Nullable android.content.Intent, @Nullable android.app.ComponentCaller);
		method @FlaggedApi("com.android.window.flags.enable_desktop_windowing_app_to_web_education") public final void setLimitSystemEducationDialogs(boolean);
		method public void setLocusContext(@Nullable android.content.LocusId, @Nullable android.os.Bundle);
		method public final void setMediaController(android.media.session.MediaController);
		method public void setPictureInPictureParams(@NonNull android.app.PictureInPictureParams);
		@@ -13399,6 +13399,7 @@ package android.content.pm {
		field public static final String FEATURE_BACKUP = "android.software.backup";
		field public static final String FEATURE_BLUETOOTH = "android.hardware.bluetooth";
		field public static final String FEATURE_BLUETOOTH_LE = "android.hardware.bluetooth_le";
		field @FlaggedApi("com.android.ranging.flags.ranging_cs_enabled") public static final String FEATURE_BLUETOOTH_LE_CHANNEL_SOUNDING = "android.hardware.bluetooth_le.channel_sounding";
		field public static final String FEATURE_CAMERA = "android.hardware.camera";
		field public static final String FEATURE_CAMERA_ANY = "android.hardware.camera.any";
		field public static final String FEATURE_CAMERA_AR = "android.hardware.camera.ar";
		@@ -13808,7 +13809,7 @@ package android.content.pm {
		field @RequiresPermission(allOf={android.Manifest.permission.FOREGROUND_SERVICE_CAMERA}, anyOf={android.Manifest.permission.CAMERA}, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_CAMERA = 64; // 0x40
		field @RequiresPermission(allOf={android.Manifest.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE}, anyOf={android.Manifest.permission.BLUETOOTH_ADVERTISE, android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_SCAN, android.Manifest.permission.CHANGE_NETWORK_STATE, android.Manifest.permission.CHANGE_WIFI_STATE, android.Manifest.permission.CHANGE_WIFI_MULTICAST_STATE, android.Manifest.permission.NFC, android.Manifest.permission.TRANSMIT_IR, android.Manifest.permission.UWB_RANGING, android.Manifest.permission.RANGING}, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE = 16; // 0x10
		field @RequiresPermission(value=android.Manifest.permission.FOREGROUND_SERVICE_DATA_SYNC, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_DATA_SYNC = 1; // 0x1
		field @RequiresPermission(allOf={android.Manifest.permission.FOREGROUND_SERVICE_HEALTH}, anyOf={android.Manifest.permission.ACTIVITY_RECOGNITION, android.Manifest.permission.BODY_SENSORS, android.Manifest.permission.HIGH_SAMPLING_RATE_SENSORS}) public static final int FOREGROUND_SERVICE_TYPE_HEALTH = 256; // 0x100
		field @FlaggedApi("android.permission.flags.replace_body_sensor_permission_enabled") @RequiresPermission(allOf={android.Manifest.permission.FOREGROUND_SERVICE_HEALTH}, anyOf={android.Manifest.permission.ACTIVITY_RECOGNITION, android.Manifest.permission.HIGH_SAMPLING_RATE_SENSORS, android.health.connect.HealthPermissions.READ_HEART_RATE, android.health.connect.HealthPermissions.READ_SKIN_TEMPERATURE, android.health.connect.HealthPermissions.READ_OXYGEN_SATURATION}) public static final int FOREGROUND_SERVICE_TYPE_HEALTH = 256; // 0x100
		field @RequiresPermission(allOf={android.Manifest.permission.FOREGROUND_SERVICE_LOCATION}, anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_LOCATION = 8; // 0x8
		field public static final int FOREGROUND_SERVICE_TYPE_MANIFEST = -1; // 0xffffffff
		field @RequiresPermission(value=android.Manifest.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK, conditional=true) public static final int FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK = 2; // 0x2
		@@ -23189,7 +23190,6 @@ package android.media {
		method public boolean isVendor();
		field @FlaggedApi("android.media.codec.in_process_sw_audio_codec") public static final int SECURITY_MODEL_MEMORY_SAFE = 1; // 0x1
		field @FlaggedApi("android.media.codec.in_process_sw_audio_codec") public static final int SECURITY_MODEL_SANDBOXED = 0; // 0x0
		field @FlaggedApi("android.media.codec.in_process_sw_audio_codec") public static final int SECURITY_MODEL_TRUSTED_CONTENT_ONLY = 2; // 0x2
		}

		public static final class MediaCodecInfo.AudioCapabilities {
		@@ -24080,7 +24080,6 @@ package android.media {
		field public static final int COLOR_TRANSFER_ST2084 = 6; // 0x6
		field @FlaggedApi("android.media.codec.in_process_sw_audio_codec") public static final int FLAG_SECURITY_MODEL_MEMORY_SAFE = 2; // 0x2
		field @FlaggedApi("android.media.codec.in_process_sw_audio_codec") public static final int FLAG_SECURITY_MODEL_SANDBOXED = 1; // 0x1
		field @FlaggedApi("android.media.codec.in_process_sw_audio_codec") public static final int FLAG_SECURITY_MODEL_TRUSTED_CONTENT_ONLY = 4; // 0x4
		field public static final String KEY_AAC_DRC_ALBUM_MODE = "aac-drc-album-mode";
		field public static final String KEY_AAC_DRC_ATTENUATION_FACTOR = "aac-drc-cut-level";
		field public static final String KEY_AAC_DRC_BOOST_FACTOR = "aac-drc-boost-level";
		@@ -33809,7 +33808,7 @@ package android.os {
		}

		public interface IBinder {
		method @FlaggedApi("android.os.binder_frozen_state_change_callback") public default void addFrozenStateChangeCallback(@NonNull android.os.IBinder.FrozenStateChangeCallback) throws android.os.RemoteException;
		method @FlaggedApi("android.os.binder_frozen_state_change_callback") public default void addFrozenStateChangeCallback(@NonNull java.util.concurrent.Executor, @NonNull android.os.IBinder.FrozenStateChangeCallback) throws android.os.RemoteException;
		method public void dump(@NonNull java.io.FileDescriptor, @Nullable String[]) throws android.os.RemoteException;
		method public void dumpAsync(@NonNull java.io.FileDescriptor, @Nullable String[]) throws android.os.RemoteException;
		method @Nullable public String getInterfaceDescriptor() throws android.os.RemoteException;
		@@ -34440,6 +34439,7 @@ package android.os {
		method public void finishBroadcast();
		method public Object getBroadcastCookie(int);
		method public E getBroadcastItem(int);
		method @FlaggedApi("android.os.binder_frozen_state_change_callback") @Nullable public java.util.concurrent.Executor getExecutor();
		method @FlaggedApi("android.os.binder_frozen_state_change_callback") public int getFrozenCalleePolicy();
		method @FlaggedApi("android.os.binder_frozen_state_change_callback") public int getMaxQueueSize();
		method public Object getRegisteredCallbackCookie(int);
		@@ -34460,6 +34460,7 @@ package android.os {
		@FlaggedApi("android.os.binder_frozen_state_change_callback") public static final class RemoteCallbackList.Builder<E extends android.os.IInterface> {
		ctor public RemoteCallbackList.Builder(int);
		method @NonNull public android.os.RemoteCallbackList<E> build();
		method @NonNull public android.os.RemoteCallbackList.Builder setExecutor(@NonNull java.util.concurrent.Executor);
		method @NonNull public android.os.RemoteCallbackList.Builder setInterfaceDiedCallback(@NonNull android.os.RemoteCallbackList.Builder.InterfaceDiedCallback<E>);
		method @NonNull public android.os.RemoteCallbackList.Builder setMaxQueueSize(int);
		}

core/api/system-current.txt

+33 −0

Original line number	Diff line number	Diff line
		@@ -103,6 +103,7 @@ package android {
		field public static final String BRIGHTNESS_SLIDER_USAGE = "android.permission.BRIGHTNESS_SLIDER_USAGE";
		field public static final String BROADCAST_CLOSE_SYSTEM_DIALOGS = "android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS";
		field @Deprecated public static final String BROADCAST_NETWORK_PRIVILEGED = "android.permission.BROADCAST_NETWORK_PRIVILEGED";
		field @FlaggedApi("android.media.audio.concurrent_audio_record_bypass_permission") public static final String BYPASS_CONCURRENT_RECORD_AUDIO_RESTRICTION = "android.permission.BYPASS_CONCURRENT_RECORD_AUDIO_RESTRICTION";
		field public static final String BYPASS_ROLE_QUALIFICATION = "android.permission.BYPASS_ROLE_QUALIFICATION";
		field public static final String CALL_AUDIO_INTERCEPTION = "android.permission.CALL_AUDIO_INTERCEPTION";
		field public static final String CAMERA_DISABLE_TRANSMIT_LED = "android.permission.CAMERA_DISABLE_TRANSMIT_LED";
		@@ -229,6 +230,7 @@ package android {
		field public static final String MANAGE_ROTATION_RESOLVER = "android.permission.MANAGE_ROTATION_RESOLVER";
		field public static final String MANAGE_SAFETY_CENTER = "android.permission.MANAGE_SAFETY_CENTER";
		field public static final String MANAGE_SEARCH_UI = "android.permission.MANAGE_SEARCH_UI";
		field @FlaggedApi("android.security.secure_lockdown") public static final String MANAGE_SECURE_LOCK_DEVICE = "android.permission.MANAGE_SECURE_LOCK_DEVICE";
		field public static final String MANAGE_SENSOR_PRIVACY = "android.permission.MANAGE_SENSOR_PRIVACY";
		field public static final String MANAGE_SMARTSPACE = "android.permission.MANAGE_SMARTSPACE";
		field public static final String MANAGE_SOUND_TRIGGER = "android.permission.MANAGE_SOUND_TRIGGER";
		@@ -3869,6 +3871,7 @@ package android.content {
		field public static final String APP_INTEGRITY_SERVICE = "app_integrity";
		field public static final String APP_PREDICTION_SERVICE = "app_prediction";
		field public static final String AUDIO_DEVICE_VOLUME_SERVICE = "audio_device_volume";
		field @FlaggedApi("android.security.secure_lockdown") public static final String AUTHENTICATION_POLICY_SERVICE = "authentication_policy";
		field public static final String BACKUP_SERVICE = "backup";
		field public static final String BATTERY_STATS_SERVICE = "batterystats";
		field public static final int BIND_ALLOW_BACKGROUND_ACTIVITY_STARTS = 1048576; // 0x100000
		@@ -12858,6 +12861,36 @@ package android.security.advancedprotection {

		}

		package android.security.authenticationpolicy {

		@FlaggedApi("android.security.secure_lockdown") public final class AuthenticationPolicyManager {
		method @FlaggedApi("android.security.secure_lockdown") @RequiresPermission(android.Manifest.permission.MANAGE_SECURE_LOCK_DEVICE) public int disableSecureLockDevice(@NonNull android.security.authenticationpolicy.DisableSecureLockDeviceParams);
		method @FlaggedApi("android.security.secure_lockdown") @RequiresPermission(android.Manifest.permission.MANAGE_SECURE_LOCK_DEVICE) public int enableSecureLockDevice(@NonNull android.security.authenticationpolicy.EnableSecureLockDeviceParams);
		field @FlaggedApi("android.security.secure_lockdown") public static final int ERROR_ALREADY_ENABLED = 6; // 0x6
		field @FlaggedApi("android.security.secure_lockdown") public static final int ERROR_INSUFFICIENT_BIOMETRICS = 5; // 0x5
		field @FlaggedApi("android.security.secure_lockdown") public static final int ERROR_INVALID_PARAMS = 3; // 0x3
		field @FlaggedApi("android.security.secure_lockdown") public static final int ERROR_NO_BIOMETRICS_ENROLLED = 4; // 0x4
		field @FlaggedApi("android.security.secure_lockdown") public static final int ERROR_UNKNOWN = 0; // 0x0
		field @FlaggedApi("android.security.secure_lockdown") public static final int ERROR_UNSUPPORTED = 2; // 0x2
		field @FlaggedApi("android.security.secure_lockdown") public static final int SUCCESS = 1; // 0x1
		}

		@FlaggedApi("android.security.secure_lockdown") public final class DisableSecureLockDeviceParams implements android.os.Parcelable {
		ctor public DisableSecureLockDeviceParams(@NonNull String);
		method public int describeContents();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.security.authenticationpolicy.DisableSecureLockDeviceParams> CREATOR;
		}

		@FlaggedApi("android.security.secure_lockdown") public final class EnableSecureLockDeviceParams implements android.os.Parcelable {
		ctor public EnableSecureLockDeviceParams(@NonNull String);
		method public int describeContents();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.security.authenticationpolicy.EnableSecureLockDeviceParams> CREATOR;
		}

		}

		package android.security.forensic {

		@FlaggedApi("android.security.afl_api") public class ForensicManager {

core/api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -1805,6 +1805,7 @@ package android.hardware.input {
		method @RequiresPermission(android.Manifest.permission.REMAP_MODIFIER_KEYS) public void remapModifierKey(int, int);
		method @FlaggedApi("com.android.input.flags.device_associations") @RequiresPermission("android.permission.ASSOCIATE_INPUT_DEVICE_TO_DISPLAY") public void removeUniqueIdAssociationByDescriptor(@NonNull String);
		method @RequiresPermission("android.permission.ASSOCIATE_INPUT_DEVICE_TO_DISPLAY") public void removeUniqueIdAssociationByPort(@NonNull String);
		method public void resetLockedModifierState();
		field public static final long BLOCK_UNTRUSTED_TOUCHES = 158002302L; // 0x96aec7eL
		}