Commit Graph

7922 Commits

Author SHA1 Message Date
Kyeongkab.Nam
f571b16bea Merge "Fix equals API bug on TvTrackInfo" am: 609ac6fe3a am: c6d3763fd7 am: 01ffb2b2dd
am: c35ff0f362

Change-Id: Idf26ba1eaaa16e41d36f624f44a832b1e5879b2c
2019-06-27 12:14:54 -07:00
Kyeongkab.Nam
01ffb2b2dd Merge "Fix equals API bug on TvTrackInfo" am: 609ac6fe3a
am: c6d3763fd7

Change-Id: I717c3054fce981004ab358b44dcb3bc7b1a1fbb2
2019-06-26 21:18:21 -07:00
Kyeongkab.Nam
37be9f904a Fix equals API bug on TvTrackInfo
Member variable of mVideoActiveFormatDescription is not compared
on equals API. The variable should be compared on the equals API.

Test: build
Change-Id: Ib8fde63afb0504140f34ebd695f4524db9c74748
2019-06-26 11:13:53 +09:00
Kyunglyul Hyun
13bc105b80 MediaRouter: Make MR2M.CB.onRouteSelected to be called
With this, MediaRouter2Manager.Callback.onRouteSelected will be called properly.

This CL also adds provider id to MediaRoute2Info to distinguish routes
with the same id from different providers.

Test: atest mediaroutertest

Change-Id: If353a4decad489576a39b1a93c7d99c7fe238abe
2019-06-25 14:29:02 +09:00
Marco Nelissen
64c4d58295 Merge "MediaMetadataRetriever: improve error reporting" 2019-06-24 19:29:18 +00:00
Marco Nelissen
703e224909 MediaMetadataRetriever: improve error reporting
Add a message to various throws.

Bug: 27150793
Test: build
Change-Id: I5a03096ad1e44ccf57eb13db1c5db8c50407d9fb
2019-06-24 11:03:11 -07:00
Hyundo Moon
6f3e20096f Merge "Merge "Do not allow adding custom Parcelable in Bundles" into qt-dev am: 1348399885 am: d762136f02" into qt-r1-dev-plus-aosp
am: 9741440ab9

Change-Id: Ia5fc024f9f6885dbf5c00e0d8da46cdd1e24980c
2019-06-24 09:22:51 -07:00
Hyundo Moon
0a29885ea8 Merge "Do not allow adding custom Parcelable in Bundles" into qt-dev am: 1348399885
am: d762136f02

Change-Id: I57d4319c30cd92b0df4d72f112b8f36c50eac1fa
2019-06-24 08:50:50 -07:00
Hyundo Moon
b535723ff5 Merge "Do not allow adding custom Parcelable in Bundles" into qt-dev
am: 1348399885

Change-Id: Ibca40676bb609379cda3797b5120be76a62041d3
2019-06-24 08:09:54 -07:00
Hyundo Moon
1348399885 Merge "Do not allow adding custom Parcelable in Bundles" into qt-dev 2019-06-24 04:26:17 +00:00
Lajos Molnar
2af4fbc9a6 Merge "media: clarify frame dropping behavior for decoder output" into qt-dev am: cfb6f93443 am: ba0ce1d6a9
am: 83cfaf6d07

Change-Id: Ie2920cafc7213528a8acb878c638550a056d3607
2019-06-21 13:07:19 -07:00
Lajos Molnar
ba0ce1d6a9 Merge "media: clarify frame dropping behavior for decoder output" into qt-dev
am: cfb6f93443

Change-Id: I069b15b05fc1032177c4874cd7ff2d2041076e22
2019-06-21 12:50:37 -07:00
Hyundo Moon
6cddbe14e1 Do not allow adding custom Parcelable in Bundles
This CL prevents the API users from passing any Bundles with
custom Parcelable to following APIs:
 - MediaSession2.Builder#setExtras()
 - MediaController2.Builder#setConnectionHints()
 - MediaSession constructor

Bug: 135572812
Test: Passed followings tests
  atest CtsMediaTestCases:android.media.cts.MediaSessionTest;
  atest CtsMediaTestCases:android.media.cts.MediaControllerTest;
  atest CtsMediaTestCases:android.media.cts.MediaBrowserTest;
  atest CtsMediaTestCases:android.media.cts.MediaSessionManagerTest;
  atest CtsMediaTestCases:android.media.cts.MediaSession2Test;
  atest CtsMediaTestCases:android.media.cts.MediaController2Test;
  atest CtsMediaTestCases:android.media.cts.MediaSession2ServiceTest;
