Commit Graph

7428 Commits

Author SHA1 Message Date
John Reck
e98248eb05 Merge "Fix ImageReader#newInstace with usage" 2019-01-28 20:17:25 +00:00
TreeHugger Robot
ad0db6fcda Merge "Add a constant for ISDB_S3" 2019-01-28 19:17:09 +00:00
Jean-Michel Trivi
170725ab67 Merge "AudioTrack API for delay/padding in offload" 2019-01-28 15:26:45 +00:00
Jeff Sharkey
cb269aac7e Get CtsProviderTestCases building against API.
To help confirm that we're actually testing developer-visible
behaviors, we need to build against public APIs, since there have
been plenty of examples in this suite of "testing" hidden API
behaviors, which are then misleading to developers.

Bug: 120429729
Test: atest cts/tests/tests/provider/
Exempt-From-Owner-Approval: Trivial API annotations
Change-Id: I07fe33e54f611a6060217f0706fb99b809961f4d
2019-01-27 03:03:39 +00:00
Jean-Michel Trivi
157cba493c AudioTrack API for delay/padding in offload
Add API to add support for specifying delay and padding values
  for the current compressed stream.
Add API to indicate the end of stream after a write() operation

Bug: 122825812
Test: atest AudioTrackOffloadTest
Change-Id: Ib4dc76938fb5cea77ce67aa12aca7d38f66e756c
2019-01-25 19:11:06 -08:00
John Reck
4d312b212c Fix ImageReader#newInstace with usage
Need to actually respect the given usage or the API doesn't
work. Shift the default to be done Java-side where it's clear
if usage was user-provided or not. Remove the incorrect
validations and assertions around usages.

Add missing HardwareBuffer#isSupported to let users
check if a usage & format combination is supported.

Change-Id: I70bfe6e6c41e78425a38af6b17d421f0e80e818b
Fixes: 123423319
Test: HardwareBuffer CTS tests
2019-01-25 16:03:58 -08:00
Jean-Michel Trivi
103a678ac3 Merge "AudioDeviceBroker in audio service" 2019-01-25 22:31:09 +00:00
Jean-Michel Trivi
5885037c88 AudioDeviceBroker in audio service
New AudioDeviceBroker class running in audio service.
Has dedicated message loop for handling audio device
   connections and disconnections.
New helper classes for AudioDeviceBroker:
 - BtHelper for Bluetooth
 - AudioDeviceInventory to manage list of devices

Bug: 112863932
Test: media CTS + audio CTS Verifier
Change-Id: I3e8f662a9d82fa7245695888e14fac7f4fc6e728
2019-01-25 11:03:50 -08:00
Hyundo Moon
c1e4316e02 Remove MediaController2 usages in MediaSessionServiceImpl
Bug: 123336670
Test: Passed below tests
      MediaSessionManagerTest#testNotifySession2Created/Destroyed*
Change-Id: I25a20bf9e8a78920f2219d22b81b899af665ed32
2019-01-25 18:52:44 +09:00
Kristian Monsen
71fe12bb84 Add a constant for ISDB_S3
Test: No test, just adding a constant and building
Bug: 122371669
Change-Id: Icbf10d2ddfb0fe05df9b3aedf3f17b8687404479
2019-01-24 17:09:18 +01:00
Sungsoo Lim
4e475438ad Move MediaBrowser API into updatable media
Bug: 119539966, Bug: 119538799
Test: build and boot,
    atest CtsMediaTestCases:android.media.cts.MediaBrowserTest,
    atest CtsMediaTestCases:android.media.cts.MediaBrowserServiceTest
Change-Id: I7afed77e61506a1b4ea57ac41eee62bfcda01a74
2019-01-24 04:45:47 +09:00
Sungsoo Lim
bb3b401d42 Add build rule for updatable media 1.0 APIs
Bug: 119539849, Bug: 119539141
Test: build and boot,
    atest CtsMediaTestCases:android.media.cts.MediaSessionTest,
    atest CtsMediaTestCases:android.media.cts.MediaControllerTest
Change-Id: Iaf07842de5aa00da5987b993b77960efa9a602bf
2019-01-24 04:34:34 +09:00
Insun Kang
f86a56c591 Add build rule for media2-abi-*
- media2-abi-* included in updatable-media.jar
- Moves the media2-abi files into media/apex
- Resolves a hidden api usage

Bug: 123209084
Test: build
Change-Id: I9f9b0b9c288da5c7acbfedcb56867ff405ac0d61
2019-01-24 04:34:19 +09:00
Sungsoo Lim
070aba8e54 Merge "Handle remaining hidden API usages" 2019-01-23 19:22:20 +00:00
Jeff Tinker
2150acb817 Merge "Add securityLevel to MediaDrm isCryptoSchemeSupported API" 2019-01-23 19:01:52 +00:00
Sungsoo Lim
d1e6f65652 Handle remaining hidden API usages
There are several hidden API usages from Media 1.0 APIs.
To move Media 1.0 APIs into mainline module, this CL removes
the unnecesarry usages or makes them as system APIs.

Bug: 119539695
Test: pass MediaSessionTest and MediaControllerTest, and
      manually check whether SystemUI can control sessions.
