Commit Graph

7039 Commits

Author SHA1 Message Date
TreeHugger Robot
a354de4c96 Merge "Clarify getMaxSecurityLevel in MediaDrm java doc" 2018-10-18 23:01:24 +00:00
weichinweng
5f86ce578c Merge "AudioService: Add Hearing Aid Switch Control" am: f3b7821fbd am: c91b0fdfeb
am: 4ee1409540

Change-Id: I62ae26865245023e7f28d2964d876031e6c19d07
2018-10-18 14:54:21 -07:00
weichinweng
4ee1409540 Merge "AudioService: Add Hearing Aid Switch Control" am: f3b7821fbd
am: c91b0fdfeb

Change-Id: If26a9b0c561a8ba8da761aaba634d705e063f315
2018-10-18 14:38:10 -07:00
weichinweng
c91b0fdfeb Merge "AudioService: Add Hearing Aid Switch Control"
am: f3b7821fbd

Change-Id: I6abbbc268a8c391e2d400e7a9811ea0e04362bfc
2018-10-18 14:18:06 -07:00
Dongwon Kang
2bb45aa869 MediaPlayer2: add fallback logic for ringtone default actual uri.
Also, private API, getAuthorityWithoutUserId(), usage is replaced
with RingtoneManager.getDefaultType(). The code is using authority
to check if the uri is ringtone default uri, but it can be also checked
with getDefaultType() since it returns -1 for non ringtone default uri.

Test: MediaPlayer2Test
Bug: 112767549
Change-Id: I4c41314364e8bc398ffe75cb0ecc20a06a4502c8
2018-10-18 09:41:14 -07:00
weichinweng
c30a3e8d1c AudioService: Add Hearing Aid Switch Control
1) Add setBluetoothHearingAidDeviceConnectionState interface to control
suppressNoisyIntent flag.
2) Add check to confirm the previous device is active or not when want
to clean it.

Bug: 112279820
Test: Build Pass, BT off/on when play A2DP, Switch active device
Change-Id: I73f1236d44213c6cf4a2708f3c96144416cfa67d
2018-10-18 07:28:39 +08:00
Wei Jia
2a1407a747 MediaPlayer2: pass positions to native
Test: cts
Bug: 112549021
Change-Id: I7576611f94f6538bbb96b95d44cb1d9624c77710
2018-10-17 14:32:05 -07:00
Dongwon Kang
edf4d2275d Merge "Add RingtoneManager.openDefaultRingtoneUri()" 2018-10-17 17:40:33 +00:00
Dongwon Kang
bfe89a9927 Merge "MediaPlayer2: remove hidden api, setMetadataFilter and getMetadata" 2018-10-17 02:28:15 +00:00
Dichen Zhang
3cb7afb2c4 Merge "setVolume() function using single input Test: run CTS" 2018-10-16 17:09:12 +00:00
TreeHugger Robot
65182e5171 Merge "Revive ApiLoader to enable updatable apk on Media2 APIs" 2018-10-16 02:54:36 +00:00
Insun Kang
1667faa4ca Revive ApiLoader to enable updatable apk on Media2 APIs
Bug: 117107246
Test: build

Change-Id: I788958b42d8da6c8aa5d105e03eeb6a3be43e6dc
2018-10-16 11:52:14 +09:00
Dichen Zhang
e7db7ef15e setVolume() function using single input
Test: run CTS

Change-Id: Ib06fb92feb6202e867aee790f5ef793a40448e07
2018-10-15 12:15:05 -07:00
TreeHugger Robot
f52fe5feed Merge "ExifInterface: Fix checking possible overflow" 2018-10-12 14:53:20 +00:00
TreeHugger Robot
8025b01ebc Merge "MediaPlayer2: skip consecutive seeks except last one" 2018-10-12 01:53:14 +00:00
Wei Jia
5cbdad4117 MediaPlayer2: skip consecutive seeks except last one
Test: cts
Bug: 112549021
Change-Id: I2a899f399956e14ffcde886156da1347c500d4b0
2018-10-10 17:28:16 -07:00
Dongwon Kang
c049bd26ea Add RingtoneManager.openDefaultRingtoneUri()
This enables a way for client to open ringtone cache from DE storage
area before user is unlocked.

Test: RingtoneManagerTest and MediaPlayer2Test
Bug: 112767549
Change-Id: Ica929f079dbc14f8541d92b5c9b9a0db502d3d64
2018-10-10 17:09:18 -07:00
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

Change-Id: I8236f86a9a605c7d912a6f3cf61d30fa1b62e189
2018-10-08 19:18:37 -07:00
kopriva
fcc09fe17e Merge "docs: bug 37007350, missing word" into pi-dev
am: 2f38a21898

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

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
Dongwon Kang
e3ccf8d044 MediaPlayer2: remove hidden api, setMetadataFilter and getMetadata
Test: build
Bug: 112767549
Change-Id: Iee9706e3a3bad094d527e9a3111ea3e9bdda384a
2018-10-04 16:31:04 -07:00
Jeff Tinker
c3a4b4d1d7 Clarify getMaxSecurityLevel in MediaDrm java doc
Test:builds

bug:109858369
Change-Id: I13fe3383ac7260b0ac86ae306339704869946112
2018-10-04 22:56:38 +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
Jin Seok Park
42d96ce87c ExifInterface: Fix checking possible overflow
Currently, in order to prevent overflow when retrieving
thumbnail image, ExifInterface checks if the given
thumbnail offset + thumbnail length value is greater than
the length of the file. Instead of using available(), which
may require rewinding the file to the beginning, this
CL creates a getter method for the length of the file.

Test: Run cts
Change-Id: Ic6f9cd4d0f1a075493c393ce3eacc832a79a99ee
2018-10-04 13:26:01 +09: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