Commit Graph

7433 Commits

Author SHA1 Message Date
TreeHugger Robot
1444690e53 Merge changes I1d901692,I3e0bca75
* changes:
  ControllerLink: Remove unused parameter asSystemService
  MediaController: Remove dispatching key event as system service APIs
2019-01-30 01:53:50 +00:00
TreeHugger Robot
d070768d8d Merge "Move MediaMetadata class back to framework" 2019-01-30 01:04:04 +00:00
Jaewan Kim
8be71c0fe2 MediaController: Remove dispatching key event as system service APIs
This removes hidden API usages from the fwk to apex, which would be
prohibited.

With this API, the dispatching logic is changed as follows for sending
key events directly to MediaSessionRecord through MediaSessionService.

Before:
    PhoneWindow
    -> MediaController.dispatch***AsSystemService(key)
    -> MediaSessionRecord

After:
    PhoneWindow
    -> MediaSessionManager.dispatch**AsSystemService(sessionToken, key)
    -> MediaSessionService
    -> MediaSessionRecord

Bug: 123485698
Test: Build, flash and injected some key events
Change-Id: I3e0bca7565ae2f142c3389322d867700646d5038
2019-01-29 21:21:17 +09:00
Hyundo Moon
a17bf2d0f2 Move MediaMetadata class back to framework
Due to the @UnsupportedAppUsage on
MediaMetadata.getKeyFromMetadataEditorKey, we'd better not to move the
class to APEX. This CL moves the MediaMetadata back to framework.

Also, in order to avoid hidden framework API usages in mainline module,
this CL moves the usage of hidden constructor of MediaMetadata.Builder()
from MediaSessionEngine to MediaSession.

Bug: 123488217
Test: make update-api -j; make -j;
      vendor/google/tools/flashall;
      atest CtsMediaTestCases:android.media.cts.MediaSessionTest;
      atest CtsMediaTestCases:android.media.cts.MediaControllerTest;
Change-Id: I21b4f0f59214478071bb0eafa93bb9538e44bf4e
2019-01-29 17:16:50 +09:00
Jaewan Kim
d0bb9eab0d Merge changes Ib3c350ba,I9f6b17a6
* changes:
  MediaController: Make getTag() public
  MediaRouter: Remove hidden annotation usages
2019-01-29 07:38:46 +00:00
Hyundo Moon
99cd4d4739 Merge "Remove unused MediaSession.notifyRemoteVolumeChanged()" 2019-01-29 06:53:35 +00:00
Jaewan Kim
36a0ff35fb MediaRouter: Remove hidden annotation usages
This removes hidden annotation usages from the framework to the apex,
which would be prohibited.

Test: Build
Bug: 123485698
Change-Id: I9f6b17a61c5438e0d538a7a97587c375d8603613
2019-01-29 15:31:13 +09:00
Hyundo Moon
2e4e51b365 Remove unused MediaSession.notifyRemoteVolumeChanged()
Bug: 123499849
Test: make -j;
Change-Id: Ie629b0811e07444cf277c9552aaece558e1c1f41
2019-01-29 13:50:46 +09:00
Sudheer Shanka
ca923a9aab Merge "Update DownloadStorageProvider to include MediaStore.Downloads." 2019-01-29 02:57:44 +00:00
TreeHugger Robot
e82f0371a5 Merge changes I6bda318c,Ie4d259dc
* changes:
  MediaController: Remove unused constructors
  Make ISessionManager.getSessions() return list of tokens
2019-01-29 02:31:23 +00:00
Jin Seok Park
3b8e00f138 Merge "MetadataRetriever: Unhide Exif-related constants" 2019-01-29 00:49:37 +00:00
TreeHugger Robot
5e55e809a7 Merge "Camera: Add support for dynamic depth image format" 2019-01-28 22:21:46 +00:00
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
Hyundo Moon
817f5f859a Make ISessionManager.getSessions() return list of tokens
This CL changes the return type of ISessionManager.getSessions()
from List<ControllerLink> to List<MediaSession.Token>.

Bug: 123488663
Test: Ran below tests
atest CtsMediaTestCases:android.media.cts.MediaSessionTest;
atest CtsMediaTestCases:android.media.cts.MediaControllerTest;
atest CtsMediaTestCases:android.media.cts.MediaSessionManagerTest;
Change-Id: Ie4d259dc3691977451c7751ae06816d67079a3f4
2019-01-29 02:36:24 +09:00
Sudheer Shanka
e93db5123b Update DownloadStorageProvider to include MediaStore.Downloads.
Bug: 120879205
Test: manual
Test: atest DownloadProviderTests
Test: atest cts/tests/app/src/android/app/cts/DownloadManagerTest.java
Test: atest MediaProviderTests
Test: atest cts/tests/tests/provider/src/android/provider/cts/MediaStore*
Change-Id: I44be836899437d87fc1a00e5fe316c6b68488643
2019-01-28 08:20:47 -08:00
Jean-Michel Trivi
170725ab67 Merge "AudioTrack API for delay/padding in offload" 2019-01-28 15:26:45 +00:00
Jin Seok Park
245cb132c4 MetadataRetriever: Unhide Exif-related constants
In order to support reading HEIF format images in AndroidX
ExifInterface, we need to unhide the Exif-related constants
inside MediaMetadataRetriever.

Bug: 123493429
Test: update-api
Change-Id: I8b9c1709d9fb00f7ad2d7815d4c280678408ea03
2019-01-28 16:17:50 +09: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