Merge changes from topic "fix-aidl-warnings"

* changes:
  aidl: Set explicit default values
  aidl: Set explicit default values
  aidl: Set explicit default values for enum-type fields
  aidl: Set explicit defaults to enum-type fields
This commit is contained in:
Jooyung Han 2021-04-27 22:46:40 +00:00 committed by Gerrit Code Review
commit a886a5c4be
14 changed files with 18 additions and 18 deletions

View file

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

View file

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

View file

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

View file

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

View file

@ -55,7 +55,7 @@ parcelable HardwareAuthToken {
* authenticatorType describes the type of authentication that took place, e.g. password or
* fingerprint.
*/
HardwareAuthenticatorType authenticatorType;
HardwareAuthenticatorType authenticatorType = HardwareAuthenticatorType.NONE;
/**
* 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 securityLevel;
SecurityLevel securityLevel = SecurityLevel.SOFTWARE;
/**
* 32-byte HMAC-SHA256 of the above values, computed as:

View file

@ -34,11 +34,11 @@
package android.hardware.neuralnetworks;
@VintfStability
parcelable Operand {
android.hardware.neuralnetworks.OperandType type;
android.hardware.neuralnetworks.OperandType type = android.hardware.neuralnetworks.OperandType.FLOAT32;
int[] dimensions;
float scale;
int zeroPoint;
android.hardware.neuralnetworks.OperandLifeTime lifetime;
android.hardware.neuralnetworks.OperandLifeTime lifetime = android.hardware.neuralnetworks.OperandLifeTime.TEMPORARY_VARIABLE;
android.hardware.neuralnetworks.DataLocation location;
@nullable android.hardware.neuralnetworks.OperandExtraParams extraParams;
}

View file

@ -34,6 +34,6 @@
package android.hardware.neuralnetworks;
@VintfStability
parcelable OperandPerformance {
android.hardware.neuralnetworks.OperandType type;
android.hardware.neuralnetworks.OperandType type = android.hardware.neuralnetworks.OperandType.FLOAT32;
android.hardware.neuralnetworks.PerformanceInfo info;
}

View file

@ -34,7 +34,7 @@
package android.hardware.neuralnetworks;
@VintfStability
parcelable Operation {
android.hardware.neuralnetworks.OperationType type;
android.hardware.neuralnetworks.OperationType type = android.hardware.neuralnetworks.OperationType.ADD;
int[] inputs;
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
* type according to {@link Model::extensionNameToPrefix}.
*/
OperandType type;
OperandType type = OperandType.FLOAT32;
/**
* Dimensions of the operand.
*
@ -86,7 +86,7 @@ parcelable Operand {
/**
* How the operand is used.
*/
OperandLifeTime lifetime;
OperandLifeTime lifetime = OperandLifeTime.TEMPORARY_VARIABLE;
/**
* Where to find the data for this operand.
* 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
parcelable OperandPerformance {
OperandType type;
OperandType type = OperandType.FLOAT32;
PerformanceInfo info;
}

View file

@ -30,7 +30,7 @@ parcelable Operation {
* {@link IDevice::OPERATION_TYPE_BASE_MAX} is possible and should be interpreted as an
* 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
* the index in the operandIndexes table.

View file

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

View file

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