Change-Id: I824113229964ad9b5785ecd488b5851b0dace626
2019-01-24 01:48:45 +09:00
Yiwen Chen
57406a7e0e Merge "Add Ramping Ringer platform flags and fix some Ringtone bugs." 2019-01-23 15:20:08 +00:00
TreeHugger Robot
448fb122a1 Merge "Remove Constructor of RemoteUserInfo which takes IBinder" 2019-01-23 13:20:46 +00:00
Hyundo Moon
4d69df3eb1 Merge "Set MediaSession.mCallback as non-null when a callback is set" 2019-01-23 12:57:24 +00:00
Hyundo Moon
b016fa8bf7 Merge "Use MediaParceledListSlice in ControllerCallbackLink" 2019-01-23 12:57:18 +00:00
TreeHugger Robot
a9b062d0bc Merge "AudioEffect: make Descriptor not final" 2019-01-23 12:01:47 +00:00
TreeHugger Robot
ed9c5ef608 Merge "Small fixes of MediaSession" 2019-01-23 11:07:33 +00:00
TreeHugger Robot
daf5dc917d Merge "Remove hidden API in Session2Token" 2019-01-23 10:57:42 +00:00
Sungsoo Lim
a65bce588b Remove hidden API in Session2Token
Test: build
Change-Id: I99479aace7d45486d6c6e1daeb7d7d87937bcbb4
2019-01-23 17:47:39 +09:00
Sungsoo Lim
93a376ecba Use link in the doc for MediaSession2Service
Test: build
Change-Id: I3990b7d0b42c9119ab21493aa71bf0ac98abccc5
2019-01-23 16:50:33 +09:00
Hyundo Moon
4312f7784b Set MediaSession.mCallback as non-null when a callback is set
In order to avoid regression, this CL sets a dummy object to
MediaSession.mCallback when a callback is set.

Since the previous versions of MediaSessionCompat checks the nullity
of mCallback by reflection, this needs to be set.

This was slipped in previous merged CL
"3ff5777: Introduce MediaSessionEngine".

Bug: 119749862
Test: make -j;
Change-Id: Iea12a77e7edd51ef3cee7e83c057f39e5528c3b6
2019-01-23 16:31:43 +09:00
TreeHugger Robot
7fd4280e97 Merge "Move hidden APIs from PlaybackState" 2019-01-23 07:31:40 +00:00
TreeHugger Robot
714756059f Merge "Allow onSessionCommand return null" 2019-01-23 07:17:51 +00:00
Hyundo Moon
158e4a2d6f Use MediaParceledListSlice in ControllerCallbackLink
This was slipped off in previously merged CL
"3e8c1c9: AML: Apply changes under frameworks/av to frameworks/base".

Bug: 122711373, Bug: 122432476
Test: atest CtsMediaTestCases:android.media.cts.MediaSessionTest;
Change-Id: I865e12f0c2d740afb97f1103f12dff1c22a3eebb
2019-01-23 15:47:39 +09:00
Sungsoo Lim
3c0ec77ce3 Small fixes of MediaSession
Test: build
Change-Id: I34e0a188f7792042898a8dbe4befc755936f7d39
2019-01-23 14:46:17 +09:00
Hyundo Moon
eb9bf73b21 Remove Constructor of RemoteUserInfo which takes IBinder
This CL reverts the API change in previously merged CL
"b505f0a: AML: Unhide 4-params constructor of RemoteUserInfo".

Bug: 119752205, Bug: 122550211
Test: make update-api -j; make -j;
      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: I5d6835af4d931c001287126c394db48d65bb09f8
2019-01-23 14:41:37 +09:00
Yiwen Chen
3d3ad02312 Add Ramping Ringer platform flags and fix some Ringtone bugs.
Bug: 120789399
Test: When finish the whole change, flash into a dev phone to test first.
Change-Id: Ifd952cf7dfc8fedb6b1b95d276fd8a46e79d172b
2019-01-22 21:41:24 -08:00
Sungsoo Lim
aa37eedaa0 Move hidden APIs from PlaybackState
In order to move PlaybackState into mainline module, it shouldn't
have any hidden API usage from framework.

Bug: 119539695
Test: build
Change-Id: If319950330b5731212ba0a7a6010ef0ffa62afe7
2019-01-23 13:59:55 +09:00
Sungsoo Lim
6003d8f4f6 Allow onSessionCommand return null
Bug: 123206059
Test: atest -t CtsMediaTestCases:android.media.cts.MediaSession2Test
Change-Id: Iab51c2e618f67bf7cf6b17ae33b379c5c3a4b677
2019-01-23 13:46:09 +09:00
TreeHugger Robot
ca626b6319 Merge changes from topic "unhide_mss"
* changes:
  MediaSession2Service: Unhide
  MediaSession2Service: Add onUpdateNotification()
2019-01-23 04:40:21 +00:00
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
Eric Laurent
aa081fdebc AudioEffect: make Descriptor not final
Make AudioEffect.Descriptor class not final and not implement Parcelable.
Directly implement read/write from parcel.

Bug: 123234025
Bug: 111438757
Test: make
Change-Id: I429341d59b9bad68f3a5b4c6c56603a8f6cb96af
2019-01-22 18:12:44 -08: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
Jeff Tinker
d571a7cefc Add securityLevel to MediaDrm isCryptoSchemeSupported API
bug:110701831
test: cts media test cases

Change-Id: Ic85afd3f617b1c8dbe8987b2e23d06787334b1d7
2019-01-22 15:09:02 -08: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
Jaewan Kim
70c8cb1dce MediaSession2Service: Unhide
Bug: 122563346
Test: Run CTS
Change-Id: Ic5ebad628ca6e2c71ec6a494dcd95515155dd92d
2019-01-22 20:17:21 +09:00
Jaewan Kim
990b41060b MediaSession2Service: Add onUpdateNotification()
Bug: 122563346
Test: Build
Change-Id: I7dbc7630c237af0e61a09e1d5359338beb76d72f
2019-01-22 20:17:11 +09: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