Commit Graph

7378 Commits

Author SHA1 Message Date
Tomoharu Kasahara
f1cef97345 Merge "Enable phone apps to mute the BLUETOOTH_SCO stream" am: 09d13a2232 am: b0395aca6a
am: b442507023

Change-Id: I0f1f761460a27d510271e2110bd3588f34ce086c
2019-01-22 20:16:16 -08:00
Tomoharu Kasahara
b442507023 Merge "Enable phone apps to mute the BLUETOOTH_SCO stream" am: 09d13a2232
am: b0395aca6a

Change-Id: I1656753897ff28a9ff9096fee0ba9928623e75ad
2019-01-22 19:02:31 -08:00
Sungsoo Lim
98955b03de Merge "Use MediaSession.Token instead of ISessionController" 2019-01-23 02:32:10 +00:00
Sungsoo Lim
1a73f7393e Merge "Introduce MediaSessionEngine" 2019-01-23 00:37:16 +00:00
Tomoharu Kasahara
a0d0c542b9 Enable phone apps to mute the BLUETOOTH_SCO stream
This change adds support for privileged apps with the MODIFY_PHONE_STATE
permission to mute the bluetooth sco stream using the adjustStreamVolume
method.
The change adds specific handling for BLUETOOTH_SCO as a mutable stream.

Bug: 111195322
Test: Mute works by AudioManager.adjustStreamVolume
 (STREAM_BLUETOOTH_SCO, ADJUST_MUTE, 0)

Change-Id: I932f9e152e9b6df93a749b083a7bcc7e08c2ad70
2019-01-23 09:04:42 +09:00
TreeHugger Robot
697fc4ca36 Merge "Deprecate isConnectedToHdmiSwitch" 2019-01-22 21:34:38 +00:00
Sungsoo Lim
3ff5777c5c Introduce MediaSessionEngine
MediaSession will be a wrapper of MediaSessionEngine, and
MediaSessionEngine will be moved into mainline module.

Bug: 119749862
Test: atest CtsMediaTestCases:android.media.cts.MediaSessionTest
    atest CtsMediaTestCases:android.media.cts.MediaControllerTest
Change-Id: I122b1e13c9c9d658ee03b91d0ebd8a41a954a79a
2019-01-22 22:28:19 +09:00
Sungsoo Lim
af7d46c117 Use MediaSession.Token instead of ISessionController
ISessionController will be moved to mainline module.

Test: pass MediaSessionTest and MediaControllerTest
Change-Id: I45b4da502e2b262730255a6cda1ab932d154ecbd
2019-01-22 21:46:12 +09:00
Jin Seok Park
bdca7e3b5d Merge "Unhide MediaSessionManager APIs" 2019-01-22 12:41:53 +00:00
Jin Seok Park
1777b87a98 Unhide MediaSessionManager APIs
Bug: 122234817
Test: update-api
Change-Id: Id4b6a8304e0ea09911729232d1d4e4db94c482b3
2019-01-22 17:39:22 +09:00
Hyundo Moon
3e8c1c9d71 AML: Apply changes under frameworks/av to frameworks/base
This CL copies the AML-related changes under frameworks/av to
frameworks/base. This CL includes changes in following merged commits:

a003298 AML: Replace ParceledListSlice
b82512b AML: Remove use of Bundle#setDefusable
70b92a4 AML: Use config_mediaMetadataBitmapMaxSize which is @SystemApi
b4dbc2d Replace hidden Parcel.(read|write)CharSequence usages

Bug:122711373, Bug:122432476
Test: atest CtsMediaTestCases:android.media.cts.MediaSessionTest;
      atest CtsMediaTestCases:android.media.cts.MediaControllerTest;
      atest CtsMediaTestCases:android.media.cts.MediaBrowserTest;
      atest CtsMediaTestCases:android.media.cts.MediaBrowserServiceTest;
      atest CtsMediaTestCases:android.media.cts.MediaBrowserServiceTest;
Change-Id: I1a13e0ae71097caa90f677bc19b7864929dbc20f
2019-01-22 12:09:40 +09:00
Sungsoo Lim
ebc2af2c76 Merge "Introduce link classes for media mainline module" 2019-01-22 03:00:41 +00:00
TreeHugger Robot
ca0ee96122 Merge "MediaController2: Add getConnectedSessionToken()" 2019-01-22 01:49:31 +00:00
TreeHugger Robot
7f6d6a95f5 Merge changes from topic "mv_jar"
* changes:
  Include updatable-media.jar in bootclasspath & apex
  Separate out mediaplayer2 code from framework
