Commit Graph

7322 Commits

Author SHA1 Message Date
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
Andy Hung
72a60f82a0 AudioFormat: Add IntRange annotation to getFrameSizeInBytes
Test: compile
Bug: 122885005
Change-Id: I4cef60d5b767ca05f4cf0284ee18f99fd886635b
2019-01-15 11:45:55 -08:00
TreeHugger Robot
ba05834931 Merge "Unhide MediaSession2 and MediaController2" 2019-01-15 08:48:33 +00:00
Sungsoo Lim
7553b35ea1 Unhide MediaSession2 and MediaController2
Also unhide the relevant class: Session2Token.

Bug: 122055262
Test: pass MediaSession2Test and MediaController2Test
Change-Id: I7fb94b24082d683ff6367961e300f9ce5f6f8821
2019-01-15 10:24:08 +09:00
Jeff Tinker
955f3424a2 Merge "Add additional error conditions to MediaDrm" 2019-01-15 01:22:16 +00:00
Robert Shih
cf96703641 MediaPlayer2: callback based DRM APIs
Bug: 112549021
Test: MediaPlayer2DrmTest
Change-Id: If837087ef38fe0b71ad67e01aefdc04bb0339c8e
2019-01-14 16:33:20 -08:00
TreeHugger Robot
c3a5109a54 Merge "MediaSessionManager: Add listener for Session2Token changes" 2019-01-14 14:24:26 +00:00
Jaewan Kim
ea911860ef MediaSessionManager: Add listener for Session2Token changes
Bug: 122234817
Test: Build and flash manually
Change-Id: I5098a2437a556a785d405a89ee27868a7d6fb49f
2019-01-14 21:17:24 +09:00
TreeHugger Robot
fc02cf7f50 Merge "Unhide Session2CommandGroup" 2019-01-14 06:46:23 +00:00
Jin Seok Park
42dd015a86 Unhide Session2CommandGroup
Bug: 122436036
Test: atest CtsMediaTestCases:android.media.cts.Session2CommandGroupTest
Change-Id: I8a3e3fed9c5e5fc900e4c6dfc80ac1a346860321
2019-01-14 12:02:04 +09:00
Michael Dooley
7534f652ba Merge "Annotating getModelState method so it can be used by NowPlaying" 2019-01-12 14:28:52 +00:00
mike dooley
e01860a6e9 Annotating getModelState method so it can be used by NowPlaying
Test: none
Bug: 119386757
Change-Id: If4dcd9fae9b693cd040e74d6e7b10be895b46af3
2019-01-12 00:37:56 +01:00
Jeff Tinker
20594d8b9d Add additional error conditions to MediaDrm
New codes are being added to handle resource
contention, lost session state, frame size too
large and insufficient security level for
decryption. Also cleans up inconsistent use of
tamper detected error where invalid state error
should have been used.

bug:111504510
bug:111505796
test: cts and gts media test cases

Change-Id: Ifa652d31ea151fbdc9faa0dd15b19f885d82b916
2019-01-11 15:31:04 -08:00
Hyundo Moon
72994d482e Merge changes I185d3723,Id674576a
* changes:
  Introduce SessionCallbackLink
  Introduce ControllerCallbackLink
2019-01-11 11:51:16 +00:00
TreeHugger Robot
ba1b767e71 Merge "MediaSessionManager: Add getSession2Tokens()" 2019-01-11 11:45:17 +00:00
Jaewan Kim
bbce3333fc MediaSessionManager: Add getSession2Tokens()
This currently only returns tokens with the TYPE_SESSION.
Follow up CLs will change this to also return tokens with other types.

Bug: 122234817
Test: Build and flash manually.
Change-Id: Ia2f67983393696439020d5ea58976b9ed1662566
2019-01-11 16:54:11 +09:00
Jin Seok Park
4900d0e4ff Merge "Unhide Session2Command" 2019-01-11 06:58:00 +00:00
Hyundo Moon
c451a82527 Introduce SessionCallbackLink
In order to avoid direct AIDL usages in framework, this CL introduces a
new public class SessionCallbackLink which can prevent usages of
ISessionCallback.

