Snap for 11469542 from 057b9150772c29b22cc7881036a3f0e9165c8b7a to 24Q2-release (c9987ca0) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+5 −0

Original line number	Diff line number	Diff line
		@@ -985,6 +985,11 @@ java_aconfig_library {
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		cc_aconfig_library {
		name: "android.tracing.flags_c_lib",
		aconfig_declarations: "android.tracing.flags-aconfig",
		}

		// App Widgets
		aconfig_declarations {
		name: "android.appwidget.flags-aconfig",

core/api/system-current.txt

+162 −0

Original line number	Diff line number	Diff line
		@@ -2193,6 +2193,139 @@ package android.app.job {

		}

		package android.app.ondeviceintelligence {

		@FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public final class Content implements android.os.Parcelable {
		ctor public Content(@NonNull android.os.Bundle);
		method public int describeContents();
		method @NonNull public android.os.Bundle getData();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.app.ondeviceintelligence.Content> CREATOR;
		}

		@FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public interface DownloadCallback {
		method public void onDownloadCompleted(@NonNull android.os.PersistableBundle);
		method public void onDownloadFailed(int, @Nullable String, @NonNull android.os.PersistableBundle);
		method public default void onDownloadProgress(long);
		method public default void onDownloadStarted(long);
		field public static final int DOWNLOAD_FAILURE_STATUS_DOWNLOADING = 3; // 0x3
		field public static final int DOWNLOAD_FAILURE_STATUS_NETWORK_FAILURE = 2; // 0x2
		field public static final int DOWNLOAD_FAILURE_STATUS_NOT_ENOUGH_DISK_SPACE = 1; // 0x1
		field public static final int DOWNLOAD_FAILURE_STATUS_UNAVAILABLE = 4; // 0x4
		field public static final int DOWNLOAD_FAILURE_STATUS_UNKNOWN = 0; // 0x0
		}

		@FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public final class Feature implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public android.os.PersistableBundle getFeatureParams();
		method public int getId();
		method @Nullable public String getModelName();
		method @Nullable public String getName();
		method public int getType();
		method public int getVariant();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.app.ondeviceintelligence.Feature> CREATOR;
		}

		public static final class Feature.Builder {
		ctor public Feature.Builder(int, int, int, @NonNull android.os.PersistableBundle);
		method @NonNull public android.app.ondeviceintelligence.Feature build();
		method @NonNull public android.app.ondeviceintelligence.Feature.Builder setFeatureParams(@NonNull android.os.PersistableBundle);
		method @NonNull public android.app.ondeviceintelligence.Feature.Builder setId(int);
		method @NonNull public android.app.ondeviceintelligence.Feature.Builder setModelName(@NonNull String);
		method @NonNull public android.app.ondeviceintelligence.Feature.Builder setName(@NonNull String);
		method @NonNull public android.app.ondeviceintelligence.Feature.Builder setType(int);
		method @NonNull public android.app.ondeviceintelligence.Feature.Builder setVariant(int);
		}

		@FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public final class FeatureDetails implements android.os.Parcelable {
		ctor public FeatureDetails(@android.app.ondeviceintelligence.FeatureDetails.Status int, @NonNull android.os.PersistableBundle);
		ctor public FeatureDetails(@android.app.ondeviceintelligence.FeatureDetails.Status int);
		method public int describeContents();
		method @NonNull public android.os.PersistableBundle getFeatureDetailParams();
		method @android.app.ondeviceintelligence.FeatureDetails.Status public int getStatus();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.app.ondeviceintelligence.FeatureDetails> CREATOR;
		field public static final int FEATURE_STATUS_AVAILABLE = 3; // 0x3
		field public static final int FEATURE_STATUS_DOWNLOADABLE = 1; // 0x1
		field public static final int FEATURE_STATUS_DOWNLOADING = 2; // 0x2
		field public static final int FEATURE_STATUS_SERVICE_UNAVAILABLE = 4; // 0x4
		field public static final int FEATURE_STATUS_UNAVAILABLE = 0; // 0x0
		}

		@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE_USE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD}) public static @interface FeatureDetails.Status {
		}

		@FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public final class FilePart implements android.os.Parcelable {
		ctor public FilePart(@NonNull String, @NonNull android.os.PersistableBundle, @NonNull String) throws java.io.FileNotFoundException;
		ctor public FilePart(@NonNull String, @NonNull android.os.PersistableBundle, @NonNull java.io.FileInputStream) throws java.io.IOException;
		method public int describeContents();
		method @NonNull public java.io.FileInputStream getFileInputStream();
		method @NonNull public String getFilePartKey();
		method @NonNull public android.os.PersistableBundle getFilePartParams();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.app.ondeviceintelligence.FilePart> CREATOR;
		}

		@FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public class OnDeviceIntelligenceManager {
		method @RequiresPermission(android.Manifest.permission.USE_ON_DEVICE_INTELLIGENCE) public void getFeature(int, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.app.ondeviceintelligence.Feature,android.app.ondeviceintelligence.OnDeviceIntelligenceManager.OnDeviceIntelligenceManagerException>);
		method @RequiresPermission(android.Manifest.permission.USE_ON_DEVICE_INTELLIGENCE) public void getFeatureDetails(@NonNull android.app.ondeviceintelligence.Feature, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.app.ondeviceintelligence.FeatureDetails,android.app.ondeviceintelligence.OnDeviceIntelligenceManager.OnDeviceIntelligenceManagerException>);
		method @RequiresPermission(android.Manifest.permission.USE_ON_DEVICE_INTELLIGENCE) public void getVersion(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.LongConsumer);
		method @RequiresPermission(android.Manifest.permission.USE_ON_DEVICE_INTELLIGENCE) public void listFeatures(@NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.util.List<android.app.ondeviceintelligence.Feature>,android.app.ondeviceintelligence.OnDeviceIntelligenceManager.OnDeviceIntelligenceManagerException>);
		method @RequiresPermission(android.Manifest.permission.USE_ON_DEVICE_INTELLIGENCE) public void processRequest(@NonNull android.app.ondeviceintelligence.Feature, @NonNull android.app.ondeviceintelligence.Content, int, @Nullable android.os.CancellationSignal, @Nullable android.app.ondeviceintelligence.ProcessingSignal, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.app.ondeviceintelligence.Content,android.app.ondeviceintelligence.OnDeviceIntelligenceManager.OnDeviceIntelligenceManagerProcessingException>);
		method @RequiresPermission(android.Manifest.permission.USE_ON_DEVICE_INTELLIGENCE) public void processRequestStreaming(@NonNull android.app.ondeviceintelligence.Feature, @NonNull android.app.ondeviceintelligence.Content, int, @Nullable android.os.CancellationSignal, @Nullable android.app.ondeviceintelligence.ProcessingSignal, @NonNull java.util.concurrent.Executor, @NonNull android.app.ondeviceintelligence.StreamingResponseReceiver<android.app.ondeviceintelligence.Content,android.app.ondeviceintelligence.Content,android.app.ondeviceintelligence.OnDeviceIntelligenceManager.OnDeviceIntelligenceManagerProcessingException>);
		method @RequiresPermission(android.Manifest.permission.USE_ON_DEVICE_INTELLIGENCE) public void requestFeatureDownload(@NonNull android.app.ondeviceintelligence.Feature, @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull android.app.ondeviceintelligence.DownloadCallback);
		method @RequiresPermission(android.Manifest.permission.USE_ON_DEVICE_INTELLIGENCE) public void requestTokenCount(@NonNull android.app.ondeviceintelligence.Feature, @NonNull android.app.ondeviceintelligence.Content, @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Long,android.app.ondeviceintelligence.OnDeviceIntelligenceManager.OnDeviceIntelligenceManagerException>);
		field public static final String API_VERSION_BUNDLE_KEY = "ApiVersionBundleKey";
		field public static final int REQUEST_TYPE_EMBEDDINGS = 2; // 0x2
		field public static final int REQUEST_TYPE_INFERENCE = 0; // 0x0
		field public static final int REQUEST_TYPE_PREPARE = 1; // 0x1
		}

		public static class OnDeviceIntelligenceManager.OnDeviceIntelligenceManagerException extends java.lang.Exception {
		ctor public OnDeviceIntelligenceManager.OnDeviceIntelligenceManagerException(int, @NonNull String, @NonNull android.os.PersistableBundle);
		ctor public OnDeviceIntelligenceManager.OnDeviceIntelligenceManagerException(int, @NonNull android.os.PersistableBundle);
		method public int getErrorCode();
		method @NonNull public android.os.PersistableBundle getErrorParams();
		field public static final int ON_DEVICE_INTELLIGENCE_SERVICE_UNAVAILABLE = 1000; // 0x3e8
		}

		public static class OnDeviceIntelligenceManager.OnDeviceIntelligenceManagerProcessingException extends android.app.ondeviceintelligence.OnDeviceIntelligenceManager.OnDeviceIntelligenceManagerException {
		ctor public OnDeviceIntelligenceManager.OnDeviceIntelligenceManagerProcessingException(int, @NonNull String, @NonNull android.os.PersistableBundle);
		ctor public OnDeviceIntelligenceManager.OnDeviceIntelligenceManagerProcessingException(int, @NonNull android.os.PersistableBundle);
		field public static final int PROCESSING_ERROR_BAD_DATA = 2; // 0x2
		field public static final int PROCESSING_ERROR_BAD_REQUEST = 3; // 0x3
		field public static final int PROCESSING_ERROR_BUSY = 9; // 0x9
		field public static final int PROCESSING_ERROR_CANCELLED = 7; // 0x7
		field public static final int PROCESSING_ERROR_COMPUTE_ERROR = 5; // 0x5
		field public static final int PROCESSING_ERROR_INTERNAL = 14; // 0xe
		field public static final int PROCESSING_ERROR_IPC_ERROR = 6; // 0x6
		field public static final int PROCESSING_ERROR_NOT_AVAILABLE = 8; // 0x8
		field public static final int PROCESSING_ERROR_REQUEST_NOT_SAFE = 4; // 0x4
		field public static final int PROCESSING_ERROR_REQUEST_TOO_LARGE = 12; // 0xc
		field public static final int PROCESSING_ERROR_RESPONSE_NOT_SAFE = 11; // 0xb
		field public static final int PROCESSING_ERROR_SAFETY_ERROR = 10; // 0xa
		field public static final int PROCESSING_ERROR_SERVICE_UNAVAILABLE = 15; // 0xf
		field public static final int PROCESSING_ERROR_SUSPENDED = 13; // 0xd
		field public static final int PROCESSING_ERROR_UNKNOWN = 1; // 0x1
		}

		@FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public final class ProcessingSignal {
		ctor public ProcessingSignal();
		method public void sendSignal(@NonNull android.os.PersistableBundle);
		method public void setOnProcessingSignalCallback(@NonNull java.util.concurrent.Executor, @Nullable android.app.ondeviceintelligence.ProcessingSignal.OnProcessingSignalCallback);
		}

		public static interface ProcessingSignal.OnProcessingSignalCallback {
		method public void onSignalReceived(@NonNull android.os.PersistableBundle);
		}

		@FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public interface StreamingResponseReceiver<R, T, E extends java.lang.Throwable> extends android.os.OutcomeReceiver<R,E> {
		method public void onNewContent(@NonNull T);
		}

		}

		package android.app.people {

		public final class PeopleManager {
		@@ -3640,6 +3773,7 @@ package android.content {
		field public static final String NETD_SERVICE = "netd";
		field @Deprecated public static final String NETWORK_SCORE_SERVICE = "network_score";
		field public static final String OEM_LOCK_SERVICE = "oem_lock";
		field @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public static final String ON_DEVICE_INTELLIGENCE_SERVICE = "on_device_intelligence";
		field public static final String PERMISSION_CONTROLLER_SERVICE = "permission_controller";
		field public static final String PERMISSION_SERVICE = "permission";
		field public static final String PERSISTENT_DATA_BLOCK_SERVICE = "persistent_data_block";
		@@ -12824,6 +12958,34 @@ package android.service.oemlock {

		}

		package android.service.ondeviceintelligence {

		@FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public abstract class OnDeviceIntelligenceService extends android.app.Service {
		ctor public OnDeviceIntelligenceService();
		method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent);
		method public abstract void onDownloadFeature(@NonNull android.app.ondeviceintelligence.Feature, @Nullable android.os.CancellationSignal, @NonNull android.app.ondeviceintelligence.DownloadCallback);
		method public abstract void onGetFeature(int, @NonNull android.os.OutcomeReceiver<android.app.ondeviceintelligence.Feature,android.app.ondeviceintelligence.OnDeviceIntelligenceManager.OnDeviceIntelligenceManagerException>);
		method public abstract void onGetFeatureDetails(@NonNull android.app.ondeviceintelligence.Feature, @NonNull android.os.OutcomeReceiver<android.app.ondeviceintelligence.FeatureDetails,android.app.ondeviceintelligence.OnDeviceIntelligenceManager.OnDeviceIntelligenceManagerException>);
		method public abstract void onGetReadOnlyFeatureFileDescriptorMap(@NonNull android.app.ondeviceintelligence.Feature, @NonNull java.util.function.Consumer<java.util.Map<java.lang.String,android.os.ParcelFileDescriptor>>);
		method public abstract void onGetVersion(@NonNull java.util.function.LongConsumer);
		method public abstract void onListFeatures(@NonNull android.os.OutcomeReceiver<java.util.List<android.app.ondeviceintelligence.Feature>,android.app.ondeviceintelligence.OnDeviceIntelligenceManager.OnDeviceIntelligenceManagerException>);
		field public static final String SERVICE_INTERFACE = "android.service.ondeviceintelligence.OnDeviceIntelligenceService";
		}

		@FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public abstract class OnDeviceTrustedInferenceService extends android.app.Service {
		ctor public OnDeviceTrustedInferenceService();
		method public final void fetchFeatureFileInputStreamMap(@NonNull android.app.ondeviceintelligence.Feature, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.util.Map<java.lang.String,java.io.FileInputStream>>);
		method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent);
		method @NonNull public abstract void onCountTokens(@NonNull android.app.ondeviceintelligence.Feature, @NonNull android.app.ondeviceintelligence.Content, @Nullable android.os.CancellationSignal, @NonNull android.os.OutcomeReceiver<java.lang.Long,android.app.ondeviceintelligence.OnDeviceIntelligenceManager.OnDeviceIntelligenceManagerProcessingException>);
		method @NonNull public abstract void onProcessRequest(@NonNull android.app.ondeviceintelligence.Feature, @NonNull android.app.ondeviceintelligence.Content, int, @Nullable android.os.CancellationSignal, @Nullable android.app.ondeviceintelligence.ProcessingSignal, @NonNull android.os.OutcomeReceiver<android.app.ondeviceintelligence.Content,android.app.ondeviceintelligence.OnDeviceIntelligenceManager.OnDeviceIntelligenceManagerProcessingException>);
		method @NonNull public abstract void onProcessRequestStreaming(@NonNull android.app.ondeviceintelligence.Feature, @NonNull android.app.ondeviceintelligence.Content, int, @Nullable android.os.CancellationSignal, @Nullable android.app.ondeviceintelligence.ProcessingSignal, @NonNull android.app.ondeviceintelligence.StreamingResponseReceiver<android.app.ondeviceintelligence.Content,android.app.ondeviceintelligence.Content,android.app.ondeviceintelligence.OnDeviceIntelligenceManager.OnDeviceIntelligenceManagerProcessingException>);
		method public final java.io.FileInputStream openFileInput(@NonNull String) throws java.io.FileNotFoundException;
		method public final void openFileInputAsync(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.io.FileInputStream>) throws java.io.FileNotFoundException;
		field public static final String SERVICE_INTERFACE = "android.service.ondeviceintelligence.OnDeviceTrustedInferenceService";
		}

		}

		package android.service.persistentdata {

		@FlaggedApi("android.security.frp_enforcement") public class PersistentDataBlockManager {

core/api/system-lint-baseline.txt

+10 −0

Original line number	Diff line number	Diff line
		@@ -509,6 +509,12 @@ GenericException: android.service.autofill.augmented.FillWindow#finalize():
		Methods must not throw generic exceptions (`java.lang.Throwable`)


		InvalidNullabilityOverride: android.service.ondeviceintelligence.OnDeviceIntelligenceService#onBind(android.content.Intent) parameter #0:
		Invalid nullability on parameter `intent` in method `onBind`. Parameters of overrides cannot be NonNull if the super parameter is unannotated.
		InvalidNullabilityOverride: android.service.ondeviceintelligence.OnDeviceTrustedInferenceService#onBind(android.content.Intent) parameter #0:
		Invalid nullability on parameter `intent` in method `onBind`. Parameters of overrides cannot be NonNull if the super parameter is unannotated.
		InvalidNullabilityOverride: android.service.ondeviceintelligence.OnDeviceTrustedInferenceService#openFileInput(String) parameter #0:
		Invalid nullability on parameter `filename` in method `openFileInput`. Parameters of overrides cannot be NonNull if the super parameter is unannotated.
		InvalidNullabilityOverride: android.service.textclassifier.TextClassifierService#onUnbind(android.content.Intent) parameter #0:
		Invalid nullability on parameter `intent` in method `onUnbind`. Parameters of overrides cannot be NonNull if the super parameter is unannotated.
		InvalidNullabilityOverride: android.service.voice.HotwordDetectionService#getSystemService(String) parameter #0:
		@@ -565,6 +571,8 @@ MissingNullability: android.service.contentcapture.ContentCaptureService#dump(ja
		Missing nullability on parameter `args` in method `dump`
		MissingNullability: android.service.notification.NotificationAssistantService#attachBaseContext(android.content.Context) parameter #0:
		Missing nullability on parameter `base` in method `attachBaseContext`
		MissingNullability: android.service.ondeviceintelligence.OnDeviceTrustedInferenceService#openFileInput(String):
		Missing nullability on method `openFileInput` return
		MissingNullability: android.telephony.NetworkService#onUnbind(android.content.Intent) parameter #0:
		Missing nullability on parameter `intent` in method `onUnbind`
		MissingNullability: android.telephony.data.DataService#onUnbind(android.content.Intent) parameter #0:
		@@ -1877,6 +1885,8 @@ Todo: android.Manifest.permission#READ_PEOPLE_DATA:
		Documentation mentions 'TODO'
		Todo: android.app.NotificationManager#isNotificationAssistantAccessGranted(android.content.ComponentName):
		Documentation mentions 'TODO'
		Todo: android.app.ondeviceintelligence.OnDeviceIntelligenceManager#requestFeatureDownload(android.app.ondeviceintelligence.Feature, android.app.ondeviceintelligence.CancellationSignal, java.util.concurrent.Executor, android.app.ondeviceintelligence.DownloadCallback):
		Documentation mentions 'TODO'
		Todo: android.hardware.camera2.params.StreamConfigurationMap:
		Documentation mentions 'TODO'
		Todo: android.hardware.location.ContextHubManager#getNanoAppInstanceInfo(int):

core/api/test-lint-baseline.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -1931,6 +1931,8 @@ Todo: android.Manifest.permission#READ_PEOPLE_DATA:
		Documentation mentions 'TODO'
		Todo: android.app.NotificationManager#isNotificationAssistantAccessGranted(android.content.ComponentName):
		Documentation mentions 'TODO'
		Todo: android.app.ondeviceintelligence.OnDeviceIntelligenceManager#requestFeatureDownload(android.app.ondeviceintelligence.Feature, android.app.ondeviceintelligence.CancellationSignal, java.util.concurrent.Executor, android.app.ondeviceintelligence.DownloadCallback):
		Documentation mentions 'TODO'
		Todo: android.hardware.camera2.params.StreamConfigurationMap:
		Documentation mentions 'TODO'
		Todo: android.hardware.location.ContextHubManager#getNanoAppInstanceInfo(int):

core/java/android/app/UiModeManager.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@

		package android.app;

		import static android.app.Flags.enableNightModeCache;
		import static android.app.Flags.enableNightModeBinderCache;

		import android.annotation.CallbackExecutor;
		import android.annotation.FlaggedApi;
		@@ -916,7 +916,7 @@ public class UiModeManager {
		*
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_ENABLE_NIGHT_MODE_CACHE)
		@FlaggedApi(Flags.FLAG_ENABLE_NIGHT_MODE_BINDER_CACHE)
		public static void invalidateNightModeCache() {
		IpcDataCache.invalidateCache(IpcDataCache.MODULE_SYSTEM,
		NIGHT_MODE_API);
		@@ -938,7 +938,7 @@ public class UiModeManager {
		* @see #setNightMode(int)
		*/
		public @NightMode int getNightMode() {
		if (enableNightModeCache()) {
		if (enableNightModeBinderCache()) {
		return mNightModeCache.query(null);
		} else {
		return getNightModeFromServer();