Commit Graph

6415 Commits

Author SHA1 Message Date
TreeHugger Robot
efee606e86 Merge "MediaSession2: Remove SessionPlayer2" 2018-02-21 16:32:37 +00:00
Hyundo Moon
c25293e532 MediaBrowser2: Rearrange API arguments in relevant order
Test: Passed MediaBrowser2Test
Change-Id: Ic7a9955235e77d9d9bd9f59ac70987c1d6e61140
2018-02-21 19:46:26 +09:00
Jaewan Kim
af25316e28 MediaSession2: Remove SessionPlayer2
MediaPlayer2 will provide implementation of MediaPlayerInterface

Test: Run all MediaComponents test once
Change-Id: Iecdbbcd0cbbdb191cdb228cf09d828565e13fc3d
2018-02-21 18:50:32 +09:00
TreeHugger Robot
437680c4ff Merge "MediaLibrarySession: Add notifySearchResultChanged" 2018-02-21 03:41:55 +00:00
Hyundo Moon
cfc3ab2ea4 Merge "MediaController2: Implement setRating()" 2018-02-21 01:35:40 +00:00
TreeHugger Robot
0f5fd79a96 Merge "VideoView2: Remove redundant listeners" 2018-02-21 00:27:13 +00:00
TreeHugger Robot
b729375d47 Merge "MediaFormat: declare key for AAC decoder DRC effect type" 2018-02-20 22:58:34 +00:00
Hyundo Moon
e08c97a38d MediaLibrarySession: Add notifySearchResultChanged
Bug: 72786724
Test: Passed MediaBrowser2Test
Change-Id: I3b232e1f959aa2d56fdc1caa46bf8d2775262bf1
2018-02-20 14:16:50 +09:00
Insun Kang
a35d1b1946 VideoView2: Remove redundant listeners
Bug: 73598418
Test: build
Change-Id: Ibc79fde985a98c2323c2c63feef874a90e084652
2018-02-20 01:31:35 +09:00
Hyundo Moon
a2be62f25b MediaController2: Implement setRating()
Bug: 73146284
Test: Passed MediaController2Test
Change-Id: Iaff4f5b58d0bbd7105a39763cd6fee7c6c621df8
2018-02-19 16:07:53 +09:00
Jean-Michel Trivi
bba1e9f24d MediaFormat: declare key for AAC decoder DRC effect type
Bug: 71430241
Test: CTS AAC decoder test

Change-Id: I077bdccf2b3ce935feaa6f14c75640d2f20affb7
2018-02-16 21:04:48 -08:00
Jeff Sharkey
2ab510ee24 Merge "Add RequiresFeature annotation." 2018-02-16 20:45:41 +00:00
Jeff Sharkey
98af2e4fec Add RequiresFeature annotation.
Certain APIs require that a device have a specific feature to operate
correctly, so start annotating them.

Test: builds, boots
Bug: 72284763
Change-Id: Ie2f30284bdfdb6acc4067f434eba3b5433837606
Exempt-From-Owner-Approval: simple annotations
2018-02-16 20:45:22 +00:00
TreeHugger Robot
7ed04f9590 Merge "MediaPlayer2: initial code for playlist support" 2018-02-16 17:06:17 +00:00
TreeHugger Robot
a426f9e5a7 Merge "Audio recording sources: annotate permissions" 2018-02-16 03:49:16 +00:00
Wei Jia
de0c3979ce MediaPlayer2: initial code for playlist support
Test: MediaPlayer2 plays
Bug: 63934228
Change-Id: I6bb8be8c2bda9221e252e54c14b95107eccf4e00
2018-02-15 16:53:18 -08:00
Jean-Michel Trivi
f11d805d30 Audio recording sources: annotate permissions
Annotate permissions for REMOTE_SUBMIX and HOTWORD.
Note that REMOTE_SUBMIX was defined before the notion
  of @SystemApi, hence its presence in SDK despite the
  need for system permission.

Bug: 72176464
Test: make online-system-api-sdk-docs
Change-Id: I315d584f06870b1e778d73a9f9415d201fe87af7
2018-02-15 15:55:44 -08:00
Jean-Michel Trivi
ebc80c8c46 AudioPolicy: media dynamic mix is fixed volume
Bug: 70859923
Test: gts-tradefed run-gts -m GtsGmscoreHostTestCases -t 'com.google.android.gts.audio.AudioHostTest#testTwoChannelCapturing'
Change-Id: Ie9a30e2607ae4ae9a9dd128e3bd80d7582eb381e
2018-02-15 15:05:00 -08:00
TreeHugger Robot
24c2b4e956 Merge "MediaSession: Rename mCallbackHandler to mCallback" 2018-02-14 03:58:51 +00:00
Sungsoo Lim
bdcb3080b4 MediaSession: Rename mCallbackHandler to mCallback
Support library uses reflection to the variable, mCallback, of
MediaSession. In order not to break the existing support lib
behavior on P devices, we need to keep the name.