Bug: 122336924
Test: make update-api -j / make -j
      atest CtsMediaTestCases:android.media.cts.MediaSessionTest
      atest CtsMediaTestCases:android.media.cts.MediaControllerTest
Change-Id: I185d372335104067b6f4ed512fcd2f3b3925642f
2019-01-11 15:18:03 +09:00
Hyundo Moon
8cd0ae9041 Introduce ControllerCallbackLink
In order to avoid direct AIDL usages in framework, this CL introduces a
new public class ControllerCallbackLink which can prevent usages of
ISessionControllerCallback.

Bug: 122337578
Test: make update-api -j / make -j
      atest CtsMediaTestCases:android.media.cts.MediaSessionTest
      atest CtsMediaTestCases:android.media.cts.MediaControllerTest
Change-Id: Id674576aa071b7fdbd0082bf6189fef2af2d919b
2019-01-11 14:42:14 +09:00
Jin Seok Park
abe390477b Merge "Cannot cast Object[] to Session2Command[]" 2019-01-11 04:33:26 +00:00
Jin Seok Park
eabc8bf0fe Cannot cast Object[] to Session2Command[]
Currently, Session2CommandGroup#writeToParcel tries to cast Object[]
to Session2Command[]. This CL casts each object instead.

Bug: 122686869
Test: Will add cts in later CL
Change-Id: I1a7c1e387bdbb089ae77d729527317959e47fce2
2019-01-11 11:03:16 +09:00
Jin Seok Park
b2b5049077 Unhide Session2Command
Bug: 122435992
Test: atest CtsMediaTestCases:android.media.cts.Session2CommandTest
Change-Id: I109fd5383689c211b4019514e498022e2717ea53
2019-01-11 10:44:18 +09:00
Dichen Zhang
c54940f204 Merge "jWakeLock" 2019-01-10 01:26:35 +00:00
TreeHugger Robot
f85b3162d7 Merge "MediaRecorder:add note for setMaxFileSize/Duration" 2019-01-09 21:37:04 +00:00
TreeHugger Robot
ed954eb7e6 Merge "MediaPlayer2: add back convenient API's for current data source." 2019-01-09 01:09:21 +00:00
TreeHugger Robot
95cb8e40ca Merge "Make PlaybackInfo implement Parcelable" 2019-01-09 00:27:30 +00:00
Dichen Zhang
8022ba126a jWakeLock
replace native binder with java PowerManager in JWakeLock

Test: MediaPlayer2Test
Bug: 122470692
Change-Id: I1e5871a50ecac4b0785f064801107e4b6035889a
2019-01-08 14:30:18 -08:00
Ray Essick
4c2d5d8c63 Merge "Synchronize mediarecorder.h and MediaRecorder.java" 2019-01-08 17:22:54 +00:00
TreeHugger Robot
e6baf1a446 Merge "Resolve hidden API usage of Handler constructor" 2019-01-08 04:41:31 +00:00
Ray Essick
be2e0e8824 Synchronize mediarecorder.h and MediaRecorder.java
These two files: frameworks/base/media/java/android/media/MediaRecorder.java
and frameworks/av/media/libmedia/include/media/mediarecorder.h have
separate definitions of output formats. The java side was missing the
definition for HEIF format.

Bug: 120134664
Test: manual
Change-Id: I1176aa1b7b688c9670183652461169fbe19682df
2019-01-07 18:37:12 -08:00
Hyundo Moon
98e819216c Make PlaybackInfo implement Parcelable
This CL makes MediaController.PlaybackInfo implement Parcelable, and
replaces ParcelableVolumeInfo with the class.

