Commit Graph

11385 Commits

Author SHA1 Message Date
David Zhao
3d254be3c2 Merge "Add requestStopRecording APIs" 2022-11-15 00:02:18 +00:00
Santiago Seifert
2a1b07f152 Simplify looper selection when instantiating MediaSession
This change essentially replaces new Handler().getLooper() with
Looper.myLooper().

Bug: 205124386
Change-Id: If2d9664d6844cf4fa2cb97b3724854db506985a3
Test: Presubmit.
2022-11-13 19:11:07 +00:00
Iván Budnik
4e72b9846e Merge "Rename selectRoute(String, MediaRoute2Info) to transfer()" 2022-11-11 11:17:46 +00:00
Eric Laurent
4a8b7d7f9b Merge changes from topic "fix-b-255477173-aptx-formats" am: 4872186e0b am: 526354de36 am: a14bf11804
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2277189

Change-Id: I3af58e9187b1edc6ac6ef9a6a59620077e7704eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-10 13:32:29 +00:00
Mikhail Naganov
8f2294af2e AudioSystem: add missing native audio formats am: 9b914446d3 am: cae458e44a am: 40fd5afd41
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2277188

Change-Id: Idf827b6d59725f901f46ac3186b2c5e0b35f7a20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-10 13:31:21 +00:00
David Zhao
08953f55d2 Add requestStopRecording APIs
Bug: 256713311
Test: atest
Change-Id: I007f77f9480546095e98eb17670169b1861685d1
2022-11-09 16:09:30 -08:00
TreeHugger Robot
2d4746d1aa Merge "Reuse ringtone across multiple ringer operations" 2022-11-09 19:26:37 +00:00
Iván Budnik
5bf22a1ffc Rename selectRoute(String, MediaRoute2Info) to transfer()
The new method represents the real underlying operation, which is a
routing session transfer to a different device. The appropriate method
for route selection is selectRoute(RoutingSessionInfo, MediaRoute2Info).

This change is a non-functional refactor.

Bug: 238178508
Bug: 205124386
Test: atest CtsMediaBetterTogetherTestCases MediaDeviceTest
MediaRouter2Manager InfoMediaManagerTest

Change-Id: Ic199686849365138049ccb73189bbc03703117b1
2022-11-09 14:57:47 +00:00
Eric Laurent
526354de36 Merge changes from topic "fix-b-255477173-aptx-formats" am: 4872186e0b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2277189

Change-Id: Id3f6cf75875bc9bcb799b1822c5cf7c36cda2348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-09 09:11:30 +00:00
Mikhail Naganov
cae458e44a AudioSystem: add missing native audio formats am: 9b914446d3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2277188

Change-Id: I0467ac32b1bfb02707484945b74de01a8abe8b02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-09 09:11:21 +00:00
Mikhail Naganov
72eb0b689c AudioSystem: Add AUDIO_FORMAT_APTX_ADAPTIVE_{QLEA|R4}
This adds new flavors of the APTX codec.

Bug: 255477173
Test: m
Change-Id: I600496f857cb290ff8b279ba6791622e458a209f
2022-11-08 19:00:04 +00:00
Mikhail Naganov
9b914446d3 AudioSystem: add missing native audio formats
Add missing native audio formats to audioFormatToString.

Bug: 255477173
Test: m
Change-Id: I4f13e7527ad407b0141cb4895083abc0e5b33df2
2022-11-08 18:58:46 +00:00
David Zhao
bd45073af0 Merge "Unhide notifyRecordingStarted API" 2022-11-03 22:59:03 +00:00
David Zhao
1a77f0874b Merge "Unhide requestStartRecording APIs" 2022-11-03 22:58:00 +00:00
David Zhao
c555dd0189 Unhide notifyRecordingStarted API
Bug: 252888452
Test: atest
Change-Id: Ie40b57389d3f1a03fe098cd17d07286f6bb029ab
2022-11-03 00:35:01 +00:00
Vlad Popa
39ca328582 APC: expose the mute state for system APIs
Add the possibility for system APIs to query if an app is muted and what
are the sources that are muting a specific player/track.

Test: atest android.media.audio.cts.AudioPlaybackConfigurationTest
Bug: 248145607
Change-Id: If40faa860c2663c9ca8436df0e7b8c10464d535b
2022-11-01 20:02:40 +01:00
Vlad Popa
3ddad6750e Adjust the APC active state
Some mute events like master mute and stream mute should not affect the
active state of the AudioPlaybackConfiguration.