Bug: 72979099
Test: version-compat-tests on P device
Change-Id: I5fd6c786d6a988777b94a3eb4f23d885202daa2a
2018-02-14 11:00:07 +09:00
Eric Laurent
92ab9f1c6b Merge "Add audioserver state callback" 2018-02-13 23:46:11 +00:00
TreeHugger Robot
2f711fec15 Merge "JAudioTrack: Create StreamEventCallback in MediaPlayer2Impl" 2018-02-13 11:25:32 +00:00
Hyundo Moon
d277683657 MediaBrowser2: Add search related methods
This CL adds following APIs:
 - BrowserCallback#onSearchResultChanged
 - BrowserCallback#onSearchResultLoaded (previously onSearchResult)
 - MediaLibrarySessionCallback#onLoadSearchResult

This CL also fixes conflicting @NonNull/@Nullable annotations in
MediaItem2 methods.

Bug: 72786724
Test: Builds successfully
Change-Id: Ica90ca6b47f33cd3d457a28598a035a00d144dfa
2018-02-13 17:04:33 +09:00
TreeHugger Robot
5cb747992d Merge "MediaBrowser2: Supplement javadoc for getItem/getChildren methods" 2018-02-13 03:13:10 +00:00
TreeHugger Robot
ffbc821046 Merge "Revert "Revert "Fix MediaDrm security level APIs""" 2018-02-12 17:55:50 +00:00
Hyundo Moon
1fd5b5d27c MediaBrowser2: Supplement javadoc for getItem/getChildren methods
Bug: 72786723
Test: Builds successfully
Change-Id: I75c3cc35b6768e14007ad6c0b0bc48b5e92c2fec
2018-02-12 14:26:57 +09:00
Jeff Tinker
2bca525460 Revert "Revert "Fix MediaDrm security level APIs""
This reverts commit fda717d501.

Change-Id: I5e51c7e8d7ab0626fdfd9726278cb762b79a512e
2018-02-11 18:59:14 +00:00
TreeHugger Robot
71a8fcfdc7 Merge "Revert "Fix MediaDrm security level APIs"" 2018-02-11 17:16:14 +00:00
Tobias Thierer
fda717d501 Revert "Fix MediaDrm security level APIs"
This reverts commit 778639efbe.

Reason for revert: Build cop here. The CL topic that I'm reverting broke several builds: Drm.h's openSession(Vector<uint8_t> &sessionId) hides overloaded virtual function openSession(DrmPlugin::SecurityLevel securityLevel, ..) from IDrm.h.

https://android-build.googleplex.com/builds/submitted/4598692/full-eng/latest/view/logs/build_error.log

Change-Id: I86bb202125b17bdeea12c414f3eca2a9e016dac2
2018-02-11 15:02:09 +00:00
TreeHugger Robot
7841ff5e88 Merge "Fix MediaDrm security level APIs" 2018-02-10 03:28:03 +00:00
TreeHugger Robot
ef8e8ef334 Merge "MediaPlayer2: hook up srcId." 2018-02-10 02:31:46 +00:00
Eric Laurent
1d3cdce9b0 Add audioserver state callback
Add system APIs for components (e.g rild) to monitor native audioserver
state and be able to reaply states after a native audioserver
crash and restart.

Bug: 67317552
Test: manual test.

Change-Id: I2afba9da5fc32b3768ca5ca0d5f97cc68707c408
2018-02-09 18:14:58 -08:00
Jeff Tinker
778639efbe Fix MediaDrm security level APIs
During development of the vendor/widevine HAL module, the newly added
MediaDrm.setSecurityLevel method was found to be difficult to
implement efficiently since the security level is needed at the time
a session is opened. This CL moves the security level parameter to
openSession to resolve this problem.

bug:72831697
bug:64001680

test: GTS media tests
Change-Id: I74b3d1013405805c18b9794bbf7c46348e0ccda9
2018-02-09 17:18:48 -08:00
Mikhail Naganov
8504ee8918 Simplify method management for IAudioService
Move all the methods called from native to the beginning,
so adding new Java-only methods does not affect transaction IDs
of methods called from native.

Also, remove unused imports from IAudioService.aidl

