Merge changes from topic "fix-aidl-warnings" am: a886a5c4be am: 5235704ac4

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1688165

Change-Id: Iac71017b6bee1b1b41c15054ac7801470c28f08a
This commit is contained in:
Jooyung Han
2021-04-27 23:26:11 +00:00
committed by Automerger Merge Worker
14 changed files with 18 additions and 18 deletions

View File

@@ -21,7 +21,7 @@ parcelable HardwareBufferDescription {
int width; int width;
int height; int height;
int layers; int layers;
android.hardware.graphics.common.PixelFormat format; android.hardware.graphics.common.PixelFormat format = android.hardware.graphics.common.PixelFormat.UNSPECIFIED;
android.hardware.graphics.common.BufferUsage usage; android.hardware.graphics.common.BufferUsage usage = android.hardware.graphics.common.BufferUsage.CPU_READ_NEVER;
int stride; int stride;
} }

View File

@@ -29,7 +29,7 @@ parcelable HardwareBufferDescription {
int width; int width;
int height; int height;
int layers; int layers;
PixelFormat format; PixelFormat format = PixelFormat.UNSPECIFIED;
BufferUsage usage; BufferUsage usage = BufferUsage.CPU_READ_NEVER;
int stride; int stride;
} }

View File

@@ -21,7 +21,7 @@ parcelable HardwareAuthToken {
long challenge; long challenge;
long userId; long userId;
long authenticatorId; long authenticatorId;
android.hardware.keymaster.HardwareAuthenticatorType authenticatorType; android.hardware.keymaster.HardwareAuthenticatorType authenticatorType = android.hardware.keymaster.HardwareAuthenticatorType.NONE;
android.hardware.keymaster.Timestamp timestamp; android.hardware.keymaster.Timestamp timestamp;
byte[] mac; byte[] mac;
} }

View File

@@ -20,6 +20,6 @@ package android.hardware.keymaster;
parcelable VerificationToken { parcelable VerificationToken {
long challenge; long challenge;
android.hardware.keymaster.Timestamp timestamp; android.hardware.keymaster.Timestamp timestamp;
android.hardware.keymaster.SecurityLevel securityLevel; android.hardware.keymaster.SecurityLevel securityLevel = android.hardware.keymaster.SecurityLevel.SOFTWARE;
byte[] mac; byte[] mac;
} }

View File

@@ -55,7 +55,7 @@ parcelable HardwareAuthToken {
* authenticatorType describes the type of authentication that took place, e.g. password or * authenticatorType describes the type of authentication that took place, e.g. password or
* fingerprint. * fingerprint.
*/ */
HardwareAuthenticatorType authenticatorType; HardwareAuthenticatorType authenticatorType = HardwareAuthenticatorType.NONE;
/** /**
* timestamp indicates when the user authentication took place, in milliseconds since some * timestamp indicates when the user authentication took place, in milliseconds since some

View File

@@ -43,7 +43,7 @@ parcelable VerificationToken {
/** /**
* SecurityLevel of the secure environment that generated the token. * SecurityLevel of the secure environment that generated the token.
*/ */
SecurityLevel securityLevel; SecurityLevel securityLevel = SecurityLevel.SOFTWARE;
/** /**
* 32-byte HMAC-SHA256 of the above values, computed as: * 32-byte HMAC-SHA256 of the above values, computed as:

View File

@@ -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;
} }

View File

@@ -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;
} }

View File

@@ -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;
} }

View File

@@ -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:

View File

@@ -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;
} }

View File

@@ -30,7 +30,7 @@ parcelable Operation {
* {@link IDevice::OPERATION_TYPE_BASE_MAX} is possible and should be interpreted as an * {@link IDevice::OPERATION_TYPE_BASE_MAX} is possible and should be interpreted as an
* extension type according to {@link Model::extensionNameToPrefix}. * extension type according to {@link Model::extensionNameToPrefix}.
*/ */
OperationType type; OperationType type = OperationType.ADD;
/** /**
* Describes the table that contains the indexes of the inputs of the operation. The offset is * Describes the table that contains the indexes of the inputs of the operation. The offset is
* the index in the operandIndexes table. * the index in the operandIndexes table.

View File

@@ -19,6 +19,6 @@ package android.hardware.vibrator;
@VintfStability @VintfStability
parcelable CompositeEffect { parcelable CompositeEffect {
int delayMs; int delayMs;
android.hardware.vibrator.CompositePrimitive primitive; android.hardware.vibrator.CompositePrimitive primitive = android.hardware.vibrator.CompositePrimitive.NOOP;
float scale; float scale;
} }

View File

@@ -22,7 +22,7 @@ import android.hardware.vibrator.CompositePrimitive;
parcelable CompositeEffect { parcelable CompositeEffect {
/* Period of silence preceding primitive. */ /* Period of silence preceding primitive. */
int delayMs; int delayMs;
CompositePrimitive primitive; CompositePrimitive primitive = CompositePrimitive.NOOP;
/* /*
* 0.0 (inclusive) - 1.0 (inclusive), * 0.0 (inclusive) - 1.0 (inclusive),
* where 0.0 is minimum "feelable" amplitude. * where 0.0 is minimum "feelable" amplitude.