Noop: aidl_api changes caused by b/262594867.
Update to AudioDeviceDescription triggers updates to current snapshots.
Test: m android.media.audio.common.types-update-api
Bug: 205884982
Change-Id: I7fdc4a092600999cc856043254c771346bfac4b2
diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioAttributes.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioAttributes.aidl
index 6d5e234..7dcb1a7 100644
--- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioAttributes.aidl
+++ b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioAttributes.aidl
@@ -37,6 +37,6 @@
android.media.audio.common.AudioContentType contentType = android.media.audio.common.AudioContentType.UNKNOWN;
android.media.audio.common.AudioUsage usage = android.media.audio.common.AudioUsage.UNKNOWN;
android.media.audio.common.AudioSource source = android.media.audio.common.AudioSource.DEFAULT;
- int flags = 0;
+ int flags = android.media.audio.common.AudioFlag.NONE;
@utf8InCpp String[] tags;
}
diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioChannelLayout.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioChannelLayout.aidl
index 6845ac1..838c933 100644
--- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioChannelLayout.aidl
+++ b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioChannelLayout.aidl
@@ -40,95 +40,95 @@
int indexMask;
int layoutMask;
int voiceMask;
- const int INDEX_MASK_1 = 1;
- const int INDEX_MASK_2 = 3;
- const int INDEX_MASK_3 = 7;
- const int INDEX_MASK_4 = 15;
- const int INDEX_MASK_5 = 31;
- const int INDEX_MASK_6 = 63;
- const int INDEX_MASK_7 = 127;
- const int INDEX_MASK_8 = 255;
- const int INDEX_MASK_9 = 511;
- const int INDEX_MASK_10 = 1023;
- const int INDEX_MASK_11 = 2047;
- const int INDEX_MASK_12 = 4095;
- const int INDEX_MASK_13 = 8191;
- const int INDEX_MASK_14 = 16383;
- const int INDEX_MASK_15 = 32767;
- const int INDEX_MASK_16 = 65535;
- const int INDEX_MASK_17 = 131071;
- const int INDEX_MASK_18 = 262143;
- const int INDEX_MASK_19 = 524287;
- const int INDEX_MASK_20 = 1048575;
- const int INDEX_MASK_21 = 2097151;
- const int INDEX_MASK_22 = 4194303;
- const int INDEX_MASK_23 = 8388607;
- const int INDEX_MASK_24 = 16777215;
- const int LAYOUT_MONO = 1;
- const int LAYOUT_STEREO = 3;
- const int LAYOUT_2POINT1 = 11;
- const int LAYOUT_TRI = 7;
- const int LAYOUT_TRI_BACK = 259;
- const int LAYOUT_3POINT1 = 15;
- const int LAYOUT_2POINT0POINT2 = 786435;
- const int LAYOUT_2POINT1POINT2 = 786443;
- const int LAYOUT_3POINT0POINT2 = 786439;
- const int LAYOUT_3POINT1POINT2 = 786447;
- const int LAYOUT_QUAD = 51;
- const int LAYOUT_QUAD_SIDE = 1539;
- const int LAYOUT_SURROUND = 263;
- const int LAYOUT_PENTA = 55;
- const int LAYOUT_5POINT1 = 63;
- const int LAYOUT_5POINT1_SIDE = 1551;
- const int LAYOUT_5POINT1POINT2 = 786495;
- const int LAYOUT_5POINT1POINT4 = 184383;
- const int LAYOUT_6POINT1 = 319;
- const int LAYOUT_7POINT1 = 1599;
- const int LAYOUT_7POINT1POINT2 = 788031;
- const int LAYOUT_7POINT1POINT4 = 185919;
- const int LAYOUT_9POINT1POINT4 = 50517567;
- const int LAYOUT_9POINT1POINT6 = 51303999;
- const int LAYOUT_13POINT_360RA = 7534087;
- const int LAYOUT_22POINT2 = 16777215;
- const int LAYOUT_MONO_HAPTIC_A = 1073741825;
- const int LAYOUT_STEREO_HAPTIC_A = 1073741827;
- const int LAYOUT_HAPTIC_AB = 1610612736;
- const int LAYOUT_MONO_HAPTIC_AB = 1610612737;
- const int LAYOUT_STEREO_HAPTIC_AB = 1610612739;
- const int LAYOUT_FRONT_BACK = 260;
+ const int INDEX_MASK_1 = ((1 << 1) - 1);
+ const int INDEX_MASK_2 = ((1 << 2) - 1);
+ const int INDEX_MASK_3 = ((1 << 3) - 1);
+ const int INDEX_MASK_4 = ((1 << 4) - 1);
+ const int INDEX_MASK_5 = ((1 << 5) - 1);
+ const int INDEX_MASK_6 = ((1 << 6) - 1);
+ const int INDEX_MASK_7 = ((1 << 7) - 1);
+ const int INDEX_MASK_8 = ((1 << 8) - 1);
+ const int INDEX_MASK_9 = ((1 << 9) - 1);
+ const int INDEX_MASK_10 = ((1 << 10) - 1);
+ const int INDEX_MASK_11 = ((1 << 11) - 1);
+ const int INDEX_MASK_12 = ((1 << 12) - 1);
+ const int INDEX_MASK_13 = ((1 << 13) - 1);
+ const int INDEX_MASK_14 = ((1 << 14) - 1);
+ const int INDEX_MASK_15 = ((1 << 15) - 1);
+ const int INDEX_MASK_16 = ((1 << 16) - 1);
+ const int INDEX_MASK_17 = ((1 << 17) - 1);
+ const int INDEX_MASK_18 = ((1 << 18) - 1);
+ const int INDEX_MASK_19 = ((1 << 19) - 1);
+ const int INDEX_MASK_20 = ((1 << 20) - 1);
+ const int INDEX_MASK_21 = ((1 << 21) - 1);
+ const int INDEX_MASK_22 = ((1 << 22) - 1);
+ const int INDEX_MASK_23 = ((1 << 23) - 1);
+ const int INDEX_MASK_24 = ((1 << 24) - 1);
+ const int LAYOUT_MONO = CHANNEL_FRONT_LEFT;
+ const int LAYOUT_STEREO = (CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT);
+ const int LAYOUT_2POINT1 = ((CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT) | CHANNEL_LOW_FREQUENCY);
+ const int LAYOUT_TRI = ((CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT) | CHANNEL_FRONT_CENTER);
+ const int LAYOUT_TRI_BACK = ((CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT) | CHANNEL_BACK_CENTER);
+ const int LAYOUT_3POINT1 = (((CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT) | CHANNEL_FRONT_CENTER) | CHANNEL_LOW_FREQUENCY);
+ const int LAYOUT_2POINT0POINT2 = (((CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT) | CHANNEL_TOP_SIDE_LEFT) | CHANNEL_TOP_SIDE_RIGHT);
+ const int LAYOUT_2POINT1POINT2 = (LAYOUT_2POINT0POINT2 | CHANNEL_LOW_FREQUENCY);
+ const int LAYOUT_3POINT0POINT2 = ((((CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT) | CHANNEL_FRONT_CENTER) | CHANNEL_TOP_SIDE_LEFT) | CHANNEL_TOP_SIDE_RIGHT);
+ const int LAYOUT_3POINT1POINT2 = (LAYOUT_3POINT0POINT2 | CHANNEL_LOW_FREQUENCY);
+ const int LAYOUT_QUAD = (((CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT) | CHANNEL_BACK_LEFT) | CHANNEL_BACK_RIGHT);
+ const int LAYOUT_QUAD_SIDE = (((CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT) | CHANNEL_SIDE_LEFT) | CHANNEL_SIDE_RIGHT);
+ const int LAYOUT_SURROUND = (((CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT) | CHANNEL_FRONT_CENTER) | CHANNEL_BACK_CENTER);
+ const int LAYOUT_PENTA = (LAYOUT_QUAD | CHANNEL_FRONT_CENTER);
+ const int LAYOUT_5POINT1 = (((((CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT) | CHANNEL_FRONT_CENTER) | CHANNEL_LOW_FREQUENCY) | CHANNEL_BACK_LEFT) | CHANNEL_BACK_RIGHT);
+ const int LAYOUT_5POINT1_SIDE = (((((CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT) | CHANNEL_FRONT_CENTER) | CHANNEL_LOW_FREQUENCY) | CHANNEL_SIDE_LEFT) | CHANNEL_SIDE_RIGHT);
+ const int LAYOUT_5POINT1POINT2 = ((LAYOUT_5POINT1 | CHANNEL_TOP_SIDE_LEFT) | CHANNEL_TOP_SIDE_RIGHT);
+ const int LAYOUT_5POINT1POINT4 = ((((LAYOUT_5POINT1 | CHANNEL_TOP_FRONT_LEFT) | CHANNEL_TOP_FRONT_RIGHT) | CHANNEL_TOP_BACK_LEFT) | CHANNEL_TOP_BACK_RIGHT);
+ const int LAYOUT_6POINT1 = ((((((CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT) | CHANNEL_FRONT_CENTER) | CHANNEL_LOW_FREQUENCY) | CHANNEL_BACK_LEFT) | CHANNEL_BACK_RIGHT) | CHANNEL_BACK_CENTER);
+ const int LAYOUT_7POINT1 = ((LAYOUT_5POINT1 | CHANNEL_SIDE_LEFT) | CHANNEL_SIDE_RIGHT);
+ const int LAYOUT_7POINT1POINT2 = ((LAYOUT_7POINT1 | CHANNEL_TOP_SIDE_LEFT) | CHANNEL_TOP_SIDE_RIGHT);
+ const int LAYOUT_7POINT1POINT4 = ((((LAYOUT_7POINT1 | CHANNEL_TOP_FRONT_LEFT) | CHANNEL_TOP_FRONT_RIGHT) | CHANNEL_TOP_BACK_LEFT) | CHANNEL_TOP_BACK_RIGHT);
+ const int LAYOUT_9POINT1POINT4 = ((LAYOUT_7POINT1POINT4 | CHANNEL_FRONT_WIDE_LEFT) | CHANNEL_FRONT_WIDE_RIGHT);
+ const int LAYOUT_9POINT1POINT6 = ((LAYOUT_9POINT1POINT4 | CHANNEL_TOP_SIDE_LEFT) | CHANNEL_TOP_SIDE_RIGHT);
+ const int LAYOUT_13POINT_360RA = ((((((((((((CHANNEL_FRONT_LEFT | CHANNEL_FRONT_RIGHT) | CHANNEL_FRONT_CENTER) | CHANNEL_SIDE_LEFT) | CHANNEL_SIDE_RIGHT) | CHANNEL_TOP_FRONT_LEFT) | CHANNEL_TOP_FRONT_RIGHT) | CHANNEL_TOP_FRONT_CENTER) | CHANNEL_TOP_BACK_LEFT) | CHANNEL_TOP_BACK_RIGHT) | CHANNEL_BOTTOM_FRONT_LEFT) | CHANNEL_BOTTOM_FRONT_RIGHT) | CHANNEL_BOTTOM_FRONT_CENTER);
+ const int LAYOUT_22POINT2 = ((((((((((((LAYOUT_7POINT1POINT4 | CHANNEL_FRONT_LEFT_OF_CENTER) | CHANNEL_FRONT_RIGHT_OF_CENTER) | CHANNEL_BACK_CENTER) | CHANNEL_TOP_CENTER) | CHANNEL_TOP_FRONT_CENTER) | CHANNEL_TOP_BACK_CENTER) | CHANNEL_TOP_SIDE_LEFT) | CHANNEL_TOP_SIDE_RIGHT) | CHANNEL_BOTTOM_FRONT_LEFT) | CHANNEL_BOTTOM_FRONT_RIGHT) | CHANNEL_BOTTOM_FRONT_CENTER) | CHANNEL_LOW_FREQUENCY_2);
+ const int LAYOUT_MONO_HAPTIC_A = (LAYOUT_MONO | CHANNEL_HAPTIC_A);
+ const int LAYOUT_STEREO_HAPTIC_A = (LAYOUT_STEREO | CHANNEL_HAPTIC_A);
+ const int LAYOUT_HAPTIC_AB = (CHANNEL_HAPTIC_A | CHANNEL_HAPTIC_B);
+ const int LAYOUT_MONO_HAPTIC_AB = (LAYOUT_MONO | LAYOUT_HAPTIC_AB);
+ const int LAYOUT_STEREO_HAPTIC_AB = (LAYOUT_STEREO | LAYOUT_HAPTIC_AB);
+ const int LAYOUT_FRONT_BACK = (CHANNEL_FRONT_CENTER | CHANNEL_BACK_CENTER);
const int INTERLEAVE_LEFT = 0;
const int INTERLEAVE_RIGHT = 1;
- const int CHANNEL_FRONT_LEFT = 1;
- const int CHANNEL_FRONT_RIGHT = 2;
- const int CHANNEL_FRONT_CENTER = 4;
- const int CHANNEL_LOW_FREQUENCY = 8;
- const int CHANNEL_BACK_LEFT = 16;
- const int CHANNEL_BACK_RIGHT = 32;
- const int CHANNEL_FRONT_LEFT_OF_CENTER = 64;
- const int CHANNEL_FRONT_RIGHT_OF_CENTER = 128;
- const int CHANNEL_BACK_CENTER = 256;
- const int CHANNEL_SIDE_LEFT = 512;
- const int CHANNEL_SIDE_RIGHT = 1024;
- const int CHANNEL_TOP_CENTER = 2048;
- const int CHANNEL_TOP_FRONT_LEFT = 4096;
- const int CHANNEL_TOP_FRONT_CENTER = 8192;
- const int CHANNEL_TOP_FRONT_RIGHT = 16384;
- const int CHANNEL_TOP_BACK_LEFT = 32768;
- const int CHANNEL_TOP_BACK_CENTER = 65536;
- const int CHANNEL_TOP_BACK_RIGHT = 131072;
- const int CHANNEL_TOP_SIDE_LEFT = 262144;
- const int CHANNEL_TOP_SIDE_RIGHT = 524288;
- const int CHANNEL_BOTTOM_FRONT_LEFT = 1048576;
- const int CHANNEL_BOTTOM_FRONT_CENTER = 2097152;
- const int CHANNEL_BOTTOM_FRONT_RIGHT = 4194304;
- const int CHANNEL_LOW_FREQUENCY_2 = 8388608;
- const int CHANNEL_FRONT_WIDE_LEFT = 16777216;
- const int CHANNEL_FRONT_WIDE_RIGHT = 33554432;
- const int CHANNEL_HAPTIC_B = 536870912;
- const int CHANNEL_HAPTIC_A = 1073741824;
- const int VOICE_UPLINK_MONO = 16384;
- const int VOICE_DNLINK_MONO = 32768;
- const int VOICE_CALL_MONO = 49152;
- const int CHANNEL_VOICE_UPLINK = 16384;
- const int CHANNEL_VOICE_DNLINK = 32768;
+ const int CHANNEL_FRONT_LEFT = (1 << 0);
+ const int CHANNEL_FRONT_RIGHT = (1 << 1);
+ const int CHANNEL_FRONT_CENTER = (1 << 2);
+ const int CHANNEL_LOW_FREQUENCY = (1 << 3);
+ const int CHANNEL_BACK_LEFT = (1 << 4);
+ const int CHANNEL_BACK_RIGHT = (1 << 5);
+ const int CHANNEL_FRONT_LEFT_OF_CENTER = (1 << 6);
+ const int CHANNEL_FRONT_RIGHT_OF_CENTER = (1 << 7);
+ const int CHANNEL_BACK_CENTER = (1 << 8);
+ const int CHANNEL_SIDE_LEFT = (1 << 9);
+ const int CHANNEL_SIDE_RIGHT = (1 << 10);
+ const int CHANNEL_TOP_CENTER = (1 << 11);
+ const int CHANNEL_TOP_FRONT_LEFT = (1 << 12);
+ const int CHANNEL_TOP_FRONT_CENTER = (1 << 13);
+ const int CHANNEL_TOP_FRONT_RIGHT = (1 << 14);
+ const int CHANNEL_TOP_BACK_LEFT = (1 << 15);
+ const int CHANNEL_TOP_BACK_CENTER = (1 << 16);
+ const int CHANNEL_TOP_BACK_RIGHT = (1 << 17);
+ const int CHANNEL_TOP_SIDE_LEFT = (1 << 18);
+ const int CHANNEL_TOP_SIDE_RIGHT = (1 << 19);
+ const int CHANNEL_BOTTOM_FRONT_LEFT = (1 << 20);
+ const int CHANNEL_BOTTOM_FRONT_CENTER = (1 << 21);
+ const int CHANNEL_BOTTOM_FRONT_RIGHT = (1 << 22);
+ const int CHANNEL_LOW_FREQUENCY_2 = (1 << 23);
+ const int CHANNEL_FRONT_WIDE_LEFT = (1 << 24);
+ const int CHANNEL_FRONT_WIDE_RIGHT = (1 << 25);
+ const int CHANNEL_HAPTIC_B = (1 << 29);
+ const int CHANNEL_HAPTIC_A = (1 << 30);
+ const int VOICE_UPLINK_MONO = CHANNEL_VOICE_UPLINK;
+ const int VOICE_DNLINK_MONO = CHANNEL_VOICE_DNLINK;
+ const int VOICE_CALL_MONO = (CHANNEL_VOICE_UPLINK | CHANNEL_VOICE_DNLINK);
+ const int CHANNEL_VOICE_UPLINK = 0x4000;
+ const int CHANNEL_VOICE_DNLINK = 0x8000;
}
diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioEncapsulationMode.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioEncapsulationMode.aidl
index 0cf2f31..0401755 100644
--- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioEncapsulationMode.aidl
+++ b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioEncapsulationMode.aidl
@@ -35,7 +35,7 @@
/* @hide */
@Backing(type="byte") @VintfStability
enum AudioEncapsulationMode {
- INVALID = -1,
+ INVALID = (-1),
NONE = 0,
ELEMENTARY_STREAM = 1,
HANDLE = 2,
diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioFlag.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioFlag.aidl
index 3138531..77139a1 100644
--- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioFlag.aidl
+++ b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioFlag.aidl
@@ -34,21 +34,21 @@
package android.media.audio.common;
@Backing(type="int") @VintfStability
enum AudioFlag {
- NONE = 0,
- AUDIBILITY_ENFORCED = 1,
- SCO = 4,
- BEACON = 8,
- HW_AV_SYNC = 16,
- HW_HOTWORD = 32,
- BYPASS_INTERRUPTION_POLICY = 64,
- BYPASS_MUTE = 128,
- LOW_LATENCY = 256,
- DEEP_BUFFER = 512,
- NO_MEDIA_PROJECTION = 1024,
- MUTE_HAPTIC = 2048,
- NO_SYSTEM_CAPTURE = 4096,
- CAPTURE_PRIVATE = 8192,
- CONTENT_SPATIALIZED = 16384,
- NEVER_SPATIALIZE = 32768,
- CALL_REDIRECTION = 65536,
+ NONE = 0x0,
+ AUDIBILITY_ENFORCED = (0x1 << 0),
+ SCO = (0x1 << 2),
+ BEACON = (0x1 << 3),
+ HW_AV_SYNC = (0x1 << 4),
+ HW_HOTWORD = (0x1 << 5),
+ BYPASS_INTERRUPTION_POLICY = (0x1 << 6),
+ BYPASS_MUTE = (0x1 << 7),
+ LOW_LATENCY = (0x1 << 8),
+ DEEP_BUFFER = (0x1 << 9),
+ NO_MEDIA_PROJECTION = (0x1 << 10),
+ MUTE_HAPTIC = (0x1 << 11),
+ NO_SYSTEM_CAPTURE = (0x1 << 12),
+ CAPTURE_PRIVATE = (0x1 << 13),
+ CONTENT_SPATIALIZED = (0x1 << 14),
+ NEVER_SPATIALIZE = (0x1 << 15),
+ CALL_REDIRECTION = (0x1 << 16),
}
diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioFormatType.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioFormatType.aidl
index 7f55abe..3b3b996 100644
--- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioFormatType.aidl
+++ b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioFormatType.aidl
@@ -36,7 +36,7 @@
@Backing(type="byte") @VintfStability
enum AudioFormatType {
DEFAULT = 0,
- NON_PCM = 0,
+ NON_PCM = DEFAULT,
PCM = 1,
- SYS_RESERVED_INVALID = -1,
+ SYS_RESERVED_INVALID = (-1),
}
diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioHalEngineConfig.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioHalEngineConfig.aidl
index 3b007c5..07f0452 100644
--- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioHalEngineConfig.aidl
+++ b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioHalEngineConfig.aidl
@@ -34,7 +34,7 @@
package android.media.audio.common;
@JavaDerive(equals=true, toString=true) @VintfStability
parcelable AudioHalEngineConfig {
- int defaultProductStrategyId = -1;
+ int defaultProductStrategyId = android.media.audio.common.AudioProductStrategyType.SYS_RESERVED_NONE;
android.media.audio.common.AudioHalProductStrategy[] productStrategies;
android.media.audio.common.AudioHalVolumeGroup[] volumeGroups;
@nullable android.media.audio.common.AudioHalEngineConfig.CapSpecificConfig capSpecificConfig;
diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioHalProductStrategy.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioHalProductStrategy.aidl
index dc2dde1..b9cb9ac 100644
--- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioHalProductStrategy.aidl
+++ b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioHalProductStrategy.aidl
@@ -34,7 +34,7 @@
package android.media.audio.common;
@JavaDerive(equals=true, toString=true) @VintfStability
parcelable AudioHalProductStrategy {
- int id = -1;
+ int id = android.media.audio.common.AudioProductStrategyType.SYS_RESERVED_NONE;
android.media.audio.common.AudioHalAttributesGroup[] attributesGroups;
const int VENDOR_STRATEGY_ID_START = 1000;
}
diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioHalVolumeGroup.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioHalVolumeGroup.aidl
index db0cbc1..6cbd9bb 100644
--- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioHalVolumeGroup.aidl
+++ b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioHalVolumeGroup.aidl
@@ -38,5 +38,5 @@
int minIndex;
int maxIndex;
android.media.audio.common.AudioHalVolumeCurve[] volumeCurves;
- const int INDEX_DEFERRED_TO_AUDIO_SERVICE = -1;
+ const int INDEX_DEFERRED_TO_AUDIO_SERVICE = (-1);
}
diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioMode.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioMode.aidl
index 8256c1c..83990da 100644
--- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioMode.aidl
+++ b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioMode.aidl
@@ -35,8 +35,8 @@
/* @hide */
@Backing(type="int") @VintfStability
enum AudioMode {
- SYS_RESERVED_INVALID = -2,
- SYS_RESERVED_CURRENT = -1,
+ SYS_RESERVED_INVALID = (-2),
+ SYS_RESERVED_CURRENT = (-1),
NORMAL = 0,
RINGTONE = 1,
IN_CALL = 2,
diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPlaybackRate.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPlaybackRate.aidl
index 1e94f22..5641bcb 100644
--- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPlaybackRate.aidl
+++ b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioPlaybackRate.aidl
@@ -45,7 +45,7 @@
}
@Backing(type="int") @VintfStability
enum TimestretchFallbackMode {
- SYS_RESERVED_CUT_REPEAT = -1,
+ SYS_RESERVED_CUT_REPEAT = (-1),
SYS_RESERVED_DEFAULT = 0,
MUTE = 1,
FAIL = 2,
diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioProductStrategyType.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioProductStrategyType.aidl
index dd04312..960199e 100644
--- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioProductStrategyType.aidl
+++ b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioProductStrategyType.aidl
@@ -34,7 +34,7 @@
package android.media.audio.common;
@Backing(type="byte") @VintfStability
enum AudioProductStrategyType {
- SYS_RESERVED_NONE = -1,
+ SYS_RESERVED_NONE = (-1),
MEDIA = 0,
PHONE = 1,
SONIFICATION = 2,
diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioSource.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioSource.aidl
index acf822e..d3ded97 100644
--- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioSource.aidl
+++ b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioSource.aidl
@@ -35,7 +35,7 @@
/* @hide */
@Backing(type="int") @VintfStability
enum AudioSource {
- SYS_RESERVED_INVALID = -1,
+ SYS_RESERVED_INVALID = (-1),
DEFAULT = 0,
MIC = 1,
VOICE_UPLINK = 2,
diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioStreamType.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioStreamType.aidl
index bcfd374..8af812b 100644
--- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioStreamType.aidl
+++ b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioStreamType.aidl
@@ -35,8 +35,8 @@
/* @hide */
@Backing(type="int") @VintfStability
enum AudioStreamType {
- INVALID = -2,
- SYS_RESERVED_DEFAULT = -1,
+ INVALID = (-2),
+ SYS_RESERVED_DEFAULT = (-1),
VOICE_CALL = 0,
SYSTEM = 1,
RING = 2,
diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioUsage.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioUsage.aidl
index 4c72455..6bad811 100644
--- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioUsage.aidl
+++ b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/AudioUsage.aidl
@@ -35,7 +35,7 @@
/* @hide */
@Backing(type="int") @VintfStability
enum AudioUsage {
- INVALID = -1,
+ INVALID = (-1),
UNKNOWN = 0,
MEDIA = 1,
VOICE_COMMUNICATION = 2,
diff --git a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/PcmType.aidl b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/PcmType.aidl
index 79bfa62..b2f3686 100644
--- a/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/PcmType.aidl
+++ b/media/aidl_api/android.media.audio.common.types/current/android/media/audio/common/PcmType.aidl
@@ -36,7 +36,7 @@
@Backing(type="byte") @VintfStability
enum PcmType {
DEFAULT = 0,
- UINT_8_BIT = 0,
+ UINT_8_BIT = DEFAULT,
INT_16_BIT = 1,
INT_32_BIT = 2,
FIXED_Q_8_24 = 3,