Test: atest android.media.audio.cts.AudioPlaybackConfigurationTest
Bug: 246846130
Change-Id: Id7c94fd44cf714d65ef8ae21734af4c2c02ff873
2022-11-01 13:20:47 +01:00
David Zhao
a698a27150 Unhide requestStartRecording APIs
Bug: 252888452
Test: atest
Change-Id: I8a9017a0327f71080180cd7ea5cacb1e6c36a4f6
2022-10-31 12:57:35 -07:00
Edgar Arriaga
833b169eeb Reuse ringtone across multiple ringer operations
This patch avoids multiple ringtone loads when taking place
that were redundant as previous approach instantiated the
same ringtone multiple times over the play flow instead we
gather all the requirements for a ringtone and instantiate
it once.

Bug: 240621827
Test: atest RingtoneTest
Test: atest RingerTest
Test: atest IncomingCallTest
Test: Verified ringtone and vibration works in various forms when
receiving call.

Change-Id: I7ac0a52c99d48fb7241c55c709a9a876a6057319
2022-10-31 18:53:39 +00:00
Santiago Seifert
95438d886b Remove broken javadoc link
Test: N/A. Minor javadoc change.
Bug: 205124386
Change-Id: I0bad44beb63acb2e95aedb0c6209089939189c03
2022-10-31 11:55:42 +00:00
Darwin Huang
d50e446877 Merge "AudioManager: Remove no-longer-relevant error message" am: 08f4332515 am: d2667447f7 am: 315d39d9d0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2264344

Change-Id: I83f05b52326f7472a50d4ac05287d4db8c012eab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-21 21:46:54 +00:00
Darwin Huang
d2667447f7 Merge "AudioManager: Remove no-longer-relevant error message" am: 08f4332515
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2264344

Change-Id: I635dd1cb1df351bda7265bc93b09d558cc7ee0c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-21 21:09:03 +00:00
Darwin Huang
bb11173147 AudioManager: Remove no-longer-relevant error message
Bug: http://b/254647699
Change-Id: I1059ed8594a0a4a2737f6df1909f1f3bf6840d91
2022-10-21 13:18:49 +00:00
Robert Wu
c40c00dc92 MIDI: Update registerDeviceCallback link
The deprecated registerDeviceCallback is linking to itself.
This change links it to the new API added in Android T.

Bug: 254685253
Change-Id: Id2df0605059f79127b9ce439080140995b8b64de
Test: m -j 8 ds-docs-switched
Test: Check out/soong/.intermediates/frameworks/base/ds-docs-java
2022-10-20 21:05:09 +00:00
Sally Qi
201323481b Fix ExtendedCameraCharacteristicsTest cts failures.
Relnote: SurfaceUtils#getSurfaceFormat function should return the
the formats of Surface, therefore, no need to convert it to public
format.

Bug: 254349961
Test: android.hardware.camera2.cts.ImageReaderTest,
android.hardware.camera2.cts.ImageWriterTest,
android.hardware.camera2.cts.ExtendedCameraCharacteristicsTest

Change-Id: I58340f684b4fc9cb2578cee03ef1d65171c9eaed
2022-10-19 21:45:57 -07:00
Ian Baker
cf00b5bfff Merge "Clarify that MediaCrypto.setMediaDrmSession cannot switch DRM schemes" am: 258d8f6321 am: 8640d2a406 am: ca79065217
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2260581

Change-Id: I3c74008efa832fd9df5954b93c08a764ac59fe63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 11:20:52 +00:00
Ian Baker
8640d2a406 Merge "Clarify that MediaCrypto.setMediaDrmSession cannot switch DRM schemes" am: 258d8f6321
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2260581

Change-Id: I7cc050ac65a21bc96e0ffdb8714b2f9a96783b5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 10:49:07 +00:00
Santiago Seifert
cb5679a857 Merge "Add route deduplication IDs API" 2022-10-19 09:56:51 +00:00
Ray Chin
4bdef37b64 Merge "Add API for requesting a specific frontend." 2022-10-19 03:30:26 +00:00
Ján Sebechlebský
351785dcfa Merge "Throw exception when attempting to build empty AudioMixingRule." 2022-10-18 18:58:09 +00:00
Ian Baker
07f35e7e2b Clarify that MediaCrypto.setMediaDrmSession cannot switch DRM schemes
Bug: 244832508
Change-Id: I88cf4936554731354e326890ea7b66143c8d7c15
2022-10-18 17:03:31 +00:00
TreeHugger Robot
44bdd7fdbd Merge "Fix the issue of Context::setBufferFormat() mix-usage in ImageWriter/ImageReader JNI side." 2022-10-18 16:26:24 +00:00
Jan Sebechlebsky
c16bba7a83 Throw exception when attempting to build empty AudioMixingRule.
This fixes
android.media.audio.cts.AudioPlaybackCaptureTest#testMatchNothing.