Change-Id: I703c9fc0b180fb7bb3bf9bbec677f01a2a128c7a
2019-06-21 15:21:07 +09:00
Lajos Molnar
9a5a383d9e media: clarify frame dropping behavior for decoder output
Bug: 135390389
Change-Id: Ie1b83e2db85703ea6fb03483b0ce08924de93e4f
2019-06-19 23:37:43 +00:00
Kyunglyul Hyun
081b18663a Media: Adds TAG_THUMBNAIL_ORIENTATION to ExifInterface
Using the new tag, users can distiguish orientation from IFD0 and IFD1.

Bug: 135583583
Test: manually with a file attached on the bug
Test: atest ExifInterfaceTest (in cts)
Change-Id: I0ac22f5d740eadc8662920b3e87619d094f0098c
2019-06-19 18:18:29 +09:00
Eric Laurent
d7eabe73f7 Merge "Merge "audioservice: add RTT mode observer" into qt-dev am: a66bfb90b6 am: fef36889bb" into qt-r1-dev-plus-aosp
am: 6ac6d6cd67

Change-Id: Ica43bd7dc0033d61866031cb3b22a90a1330d055
2019-06-11 18:45:24 -07:00
Eric Laurent
fef36889bb Merge "audioservice: add RTT mode observer" into qt-dev
am: a66bfb90b6

Change-Id: I9b0e2ac080e648bf42ad4f3e1e787daa651a4b91
2019-06-11 18:33:35 -07:00
Eric Laurent
6acdc094d6 audioservice: add RTT mode observer
Add content observer for RTT mode: when RTT is ON during a call,
The assistant is allowed to capture audio similarly to when an
accessibility service is in the foreground.

Bug: 132976361
Test: use voice input during a call with RTT enabled.
Change-Id: Ief04d886370b50ae3dac0a72dbd1a4ea5f2c66a3
2019-06-11 15:01:45 -07:00
Neil Fuller
ca48dd8182 Switch to HexEncoding from ByteStringUtils
Migration in preparation for deletion of ByteStringUtils.

Also contains an import ordering change needed for upload.

Bug: 124232146
Test: build only
Change-Id: I0c71751de9a142a81ce43b4eaea497bf291afcbc
(cherry picked from commit 8fdca745d6)
2019-06-06 14:01:38 +00:00
Mathew Inwood
49d9704397 Merge "Move two audio APIs back the the greylist." into qt-dev am: 811c8a06e0 am: 6d455c5d16
am: fa564796da

Change-Id: I91e40dba2b553a7fa2e039d53ced6547a03296fb
2019-05-31 16:08:01 -07:00
Mathew Inwood
fa564796da Merge "Move two audio APIs back the the greylist." into qt-dev am: 811c8a06e0
am: 6d455c5d16

Change-Id: Ifca57821dacaeca927c8f7d95f0361e876e5f29d
2019-05-31 15:26:48 -07:00
Mathew Inwood
d255776d9d Merge "Move two audio APIs back the the greylist." into qt-dev
am: 811c8a06e0

Change-Id: I151f641eef449d5476b5792c92eba1352e04c6fb
2019-05-31 15:22:14 -07:00
TreeHugger Robot
811c8a06e0 Merge "Move two audio APIs back the the greylist." into qt-dev 2019-05-31 22:07:49 +00:00
Jesse Evans
507af33851 Merge "Fix documentation bug with METADATA_KEY_LOCATION" into qt-dev am: 8b1f5ba17e am: f754d1397c
am: cad8e2134a

Change-Id: I0556388374a76450c0c3b8fbb78ef22a379d4034
2019-05-31 14:22:43 -07:00
Jesse Evans
f754d1397c Merge "Fix documentation bug with METADATA_KEY_LOCATION" into qt-dev
am: 8b1f5ba17e

Change-Id: Iafbdb290293c6b2fd2b32b196b60f83f5c0f6a2b
2019-05-31 13:58:17 -07:00
Jesse Evans
fabc1ad011 Fix documentation bug with METADATA_KEY_LOCATION
MPEG4Writer::writeGeoDataBox() has always written latitude
before longitude since it was introduced. And the ISO-6709
is also to have +-{latitude}+-{longitude}/ so we should have
the correct information here.

