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

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

Revert module related chanages in platform folder 

In order to allow migration to mainline module, certain hidden API calls were replaced to alternate usages in ag/30507833

These changes are not supposed to be used when the build flag is false, this CL reverts all such changes and brings them back to state before the refactor for module migration was done.

Flag: build.release_ondevice_intelligence_module
Bug: 376427781
Change-Id: If72804788d5a3db9e152be4c0d387efe8b156d8a
parent 9f0ff89c

packages/NeuralNetworks/framework/Android.bp

+14 −3
Original line number Diff line number Diff line
@@ -19,10 +19,21 @@ package { 
filegroup {

    name: "framework-ondeviceintelligence-sources",

    srcs: [

        "java/**/*.aidl",

        "java/**/*.java",

        "module/java/**/*.aidl",

        "module/java/**/*.java",

    ],

    visibility: [

        "//frameworks/base:__subpackages__",

        "//packages/modules/NeuralNetworks:__subpackages__",

    ],

}



filegroup {

    name: "framework-ondeviceintelligence-sources-platform",

    srcs: [

        "platform/java/**/*.aidl",

        "platform/java/**/*.java",

    ],

    path: "java",

    visibility: [

        "//frameworks/base:__subpackages__",

        "//packages/modules/NeuralNetworks:__subpackages__",

packages/NeuralNetworks/framework/platform/java/android/app/ondeviceintelligence/Feature.aidl

+1 −1
Original line number Diff line number Diff line
@@ -19,4 +19,4 @@ package android.app.ondeviceintelligence; 
/**

  * @hide

  */

@JavaOnlyStableParcelable parcelable Feature;
 
parcelable Feature;

packages/NeuralNetworks/framework/platform/java/android/app/ondeviceintelligence/Feature.java

+5 −5
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ import android.os.Parcel; 
import android.os.Parcelable;

import android.os.PersistableBundle;



import java.util.Objects;



/**

 * Represents a typical feature associated with on-device intelligence.

 *
@@ -58,8 +56,9 @@ public final class Feature implements Parcelable { 
        this.mModelName = modelName;

        this.mType = type;

        this.mVariant = variant;

        this.mFeatureParams = Objects.requireNonNull(featureParams,

                "featureParams should be non-null.");

        this.mFeatureParams = featureParams;

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

                NonNull.class, null, mFeatureParams);

    }



    /** Returns the unique and immutable identifier of this feature. */
@@ -168,6 +167,8 @@ public final class Feature implements Parcelable { 
        this.mType = type;

        this.mVariant = variant;

        this.mFeatureParams = featureParams;

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

                NonNull.class, null, mFeatureParams);

    }



    public static final @NonNull Parcelable.Creator<Feature> CREATOR
@@ -199,7 +200,6 @@ public final class Feature implements Parcelable { 


        /**

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

         *

         * @param id the unique identifier for the feature.

         */

        public Builder(int id) {

packages/NeuralNetworks/framework/platform/java/android/app/ondeviceintelligence/FeatureDetails.aidl

+1 −1
Original line number Diff line number Diff line
@@ -19,4 +19,4 @@ package android.app.ondeviceintelligence; 
/**

  * @hide

  */

@JavaOnlyStableParcelable parcelable FeatureDetails;
 
parcelable FeatureDetails;

packages/NeuralNetworks/framework/platform/java/android/app/ondeviceintelligence/FeatureDetails.java

+11 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import java.lang.annotation.Retention; 
import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.Target;

import java.text.MessageFormat;

import java.util.Objects;



/**

 * Represents a status of a requested {@link Feature}.
@@ -79,12 +78,18 @@ public final class FeatureDetails implements Parcelable { 
            @Status int featureStatus,

            @NonNull PersistableBundle featureDetailParams) {

        this.mFeatureStatus = featureStatus;

        this.mFeatureDetailParams = Objects.requireNonNull(featureDetailParams);

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

                Status.class, null, mFeatureStatus);

        this.mFeatureDetailParams = featureDetailParams;

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

                NonNull.class, null, mFeatureDetailParams);

    }



    public FeatureDetails(

            @Status int featureStatus) {

        this.mFeatureStatus = featureStatus;

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

                Status.class, null, mFeatureStatus);

        this.mFeatureDetailParams = new PersistableBundle();

    }
@@ -149,7 +154,11 @@ public final class FeatureDetails implements Parcelable { 
                PersistableBundle.CREATOR);



        this.mFeatureStatus = status;

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

                Status.class, null, mFeatureStatus);

        this.mFeatureDetailParams = persistableBundle;

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

                NonNull.class, null, mFeatureDetailParams);

    }