TreeHugger Robot
f25495c51b
Merge "Clarify use of initData in MediaCrypto constructor"
2018-10-10 21:09:04 +00:00
TreeHugger Robot
6d87cc49c5
Merge "Fix compilation warning on MediaDrm"
2018-10-10 19:59:48 +00:00
TreeHugger Robot
1929a72d57
Merge "MediaPlayer2: remove hidden oob subtitle/timed text APIs"
2018-10-10 17:13:57 +00:00
TreeHugger Robot
a1d5e0e921
Merge "MediaPlayer2: add Context to create MediaPlayer2"
2018-10-10 04:55:59 +00:00
Wei Jia
ae4ff743e7
MediaPlayer2: add Context to create MediaPlayer2
...
Test: cts
Bug: 112549021
Change-Id: I7eb4f5483f07a71d962bd447c20f765dd8f5bdf6
2018-10-09 15:19:25 -07:00
kopriva
b6093ae7bd
Merge "docs: bug 37007350, missing word" into pi-dev am: 2f38a21898
...
am: fcc09fe17e
2018-10-08 19:18:37 -07:00
kopriva
fcc09fe17e
Merge "docs: bug 37007350, missing word" into pi-dev
...
am: 2f38a21898
2018-10-08 19:06:03 -07:00
kopriva
d104c81916
docs: bug 37007350, missing word
...
Test: make ds-docs
Bug: 37007350
Change-Id: Ibbff4232f67e7c955b182ff9f3b97250bb15c310
Exempt-From-Owner-Approval: Docs-only change
2018-10-08 15:24:21 -07:00
Jeff Tinker
6c174f848f
Fix compilation warning on MediaDrm
...
getMaxSecurityLevel does not return an element of the
@SecurityLevel enumeration, it only returns SECURITY_LEVEL_MAX
which is unrelated. Remove the annotation.
bug:116746514
Change-Id: I1683c14b25f76df36c2287135af3940df6aff4a0
2018-10-05 11:28:30 -07:00
Jeff Tinker
46a5d76810
Clarify use of initData in MediaCrypto constructor
...
Documentation bug: MediaCrypto constructor doc is unclear
bug: 29094355
Change-Id: I6c723874c0a8705216913d680fe5318a8c585dd4
2018-10-05 10:02:27 -07:00
TreeHugger Robot
9f9c47db93
Merge "Check album art for video thumbnails."
2018-10-05 15:18:56 +00:00
TreeHugger Robot
314cf1174e
Merge "MediaPlayer2: update javadoc"
2018-10-05 01:41:11 +00:00
kopriva
a7a1a152bc
docs: bug 37127405, typo am: cce5e4f4a2
...
am: b0fdbca951
2018-10-04 16:56:44 -07:00
Wei Jia
d92e59985c
MediaPlayer2: update javadoc
...
Test: compiles
Bug: 112549021
Change-Id: Ie889963a831be9bf39ddae157a21ea06d486d8a3
2018-10-04 16:52:09 -07:00
kopriva
b0fdbca951
docs: bug 37127405, typo
...
am: cce5e4f4a2
2018-10-04 16:48:19 -07:00
TreeHugger Robot
2cb7a4c524
Merge "MediaPlayer2: remove private API usage, Preconditions.checkArgument()"
2018-10-04 23:40:23 +00:00
Andrew Solovay
d10e384d6c
resolve merge conflicts of a3e34fe9fe to pi-dev-plus-aosp
...
Bug: None
Test: Eyeballed (comment-only change).
Change-Id: Ia644cde66376b2bddeb27bb2a147b3266037aa2c
Exempt-From-Owner-Approval: Docs-only change
Merged-In: Ia06e1fffd814671289a1caebd5962aedc18a28d7
2018-10-04 22:50:39 +00:00
Dongwon Kang
37c898b072
MediaPlayer2: remove private API usage, Preconditions.checkArgument()
...
Test: build
Bug: 112767549
Change-Id: I0ee4053d593aa75ef79f8c4cff19540312749461
2018-10-04 15:07:37 -07:00
kopriva
cce5e4f4a2
docs: bug 37127405, typo
...
Test: make ds-docs
Bug: 37127405
Change-Id: I40892ad7248d95a562d6af448ce4d475c79fd19f
Exempt-From-Owner-Approval: Docs-only change
2018-10-04 14:09:04 -07:00
Andrew Solovay
a3e34fe9fe
Merge "docs: Replacing {#link with {@link" into pi-dev
2018-10-04 20:06:59 +00:00
Amin Shaikh
105d2a35ee
Check album art for video thumbnails.
...
If there is no album art set, fall back to the first frame in the video,
as was previously done.
Test: manual
Change-Id: Id091c3c8a8054a87124759eb9be3ba759a115ad4
Fixes: 117161952
2018-10-04 15:23:52 -04:00
Andrew Solovay
a44f2c075b
docs: Replacing {#link with {@link
...
Several java files had the typo {#link (for cross-references to other
Javadocs) instead of the proper {@link format. This was confusing the
new doc publish tool (Mivi) since that's the format used for {# Django
comments #}.
Fixed a couple of links that had other errors (which prevented building
once the {# -> {@ was done) and other typos.
Replaced throughout the frameworks/base project; I'll need a separate CL
for the AndroidX fixes.
Staged to:
go/dac-stage/reference/android/app/Instrumentation.html
go/dac-stage/reference/android/bluetooth/BluetoothAdapter.html
go/dac-stage/reference/android/bluetooth/BluetoothDevice.html
go/dac-stage/reference/android/bluetooth/BluetoothServerSocket.html
go/dac-stage/reference/android/inputmethodservice/InputMethodService.html
go/dac-stage/reference/android/view/KeyCharacterMap.html
go/dac-stage/reference/android/view/KeyEvent.html
go/dac-stage/reference/android/media/AudioManager.html
go/dac-stage/reference/android/net/wifi/WifiConfiguration.html
(Other files were not in the public Javadocs.)
Bug: 111925950
Test: make ds-docs
Exempt-From-Owner-Approval: Docs-only change
Change-Id: Ia06e1fffd814671289a1caebd5962aedc18a28d7
Merged-In: Ia06e1fffd814671289a1caebd5962aedc18a28d7
2018-10-04 18:20:51 +00:00
Andrew Solovay
5c05dedda1
cherry-pick from pi-dev docs: Replacing {#link with {@link
...
Several java files had the typo {#link (for cross-references to other
Javadocs) instead of the proper {@link format. This was confusing the
new doc publish tool (Mivi) since that's the format used for {# Django
comments #}.
Fixed a couple of links that had other errors (which prevented building
once the {# -> {@ was done) and other typos.
Replaced throughout the frameworks/base project; I'll need a separate CL
for the AndroidX fixes.
(Other files were not in the public Javadocs.)
Bug: 111925950
Test: make ds-docs
Change-Id: Ia06e1fffd814671289a1caebd5962aedc18a28d7
Original Change-Id: Ia06e1fffd814671289a1caebd5962aedc18a28d7
Exempt-From-Owner-Approval: Docs-only change
2018-10-04 18:17:05 +00:00
Dongwon Kang
8a9edc9821
MediaPlayer2: remove hidden oob subtitle/timed text APIs
...
Also, other hidden subtitle API (SubtitleController, TimeProvider)
usages are removed since it will be handled within the VideoView2
side by using MediaClock notification.
Test: MediaPlayer2Test
Bug: 112767549
Change-Id: Ie1bba984b5e159cbd3915ea57b7624d31d84f011
2018-10-04 11:03:41 -07:00
TreeHugger Robot
7ff30e9ba9
Merge "Camera: Fix a typo in Image class comment"
2018-10-03 17:50:16 +00:00
kopriva
1fd1e06e82
Merge "docs: bug 37070633, wrong method name" into pi-dev am: d6301096ce
...
am: 200b55a7e3
2018-10-02 20:50:35 -07:00
TreeHugger Robot
cc5362235a
Merge "MediaPlayer2: fix and move CloseGuard checking to MediaPlayer2"
2018-10-03 03:32:25 +00:00
kopriva
200b55a7e3
Merge "docs: bug 37070633, wrong method name" into pi-dev
...
am: d6301096ce
2018-10-02 20:25:06 -07:00
TreeHugger Robot
206001641e
Merge "MediaPlayer2: fix argument offset for ByteString.copyTo"
2018-10-03 00:46:21 +00:00
kopriva
8cdc615ccd
docs: bug 37070633, wrong method name
...
Test: make ds-docs
Bug: 37070633
Change-Id: I0e95ce9ac14f00395ddcd0c74bf450ff77178255
Exempt-From-Owner-Approval: Docs-only change
2018-10-02 16:02:39 -07:00
Dongwon Kang
c18e3d39cb
MediaPlayer2: fix and move CloseGuard checking to MediaPlayer2
...
Test: build and boot
Bug: 112767549
Change-Id: I4e50f06c919e6666a08ba177bf9eb578fc224409
2018-10-02 15:37:51 -07:00
Shuzhen Wang
c98ff964da
Camera: Fix a typo in Image class comment
...
Test: None
Change-Id: Ia6cf6a1000ab2b6ff0d6a50726a70ba8d584e7b2
2018-10-02 14:52:38 -07:00
Wei Jia
3aa24eb5b9
MediaPlayer2: fix argument offset for ByteString.copyTo
...
Test: cts
Bug: 112549021
Change-Id: I0e14551bd4cd605e3fa64dbfc7dd81e6653e9210
2018-10-02 12:00:55 -07:00
Dongwon Kang
9f940dc9ec
Merge "MediaPlayer2: Remove hidden API usage, libcore.io.Streams"
2018-10-01 20:38:33 +00:00
Dongwon Kang
e2af339fbd
Merge "MediaPlayer2: remove hidden API AudioAttributes.FLATTEN_TAGS usage"
2018-10-01 20:38:21 +00:00
Jeff Sharkey
954725874b
Merge changes from topic "bugfix_content_path" am: aa642187cd am: f8ad474935
...
am: 8fe3754f1a
2018-10-01 12:06:55 -07:00
Jeff Sharkey
8fe3754f1a
Merge changes from topic "bugfix_content_path" am: aa642187cd
...
am: f8ad474935
2018-10-01 11:40:25 -07:00
Jeff Sharkey
f8ad474935
Merge changes from topic "bugfix_content_path"
...
am: aa642187cd
2018-10-01 11:25:38 -07:00
Dongwon Kang
a563eec2e7
MediaPlayer2: Remove hidden API usage, libcore.io.Streams
...
Test: build
Bug: 112767549
Change-Id: I7a23711660dab0a49a5d383f61f683283b592d0f
2018-10-01 10:16:43 -07:00
Dongwon Kang
e12c26d857
MediaPlayer2: remove hidden API AudioAttributes.FLATTEN_TAGS usage
...
Test: build
Bug: 112767549
Change-Id: Ib47b8078c009d1bdee3f45a5337d048737177c39
2018-09-28 15:04:11 -07:00
kopriva
2e18958528
Merge "docs: bug 37070226, sates typo" into pi-dev am: bfbfd12a2c
...
am: a92c529705
2018-09-28 14:48:00 -07:00
kopriva
a92c529705
Merge "docs: bug 37070226, sates typo" into pi-dev
...
am: bfbfd12a2c
2018-09-28 14:23:05 -07:00
Michael Dooley
7e833acdaf
Merge "Revert "Revert "Revert "Adding getModelState API to sound trigger""""
2018-09-28 07:38:34 +00:00
Michael Dooley
be93d52505
Revert "Revert "Revert "Adding getModelState API to sound trigger"""
...
This reverts commit 7999836ee3
2018-09-28 07:30:28 +00:00
Michael Dooley
ea3e73a879
Merge "Revert "Revert "Adding getModelState API to sound trigger"""
2018-09-28 06:24:43 +00:00
kopriva
cce2d3211e
docs: bug 37070226, sates typo
...
Test: make ds-docs
Bug: 37070226
Change-Id: I122715a93ae47fc5d8654b0a2fce8bb817c813c8
Exempt-From-Owner-Approval: Docs-only change
2018-09-27 15:01:04 -07:00
Wei Jia
27fa6f007b
MediaPlayer2: implement skipToNext
...
Test: cts
Bug: 112549021
Change-Id: Ibaf1fad4166c0c48058489f3d3d29dcda9a90d52
2018-09-27 13:32:31 -07:00
Wei Jia
f5e7900370
MediaPlayer2: allow prepared->pause
...
Test: cts
Bug: 112549021
Change-Id: Ifa6c556347b0e50d2a054aa43810294fd3cf0e95
2018-09-26 12:36:54 -07:00
Wei Jia
35a00b7f67
MediaPlayer2: catch RejectedExecutionException
...
Test: cts
Bug: 112549021
Change-Id: I8e18d1529b79548baf678a6a3a5aba1908ce93c3
2018-09-24 13:46:47 -07:00
Michael Dooley
7999836ee3
Revert "Revert "Adding getModelState API to sound trigger""
...
This reverts commit 81f71f1c27
2018-09-21 12:13:01 +00:00
