Commit Graph

7019 Commits

Author SHA1 Message Date
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

Change-Id: I0c5cf3c2c1cdced9c42709f55055c632624983b2
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

Change-Id: Ibf98603127f39b6b7ed6bb6d7790121ed678c598
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
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

Change-Id: Id161ff13bc0b6c203bb88a0e993d69e46857298a
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

Change-Id: Ia5e127c9a2bc7d6aba92e46d3fc554e222884b65
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

Change-Id: I1718c1c34860b23d7dbe22bb6350825483e41fd6
2018-10-01 12:06:55 -07:00
Jeff Sharkey
8fe3754f1a Merge changes from topic "bugfix_content_path" am: aa642187cd
am: f8ad474935

Change-Id: Ic5bbd68c327e6ad26ba3ddbd19ca5ea277396452
2018-10-01 11:40:25 -07:00
Jeff Sharkey
f8ad474935 Merge changes from topic "bugfix_content_path"
am: aa642187cd

Change-Id: Ice15a2cffcaf96a370f8e73ebe0a25bdea67f1c3
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

Change-Id: I22f8e7efd80498b170efb5a73bfddd5d77628c96
2018-09-28 14:48:00 -07:00
kopriva
a92c529705 Merge "docs: bug 37070226, sates typo" into pi-dev
am: bfbfd12a2c

Change-Id: I8e2657148e06b21238f4f444ce29380f4837ab3d
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.

Reason for revert: broke build

Change-Id: Id02636908aed26ee0ed38042da1ace0125a6d417
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.

Reason for revert: undoing rollback

Change-Id: Ifddfd0c730f03e93788d662a392d538564ce210b
2018-09-21 12:13:01 +00:00
nobuhiko saitou
436b7b5634 Add OEM_SOUNDS_DIR variable
Add OEM_SOUNDS_DIR variable
And add judgment of OEM_SOUNDS_DIR in isSystemSoundWithMetadata.

Test: build and check sound like ringtone etc
Bug: 79123178

Change-Id: Ib432910c7a99695e73c88480b7028be1c9d04702
2018-09-20 16:05:54 +09:00
TreeHugger Robot
6f92f5215b Merge "MediaPlayer2: update javadoc for setPlaybackParams" 2018-09-19 19:57:19 +00:00
Wei Jia
6b29b71894 MediaPlayer2: update javadoc for setPlaybackParams
Test: cts
Bug: 112549021
Change-Id: I348d6b54414659accdf526fdc3448068490c6102
2018-09-18 14:24:43 -07:00
Dongwon Kang
7a53c4422f MediaPlayer2: remove unused code
Test: build
Bug: 112767549
Change-Id: I21d3f45c16fc884b05b848a18966f3ff59f84d86
2018-09-17 16:10:44 -07:00
Wonsik Kim
61796fdaa1 media: fix race condition around release
Protect native context for MediaCodec object from concurrent access.

Bug: 112863346
Bug: 112913410
Test: atest frameworks/av/media/libstagefright:postsubmit
Change-Id: Icacdd45bd6dcb0b03e2760a3441d2e7c7587d3ec
2018-09-14 14:37:10 -07:00
Jeff Sharkey
34e3e68375 Merge "Mark deprecated APIs, support column greylisting." 2018-09-14 18:38:15 +00:00
Michael Dooley
c106550132 Merge "Revert "Adding getModelState API to sound trigger"" 2018-09-14 16:21:17 +00:00
Michael Dooley
81f71f1c27 Revert "Adding getModelState API to sound trigger"
This reverts commit 4f809fe73e.

Reason for revert: fix build breakage

Change-Id: I75a54189f96fc21f6cb12dd8a05e513b1bda027c
2018-09-14 16:09:18 +00:00
Mathew Inwood
db0657a4f4 Merge "Move some members to the "Q blacklist"." 2018-09-14 13:54:28 +00:00
Michael Dooley
a707ba1cb0 Merge "Adding getModelState API to sound trigger" 2018-09-14 12:32:09 +00:00
Mathew Inwood
8c854f86a4 Move some members to the "Q blacklist".
Based on some analysis, these fields/methods are likely false positives.
Set maxTargetSdk=P so that any apps using them are required to migrate off
them in future. See the bug for more details.

Exempted-From-Owner-Approval: Automatic changes to the codebase
affecting only @UnsupportedAppUsage annotations, themselves added
without requiring owners approval earlier.

Bug: 115609023
Test: m
Change-Id: I719b5c94e5b1f4fa562dd5d655953422958ad37e
2018-09-14 13:18:34 +01:00