2019-01-21 14:27:03 +00:00
Jaewan Kim
5886d3d571 MediaController2: Add getConnectedSessionToken()
Bug: 122055262
Test: MediaController2Test in CtsMediaTestCases
Change-Id: I64e1a268add047dfa1438e01155ea460f58f4b91
2019-01-21 22:35:03 +09:00
Sungsoo Lim
39d07a3a03 Introduce link classes for media mainline module
Bug: 121239200
Test: make update-api -j / make -j
      atest CtsMediaTestCases:android.media.cts.MediaSessionTest
      atest CtsMediaTestCases:android.media.cts.MediaControllerTest
Change-Id: I93662e83a82f111bfdf25e22525c1466dd66079f
2019-01-21 22:20:42 +09:00
Jaewan Kim
161fb93951 Merge "Session2Token: Fix issues with TYPE_SESSION_SERVICE" 2019-01-21 07:58:19 +00:00
Jaewan Kim
0103e7a81b Session2Token: Fix issues with TYPE_SESSION_SERVICE
This fixes two issues
  1. NPE in writeToParcel()
  2. Leave log for invalid ComponentName

Bug: 122563346
Test: Run Cts
Change-Id: Idd544ffa7e1b9d202e3bb8f4edb8bcb85096a22c
2019-01-21 13:38:39 +09:00
Eric Laurent
de2a980547 Merge "audio: Add API for BT to query offload A2DP encoding formats" 2019-01-19 22:26:25 +00:00
TreeHugger Robot
329bc82c0f Merge "audio: Add API to handle active device change" 2019-01-19 19:39:24 +00:00
TreeHugger Robot
2d4677140c Merge "audio: Send A2DP codec to AudioSystem on connection state change" 2019-01-19 19:31:16 +00:00
Jeff Tinker
e607b5fb2d Merge "Add support for HDCP 2.3" 2019-01-19 05:48:02 +00:00
TreeHugger Robot
1cb37aae7c Merge "ImageReader/ImageWriter: unhide newInstance methods" 2019-01-19 01:11:44 +00:00
Yin-Chia Yeh
d07e9ec5ae ImageReader/ImageWriter: unhide newInstance methods
ImageReader: unhide the factory method to assign usage flag
ImageWriter: unhide the factory method to assign format

Test: new CTS tests
Bug: 112171574
Change-Id: Ia2579c466cdad378ecedc6398a652bb5f4e6aeec
2019-01-18 14:21:23 -08:00
TreeHugger Robot
6364e04bac Merge "Add audio device type AUDIO_DEVICE_IN_HDMI_ARC" 2019-01-18 17:35:46 +00:00
TreeHugger Robot
615329242c Merge "Media2: Provide a way to tell session's playback active state" 2019-01-18 05:47:41 +00:00
Nick Chalko
2e1f76a462 Add audio device type AUDIO_DEVICE_IN_HDMI_ARC
ag/5359018

Bug:117967786
Test: flashall on an atom
Change-Id: I197723448716460379da3ec7568c5367bad3b88b
2019-01-17 16:49:02 -08:00
Arun Mirpuri
cb102fa366 audio: Add API for BT to query offload A2DP encoding formats
Add API in AudioManager to query offload A2DP encoding formats
supported on primary HAL. This can be used instead of reading
from property

Bug: 111812273
Test: make
Change-Id: I168f288d0bf32d6c9733c9b57934084667e794ee
2019-01-17 14:48:27 -08:00
Aniket Kumar Lata
a8439e20e5 audio: Add API to handle active device change
Add API to handle active device change based on
whether we are switching between:
null to 'X'
'X' to 'Y'
'X' to null
This API must be called from A2dpService to update
active device.
Same API also caters to device config change on
an already connected A2DP device.

Bug: 111812273
Test: make
Change-Id: I9f28092934ee611fbc2cd7c81447b4ed22288ac9
2019-01-17 14:48:27 -08:00
Aniket Kumar Lata
9fbc205fdc audio: Send A2DP codec to AudioSystem on connection state change
Add A2DP codec parameter to AudioSystem and AudioService APIs
for connection state change and device config change. Update
native interface to pass codec parameter.

Bug: 111812273
Test: make
Change-Id: I9bcc9c97241a2ac2d941ae6902469ef9957a993c
2019-01-17 14:48:27 -08:00
Paul Mclean
5955f741e4 Merge "Adding Audio HAL V5: Direction API" 2019-01-17 21:34:34 +00:00
Dongwon Kang
8afd5319b0 Separate out mediaplayer2 code from framework
"media2.jar" is renamed to "updatable-media.jar" in order to
show its purpose clearly.