The test asserts that attempting to capture playback with no
criteria specified throws and Exception. However, the reason why
the test was passing and Exception thrown was not because of
explicit check for empty AudioMixingRule, but because of
invalid mix role (not adding any rules prior to ag/20001744
caused mix type not to be inferred). If the mix role was
explicitly set for the AudioMixingRule.Builder the test would
also fail the expectation.
This cl is adding explicit check for the presence of rules when
building AudioMixingRule to fix this.

Bug: 252822301
Test: atest AudioPlaybackCaptureTest
Change-Id: If3caa635b67eca779bb2026d2da1c4727e4636e9
2022-10-18 14:05:48 +02:00
Treehugger Robot
b55298e09c Merge "Add graphics owners for Image, ImageReader and ImageWriter files." am: 624fe54fb3 am: f56c5cc599 am: ac5aa1b20e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2258322

Change-Id: I6a328d08fd1b0d7655226e3be8f7f655002f8fa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 00:31:24 +00:00
Treehugger Robot
f56c5cc599 Merge "Add graphics owners for Image, ImageReader and ImageWriter files." am: 624fe54fb3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2258322

Change-Id: I00d79cc443afc009005c28883f3267703d749e7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-17 23:39:50 +00:00
Sally Qi
97f5fba010 Add graphics owners for Image, ImageReader and ImageWriter files.
Change-Id: Ia4b4560685f2ee5401e90a6b476bdbe6cf8f81c6
2022-10-17 21:17:42 +00:00
Santiago Seifert
e757499dfb Add route deduplication IDs API
Bug: 235352899
Bug: 241888071
Test: atest CtsMediaBetterTogetherTestCases MediaRouter2HostSideTest
Change-Id: I48057eb1da4b398f5e1482563d99449a6c985774
2022-10-17 16:10:10 +00:00
Ray Chin
fa22e71e51 Add API for requesting a specific frontend.
Test: atest android.media.tv.tuner.cts
Bug: b/239240556
Change-Id: Ia2ade164da52aca1a3e347781851f5a86e8d8c0f
2022-10-17 19:32:03 +08:00
Ján Sebechlebský
a514c20292 Merge "Add support for audio session id based routing" 2022-10-14 12:23:03 +00:00
Jan Sebechlebsky
f28b1c6644 Add support for audio session id based routing
Bug: 233910083
Test: atest AudioServiceHostTest AudioHostTest
Test: atest com.android.audiopolicytest
Change-Id: Ica38e5c4cd3b2cc0c6c739dbd47fa0790d4393e2
2022-10-14 11:00:07 +02:00
Iván Budnik
2d054595f3 Merge "Enforce MediaButtonReceiver extracted component name matches session package name" 2022-10-13 16:46:59 +00:00
David Zhao
6e3cc4306b Merge "Add TIAF recording request/response API" 2022-10-13 02:07:16 +00:00
David Zhao
bc32081279 Add TIAF recording request/response API
Bug: 252888452
Test: Cuttlefish
Change-Id: Ib133b2025aabaf867751d6a473bafdd326a7f1bf
2022-10-12 15:16:35 -07:00
Iván Budnik
185c3e2523 Enforce MediaButtonReceiver extracted component name matches session package name
This change makes sure that the extracted component name in a
MediaButtonReceiverHolder matches the Media Session owner's package
name. This avoids incorrectly routing media button events and potential
security issues.

Bug: 244312001
Bug: 238177121
Test: atest CtsMediaBetterTogetherTestCases
Change-Id: Ifac9cf53889222e31d18c14c1e096ee68c0a346c
2022-10-12 13:48:16 +00:00
Ray Chin
007c4c6cc2 Merge "Add setStatusCheckIntervalHint method" 2022-10-12 07:04:30 +00:00
Xin Li
92da83812c Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9129937" into stage-aosp-master 2022-10-11 17:39:41 +00:00
TreeHugger Robot
2dbc157f98 Merge "Support checking hasHapticChannels on a MediaPlayer." 2022-10-11 16:58:37 +00:00
Treehugger Robot
296898a798 Merge "MediaMuxer: throw exception if create() fails for muxer" am: f9a1e3c913 am: 74d38181ca am: 222df0de6e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842097

Change-Id: I7397b5b3f4e97bd921612acb7b189bc5bc31c13c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 19:50:18 +00:00
Treehugger Robot
222df0de6e Merge "MediaMuxer: throw exception if create() fails for muxer" am: f9a1e3c913 am: 74d38181ca
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1842097

Change-Id: Ifa2bc7dccb109d8a54fb9d4ef46c960494ac83ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 18:51:47 +00:00
Treehugger Robot
f9a1e3c913 Merge "MediaMuxer: throw exception if create() fails for muxer" 2022-10-10 17:53:56 +00:00