Commit Graph

7930 Commits

Author SHA1 Message Date
Mark Goldstein
d5333390d5 Fix minor typo
Bug: 134914150

Test: Docs bash

Exempt-From-Owner-Approval: Docs-only change

Change-Id: I3cf02d169f3fee409cd39b11094ca1cb161d290c
2019-07-22 17:26:16 +00:00
Mark Goldstein
a940560b6e Fix typo: Change setOutFormat to setOutputFormat.
Test: No test needed.

Change-Id: Ib4ca2f770866d3ada481d9aecabd092b03d6e99e

Exempt-From-Owner-Approval: Docs-only change
2019-07-19 17:26:39 +00:00
Kyunglyul Hyun
e23e5ed72b Media : Implement getAvailableRoutes in MediaRouter2Manager
This CL adds capability to media route 2 info, which can be used
to get available routes for each app, which set control categories.

The test for control category is changed to test getAvailableRoutes().

Test: atest mediaroutertest

Change-Id: If93d64f02b4868b5e04b737431291b18a52177de
2019-07-17 17:00:04 +09:00
Eric Laurent
f361061451 audio record: fix getPortId() after release
Some race condition can cause AudioRecordingMonitorImpl to call
getPortId() on the client object after it has been released causing
an exception to be thrown by the JNI.

Test: Use audio Recorder app and check that no exception is thrown
when recording stops

Change-Id: I6cc1aee0a2ccae879e2cb5df7af757f33436d1f3
2019-07-12 17:29:33 -07:00
Kyunglyul Hyun
0987e3d5e4 Merge "Media: Implement Seamless Transfer with a single provider." 2019-07-11 05:38:48 +00:00
Sungsoo Lim
97e2f0897b Merge "Allow to register multiple callbacks in MediaSessionManager" 2019-07-11 04:17:49 +00:00
TreeHugger Robot
dfb94f02fc Merge "Fix ThumbnailUtils thumbnail pts calculation" 2019-07-09 22:53:50 +00:00
Chong Zhang
0da7cdc103 Fix ThumbnailUtils thumbnail pts calculation
bug: 137113185
test: manual test the clip attached in the bug in Download app.
Change-Id: I824cf1a5c5e08b87e7534a4c2287286134838917
2019-07-09 12:20:53 -07:00
Kyunglyul Hyun
a0d47419e3 Media: Implement Seamless Transfer with a single provider.
Seamless transfer for a single provider case and two providers case
should be dealt with in different ways.

For a single provider case, the provider can handle transfer and returns
the result of transfer.

For multiple providers case, the media app handles the transfer.

This CL covers seamless transfer within a single provider.

If a user requests semless transfer in System UI, MR2Manager.selectRoute
should be called and this request is sent to MediaRoute2ProviderService
that can handle seamless transfer internally.

The new test, testSingleProviderSelect() in MediaRouterManagerTest tests the path for
seamless transfer and ensure transfer request is handled by a provider.

From this CL, we use packagename instead of uid to select app for seamless transfer.
This is required to handle unlaunched apps that don't have uid.
It would prevent to use media router 2 in a multi-user case, that will
be supported by another CL.

I also added onUnselectRoute in MediaRoute2ProviderService, which is
essential to notify a provider that a media app stopped casting.

Bug: 136775407
Test: atest mediaroutertest

Change-Id: Ie3d0e988a72eedea6036f465454e661c424a0495
2019-07-09 17:18:52 +09:00
Sungsoo Lim
14ddf75c47 Allow to register multiple callbacks in MediaSessionManager
Bug: 126758528
Test: manually
Change-Id: I613593a88c115a5ac694b8c984f3ae36e9cc1c78
2019-07-09 09:07:15 +09:00
Jaewan Kim
ae8c789a0d Merge "Media2: Make Javadoc consistent for recommending use of AndroidX" into qt-dev am: d1a84cb578 am: 9917209b15
am: 1bac830d6b

Change-Id: Iea268914656816f899552293b7362a1ee4f89d44
2019-07-03 20:38:31 -07:00
Jaewan Kim
1bac830d6b Merge "Media2: Make Javadoc consistent for recommending use of AndroidX" into qt-dev am: d1a84cb578
am: 9917209b15

Change-Id: I1435d9d111c60cc33198ead82f1ec021198c6cf5
2019-07-03 18:29:10 -07:00
TreeHugger Robot
d1a84cb578 Merge "Media2: Make Javadoc consistent for recommending use of AndroidX" into qt-dev 2019-07-03 21:59:30 +00:00
Marco Nelissen
5954d210d3 Remove libexif usage from libmedia_jni.so
Test: manual, connect with MTP and PTP
Change-Id: I33128db25b8aae60df7854c61fc2a3873a1bced9
(cherry picked from commit f7ec16802c)
(cherry picked from commit efb865ace2)
2019-07-03 18:13:53 +00:00
Jaewan Kim
db90afdb78 Media2: Make Javadoc consistent for recommending use of AndroidX
Bug: 136602530
Test: Build docs offline and checked manually.
Change-Id: I70df7b05a6749b9ba492ac03cd3b9179a7416b9c
2019-07-03 14:55:55 +09:00
Marco Nelissen
f7ec16802c Remove libexif usage from libmedia_jni.so
Test: manual, connect with MTP and PTP
Change-Id: I33128db25b8aae60df7854c61fc2a3873a1bced9
2019-07-02 15:48:17 +00:00
Mathew Inwood
77f6a6c262 Merge "Restore some greylist entries." into qt-dev am: 4c46902338 am: 07f3dfc625
am: c9cddd528f

Change-Id: Ia5906c5a5953ada2e52ff03d93c0d453eb676194
2019-06-28 23:52:49 -07:00
Mathew Inwood
07f3dfc625 Merge "Restore some greylist entries." into qt-dev
am: 4c46902338

Change-Id: I1e1e60d2d47c24576ff8c9f41c0676e781348dbb
2019-06-28 23:32:29 -07:00
Mathew Inwood
36292fc9e2 Restore some greylist entries.
In Q, these APIs were either:
- removed from the greylist entirely without good reason
- Moved to the restricted greylist without any public alternative
  information added

So they are being moved back to the greylist for Q.

Test: Treehugger
Bug: 136102585
Change-Id: I6518440a7b0de8292ad05b4df9f0f9580d18b2a5
2019-06-28 09:21:36 +00:00
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