Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
409,937 Commits 3 Branches 0 Tags
f11261ba884b217526babbfc2724490602f75fd1
Commit Graph

64 Commits

Author SHA1 Message Date
Robert Shih
478f5a8fd5 Annotate MediaPlayer2 DRM APIs with @NonNull/@Nullable 
Bug: 126702259
Bug: 126701361
Bug: 126702080
Bug: 126701672
Bug: 126702082
Test: Build
Change-Id: I983d508c3ea96e536d3496e705dbd23bdcf5844e
 2019-03-19 11:51:26 -07:00
Hyundo Moon
74f4491bd2 Make Session2Token#getExtras @NonNull 
Bug: 128413976
Test: atest CtsMediaTestCases:android.media.cts.MediaSession2Test;
      atest CtsMediaTestCases:android.media.cts.MediaController2Test;
      atest CtsMediaTestCases:android.media.cts.MediaSession2ServiceTest;
Change-Id: I007efc4318d2bbf0e3849cc00f22ff9dac9784da
 2019-03-13 12:04:14 +09:00
TreeHugger Robot
1d7a3f9be4 Merge "MediaPlayer2: make TrackInfo.getLanguage return NonNull" 2019-03-08 14:55:35 +00:00
TreeHugger Robot
1b8ddb4ded Merge "MediaSession2: Revisit documentation of SessionCallback#onPostConnect()" 2019-03-08 11:19:20 +00:00
Wei Jia
43f7b8a280 MediaPlayer2: make TrackInfo.getLanguage return NonNull 
Test: cts
Bug: 126702181
Change-Id: I27f03343ee905e46ab48e5667b0ed928cadf772c
 2019-03-07 16:32:46 -08:00
Jaewan Kim
7f3675c54f Merge "MediaController2: Add @Nullable to getConnectedSessionToken()" 2019-03-07 07:47:25 +00:00
Jaewan Kim
c3855960e9 MediaSession2: Revisit documentation of SessionCallback#onPostConnect() 
Bug: 127465354
Test: Build
Change-Id: I3f4244796919bae52622d0d5c8f22613e50e2e7f
 2019-03-06 16:40:56 +09:00
Jaewan Kim
e5c876a8b9 MediaController2: Add @Nullable to getConnectedSessionToken() 
Bug: 126699575
Test: Build
Change-Id: Ic18166991bd3c4d5f3ed93fdcaf80562b4883435
 2019-03-06 15:14:26 +09:00
Sungsoo Lim
215d24af93 Make MediaItem2 builder be a final class 
Bug: 126700915
Test: make update-api -j && m -j
Change-Id: Iad3e26316cedceaf84d917842032cd33cd2cb124
 2019-03-05 16:32:58 +09:00
TreeHugger Robot
e7979eb41f Merge "MediaPlayer2: address API council comments" 2019-03-04 20:08:38 +00:00
Wei Jia
2fc1654ab1 MediaPlayer2: address API council comments 
Test: cts
Bug: 126700359
Bug: 126701061
Bug: 126701365
Bug: 126701652
Bug: 126701657
Bug: 126701901
Bug: 126702124
Bug: 126702181
Bug: 126702182
Change-Id: I3b33d7c1a403b6d2c13b93e5937a0f1a3e4d80a1
 2019-03-01 17:45:31 -08:00
Dongwon Kang
436a76d1fa Merge "Use Uri.toSafeString() in MediaPlayer[2].java." 2019-03-01 17:10:08 +00:00
Jeff Sharkey
9e8f83db6d All Parcelable CREATOR fields are @NonNull. 
If they were null, then the Parcelable would fail to work.

Bug: 126726802
Test: manual
Change-Id: I7929ffa2f20e5de1c8e68e8263cca99496e9d014
Exempt-From-Owner-Approval: Trivial API annotations
 2019-02-28 23:29:04 -07:00
eunyoung.moon
db21cbae34 Use Uri.toSafeString() in MediaPlayer[2].java. 
Bug: 123669012
Test: play HLS/RTSP streaming
      atest CtsNetTestCases:android.net.cts.UriTest
Signed-off-by: Eunyoung Moon <eunyoung.moon@lge.com>

Change-Id: I3695b0a6f28df3dfff981de2dcd6417d227965ae
 2019-02-28 16:59:53 -08:00
Hyundo Moon
cf2d82f2be Add Session2Token#getExtras() 
Bug: 125691206
Test: Passed MediaSession2Test and MediaController2Test
Change-Id: I8f6a74ec0a9a733b08fbb7c2000609e9084af279
 2019-02-22 20:58:55 +09:00
TreeHugger Robot
d4455890cb Merge "MediaSession2: Add SessionCallback#onPostConnect()" 2019-02-20 08:06:05 +00:00
TreeHugger Robot
d240a8ca7c Merge "Fix NPE in MediaController2" 2019-02-18 06:53:13 +00:00
Jaewan Kim
6023b6727c MediaSession2: Add SessionCallback#onPostConnect() 
Bug: 124482497
Test: Run CTS
Change-Id: I280a657c10393253479f773b17b0de3c5f4780af
 2019-02-18 12:11:09 +09:00
Sungsoo Lim
719b05d7eb Fix NPE in MediaController2 
Test: build
Change-Id: Ibd48b1515afe639f58fd20198b67e828b2c20106
 2019-02-18 12:01:53 +09:00
