19090 Commits

Author SHA1 Message Date
Jiyong Park
c1942ad9e7 Explicitly depend on V1 of soundtrigger.types
sountrigger.types now has V1 (frozen) and V2 (unstable).
`sountrigger.types` without the version suffix references the unstable
one and causes an ODR violation where there's a transitive dependency to
V1 (via other stable AIDL interface).

Bug: 225941299
Test: m
Change-Id: Ia7a3f002a768a4a879bb8495467c75cb11844459
2022-03-31 11:08:41 +09:00
Jiyong Park
1fd7a8dc56 Freeze AIDL APIs for TM
Bug: 225941299
Test: m
Change-Id: If987054be072b14cff68203627b82f2d3cebd26d
2022-03-31 11:08:41 +09:00
Andy Hung
240d32c201 SoundPool: Clean up attribute pointer
Test: atest SoundPoolAacTest
Test: atest SoundPoolHapticTest
Test: atest SoundPoolMidiTest
Test: atest SoundPoolOggTest
Test: atest AudioManagerTest#testSoundEffects
Test: soundpool_stress
Bug: 223815163
Change-Id: Idb2dafb9ad53dc7ffa0005425ea630fa7b7e5102
2022-03-29 09:42:04 -07:00
Shubang Lu
dabf01fb83 Merge "TIAF API review: add onError" into tm-dev 2022-03-28 23:24:13 +00:00
Andy Hung
6a1b6bc9da Merge "SoundPool: Clean up JNI weak reference handling" into tm-dev 2022-03-28 19:43:21 +00:00
Andy Hung
fdf11ed6f1 Merge "SoundPool: Clean up JNI AudioAttribute handling" into tm-dev 2022-03-28 18:51:22 +00:00
Andy Hung
62e9478875 Merge "SoundPool: Fix WeakRef lifetime" into tm-dev 2022-03-28 18:25:29 +00:00
Andy Hung
fb19b74f92 Merge "SoundPool: Fix lifetime of SoundPool native object" into tm-dev 2022-03-28 18:03:52 +00:00
shubang
832d0eb782 TIAF API review: add onError
Bug: 225388549
Test: CTS
Change-Id: I853503c2e4b388168a2eaf59883cbeaa66c5e2a9
2022-03-28 08:54:59 +00:00
Robert Wu
477735ae40 Merge "BluetoothMidiService: Remove target version" into tm-dev 2022-03-24 20:12:16 +00:00
Oscar Azucena
cb7a1fe954 Merge "Added logic to reset assistant UIDs on audio crash" into tm-dev 2022-03-24 19:22:21 +00:00
Andy Hung
337cfcbe0a SoundPool: Clean up JNI weak reference handling
Remove unnecessary JNI params and overhead.
Use weak reference entirely on the native side.

Test: atest SoundPoolAacTest
Test: atest SoundPoolHapticTest
Test: atest SoundPoolMidiTest
Test: atest SoundPoolOggTest
Test: atest AudioManagerTest#testSoundEffects
Bug: 223815163
Change-Id: I31964b27ab3e8a96f49794e78537b165e9e84ed3
2022-03-24 10:36:52 -07:00
Robert Wu
abe6b486b6 BluetoothMidiService: Remove target version
Platform APIs should not explicitly define the API version.
In Android.bp, platform_apis is set to true so the correct API
version will be chosen automatically.

Bug: 215743611
Change-Id: Ie974cbb41a1c2cb2d59991970d3d632a831c4462
Test: Verified Echo and Identity tests with MIDIMatrix
2022-03-24 17:16:52 +00:00
Andy Hung
0850300d63 SoundPool: Clean up JNI AudioAttribute handling
Test: atest SoundPoolAacTest
Test: atest SoundPoolHapticTest
Test: atest SoundPoolMidiTest
Test: atest SoundPoolOggTest
Test: atest AudioManagerTest#testSoundEffects
Bug: 223815163
Change-Id: I9a7b474408654ad65a3e2be0acf0b3add91c9fd1
2022-03-24 10:06:21 -07:00
Andy Hung
0a6c126796 SoundPool: Fix WeakRef lifetime
Ensure WeakRef lifetime is extended to duration of callback.

Test: atest SoundPoolAacTest
Test: atest SoundPoolHapticTest
Test: atest SoundPoolMidiTest
Test: atest SoundPoolOggTest
Test: atest AudioManagerTest#testSoundEffects
Bug: 223815163
Change-Id: I235ef32532d919823f1bbc4d7c90ec47311cc7ae
2022-03-24 10:02:19 -07:00
Andy Hung
48c0795054 SoundPool: Fix lifetime of SoundPool native object
Avoids race between release and Binder volume adjustment.

Test: atest SoundPoolAacTest
Test: atest SoundPoolHapticTest
Test: atest SoundPoolMidiTest
Test: atest SoundPoolOggTest
Test: atest AudioManagerTest#testSoundEffects
Bug: 223815163
Change-Id: Iac6ad878050ffc0cd1faa70abe11d3441ea34d8e
2022-03-24 09:30:46 -07:00
Yan Han
f4cdc8b1a8 Merge "AudioService: Add general support for Absolute Volume behavior" into tm-dev 2022-03-24 09:45:06 +00:00
Oscar Azucena
3ae3376064 Added logic to reset assistant UIDs on audio crash
On native audioserver recovery the assistant UIDs will reset to an empty
list, followed by adding the current role or setting holder for
assistant. Also added a settings lock around the update assistant
method. Added remove assistant UID for reset hotword detection
connection.

