Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1feccd26 authored by Sandeep Bandaru's avatar Sandeep Bandaru Committed by Android (Google) Code Review
Browse files

Merge "Adding system service for OnDeviceIntelligenceManager to manage remote... 

Merge "Adding system service for OnDeviceIntelligenceManager to manage remote service implementations and orchestrate calls to both isolated and non-isolated service components." into main
parents 27ad7ae6 bd278528

core/api/system-current.txt

+29 −0
Original line number Diff line number Diff line
@@ -2276,6 +2276,7 @@ package android.app.ondeviceintelligence { 
    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
@@ -12957,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



+8
−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:

































core/java/android/app/ondeviceintelligence/OnDeviceIntelligenceManager.java



+5
−1




























Original line number
Diff line number
Diff line








@@ -60,7 +60,7 @@ import java.util.function.LongConsumer;













@SystemService(Context.ON_DEVICE_INTELLIGENCE_SERVICE)















@FlaggedApi(FLAG_ENABLE_ON_DEVICE_INTELLIGENCE)















public class OnDeviceIntelligenceManager {













    private static final String API_VERSION_BUNDLE_KEY = "ApiVersionBundleKey";













    public static final String API_VERSION_BUNDLE_KEY = "ApiVersionBundleKey";















    private final Context mContext;















    private final IOnDeviceIntelligenceManager mService;

























@@ -86,6 +86,10 @@ public class OnDeviceIntelligenceManager {













        //  version and package name of the remote service implementing this.















        try {















            RemoteCallback callback = new RemoteCallback(result -> {













                if (result == null) {













                    Binder.withCleanCallingIdentity(













                            () -> callbackExecutor.execute(() -> versionConsumer.accept(0)));













                }















                long version = result.getLong(API_VERSION_BUNDLE_KEY);















                Binder.withCleanCallingIdentity(















                        () -> callbackExecutor.execute(() -> versionConsumer.accept(version)));

































core/java/android/service/ondeviceintelligence/IOnDeviceIntelligenceService.aidl
0 → 100644



+44
−0




























Original line number
Diff line number
Diff line













/*













 * Copyright (C) 2022 The Android Open Source Project













 *













 * Licensed under the Apache License, Version 2.0 (the "License");













 * you may not use this file except in compliance with the License.













 * You may obtain a copy of the License at













 *













 *      http://www.apache.org/licenses/LICENSE-2.0













 *













 * Unless required by applicable law or agreed to in writing, software













 * distributed under the License is distributed on an "AS IS" BASIS,













 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













 * See the License for the specific language governing permissions and













 * limitations under the License.













 */



























package android.service.ondeviceintelligence;



























import android.os.PersistableBundle;













import android.os.ParcelFileDescriptor;













import android.os.ICancellationSignal;













import android.os.RemoteCallback;













import android.app.ondeviceintelligence.IDownloadCallback;













import android.app.ondeviceintelligence.Feature;













import android.app.ondeviceintelligence.IFeatureCallback;













import android.app.ondeviceintelligence.IListFeaturesCallback;













import android.app.ondeviceintelligence.IFeatureDetailsCallback;













import com.android.internal.infra.AndroidFuture;









































/**













 * Interface for a concrete implementation to provide on device intelligence services.













 *













 * @hide













 */













oneway interface IOnDeviceIntelligenceService {













    void getVersion(in RemoteCallback remoteCallback);













    void getFeature(in int featureId, in IFeatureCallback featureCallback);













    void listFeatures(in IListFeaturesCallback listFeaturesCallback);













    void getFeatureDetails(in Feature feature, in IFeatureDetailsCallback featureDetailsCallback);













    void getReadOnlyFileDescriptor(in String fileName, in AndroidFuture<ParcelFileDescriptor> future);













    void getReadOnlyFeatureFileDescriptorMap(in Feature feature, in RemoteCallback remoteCallback);













    void requestFeatureDownload(in Feature feature, in ICancellationSignal cancellationSignal, in IDownloadCallback downloadCallback);













}










 No newline at end of file
























core/java/android/service/ondeviceintelligence/IOnDeviceTrustedInferenceService.aidl
0 → 100644



+44
−0




























Original line number
Diff line number
Diff line













/*













 * Copyright (C) 2022 The Android Open Source Project













 *













 * Licensed under the Apache License, Version 2.0 (the "License");













 * you may not use this file except in compliance with the License.













 * You may obtain a copy of the License at













 *













 *      http://www.apache.org/licenses/LICENSE-2.0













 *













 * Unless required by applicable law or agreed to in writing, software













 * distributed under the License is distributed on an "AS IS" BASIS,













 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













 * See the License for the specific language governing permissions and













 * limitations under the License.













 */



























package android.service.ondeviceintelligence;



























import android.app.ondeviceintelligence.IStreamingResponseCallback;













import android.app.ondeviceintelligence.IResponseCallback;













import android.app.ondeviceintelligence.ITokenCountCallback;













import android.app.ondeviceintelligence.IProcessingSignal;













import android.app.ondeviceintelligence.Content;













import android.app.ondeviceintelligence.Feature;













import android.os.ICancellationSignal;













import android.service.ondeviceintelligence.IRemoteStorageService;









































/**













 * Interface for a concrete implementation to provide on device trusted inference.













 *













 * @hide













 */













oneway interface IOnDeviceTrustedInferenceService {













    void registerRemoteStorageService(in IRemoteStorageService storageService);













    void requestTokenCount(in Feature feature, in Content request, in ICancellationSignal cancellationSignal,













                            in ITokenCountCallback tokenCountCallback);













    void processRequest(in Feature feature, in Content request, in int requestType,













                        in ICancellationSignal cancellationSignal, in IProcessingSignal processingSignal,













                        in IResponseCallback callback);













    void processRequestStreaming(in Feature feature, in Content request, in int requestType,













                                in ICancellationSignal cancellationSignal, in IProcessingSignal processingSignal,













                                in IStreamingResponseCallback callback);













}










 No newline at end of file