This is likely to be important for Q since lat/long are no
longer accessible via MediaStore.

Bug: 134100244
Test: documentation change only
Change-Id: If157e3b0a639da9e012c0dd23fcfacfa0a59c28e
2019-05-31 18:02:05 +00:00
Jeff Sharkey
ff00ce56a7 Merge "video files with mimetype video/x-ms-asf can't scan to Gallery" into qt-dev am: 6f574c4d3a am: 1aa2934cf2
am: 58f1d00dce

Change-Id: If828a57f62a05b60dda582ba71c3a9b55bb29d69
2019-05-30 17:54:37 -07:00
Jeff Sharkey
1aa2934cf2 Merge "video files with mimetype video/x-ms-asf can't scan to Gallery" into qt-dev
am: 6f574c4d3a

Change-Id: I50973ff724c5a3dbb65744be81c786de8956615d
2019-05-30 17:31:05 -07:00
Jeff Sharkey
6f574c4d3a Merge "video files with mimetype “video/x-ms-asf” can't scan to Gallery" into qt-dev 2019-05-31 00:10:04 +00:00
Vineet Jhunjhunwala
5a7b1183a3 video files with mimetype “video/x-ms-asf” can't scan to Gallery
video files with mimetype  “video/x-ms-asf”  are considered as PlayList
file type due to below check in MediaFile.Java
Do not consider it as playlist file and remove case of “video/x-ms-asf”

Bug: 133940458
Test: The video is show in gallery
Change-Id: I6af45b597d9b8d9b277e1ae89f2afe019ee2eead
2019-05-30 15:54:37 -06:00
Jean-Michel Trivi
1e05b52b23 Merge "AudioService: remove dead BT code" into qt-dev am: 3de2438d5c am: 3222703156
am: 96d2c7898e

Change-Id: I9faf497e730c27eb756d3a374ad4825d8adbecd8
2019-05-30 13:15:56 -07:00
Jean-Michel Trivi
3222703156 Merge "AudioService: remove dead BT code" into qt-dev
am: 3de2438d5c

Change-Id: I99388c3ec13278731b2e403aa308c2eb8131da21
2019-05-30 11:59:24 -07:00
TreeHugger Robot
3de2438d5c Merge "AudioService: remove dead BT code" into qt-dev 2019-05-30 18:36:34 +00:00
Mathew Inwood
5e757204d3 Move two audio APIs back the the greylist.
These APIs are used by older versions of the unity game engine, and many
of these games are not in a position where they are able to update
unity. To keep these games working now and in the future, leave these
APIs on the derestricted greylist.

Bug: 134049522
Test: m
Change-Id: I541ed6fbacfc1e405a319af5c2ff785625afb26a
2019-05-30 15:26:56 +01:00
Jin Seok Park
ad91dc5dda Merge "Catch OutOfMemoryError and log warning" into qt-dev am: f66a0737ca am: 49d3fb772a
am: e57d4841fd

Change-Id: I2651c127868f4496faf346a812bc935a66cc442f
2019-05-30 03:04:06 -07:00
Jin Seok Park
49d3fb772a Merge "Catch OutOfMemoryError and log warning" into qt-dev
am: f66a0737ca

Change-Id: I73ffd7764f57470afcaac23ab5546d6ea786c387
2019-05-30 02:55:06 -07:00
Jin Seok Park
f66a0737ca Merge "Catch OutOfMemoryError and log warning" into qt-dev 2019-05-30 09:40:57 +00:00
Jin Seok Park
6e3113302f Catch OutOfMemoryError and log warning
Bug: 133827762
Test: atest CtsMediaTestCases:android.media.cts.ExifInterfaceTest
Change-Id: I5c6e247136e033968f418a50276971a8a686e021
2019-05-30 14:26:11 +09:00
Tobias Thierer
6bbdbcd4c4 Merge "Merge "Fix MediaHTTPConnection.disconnect() blocking for a long time." into qt-dev am: 0c1f41d303 am: eed3cc94d7" into qt-r1-dev-plus-aosp
am: 9c73457f03