Bug: 222584963
Bug: 222777782
Test: atest VoiceInteractionTest
Test: atest AudioManagerTest
Test: atest HotwordDetectionServiceBasicTest
Test: kill audio server and verify assistant UIDs is not increasing
	unbounded.
Test: adb shell cmd voiceinteraction restart-detection, verify assistant
	UIDs list is not increasing unbounded.
Change-Id: I475bfee1f0bcd56a750e4fef8aa8a2b93fe090fc
2022-03-24 04:37:55 +00:00
Ray Essick
48d5cfa846 Merge "Integrate feedback from MediaMetrics API reviews" into tm-dev 2022-03-23 22:38:59 +00:00
Robert Wu
2bea42c4bd Merge "BluetoothMidi: Remove unsafe code" into tm-dev 2022-03-23 16:06:50 +00:00
Yan Han
f928348826 Merge "AudioDeviceVolumeManager: Add APIs for listeners for device volume behavior changes" into tm-dev 2022-03-23 14:44:24 +00:00
Ray Essick
2ee37d3d6a Integrate feedback from MediaMetrics API reviews
observations about missing action in close().
javadoc on some KEY_* fields.
Implement PlaybackStateEvent within BundleSession as example.

Bug: 220129161
Test: atest CtsMediaHostTestCases  (with corresponding CLs for cts)
Change-Id: I09a8be6d3f2780ca97b6b08cd33ccf35b02c245f
2022-03-22 20:56:03 -07:00
Yixiao Luo
06959ab51c Merge "[SERAPHIC][TIAF] StreamEventResponse with null data parameter will cause a null-pointer crash." into tm-dev 2022-03-22 19:18:19 +00:00
Robert Wu
6d9c9dcb5b BluetoothMidi: Remove unsafe code
In ag/16192242, several functions in Bluetooth relating to
characteristics were marked as unsafe and new ones were added.

This CL is meant to conform with these standards and potentially
remove a long standing bug.

Bug: 146385555
Test: Added Identity Reply/Request code to MIDIMatrix
and tested with Yamaha MD-BT01 for Android T->T, T->R, R->T
Change-Id: I07311296509d4d042fc92aec327f40993d2e6f54
2022-03-22 19:18:08 +00:00
Yan Han
7d4198268d AudioService: Add general support for Absolute Volume behavior
- Adds a map to store information about audio devices using absolute
  volume behavior. The map is updated when devices change behavior.
- setStreamVolume and adjustStreamVolume now notify absolute volume
  listeners after changing the stream state.
- Added option for absolute volume dispatcher to dispatch abstract
  volume adjustments (e.g. raise, lower, mute) as a result of calls to
  adjustStreamVolume. When registering the listener, the controller
  specifies whether it handles adjustments; if it does, future calls to
  adjustStreamVolume are forwarded to the controller without affecting
  stream state.
- Refactoring to support the changes above:
  - rescaleIndex is generalized to allow converting between stream and
    absolute volume ranges.
  - Volume adjustment mode constants are moved into
    AudioDeviceVolumeManager because they are needed when dispatching
    volume adjustments to absolute volume controllers.

Bug: 205817863
Test: atest AbsoluteVolumeBehaviorTest
Change-Id: Ie5fb2179adea2096bd2d226fe73b4f09b28b0cf1
2022-03-22 15:09:26 +01:00
Yan Han
19a4593771 AudioDeviceVolumeManager: Add APIs for listeners for device volume behavior changes
Add APIs for registering and unregistering a listener
for changes to any device's volume behavior.