Test: build & boot & MediaPlayer2Test
Bug: 112766913
Change-Id: Ia2ea05e0ed1a8bb2cfea20c9e2585e3d3cbfffd9
2019-01-17 13:33:58 -08:00
Lajos Molnar
c7641debd3 Merge "MediaCodecInfo: add codec attributes and performance points." 2019-01-17 20:21:08 +00:00
TreeHugger Robot
3d404e7836 Merge "MediaSession2: Fix controller is disconnected immediatly after connected" 2019-01-17 16:32:12 +00:00
Lajos Molnar
a462966c8e Merge "media: Add new AVC levels and AV1 media type string" 2019-01-17 14:41:58 +00:00
Jaewan Kim
69dd985043 Media2: Provide a way to tell session's playback active state
Bug: 122818120
Test: Run MediaSession2Test in CTS
Change-Id: I32fed056db08b95fc406d82f32c583bbb3ca4fa8
2019-01-17 22:24:07 +09:00
Jaewan Kim
f8e970a923 MediaSession2: Fix controller is disconnected immediatly after connected
This is regression introduced by my previous commit
45d94a4844 MediaSession2Service: Initial commit

Test: Run CTS
Change-Id: Id1490e1897e502c2a6008e5ed72158d4d5cf9685
2019-01-17 21:55:58 +09:00
Insun Kang
b3517bf1fe Initial code for AML MediaSessionService
Bug: 123000882
Test: build / manually
Change-Id: If2234340ed835fa02dcdbd1fd1b968418fe0a8ac
2019-01-17 19:32:12 +09:00
Jaewan Kim
9a11c43809 Session2Token: Write Session2Link in writeToParcel()
This fixes MediaController2's connection failure when the token is from
the remote process.

Test: Build and run CTS test
Change-Id: Ic44b31b0088bc59ead4d341c27eebc57beac7d20
2019-01-17 11:53:28 +09:00
TreeHugger Robot
b9b73aee2a Merge "MediaSession2Service: Initial commit" 2019-01-17 02:17:32 +00:00
Lajos Molnar
49beba10cf media: Add new AVC levels and AV1 media type string
Also remove OMX references for the current constants.

Bug: 122971163
Bug: 111936705
Change-Id: I604ecdeedd5408016fe7c69b763ffbc040ecffd2
2019-01-16 17:29:35 -08:00
Lajos Molnar
d2a7f47b0d MediaCodecInfo: add codec attributes and performance points.
Bug: 112374531
Bug: 119631295
Bug: 112370870
Change-Id: Icf8db614a616bd5c815bc272093ce77d05eb4406
2019-01-16 16:46:50 -08:00
Eric Laurent
56f5322566 Merge "add new audio sources for audio capture" 2019-01-16 23:57:58 +00:00
shubang
19ccf61302 Deprecate isConnectedToHdmiSwitch
ag/5655140

Bug: 120108729
Test: make; local tests
Change-Id: I889e267ec120f8e6fedc8cd8ab80b68b3a6fb6f5
2019-01-16 15:24:40 -08:00
Eric Laurent
0016c5b739 add new audio sources for audio capture
This commit adds the following audio capture sources:
- AudioSource.VOICE_PERFORMANCE: for real time live performances like Karaoke.
- AudioSource.ECHO_REFERENCE: for capturing the reference signal to suppress by an echo
canceller. Protected by privileged permission CAPTURE_AUDIO_OUTPUT.

Also added device AUDIO_DEVICE_IN_ECHO_REFERENCE selected when the requested
capture source is AudioSource.ECHO_REFERENCE.

Bug: 118203066
Test: CTS tests for audio capture

Change-Id: I8258296736848986562f7fc89c9260aad562d3d1
2019-01-16 09:53:51 -08:00
Jaewan Kim
45d94a4844 MediaSession2Service: Initial commit
Bug: 122563346
Test: Build
Change-Id: I250ee493837bfa7964fa7baf3d11f1673c879010
2019-01-16 17:18:14 +09:00
TreeHugger Robot
3ee68ec453 Merge "MediaPlayer2: fix checking for next datasources" 2019-01-16 01:23:32 +00:00
Andy Hung
ef0d3861a6 Merge "AudioFormat: Add IntRange annotation to getFrameSizeInBytes" 2019-01-16 00:08:41 +00:00
Wei Jia
2b5dfbc265 MediaPlayer2: fix checking for next datasources
Test: cts testPlaylist
Bug: 122073361
Change-Id: I0306b09b1f5d3796a4a74d4fe76a5c53d1ea6f57
2019-01-15 15:12:52 -08:00
Robert Shih
b5fd613d16 Merge "MediaPlayer2: callback based DRM APIs" 2019-01-15 23:12:51 +00:00