Commit Graph

25 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
da59389fc9 ControllerLink: Remove unused parameter asSystemService
Bug: 123485698
Test: Build, flash and injected some key events
Change-Id: I1d90169221842fc1c986e40c3a2790c73af260f4
2019-01-29 21:21:52 +09: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
06540cf94f Merge "Make hidden constructor of PlaybackInfo as @SystemApi" 2019-01-29 07:33:58 +00:00
Hyundo Moon
99cd4d4739 Merge "Remove unused MediaSession.notifyRemoteVolumeChanged()" 2019-01-29 06:53:35 +00:00
Jaewan Kim
be68aae2bb MediaController: Make getTag() public
This removes hidden API usages from the framework to the apex, which
would be prohibited.

Test: Build
Bug: 123485698
Change-Id: Ib3c350bad4af2e8db3788296dc78b7f7eb0693c0
2019-01-29 15:31:14 +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
Robert Shih
50db6e72f3 Merge "MediaPlayer2: pass source ID on DRM prepared event" 2019-01-29 04:39:07 +00:00
TreeHugger Robot
4dbad5640d Merge "Ensure that framework does not refer MediaSession2 related code" 2019-01-29 03:05:52 +00:00
Hyundo Moon
1dfec66d30 Make hidden constructor of PlaybackInfo as @SystemApi
When the android build setting is configured to a rule which moves
MediaSession1 related codes to mainline module, the non-public and
non-system APIs in the module cannot be used by the framework.

This CL makes the hidden constructor of PlaybackInfo as
system API, so that it can be used by the framework.

Bug: 123500940
Test: make update-api -j; make -j;
Change-Id: I8583d6f79c70f8bbbbedfa0a75676218aeec58e6
2019-01-29 11:48:39 +09: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
Hyundo Moon
14ca142e65 Ensure that framework does not refer MediaSession2 related code
Also, this CL moves mediasession2 to com.android.media apex.

Bug: 123495968
Test: Passed below tests:
atest CtsMediaTestCases:android.media.cts.MediaSession2Test;
atest CtsMediaTestCases:android.media.cts.MediaController2Test;
atest CtsMediaTestCases:android.media.cts.MediaItem2Test;
atest CtsMediaTestCases:android.media.cts.MediaSession2ServiceTest;
atest CtsMediaTestCases:android.media.cts.Session2CommandGroupTest;
atest CtsMediaTestCases:android.media.cts.Session2CommandTest;
Change-Id: I8cf7a657545e6b7b2973035f365506206e7147a0
2019-01-29 09:12:54 +09:00
Robert Shih
89b57dcc58 MediaPlayer2: pass source ID on DRM prepared event
If we don't specify source ID explicitly, the default source ID 0 is
used.

Bug: 123425309
Test: MediaPlayer2DrmTest
Change-Id: I16d76d4dfbe4551f97234f27e4500cb74480f8ed
2019-01-28 15:53:33 -08:00
Robert Shih
9d9b107519 MediaPlayer2: create one MediaDrm per DRM scheme
Required for offline ClearKey playback.

Bug: 123425309
Test: MediaPlayer2DrmTest
Change-Id: Ib49666eb9807ed5ad04b51c626a2b5fc7158b4e6
2019-01-28 10:37:43 -08:00
Jaewan Kim
91390281f4 MediaController: Remove unused constructors
Bug: 123488663
Test: Build
Change-Id: I6bda318c5d8a83c4f833fe737a7b68229933c0b9
2019-01-29 02:36:31 +09: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
TreeHugger Robot
f408818ac3 Merge changes from topic "media-apex"
* changes:
  Separate updatable-media library
  Move MediaBrowser API into updatable media
  Add build rule for updatable media 1.0 APIs
  Add build rule for media2-abi-*
2019-01-24 08:45:07 +00:00
Robert Shih
3e26412fe4 MediaPlayer2: callback based DRM APIs implementation
Bug: 112549021
Test: MediaPlayer2DrmTest
Change-Id: I4b9b5447e59b122dc985d9abfdd40b8c24a230a1
2019-01-23 12:45:22 -08: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
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