Bug: 72256604
Test: Loopback test in Java, OpenSL ES, and AAudio modes
Change-Id: Icc89e3ed7a052c26eb0e72ba31e3a4a973bcfd35
2018-02-09 09:03:05 -08:00
Hyundo Moon
8e5ef909c7 JAudioTrack: Create StreamEventCallback in MediaPlayer2Impl
This CL also adds setAudioOutputDeviceById() in the same class,
in order to support JAudioTrack::setOutputDevice().

Bug: 70363744
Test: Builds successfully
Change-Id: I1466670e74cff73d6cd32c4f439eac476c53ea2a
2018-02-09 22:07:52 +09:00
Chong Zhang
bd6be624f6 Merge "media: fix javadoc for MediaDataSource" 2018-02-09 02:12:05 +00:00
Chong Zhang
80c4dba4df media: fix javadoc for MediaDataSource
bug: 72872254
Change-Id: I843a75e1890f6c26b005c5f95641e0f472679155
2018-02-08 16:29:37 -08:00
Wei Jia
34c5bb126b MediaPlayer2: hook up srcId.
Test: MediaPlayer2 plays.
Bug: 63934228
Change-Id: Ie9f2b4ccd960461dd3384029bd267746a09ce8f6
2018-02-08 09:57:23 -08:00
Andreas Gampe
57d03914a1 Frameworks: Annotate trivial @GuardedBy in media
Add @GuardedBy for simple functions that require a single lock
and are named XYZLocked.

Derived by errorprone.

Bug: 73000847
Test: m
Test: m javac-check-framework RUN_ERROR_PRONE=true
Change-Id: I17e265a771604a06792566c2dd1842f9fe6439e7
2018-02-07 23:00:50 -08:00
TreeHugger Robot
8dd90ec5f5 Merge "MediaSession2: Make PlaybackInfoProvider inner interface" 2018-02-08 02:16:57 +00:00
TreeHugger Robot
5bc67523ab Merge "Silent does not put phone into DND by default" 2018-02-07 16:17:28 +00:00
Jaewan Kim
7d550e736e MediaSession2: Make PlaybackInfoProvider inner interface
It should be inner interface of MediaController2Provider because
PlaybackInfo is inner class of MediaController2

Test: Build
Change-Id: I575fe7e214256229bb27ce21038970fd552c8b97
2018-02-07 15:29:35 +09:00
Beverly
863e277533 Silent does not put phone into DND by default
Change-Id: Idf9e2cfbe1404d5455c25f14b464f455bd74859c
Fixes:72869432
Test: manual (toggle ringer to silence, dnd is not triggered)
2018-02-06 14:45:38 -05:00
Jean-Michel Trivi
29a97de36c Merge "Synchronous audio focus behavior with external focus policy" 2018-02-06 03:24:40 +00:00
Jean-Michel Trivi
e2d8aae2cc Synchronous audio focus behavior with external focus policy
This patch preserves the synchronous nature of audio focus requests,
  even when an external focus policy is installed.
When focus is requested, the request is blocked on
  the client-side, while AudioService informs the external
  policy of the request, and until the ext policy responds
  with the focus request result for this client, or
  it times out.
The new AudioPolicy API is the call for the external policy
  to send the focus request result.

Bug: 63906162
Test: gts-tradefed run gts -m GtsGmscoreHostTestCases -t 'com.google.android.gts.audio.AudioHostTest#testFocusPolicy'

Change-Id: I4671517f7f00eaaed8748bd4013b7d20be3085fb
2018-02-05 10:56:58 -08:00
TreeHugger Robot
56ac8ce053 Merge "MediaSession2: Implement playFromXXX and prepareFromXXX" 2018-02-05 13:51:47 +00:00
TreeHugger Robot
d11dc140bc Merge "VV2 & MCV2: Move handling MediaControlView2 visibility logic to VV2" 2018-02-05 10:17:33 +00:00
Jaewan Kim
47b7f2b63b MediaSession2: Implement playFromXXX and prepareFromXXX
Test: Run all MediaComponents tests once
Bug: 72798434
Change-Id: Ib45fea28c3431edc91af5120270275c906df78b6
2018-02-05 17:35:42 +09:00
Insun Kang
718c1d122f VV2 & MCV2: Move handling MediaControlView2 visibility logic to VV2
MediaControlView2's setTimeout API is removed and MCV2's visibility
handling logic is moved into VideoView2.

Test: build
Change-Id: I149119148f159c78e86c5061d247f0a434310719
2018-02-05 16:39:58 +09:00
TreeHugger Robot
1204834121 Merge "MediaSession2: Change controller's behavior when connected" 2018-02-05 07:08:15 +00:00