From d26dc50abbad068cd1a673f204fa538c1c61bdb2 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Tue, 29 Nov 2016 14:07:27 -0800 Subject: [PATCH] Always specify underlying enum type. Bug: 33197891 Test: compiles Change-Id: I3d4822ea9a665708302d3bd1460425fddf1dcda9 --- audio/2.0/IDevicesFactory.hal | 2 +- audio/2.0/IPrimaryDevice.hal | 2 +- audio/2.0/types.hal | 4 ++-- audio/common/2.0/types.hal | 20 ++++++++++---------- audio/effect/2.0/IDownmixEffect.hal | 2 +- audio/effect/2.0/INoiseSuppressionEffect.hal | 4 ++-- audio/effect/2.0/IPresetReverbEffect.hal | 2 +- audio/effect/2.0/IVisualizerEffect.hal | 6 +++--- audio/effect/2.0/types.hal | 10 +++++----- broadcastradio/1.0/types.hal | 6 +++--- contexthub/1.0/types.hal | 2 +- gnss/1.0/IAGnssRil.hal | 2 +- media/omx/1.0/types.hal | 4 ++-- tests/baz/1.0/IBase.hal | 2 +- tests/expression/1.0/IExpression.hal | 2 +- tv/input/1.0/types.hal | 6 +++--- vehicle/2.0/types.hal | 4 ++-- wifi/1.0/types.hal | 2 +- 18 files changed, 41 insertions(+), 41 deletions(-) diff --git a/audio/2.0/IDevicesFactory.hal b/audio/2.0/IDevicesFactory.hal index a4e6956b89..f1dc7d3533 100644 --- a/audio/2.0/IDevicesFactory.hal +++ b/audio/2.0/IDevicesFactory.hal @@ -22,7 +22,7 @@ import IDevice; interface IDevicesFactory { typedef android.hardware.audio@2.0::Result Result; - enum Device { + enum Device : int32_t { PRIMARY, A2DP, USB, diff --git a/audio/2.0/IPrimaryDevice.hal b/audio/2.0/IPrimaryDevice.hal index 6beddfe033..f1dd56ebd6 100644 --- a/audio/2.0/IPrimaryDevice.hal +++ b/audio/2.0/IPrimaryDevice.hal @@ -76,7 +76,7 @@ interface IPrimaryDevice extends IDevice { */ setBtScoWidebandEnabled(bool enabled) generates (Result retval); - enum TtyMode { + enum TtyMode : int32_t { OFF, VCO, HCO, diff --git a/audio/2.0/types.hal b/audio/2.0/types.hal index 9a5e4f1ade..7002f38640 100644 --- a/audio/2.0/types.hal +++ b/audio/2.0/types.hal @@ -18,7 +18,7 @@ package android.hardware.audio@2.0; import android.hardware.audio.common@2.0; -enum Result { +enum Result : int32_t { OK, NOT_INITIALIZED, INVALID_ARGUMENTS, @@ -27,7 +27,7 @@ enum Result { }; @export(name="audio_drain_type_t", value_prefix="AUDIO_DRAIN_") -enum AudioDrain { +enum AudioDrain : int32_t { /* drain() returns when all data has been played. */ ALL, /* drain() returns a short time before all data from the current track has diff --git a/audio/common/2.0/types.hal b/audio/common/2.0/types.hal index 75fdb52793..4e969a79c8 100644 --- a/audio/common/2.0/types.hal +++ b/audio/common/2.0/types.hal @@ -56,7 +56,7 @@ typedef uint32_t AudioHwSync; * Each port has a unique ID or handle allocated by policy manager. */ @export(name="") -enum AudioHandleConsts { +enum AudioHandleConsts : int32_t { AUDIO_IO_HANDLE_NONE = 0, AUDIO_MODULE_HANDLE_NONE = 0, AUDIO_PORT_HANDLE_NONE = 0, @@ -114,7 +114,7 @@ enum AudioStreamType : int32_t { }; @export(name="audio_source_t", value_prefix="AUDIO_SOURCE_") -enum AudioSource { +enum AudioSource : int32_t { // These values must kept in sync with // frameworks/base/media/java/android/media/MediaRecorder.java, // frameworks/av/services/audiopolicy/AudioPolicyService.cpp, @@ -269,7 +269,7 @@ enum AudioFormat : uint32_t { * assumptions. */ @export(name="") -enum FixedChannelCount { +enum FixedChannelCount : int32_t { FCC_2 = 2, // This is typically due to legacy implementation of stereo I/O FCC_8 = 8 // This is typically due to audio mixer and resampler limitations }; @@ -425,7 +425,7 @@ enum AudioChannelMask : uint32_t { * to this convention will be noted at the appropriate API. */ @export(name="", value_prefix="AUDIO_INTERLEAVE_") -enum AudioInterleave { +enum AudioInterleave : int32_t { LEFT = 0, RIGHT = 1, }; @@ -435,7 +435,7 @@ enum AudioInterleave { * routing. */ @export(name="audio_mode_t", value_prefix="AUDIO_MODE_") -enum AudioMode { +enum AudioMode : int32_t { INVALID = -2, CURRENT = -1, NORMAL = 0, @@ -597,7 +597,7 @@ enum AudioDevice : uint32_t { * (when getOuput() is called) to an available output stream. */ @export(name="audio_output_flags_t", value_prefix="AUDIO_OUTPUT_FLAG_") -enum AudioOutputFlag { +enum AudioOutputFlag : int32_t { NONE = 0x0, // no attributes DIRECT = 0x1, // this output directly connects a track // to one output stream: no software mixer @@ -627,7 +627,7 @@ enum AudioOutputFlag { * attributes corresponding to the specified flags. */ @export(name="audio_input_flags_t", value_prefix="AUDIO_INPUT_FLAG_") -enum AudioInputFlag { +enum AudioInputFlag : int32_t { NONE = 0x0, // no attributes FAST = 0x1, // prefer an input that supports "fast tracks" HW_HOTWORD = 0x2, // prefer an input that captures from hw hotword source @@ -728,7 +728,7 @@ struct AudioGainConfig { /* Audio port role: either source or sink */ @export(name="audio_port_role_t", value_prefix="AUDIO_PORT_ROLE_") -enum AudioPortRole { +enum AudioPortRole : int32_t { NONE, SOURCE, SINK, @@ -739,7 +739,7 @@ enum AudioPortRole { * PlaybackThread output) or a physical device (e.g OUT_SPEAKER) */ @export(name="audio_port_type_t", value_prefix="AUDIO_PORT_TYPE_") -enum AudioPortType { +enum AudioPortType : int32_t { NONE, DEVICE, MIX, @@ -816,7 +816,7 @@ struct AudioPortDeviceExt { * Latency class of the audio mix. */ @export(name="audio_mix_latency_class_t", value_prefix="AUDIO_LATENCY_") -enum AudioMixLatencyClass { +enum AudioMixLatencyClass : int32_t { LOW, NORMAL } ; diff --git a/audio/effect/2.0/IDownmixEffect.hal b/audio/effect/2.0/IDownmixEffect.hal index 817e14c5a9..06409a3093 100644 --- a/audio/effect/2.0/IDownmixEffect.hal +++ b/audio/effect/2.0/IDownmixEffect.hal @@ -20,7 +20,7 @@ import android.hardware.audio.common@2.0; import IEffect; interface IDownmixEffect extends IEffect { - enum Type { + enum Type : int32_t { STRIP, // throw away the extra channels FOLD // mix the extra channels with FL/FR }; diff --git a/audio/effect/2.0/INoiseSuppressionEffect.hal b/audio/effect/2.0/INoiseSuppressionEffect.hal index 58e439f930..ae2bfb5e16 100644 --- a/audio/effect/2.0/INoiseSuppressionEffect.hal +++ b/audio/effect/2.0/INoiseSuppressionEffect.hal @@ -20,7 +20,7 @@ import android.hardware.audio.common@2.0; import IEffect; interface INoiseSuppressionEffect extends IEffect { - enum Level { + enum Level : int32_t { LOW, MEDIUM, HIGH @@ -36,7 +36,7 @@ interface INoiseSuppressionEffect extends IEffect { */ getSuppressionLevel() generates (Result retval, Level level); - enum Type { + enum Type : int32_t { SINGLE_CHANNEL, MULTI_CHANNEL }; diff --git a/audio/effect/2.0/IPresetReverbEffect.hal b/audio/effect/2.0/IPresetReverbEffect.hal index 58dfd4083c..2237bc482a 100644 --- a/audio/effect/2.0/IPresetReverbEffect.hal +++ b/audio/effect/2.0/IPresetReverbEffect.hal @@ -20,7 +20,7 @@ import android.hardware.audio.common@2.0; import IEffect; interface IPresetReverbEffect extends IEffect { - enum Preset { + enum Preset : int32_t { NONE, // no reverb or reflections SMALLROOM, // a small room less than five meters in length MEDIUMROOM, // a medium room with a length of ten meters or less diff --git a/audio/effect/2.0/IVisualizerEffect.hal b/audio/effect/2.0/IVisualizerEffect.hal index 70dabf9e58..79dc9ee07d 100644 --- a/audio/effect/2.0/IVisualizerEffect.hal +++ b/audio/effect/2.0/IVisualizerEffect.hal @@ -20,7 +20,7 @@ import android.hardware.audio.common@2.0; import IEffect; interface IVisualizerEffect extends IEffect { - enum CaptureSizeRange { + enum CaptureSizeRange : int32_t { MAX = 1024, // maximum capture size in samples MIN = 128 // minimum capture size in samples }; @@ -35,7 +35,7 @@ interface IVisualizerEffect extends IEffect { */ getCaptureSize() generates (Result retval, uint16_t captureSize); - enum ScalingMode { + enum ScalingMode : int32_t { // Keep in sync with SCALING_MODE_... in // frameworks/base/media/java/android/media/audiofx/Visualizer.java NORMALIZED = 0, @@ -62,7 +62,7 @@ interface IVisualizerEffect extends IEffect { */ getLatency() generates (Result retval, uint32_t latencyMs); - enum MeasurementMode { + enum MeasurementMode : int32_t { // Keep in sync with MEASUREMENT_MODE_... in // frameworks/base/media/java/android/media/audiofx/Visualizer.java NONE = 0x0, diff --git a/audio/effect/2.0/types.hal b/audio/effect/2.0/types.hal index 35015b27ec..ad7f4ce0b1 100644 --- a/audio/effect/2.0/types.hal +++ b/audio/effect/2.0/types.hal @@ -18,7 +18,7 @@ package android.hardware.audio.effect@2.0; import android.hardware.audio.common@2.0; -enum Result { +enum Result : int32_t { OK, NOT_INITIALIZED, INVALID_ARGUMENTS, @@ -110,7 +110,7 @@ enum Result { * +----------------+--------+-------------------------------------------------- */ @export(name="", value_prefix="EFFECT_FLAG_") -enum EffectFlags { +enum EffectFlags : int32_t { // Insert mode TYPE_SHIFT = 0, TYPE_SIZE = 3, @@ -229,7 +229,7 @@ struct AudioBuffer { }; @export(name="effect_buffer_access_e", value_prefix="EFFECT_BUFFER_") -enum EffectBufferAccess { +enum EffectBufferAccess : int32_t { ACCESS_WRITE, ACCESS_READ, ACCESS_ACCUMULATE @@ -239,7 +239,7 @@ enum EffectBufferAccess { * Determines what fields of EffectBufferConfig need to be considered. */ @export(name="", value_prefix="EFFECT_CONFIG_") -enum EffectConfigParameters { +enum EffectConfigParameters : int32_t { BUFFER = 0x0001, // buffer field SMP_RATE = 0x0002, // samplingRate CHANNELS = 0x0004, // channels @@ -267,7 +267,7 @@ struct EffectConfig { }; @export(name="effect_feature_e", value_prefix="EFFECT_FEATURE_") -enum EffectFeature { +enum EffectFeature : int32_t { AUX_CHANNELS, // supports auxiliary channels // (e.g. dual mic noise suppressor) CNT diff --git a/broadcastradio/1.0/types.hal b/broadcastradio/1.0/types.hal index d04359cd4a..d8b2da346c 100644 --- a/broadcastradio/1.0/types.hal +++ b/broadcastradio/1.0/types.hal @@ -16,7 +16,7 @@ package android.hardware.broadcastradio@1.0; -enum Result { +enum Result : int32_t { OK, NOT_INITIALIZED, INVALID_ARGUMENTS, @@ -139,7 +139,7 @@ struct Properties { vec bands; /* band descriptors */ }; -enum MetadataType { +enum MetadataType : int32_t { INVALID = -1, /* Signed 32 bit integer */ INT = 0, @@ -152,7 +152,7 @@ enum MetadataType { CLOCK = 3, }; -enum MetadataKey { +enum MetadataKey : int32_t { INVALID = -1, /* RDS PI - string */ RDS_PI = 0, diff --git a/contexthub/1.0/types.hal b/contexthub/1.0/types.hal index 7d5a1ac988..b9f014bf75 100644 --- a/contexthub/1.0/types.hal +++ b/contexthub/1.0/types.hal @@ -138,7 +138,7 @@ enum AsyncEventType : uint32_t { RESTARTED = 1, // Hub restarted unexpectedly }; -enum TransactionResult { +enum TransactionResult : int32_t { SUCCESS, // successful completion of transaction FAILURE, // failed transaction }; diff --git a/gnss/1.0/IAGnssRil.hal b/gnss/1.0/IAGnssRil.hal index fb73498ba4..7363d460c8 100644 --- a/gnss/1.0/IAGnssRil.hal +++ b/gnss/1.0/IAGnssRil.hal @@ -41,7 +41,7 @@ interface IAGnssRil { WIMAX = 6, }; - enum AGnssRefLocationType { + enum AGnssRefLocationType : int32_t { GSM_CELLID = 1, UMTS_CELLID = 2, MAC = 3, diff --git a/media/omx/1.0/types.hal b/media/omx/1.0/types.hal index c0350de10d..0b7b66ec3d 100644 --- a/media/omx/1.0/types.hal +++ b/media/omx/1.0/types.hal @@ -112,7 +112,7 @@ struct CodecBuffer { /** * There are four main types of buffers. */ - enum Type { + enum Type : int32_t { INVALID = 0, PRESET, SHARED_MEM, @@ -164,7 +164,7 @@ struct CodecBuffer { * * Enumeration of port modes. */ -enum PortMode { +enum PortMode : int32_t { PRESET_START = 0, PRESET_BYTE_BUFFER, PRESET_ANW_BUFFER, diff --git a/tests/baz/1.0/IBase.hal b/tests/baz/1.0/IBase.hal index add415343d..7f90f16f2a 100644 --- a/tests/baz/1.0/IBase.hal +++ b/tests/baz/1.0/IBase.hal @@ -17,7 +17,7 @@ package android.hardware.tests.baz@1.0; interface IBase { - enum SomeBaseEnum { + enum SomeBaseEnum : int32_t { grrr = 1, }; diff --git a/tests/expression/1.0/IExpression.hal b/tests/expression/1.0/IExpression.hal index a44e03c151..6eb5b2a4b7 100644 --- a/tests/expression/1.0/IExpression.hal +++ b/tests/expression/1.0/IExpression.hal @@ -178,7 +178,7 @@ interface IExpression { MAX_PLUS_2 // 1 }; - enum Constants { + enum Constants : int32_t { CONST_FOO, CONST_BAR = 70, MAX_ARRAY_SIZE = 20, diff --git a/tv/input/1.0/types.hal b/tv/input/1.0/types.hal index 89a7acc0c6..6852c703a3 100644 --- a/tv/input/1.0/types.hal +++ b/tv/input/1.0/types.hal @@ -18,7 +18,7 @@ package android.hardware.tv.input@1.0; import android.hardware.audio.common@2.0; -enum Result { +enum Result : int32_t { OK, UNKNOWN, NO_RESOURCE, @@ -27,7 +27,7 @@ enum Result { }; /* Type of physical TV input. */ -enum TvInputType { +enum TvInputType : int32_t { OTHER = 1, // Generic hardware. TUNER = 2, // Tuner. e.g. built-in terrestrial tuner COMPOSITE = 3, @@ -50,7 +50,7 @@ struct TvInputDeviceInfo { // must be filled with 0s. }; -enum TvInputEventType { +enum TvInputEventType : int32_t { /* * Hardware notifies the framework that a device is available. * diff --git a/vehicle/2.0/types.hal b/vehicle/2.0/types.hal index b19621c99f..aff6edd3a5 100644 --- a/vehicle/2.0/types.hal +++ b/vehicle/2.0/types.hal @@ -2430,7 +2430,7 @@ enum VehiclePropertyOperation : int32_t { }; -enum SubscribeFlags { +enum SubscribeFlags : int32_t { UNDEFINED = 0x0, /* @@ -2477,7 +2477,7 @@ struct SubscribeOptions { }; /* Error codes used in vehicle HAL interface. */ -enum StatusCode { +enum StatusCode : int32_t { OK = 0, /* Try again. */ diff --git a/wifi/1.0/types.hal b/wifi/1.0/types.hal index 066662c1f9..9e53377c2e 100644 --- a/wifi/1.0/types.hal +++ b/wifi/1.0/types.hal @@ -486,7 +486,7 @@ struct StaScanResult { /** * Mask of flags set in the |ScanData| instance. */ -enum StaScanDataFlagMask { +enum StaScanDataFlagMask : int32_t { /** * Indicates that a scan was interrupted/did not occur so results may be * incomplete.