Jaewan Kim
1d20148e8a MediaSession2: Make getConnectedControllers() public 
Bug: 124478505
Test: Build
Change-Id: Iee132fca34ccdf89b263a74d727c5bcc5e75d196
 2019-02-15 14:52:29 +09:00
TreeHugger Robot
99370a2f3e Merge "MediaController2: Revisit Javadoc of onPlaybackActiveChanged" 2019-02-14 02:00:45 +00:00
Jaewan Kim
a7ddd7283d MediaController2: Revisit Javadoc of onPlaybackActiveChanged 
Bug: 124300551
Test: Build
Change-Id: Ie8592e9c6c3dd3cf7ba4da887722b6f10257eb19
 2019-02-13 21:24:07 +09:00
Insun Kang
291318d5f4 Remove duplicated classes with framework.jar from updatable-media.jar 
Bug: 111107855
Test: Sucessfully build with aosp/884112
Change-Id: Ic3c93ab395ccfae6150297bf6447043f928a01c5
 2019-02-13 11:52:46 +09:00
TreeHugger Robot
42257a8bc8 Merge "MediaPlayer2: clear MediaDrm objects upon close/reset" 2019-02-06 05:47:38 +00:00
TreeHugger Robot
d58aa257cd Merge "MediaPlayer2: add doc referencing androidx" 2019-02-05 03:34:04 +00:00
Wei Jia
ea0f2abe81 MediaPlayer2: add doc referencing androidx 
Test: compiles
Change-Id: I8267c40eae23e3faa188c2cd6b68eb3bb2fd2a9a
 2019-02-04 15:39:02 -08:00
Robert Shih
c08905bd87 MediaPlayer2: clear MediaDrm objects upon close/reset 
Bug: 112555913
Test: MediaPlayer2DrmTest
Change-Id: I3b60b0d8df4ae3273e17527975c154c80713b328
 2019-02-01 11:42:04 -08:00
Hyundo Moon
ff36c48229 Revert "Remove MediaController2 usages in MediaSessionServiceImpl" 
This reverts commit c1e4316e02.

Reason for revert: Now the circular dependency problem is resolved, this change is now obsolete.

Bug: 123336670
Change-Id: I065d811e9b8a3c7f851fb66d9527d62b417f1420
 2019-02-01 14:54:24 +09:00
Hyundo Moon
9f914c9bb7 Revert "Ensure that framework does not refer MediaSession2 related code" 
This reverts commit 14ca142e65.

Reason for revert: Now the circular dependency problem is resolved, the change is now obsolete.

Bug: 123495968
Change-Id: I5992f9dd205654ce70143773f9ab9bdcafee9ace
 2019-02-01 14:54:09 +09:00
Dongwon Kang
e6e5f41302 Move Session2Token to media apex 
Test: build
Change-Id: Id55fe0fa8596f98a84f5bdc89755631b18c7d308
 2019-01-31 15:33:41 -08:00
TreeHugger Robot
d73433cf25 Merge "VideoSize: replace with Size" 2019-01-31 17:35:13 +00:00
Wei Jia
a3aac960ba VideoSize: replace with Size 
Test: cts
Bug: 123661223
Change-Id: I31bfdf7a50a865854034e6c4fa0515e0c028f1a9
 2019-01-30 17:22:38 -08:00
Hyundo Moon
88dd29a6a3 Merge changes Ie30f0ca8,I59b4d4ce 
* changes:
  Move Media 1.0 files in mainline back to framework
  Remove MediaSessionEngine.CallbackStub
 2019-01-31 00:35:30 +00:00
TreeHugger Robot
65dc480a6b Merge "MediaPlayer2: unhide prepare DRM error codes" 2019-01-30 23:58:28 +00:00
Robert Shih
761b29030e MediaPlayer2: unhide prepare DRM error codes 
Bug: 123425309
Test: compiles
Change-Id: I1829dd6c7a55f111482439afe37897efa2689741
 2019-01-30 10:39:48 -08:00
Robert Shih
c9875d3755 MediaPlayer2: mark MediaPlayer-style DRM APIs TestApi 
Keep MediaPlayer-style DRM APIs as `@TestApi`s to help test
regressions between MediaPlayer-style and MediaPlayer2-style
DRM APIs.

Bug: 123425309
Test: compiles
Change-Id: I880129eff1b12a1476be240f1566bb4eedc94a63
 2019-01-30 18:23:03 +00:00
Hyundo Moon
83ff14c310 Move Media 1.0 files in mainline back to framework 
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;
Change-Id: Ie30f0ca86bd9303683bf6573f2f5858c6fb3206a
 2019-01-30 22:03:04 +09:00
Hyundo Moon
2a5179df15 Remove MediaSessionEngine.CallbackStub 
This CL also removes SessionCallbackLink.CallbackStub class
from the system API list.

Bug: 123500993
Test: make update-api -j; make -j;
      atest CtsMediaTestCases:android.media.cts.MediaSessionTest;
      atest CtsMediaTestCases:android.media.cts.MediaControllerTest;
Change-Id: I59b4d4ce058c53c82d816152039c51b109f0c245
 2019-01-30 19:43:57 +09:00
Sungsoo Lim
15c52f693d Move Rating and MediaDescription into mainline module 
Bug: 119539695
Test: pass MediaSessionTest, MediaControllerTest and
      MediaSessionManagerTest
Change-Id: I2274a473700b6ea432e368aeeb5201d449d53635
 2019-01-30 13:58:31 +09:00
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