Bug: 201781907
Test: atest DeviceVolumeBehaviorTest
Change-Id: I75b6463a73109e624ffd14b14bae3f829974f3ea
2022-03-22 11:38:22 +01:00
Yixiao Luo
925e1460ae Merge "TIAF: handling null objects in DsmccResponse class" into tm-dev 2022-03-22 03:45:34 +00:00
Yixiao Luo
a92a92fc62 [SERAPHIC][TIAF] StreamEventResponse with null data parameter will cause a null-pointer crash.
Test: atest android.media.tv.interactive.cts.TvInteractiveAppServiceTest
Bug: 224877495
Change-Id: Iab7547f27bb2e2340e42ead981877d3a52055ad4
2022-03-21 19:13:56 -07:00
Kyle Zhang
8b7f31171a Merge "Change getSupportedCryptoSchemesNative to use getSupportedSchemes" into tm-dev 2022-03-22 00:55:18 +00:00
Yixiao Luo
bbf7f2884a TIAF: handling null objects in DsmccResponse class
Bug: 225256308
Test: atest android.media.tv.interactive.cts.TvInteractiveAppServiceTest
Change-Id: I20c9a5c16ff824f39e5223623672a02edc518e77
2022-03-21 17:20:52 -07:00
Yixiao Luo
a4691b235e Merge "TIAF: Change on API Review: DTV to VOD 2" into tm-dev 2022-03-18 21:40:07 +00:00
Shubang Lu
6d26abc33d Merge "TIAF: add JavaDoc for TvInteractiveAppServiceInfo constructor" into tm-dev 2022-03-18 20:49:33 +00:00
Shubang Lu
365b716cb6 Merge "TIAF API review: remove prepare()" into tm-dev 2022-03-18 20:44:42 +00:00
Shubang Lu
6c1f109937 Merge "TIAF API review: rename onCreateBiInteractiveApp" into tm-dev 2022-03-18 20:43:14 +00:00
Kyle Zhang
621af3e560 Change getSupportedCryptoSchemesNative to use getSupportedSchemes
Bug: 225064675
Test: CtsMediaDrmFrameworkTestCases
Change-Id: I2461e17f5e97e58110b6e2a56cd699496ef253eb
2022-03-18 19:43:10 +00:00
Ray Essick
5bb3da076d Merge "Define MediaFormat crop-related constants" into tm-dev 2022-03-18 18:02:08 +00:00
Oliver Woodman
f48450217c Merge "Hide new route discovery preferences in T" into tm-dev 2022-03-18 16:55:14 +00:00
Raymond Tiong
6bdc667d3b Merge "Add recommendation to use MediaActionSound class in a background thread since it relies on binder." am: 23398e75a3 am: 2f04f34eb3 am: d44a439edf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2025024

Change-Id: I75901c3f89cbad5a4279d54a868947cf84a7446e
2022-03-18 16:04:04 +00:00
shubang
9a08a753f8 TIAF: add JavaDoc for TvInteractiveAppServiceInfo constructor
Test: mmm
Change-Id: Ifc1b584f220dffc813075ec44f57820b988b8966
2022-03-18 15:59:53 +00:00
shubang
bb50a67f88 TIAF API review: remove prepare()
It's no longer necessary and can be confusing

Bug: 219501014
Test: mmm
Change-Id: Id54f20245bb4e44cdf28f8d93b9ed413e3326410
2022-03-18 08:42:51 -07:00
shubang
1de756032c TIAF API review: rename onCreateBiInteractiveApp
Bug: 217554457
Test: CTS
Change-Id: I7096070781956af838a6e8d04ce187f4d5bbe646
2022-03-18 08:31:38 -07:00
shubang
3f49082523 TIAF API review: multiple components
Address feedback from API council

Bug: 219501014
Test: atest android.media.tv.interactive.cts.TvInteractiveAppServiceTest
Change-Id: I655483db22b9a5ad3c3e30200f887fe49e73f240
2022-03-18 07:58:28 +00:00
shubang
553d6fb7c5 TIAF: add signing request and result
Detailed call sequence can be found at
go/tiaf-use-cases

And add INTENT_KEY_COMMAND_TYPE

Bug: 224121339
Bug: 225082750
Test: atest testRequestSigning
Test: atest testSendSigningResult

Change-Id: I32b7e77dc7fc357ce168f486c28c16863bbbb3bf
2022-03-18 04:16:08 +00:00
Yixiao Luo
84edd3f63b TIAF: Change on API Review: DTV to VOD 2
Bug: 217591199
Test: atest android.media.tv.interactive.cts.TvInteractiveAppServiceTest
Change-Id: Iaa4f6d1e19f787bb38215385f8a38a14a538984d
2022-03-17 20:32:00 -07:00
Ray Essick
0f26a198ce Define MediaFormat crop-related constants
MediaFormat used literals "crop-left", "crop-right", crop-bottom
and crop-top. Define appropriate MediaFormat.KEY_XXX for these.

Bug: 178687730
Test: build, boot
Test: atest android.media.codec.cts.EncodeDecodeTest
Change-Id: I1782caa5ff320d3dca19272c5532466199ef72f0
2022-03-17 18:42:57 -07:00
Naomi Musgrave
4b563a2d37 Merge "Capture the contents of a single task" into tm-dev 2022-03-17 17:03:48 +00:00
Raymond Tiong
8c06d5e257 Add recommendation to use MediaActionSound class in a background thread since it
relies on binder.

Bug: 213174684
Test: N/A as it's a comment update
Change-Id: I01ddc0402bd27d19b2e9e7606ad327da703e8aaa
2022-03-17 15:37:51 +00:00
Jean-Michel Trivi
1b7b191bdf Merge "MediaFormat: deprecate KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT" into tm-dev 2022-03-17 14:29:49 +00:00
Jean-Michel Trivi
7e0c385a66 Merge "Spatializer: output listener fires upon registration" into tm-dev 2022-03-17 14:27:04 +00:00
Jean-Michel Trivi
beac78f252 Spatializer: output listener fires upon registration
Address API council feedback to have the output change listener
report the current output upon registration.

Bug: 203004903
Test: atest SpatializerTest
Change-Id: I858a5efef91ad113d02af6734b7b625460f29634
2022-03-16 18:48:24 -07:00