Merge "Move dvr_buffer_queue-test to use Android.mk"
diff --git a/include/audiomanager/IAudioManager.h b/include/audiomanager/IAudioManager.h
index 067dc5c..d279bbd 100644
--- a/include/audiomanager/IAudioManager.h
+++ b/include/audiomanager/IAudioManager.h
@@ -32,90 +32,10 @@
// These transaction IDs must be kept in sync with the method order from
// IAudioService.aidl.
enum {
- // transaction IDs for the unsupported methods are commented out
- /*
- ADJUSTSUGGESTEDSTREAMVOLUME = IBinder::FIRST_CALL_TRANSACTION,
- ADJUSTSTREAMVOLUME = IBinder::FIRST_CALL_TRANSACTION + 1,
- SETSTREAMVOLUME = IBinder::FIRST_CALL_TRANSACTION + 2,
- ISSTREAMMUTE = IBinder::FIRST_CALL_TRANSACTION + 3,
- FORCEREMOTESUBMIXFULLVOLUME = IBinder::FIRST_CALL_TRANSACTION + 4,
- ISMASTERMUTE = IBinder::FIRST_CALL_TRANSACTION + 5,
- SETMASTERMUTE = IBinder::FIRST_CALL_TRANSACTION + 6,
- GETSTREAMVOLUME = IBinder::FIRST_CALL_TRANSACTION + 7,
- GETSTREAMMINVOLUME = IBinder::FIRST_CALL_TRANSACTION + 8,
- GETSTREAMMAXVOLUME = IBinder::FIRST_CALL_TRANSACTION + 9,
- GETLASTAUDIBLESTREAMVOLUME = IBinder::FIRST_CALL_TRANSACTION + 10,
- SETMICROPHONEMUTE = IBinder::FIRST_CALL_TRANSACTION + 11,
- SETRINGERMODEEXTERNAL = IBinder::FIRST_CALL_TRANSACTION + 12,
- SETRINGERMODEINTERNAL = IBinder::FIRST_CALL_TRANSACTION + 13,
- GETRINGERMODEEXTERNAL = IBinder::FIRST_CALL_TRANSACTION + 14,
- GETRINGERMODEINTERNAL = IBinder::FIRST_CALL_TRANSACTION + 15,
- ISVALIDRINGERMODE = IBinder::FIRST_CALL_TRANSACTION + 16,
- SETVIBRATESETTING = IBinder::FIRST_CALL_TRANSACTION + 17,
- GETVIBRATESETTING = IBinder::FIRST_CALL_TRANSACTION + 18,
- SHOULDVIBRATE = IBinder::FIRST_CALL_TRANSACTION + 19,
- SETMODE = IBinder::FIRST_CALL_TRANSACTION + 20,
- GETMODE = IBinder::FIRST_CALL_TRANSACTION + 21,
- PLAYSOUNDEFFECT = IBinder::FIRST_CALL_TRANSACTION + 22,
- PLAYSOUNDEFFECTVOLUME = IBinder::FIRST_CALL_TRANSACTION + 23,
- LOADSOUNDEFFECTS = IBinder::FIRST_CALL_TRANSACTION + 24,
- UNLOADSOUNDEFFECTS = IBinder::FIRST_CALL_TRANSACTION + 25,
- RELOADAUDIOSETTINGS = IBinder::FIRST_CALL_TRANSACTION + 26,
- AVRCPSUPPORTSABSOLUTEVOLUME = IBinder::FIRST_CALL_TRANSACTION + 27,
- SETSPEAKERPHONEON = IBinder::FIRST_CALL_TRANSACTION + 28,
- ISSPEAKERPHONEON = IBinder::FIRST_CALL_TRANSACTION + 29,
- SETBLUETOOTHSCOON = IBinder::FIRST_CALL_TRANSACTION + 30,
- ISBLUETOOTHSCOON = IBinder::FIRST_CALL_TRANSACTION + 31,
- SETBLUETOOTHA2DPON = IBinder::FIRST_CALL_TRANSACTION + 32,
- ISBLUETOOTHA2DPON = IBinder::FIRST_CALL_TRANSACTION + 33,
- REQUESTAUDIOFOCUS = IBinder::FIRST_CALL_TRANSACTION + 34,
- ABANDONAUDIOFOCUS = IBinder::FIRST_CALL_TRANSACTION + 35,
- UNREGISTERAUDIOFOCUSCLIENT = IBinder::FIRST_CALL_TRANSACTION + 36,
- GETCURRENTAUDIOFOCUS = IBinder::FIRST_CALL_TRANSACTION + 37,
- STARTBLUETOOTHSCO = IBinder::FIRST_CALL_TRANSACTION + 38,
- STARTBLUETOOTHSCOVIRTUALCALL = IBinder::FIRST_CALL_TRANSACTION + 39,
- STOPBLUETOOTHSCO = IBinder::FIRST_CALL_TRANSACTION + 40,
- FORCEVOLUMECONTROLSTREAM = IBinder::FIRST_CALL_TRANSACTION + 41,
- SETRINGTONEPLAYER = IBinder::FIRST_CALL_TRANSACTION + 42,
- GETRINGTONEPLAYER = IBinder::FIRST_CALL_TRANSACTION + 43,
- GETUISOUNDSSTREAMTYPE = IBinder::FIRST_CALL_TRANSACTION + 44,
- SETWIREDDEVICECONNECTIONSTATE = IBinder::FIRST_CALL_TRANSACTION + 45,
- SETBLUETOOTHA2DPDEVICECONNECTIONSTATE = IBinder::FIRST_CALL_TRANSACTION + 46,
- HANDLEBLUETOOTHA2DPDEVICECONFIGCHANGE = IBinder::FIRST_CALL_TRANSACTION + 47,
- STARTWATCHINGROUTES = IBinder::FIRST_CALL_TRANSACTION + 48,
- ISCAMERASOUNDFORCED = IBinder::FIRST_CALL_TRANSACTION + 49,
- SETVOLUMECONTROLLER = IBinder::FIRST_CALL_TRANSACTION + 50,
- NOTIFYVOLUMECONTROLLERVISIBLE = IBinder::FIRST_CALL_TRANSACTION + 51,
- ISSTREAMAFFECTEDBYRINGERMODE = IBinder::FIRST_CALL_TRANSACTION + 52,
- ISSTREAMAFFECTEDBYMUTE = IBinder::FIRST_CALL_TRANSACTION + 53,
- DISABLESAFEMEDIAVOLUME = IBinder::FIRST_CALL_TRANSACTION + 54,
- SETHDMISYSTEMAUDIOSUPPORTED = IBinder::FIRST_CALL_TRANSACTION + 55,
- ISHDMISYSTEMAUDIOSUPPORTED = IBinder::FIRST_CALL_TRANSACTION + 56,
- REGISTERAUDIOPOLICY = IBinder::FIRST_CALL_TRANSACTION + 57,
- UNREGISTERAUDIOPOLICYASYNC = IBinder::FIRST_CALL_TRANSACTION + 58,
- SETFOCUSPROPERTIESFORPOLICY = IBinder::FIRST_CALL_TRANSACTION + 59,
- SETVOLUMEPOLICY = IBinder::FIRST_CALL_TRANSACTION + 60,
- REGISTERRECORDINGCALLBACK = IBinder::FIRST_CALL_TRANSACTION + 61,
- UNREGISTERRECORDINGCALLBACK = IBinder::FIRST_CALL_TRANSACTION + 62,
- GETACTIVERECORDINGCONFIGURATIONS = IBinder::FIRST_CALL_TRANSACTION + 63,
- REGISTERPLAYBACKCALLBACK = IBinder::FIRST_CALL_TRANSACTION + 64,
- UNREGISTERPLAYBACKCALLBACK = IBinder::FIRST_CALL_TRANSACTION + 65,
- GETACTIVEPLAYBACKCONFIGURATIONS = IBinder::FIRST_CALL_TRANSACTION + 66,
- */
-
- TRACK_PLAYER = IBinder::FIRST_CALL_TRANSACTION + 67,
- PLAYER_ATTRIBUTES = IBinder::FIRST_CALL_TRANSACTION + 68,
- PLAYER_EVENT = IBinder::FIRST_CALL_TRANSACTION + 69,
- RELEASE_PLAYER = IBinder::FIRST_CALL_TRANSACTION + 70,
-
- /*
- DISABLE_RINGTONE_SYNC = IBinder::FIRST_CALL_TRANSACTION + 71,
- GET_FOCUS_RAMP_TIME_MS = IBinder::FIRST_CALL_TRANSACTION + 72,
- DISPATCH_FOCUS_CHANGE = IBinder::FIRST_CALL_TRANSACTION + 73,
- PLAYER_HAS_OP_PLAY_AUDIO = IBinder::FIRST_CALL_TRANSACTION + 74,
- SET_BLUETOOTH_A2DP_DEVICE_CONNECTION_STATE_SUPPRESS_NOISY_INTENT
- = IBinder::FIRST_CALL_TRANSACTION + 75,
- */
+ TRACK_PLAYER = IBinder::FIRST_CALL_TRANSACTION,
+ PLAYER_ATTRIBUTES = IBinder::FIRST_CALL_TRANSACTION + 1,
+ PLAYER_EVENT = IBinder::FIRST_CALL_TRANSACTION + 2,
+ RELEASE_PLAYER = IBinder::FIRST_CALL_TRANSACTION + 3,
};
DECLARE_META_INTERFACE(AudioManager)