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

Commit 3a966323 authored by Jooyung Han's avatar Jooyung Han
Browse files

aidl: Set explicit default values for enum-type fields 

Fixes: 179853674
Test: mma in hardware/interfaces/neuralnetworks
Change-Id: I9fdc7089eaf1202299da098220875ef8398667fe
parent 695ef7ac

neuralnetworks/aidl/aidl_api/android.hardware.neuralnetworks/current/android/hardware/neuralnetworks/Operand.aidl

+2 −2
Original line number Original line Diff line number Diff line
@@ -34,11 +34,11 @@ 
package android.hardware.neuralnetworks;

package android.hardware.neuralnetworks;

@VintfStability

@VintfStability

parcelable Operand {

parcelable Operand {

  android.hardware.neuralnetworks.OperandType type;

  android.hardware.neuralnetworks.OperandType type = android.hardware.neuralnetworks.OperandType.FLOAT32;

  int[] dimensions;

  int[] dimensions;

  float scale;

  float scale;

  int zeroPoint;

  int zeroPoint;

  android.hardware.neuralnetworks.OperandLifeTime lifetime;

  android.hardware.neuralnetworks.OperandLifeTime lifetime = android.hardware.neuralnetworks.OperandLifeTime.TEMPORARY_VARIABLE;

  android.hardware.neuralnetworks.DataLocation location;

  android.hardware.neuralnetworks.DataLocation location;

  @nullable android.hardware.neuralnetworks.OperandExtraParams extraParams;

  @nullable android.hardware.neuralnetworks.OperandExtraParams extraParams;

}
 
}

neuralnetworks/aidl/aidl_api/android.hardware.neuralnetworks/current/android/hardware/neuralnetworks/OperandPerformance.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -34,6 +34,6 @@ 
package android.hardware.neuralnetworks;

package android.hardware.neuralnetworks;

@VintfStability

@VintfStability

parcelable OperandPerformance {

parcelable OperandPerformance {

  android.hardware.neuralnetworks.OperandType type;

  android.hardware.neuralnetworks.OperandType type = android.hardware.neuralnetworks.OperandType.FLOAT32;

  android.hardware.neuralnetworks.PerformanceInfo info;

  android.hardware.neuralnetworks.PerformanceInfo info;

}
 
}

neuralnetworks/aidl/aidl_api/android.hardware.neuralnetworks/current/android/hardware/neuralnetworks/Operation.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -34,7 +34,7 @@ 
package android.hardware.neuralnetworks;

package android.hardware.neuralnetworks;

@VintfStability

@VintfStability

parcelable Operation {

parcelable Operation {

  android.hardware.neuralnetworks.OperationType type;

  android.hardware.neuralnetworks.OperationType type = android.hardware.neuralnetworks.OperationType.ADD;

  int[] inputs;

  int[] inputs;

  int[] outputs;

  int[] outputs;

}
 
}

neuralnetworks/aidl/android/hardware/neuralnetworks/Operand.aidl

+2 −2
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ parcelable Operand { 
     * {@link IDevice::OPERAND_TYPE_BASE_MAX} is possible and should be interpreted as an extension

     * {@link IDevice::OPERAND_TYPE_BASE_MAX} is possible and should be interpreted as an extension

     * type according to {@link Model::extensionNameToPrefix}.

     * type according to {@link Model::extensionNameToPrefix}.

     */

     */

    OperandType type;

    OperandType type = OperandType.FLOAT32;

    /**

    /**

     * Dimensions of the operand.

     * Dimensions of the operand.

     *

     *
@@ -86,7 +86,7 @@ parcelable Operand { 
    /**

    /**

     * How the operand is used.

     * How the operand is used.

     */

     */

    OperandLifeTime lifetime;

    OperandLifeTime lifetime = OperandLifeTime.TEMPORARY_VARIABLE;

    /**

    /**

     * Where to find the data for this operand.

     * Where to find the data for this operand.

     * If the lifetime is TEMPORARY_VARIABLE, SUBGRAPH_INPUT, SUBGRAPH_OUTPUT, or NO_VALUE:

     * If the lifetime is TEMPORARY_VARIABLE, SUBGRAPH_INPUT, SUBGRAPH_OUTPUT, or NO_VALUE:

neuralnetworks/aidl/android/hardware/neuralnetworks/OperandPerformance.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,6 +25,6 @@ import android.hardware.neuralnetworks.PerformanceInfo; 
 */

 */

@VintfStability

@VintfStability

parcelable OperandPerformance {

parcelable OperandPerformance {

    OperandType type;

    OperandType type = OperandType.FLOAT32;

    PerformanceInfo info;

    PerformanceInfo info;

}
 
}