Bug: 122243794
Test: make update-api -j; make -j;
Change-Id: I89d3df721a43e8c1454dbb3bdcb0b34c943339ce
2019-01-07 15:23:04 +09:00
TreeHugger Robot
48c2c2751a Merge "MediaSession2: Tell framework about new MediaSession2" 2019-01-07 06:00:10 +00:00
Insun Kang
2166933f2f Resolve hidden API usage of Handler constructor
Previous code uses hidden constructor of Handler to set its messages
to be asynchronous. This replaces it with Message#setAsynchronous(),
which is public.

Bug: 122047488
Test: build
Change-Id: I06a958d1bea1c3c0f104c4380fce6084f8e7bad9
2019-01-07 14:05:35 +09:00
Jaewan Kim
7ad39875fd MediaSession2: Tell framework about new MediaSession2
Bug: 122234817
Test: Build and flash manually.
Change-Id: If210762c51d33e72ea09e6328eea435b68d2eaa4
2019-01-07 10:40:18 +09:00
TreeHugger Robot
30635a95d2 Merge "Unhide MediaItem2" 2019-01-07 00:23:45 +00:00
TreeHugger Robot
38a00d89c5 Merge "MediaPlayer: handle concurrency on mTimeProvider" 2019-01-05 03:22:58 +00:00
Wei Jia
ab715166ee MediaPlayer: handle concurrency on mTimeProvider
Bug: 118341983
Test: cts
Change-Id: Ieaf082b7dbc3cb93c2398e935ead77ca1810c62a
2019-01-04 15:24:15 -08:00
Gopalakrishnan Nallasamy
40056f4afd MediaRecorder:add note for setMaxFileSize/Duration
Added note about the side effects of setting a very large file size and duration using methods
setMaxFileSize and setMaxDuration respectively.

Bug: 62071579

Test: make offline-sdk-docs
      Added notes were visible in MediaRecorder.html

Change-Id: I7542da0bb55af286ac0c4c736ef783d8f4a4918a
2019-01-04 10:49:02 -08:00
TreeHugger Robot
9839414d27 Merge "Remove unnecesaary constants of Session2Command" 2019-01-04 08:56:50 +00:00
Sungsoo Lim
d922e0d659 Unhide MediaItem2
Bug: 122334310
Test: pass MediaItem2Test
Change-Id: Icfdefec07071c897e1d70601fa3ff5d21e80e18c
2019-01-04 15:14:22 +09:00
Hyundo Moon
7053844db7 Revert "Introduce ControllerCallbackLink"
This reverts commit e521669b5d.

Reason for revert: Another CL will be uploaded which makes the APIs public, not @SystemApi.

Bug: 122169124
Change-Id: Ie9ed1067596fe1724879e81d768ac8252eda7841
2019-01-04 14:27:45 +09:00
Hyundo Moon
fcaaba066a Revert "Introduce SessionCallbackLink"
This reverts commit 8eee83e594.

Reason for revert: Another CL will be uploaded which makes the APIs public, not @SystemApi.

Bug: 121239657
Change-Id: I0537ffd487ab6889213b8917615156caaec17eb5
2019-01-04 14:20:47 +09:00
TreeHugger Robot
ecf7b4fed5 Merge "MediaController: Use Context#getPackageName() for RemoteUserInfo" 2019-01-03 19:51:16 +00:00
Jeff Sharkey
c54ffd28f7 Merge "MediaStore should reflect state on disk." 2019-01-03 17:56:17 +00:00
Jean-Michel Trivi
9958c94e4d Merge "Dynamic audio policies: multi-zone through uid/device affinity" 2019-01-03 16:16:50 +00:00
TreeHugger Robot
a9ccb72194 Merge "Implement cancelSessionCommand" 2019-01-03 10:02:56 +00:00
Sungsoo Lim
2d4fe896e2 Remove unnecesaary constants of Session2Command
As ABI, we don't need to have all the constants defined
in AndroidX media2.

Bug: 121230641
Test: build
Change-Id: Ic6a8e1bfa8a3251a97fa5609542eabbfda1ebbac
2019-01-03 15:32:18 +09:00