Change-Id: Iccacfffb860f8e8e099495926d278167f7c906ee
2019-05-29 16:21:01 -07:00
Tobias Thierer
eed3cc94d7 Merge "Fix MediaHTTPConnection.disconnect() blocking for a long time." into qt-dev
am: 0c1f41d303

Change-Id: I7a779fde87442bce23b1c6edc344197be2111f4f
2019-05-29 16:01:49 -07:00
TreeHugger Robot
0c1f41d303 Merge "Fix MediaHTTPConnection.disconnect() blocking for a long time." into qt-dev 2019-05-29 22:51:36 +00:00
Beverly
4dfa409d4c Merge "Change suppresible type of voice comm signalling" into qt-dev am: c9dcf2ff78 am: e0d4554fa0
am: 39d17e3b8f

Change-Id: I522bb516b1e6082426a11da0813933197fa4b57d
2019-05-29 10:22:40 -07:00
Beverly
e0d4554fa0 Merge "Change suppresible type of voice comm signalling" into qt-dev
am: c9dcf2ff78

Change-Id: If272dbfe8acec4020c78b834d786890af2261c9f
2019-05-29 09:53:34 -07:00
Beverly
1feff71387 Change suppresible type of voice comm signalling
USAGE_VOICE_COMMUNICATION_SIGNALLING shouldn't be considered
SUPPRESSIBLE_SYSTEM. It includes the ring tone sound when in a call.
Instead, it should not be suppressible like USAGE_VOICE_COMMUNICATION.

Test: manual
Fixes: 131756661
Change-Id: Ide8aafafe58c421f3b699e6de9358b4e73ad01c5
2019-05-29 13:36:12 +00:00
Tobias Thierer
7dc093c08b Fix MediaHTTPConnection.disconnect() blocking for a long time.
MediaHTTPConnection.seek() was creating new connections in a while
loop without checking whether another thread was busy concurrently
disconnecting.

When a new connection was created between the time the disconnect()ing
thread had disconnected the old one and acquired the synchronized
block, the new connection wouldn't be disconnected and therefore
seek() would not encounter an IOException; therefore, seek() would
not return quickly, leaving the disconnecting thread waiting to
acquire the synchronized block for a long time.

This CL fixes this by making seek() throw IOException quickly if
it discovers that another thread is trying to disconnect. This
is checked shortly before and after the new connection is created,
to avoid a race based on the order between the new connection
being created and the disconnecting thread reading the old
connection value. Note that this still doesn't stop a new
connection being created shortly after the previous one was torn
down - it only stops the disconnecting thread waiting for a long
time to acquire the synchronized lock.

Fixes: 131894499
Test: The following command hang 3/3 times before this CL, but
      succeeded 3/3 times afterwards:
      atest android.media.cts.NativeDecoderTest#testAMediaDataSourceClose

Change-Id: I3862a4367d0e46c64c0cbf7bcaa369aca5692871
2019-05-29 01:17:43 +01:00
Eric Laurent
0971b734fd Merge "Merge "AudioTrack: implement gapless transition for offload mode" into qt-dev am: 1c66d4c716 am: 3de238984e" into qt-r1-dev-plus-aosp
am: a2e03c40de

Change-Id: Ie02de6bbb641a5afcee6f6280a49bf7730cca4d0
2019-05-28 12:34:55 -07:00
Eric Laurent
3de238984e Merge "AudioTrack: implement gapless transition for offload mode" into qt-dev
am: 1c66d4c716

Change-Id: I21427829d6fe6acff15c899e8d2e84b898b0d7a3
2019-05-28 12:21:11 -07:00
TreeHugger Robot
1c66d4c716 Merge "AudioTrack: implement gapless transition for offload mode" into qt-dev 2019-05-28 19:11:28 +00:00
Eric Laurent
bb23d7c8b5 AudioTrack: implement gapless transition for offload mode
Bug: 119775911
Test: test track transition with offload playback cmd line app
Change-Id: Ib105f65eb62845feceff45fbda9bec165e219841
2019-05-28 08:33:18 -07:00
Kyunglyul Hyun
f6490b5de3 Merge "Media: Add group id for media router to sync" into qt-dev am: 5644a46b3c am: 4156ab2d82
am: 7f3762b584

Change-Id: I4e5c32d0ac6615728701959223de510f8718ad50
2019-05-24 17:50:19 -07:00