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

Commit 46571064 authored by sandeepbandaru's avatar sandeepbandaru Committed by Sandeep Bandaru
Browse files

Addressing previous todo comments and feedback 

- Rename all Trusted references to Sandboxed.
- Added method onDataAugmentRequest for allowing data retreival in the midst of inference.
- Adding API to provide service package name for remote impl
- Adding API to notify OnDeviceIntelligence on isolated process startup
- Moving token count in a container class with params
- Marking Content in processRequest* as @Nullable
- Adding callerUid field to service methods to allow validation/rate-limiting in the service impl


Test: make
Bug: 316589195
API-Coverage-Bug: 323147058
Change-Id: I51e71920f346dc966d158296530d61546fe3d25b
parent 3c39224c

core/api/system-current.txt

+36 −31
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ package android { 
    field public static final String BIND_NETWORK_RECOMMENDATION_SERVICE = "android.permission.BIND_NETWORK_RECOMMENDATION_SERVICE";

    field public static final String BIND_NOTIFICATION_ASSISTANT_SERVICE = "android.permission.BIND_NOTIFICATION_ASSISTANT_SERVICE";

    field @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public static final String BIND_ON_DEVICE_INTELLIGENCE_SERVICE = "android.permission.BIND_ON_DEVICE_INTELLIGENCE_SERVICE";

    field @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public static final String BIND_ON_DEVICE_TRUSTED_SERVICE = "android.permission.BIND_ON_DEVICE_TRUSTED_SERVICE";

    field @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public static final String BIND_ON_DEVICE_SANDBOXED_INFERENCE_SERVICE = "android.permission.BIND_ON_DEVICE_SANDBOXED_INFERENCE_SERVICE";

    field public static final String BIND_PHONE_ACCOUNT_SUGGESTION_SERVICE = "android.permission.BIND_PHONE_ACCOUNT_SUGGESTION_SERVICE";

    field public static final String BIND_PRINT_RECOMMENDATION_SERVICE = "android.permission.BIND_PRINT_RECOMMENDATION_SERVICE";

    field public static final String BIND_REMOTE_LOCKSCREEN_VALIDATION_SERVICE = "android.permission.BIND_REMOTE_LOCKSCREEN_VALIDATION_SERVICE";
@@ -2223,10 +2223,9 @@ package android.app.ondeviceintelligence { 
  }















  public static final class Feature.Builder {













    ctor public Feature.Builder(int, int, int, @NonNull android.os.PersistableBundle);













    ctor public Feature.Builder(int);















    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);









@@ -2238,7 +2237,7 @@ package android.app.ondeviceintelligence {













    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 @android.app.ondeviceintelligence.FeatureDetails.Status public int getFeatureStatus();















    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









@@ -2251,27 +2250,16 @@ package android.app.ondeviceintelligence {













  @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 @Nullable @RequiresPermission(android.Manifest.permission.USE_ON_DEVICE_INTELLIGENCE) public String getRemoteServicePackageName();















    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 processRequest(@NonNull android.app.ondeviceintelligence.Feature, @Nullable android.app.ondeviceintelligence.Content, int, @Nullable android.os.CancellationSignal, @Nullable android.app.ondeviceintelligence.ProcessingSignal, @NonNull java.util.concurrent.Executor, @NonNull android.app.ondeviceintelligence.ProcessingOutcomeReceiver);













    method @RequiresPermission(android.Manifest.permission.USE_ON_DEVICE_INTELLIGENCE) public void processRequestStreaming(@NonNull android.app.ondeviceintelligence.Feature, @Nullable android.app.ondeviceintelligence.Content, int, @Nullable android.os.CancellationSignal, @Nullable android.app.ondeviceintelligence.ProcessingSignal, @NonNull java.util.concurrent.Executor, @NonNull android.app.ondeviceintelligence.StreamedProcessingOutcomeReceiver);















    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";













    method @RequiresPermission(android.Manifest.permission.USE_ON_DEVICE_INTELLIGENCE) public void requestTokenInfo(@NonNull android.app.ondeviceintelligence.Feature, @NonNull android.app.ondeviceintelligence.Content, @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.app.ondeviceintelligence.TokenInfo,android.app.ondeviceintelligence.OnDeviceIntelligenceManager.OnDeviceIntelligenceManagerException>);















    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










@@ -2305,6 +2293,10 @@ package android.app.ondeviceintelligence {













    field public static final int PROCESSING_ERROR_UNKNOWN = 1; // 0x1















  }



























  @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public interface ProcessingOutcomeReceiver extends android.os.OutcomeReceiver<android.app.ondeviceintelligence.Content,android.app.ondeviceintelligence.OnDeviceIntelligenceManager.OnDeviceIntelligenceManagerProcessingException> {













    method public default void onDataAugmentRequest(@NonNull android.app.ondeviceintelligence.Content, @NonNull java.util.function.Consumer<android.app.ondeviceintelligence.Content>);













  }



























  @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public final class ProcessingSignal {















    ctor public ProcessingSignal();















    method public void sendSignal(@NonNull android.os.PersistableBundle);









@@ -2315,8 +2307,18 @@ package android.app.ondeviceintelligence {













    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);













  @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public interface StreamedProcessingOutcomeReceiver extends android.app.ondeviceintelligence.ProcessingOutcomeReceiver {













    method public void onNewContent(@NonNull android.app.ondeviceintelligence.Content);













  }

























  @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public final class TokenInfo implements android.os.Parcelable {













    ctor public TokenInfo(long, @NonNull android.os.PersistableBundle);













    ctor public TokenInfo(long);













    method public int describeContents();













    method public long getCount();













    method @NonNull public android.os.PersistableBundle getInfoParams();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.app.ondeviceintelligence.TokenInfo> CREATOR;















  }





























}










@@ -12963,12 +12965,14 @@ 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 onDownloadFeature(int, @NonNull android.app.ondeviceintelligence.Feature, @Nullable android.os.CancellationSignal, @NonNull android.app.ondeviceintelligence.DownloadCallback);













    method public abstract void onGetFeature(int, int, @NonNull android.os.OutcomeReceiver<android.app.ondeviceintelligence.Feature,android.app.ondeviceintelligence.OnDeviceIntelligenceManager.OnDeviceIntelligenceManagerException>);













    method public abstract void onGetFeatureDetails(int, @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>);













    method public abstract void onInferenceServiceConnected();













    method public abstract void onInferenceServiceDisconnected();













    method public abstract void onListFeatures(int, @NonNull android.os.OutcomeReceiver<java.util.List<android.app.ondeviceintelligence.Feature>,android.app.ondeviceintelligence.OnDeviceIntelligenceManager.OnDeviceIntelligenceManagerException>);















    method public final void updateProcessingState(@NonNull android.os.Bundle, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.os.PersistableBundle,android.service.ondeviceintelligence.OnDeviceIntelligenceService.OnDeviceUpdateProcessingException>);















    field public static final String SERVICE_INTERFACE = "android.service.ondeviceintelligence.OnDeviceIntelligenceService";















  }









@@ -12985,17 +12989,18 @@ package android.service.ondeviceintelligence {













    field public static final int PROCESSING_UPDATE_STATUS_CONNECTION_FAILED = 1; // 0x1















  }



























  @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public abstract class OnDeviceTrustedInferenceService extends android.app.Service {













    ctor public OnDeviceTrustedInferenceService();













  @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public abstract class OnDeviceSandboxedInferenceService extends android.app.Service {













    ctor public OnDeviceSandboxedInferenceService();















    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 @NonNull public java.util.concurrent.Executor getCallbackExecutor();















    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 @NonNull public abstract void onProcessRequest(int, @NonNull android.app.ondeviceintelligence.Feature, @Nullable android.app.ondeviceintelligence.Content, int, @Nullable android.os.CancellationSignal, @Nullable android.app.ondeviceintelligence.ProcessingSignal, @NonNull android.app.ondeviceintelligence.ProcessingOutcomeReceiver);













    method @NonNull public abstract void onProcessRequestStreaming(int, @NonNull android.app.ondeviceintelligence.Feature, @Nullable android.app.ondeviceintelligence.Content, int, @Nullable android.os.CancellationSignal, @Nullable android.app.ondeviceintelligence.ProcessingSignal, @NonNull android.app.ondeviceintelligence.StreamedProcessingOutcomeReceiver);













    method @NonNull public abstract void onTokenInfoRequest(int, @NonNull android.app.ondeviceintelligence.Feature, @NonNull android.app.ondeviceintelligence.Content, @Nullable android.os.CancellationSignal, @NonNull android.os.OutcomeReceiver<android.app.ondeviceintelligence.TokenInfo,android.app.ondeviceintelligence.OnDeviceIntelligenceManager.OnDeviceIntelligenceManagerProcessingException>);















    method public abstract void onUpdateProcessingState(@NonNull android.os.Bundle, @NonNull android.os.OutcomeReceiver<android.os.PersistableBundle,android.service.ondeviceintelligence.OnDeviceIntelligenceService.OnDeviceUpdateProcessingException>);















    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";













    field public static final String SERVICE_INTERFACE = "android.service.ondeviceintelligence.OnDeviceSandboxedInferenceService";















  }





























}

























core/api/system-lint-baseline.txt



+3
−3




























Original line number
Diff line number
Diff line








@@ -511,9 +511,9 @@ GenericException: android.service.autofill.augmented.FillWindow#finalize():





























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:













InvalidNullabilityOverride: android.service.ondeviceintelligence.OnDeviceSandboxedInferenceService#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:













InvalidNullabilityOverride: android.service.ondeviceintelligence.OnDeviceSandboxedInferenceService#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.










@@ -571,7 +571,7 @@ 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):













MissingNullability: android.service.ondeviceintelligence.OnDeviceSandboxedInferenceService#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`

































core/java/android/app/ondeviceintelligence/Feature.java



+6
−17




























Original line number
Diff line number
Diff line








@@ -199,24 +199,13 @@ public final class Feature implements Parcelable {





























        private long mBuilderFieldsSet = 0L;





























        public Builder(













                int id,













                int type,













                int variant,













                @NonNull PersistableBundle featureParams) {













        /**













         * Provides a builder instance to create a feature for given id.













         * @param id the unique identifier for the feature.













         */













        public Builder(int id) {















            mId = id;













            mType = type;













            mVariant = variant;













            mFeatureParams = featureParams;













            com.android.internal.util.AnnotationValidations.validate(













                    NonNull.class, null, mFeatureParams);













        }



























        public @NonNull Builder setId(int value) {













            checkNotUsed();













            mBuilderFieldsSet |= 0x1;













            mId = value;













            return this;













            mFeatureParams = new PersistableBundle();















        }































        public @NonNull Builder setName(@NonNull String value) {

































core/java/android/app/ondeviceintelligence/FeatureDetails.java



+15
−15




























Original line number
Diff line number
Diff line








@@ -41,7 +41,7 @@ import java.text.MessageFormat;













@FlaggedApi(FLAG_ENABLE_ON_DEVICE_INTELLIGENCE)















public final class FeatureDetails implements Parcelable {















    @Status













    private final int mStatus;













    private final int mFeatureStatus;















    @NonNull















    private final PersistableBundle mFeatureDetailParams;


























@@ -73,21 +73,21 @@ public final class FeatureDetails implements Parcelable {













    }































    public FeatureDetails(













            @Status int status,













            @Status int featureStatus,















            @NonNull PersistableBundle featureDetailParams) {













        this.mStatus = status;













        this.mFeatureStatus = featureStatus;















        com.android.internal.util.AnnotationValidations.validate(













                Status.class, null, mStatus);













                Status.class, null, mFeatureStatus);















        this.mFeatureDetailParams = featureDetailParams;















        com.android.internal.util.AnnotationValidations.validate(















                NonNull.class, null, mFeatureDetailParams);















    }































    public FeatureDetails(













            @Status int status) {













        this.mStatus = status;













            @Status int featureStatus) {













        this.mFeatureStatus = featureStatus;















        com.android.internal.util.AnnotationValidations.validate(













                Status.class, null, mStatus);













                Status.class, null, mFeatureStatus);















        this.mFeatureDetailParams = new PersistableBundle();















    }

























@@ -95,8 +95,8 @@ public final class FeatureDetails implements Parcelable {













    /**















     * Returns an integer value associated with the feature status.















     */













    public @Status int getStatus() {













        return mStatus;













    public @Status int getFeatureStatus() {













        return mFeatureStatus;















    }









































@@ -111,7 +111,7 @@ public final class FeatureDetails implements Parcelable {













    public String toString() {















        return MessageFormat.format("FeatureDetails '{' status = {0}, "















                        + "persistableBundle = {1} '}'",













                mStatus,













                mFeatureStatus,















                mFeatureDetailParams);















    }

























@@ -121,21 +121,21 @@ public final class FeatureDetails implements Parcelable {













        if (o == null || getClass() != o.getClass()) return false;















        @SuppressWarnings("unchecked")















        FeatureDetails that = (FeatureDetails) o;













        return mStatus == that.mStatus













        return mFeatureStatus == that.mFeatureStatus















                && java.util.Objects.equals(mFeatureDetailParams, that.mFeatureDetailParams);















    }































    @Override















    public int hashCode() {















        int _hash = 1;













        _hash = 31 * _hash + mStatus;













        _hash = 31 * _hash + mFeatureStatus;















        _hash = 31 * _hash + java.util.Objects.hashCode(mFeatureDetailParams);















        return _hash;















    }































    @Override















    public void writeToParcel(@NonNull android.os.Parcel dest, int flags) {













        dest.writeInt(mStatus);













        dest.writeInt(mFeatureStatus);















        dest.writeTypedObject(mFeatureDetailParams, flags);















    }

























@@ -151,9 +151,9 @@ public final class FeatureDetails implements Parcelable {













        PersistableBundle persistableBundle = (PersistableBundle) in.readTypedObject(















                PersistableBundle.CREATOR);





























        this.mStatus = status;













        this.mFeatureStatus = status;















        com.android.internal.util.AnnotationValidations.validate(













                Status.class, null, mStatus);













                Status.class, null, mFeatureStatus);















        this.mFeatureDetailParams = persistableBundle;















        com.android.internal.util.AnnotationValidations.validate(















                NonNull.class, null, mFeatureDetailParams);

































core/java/android/app/ondeviceintelligence/FilePart.java
deleted100644 → 0



+0
−137


























File deleted.
Preview size limit exceeded, changes collapsed.