Commit Graph

6873 Commits

Author SHA1 Message Date
Wei Jia
ba145fec56 MediaPlayer2: move SubtitleData listener into EventCallback
Rename onMediaTimeChanged to onMediaTimeDiscontinuity
Remove stop
Test: MediaPlayer2Test
Bug: 109928575

Change-Id: I7e81a3255360fe780f07d8478634a4a41935db8c
2018-07-02 18:12:42 -07:00
TreeHugger Robot
576150623c Merge "MediaPlayer2: remove inheritance on MediaPlayerBase" 2018-06-22 05:52:26 +00:00
Wei Jia
e1b48b6534 MediaPlayer2: remove inheritance on MediaPlayerBase
rename getMediaPlayer2State to getState
Test: MediaPlayer2Test
Bug: 109928575
Change-Id: I93c1b645bfe2a8be55e41fb07e6ecd9c60155258
2018-06-21 16:29:12 -07:00
TreeHugger Robot
f0ac738a21 Merge "AudioManager: javadoc update for volume methods" 2018-06-20 22:55:58 +00:00
Marco Nelissen
a41654c583 Merge "Fix race condition in MediaHTTPConnection" into pi-dev am: d7c87b74d9
am: 7a72844fd5

Change-Id: Ie8a4a2ec2c6df33aba1d48d0b89f400a75c1233d
2018-06-20 15:40:22 -07:00
Marco Nelissen
7a72844fd5 Merge "Fix race condition in MediaHTTPConnection" into pi-dev
am: d7c87b74d9

Change-Id: I65de507c2b98b81a25141994baba38831aea9142
2018-06-20 15:28:32 -07:00
Marco Nelissen
d4f64f27b0 Fix race condition in MediaHTTPConnection
getSize() and getMIMEType() rely on seekTo() having completed.
If seekTo() was called on a different thread, for example because
NuCachedSource2 was doing reads on a background thread, getSize()
could return -1 if it was called after connection was established,
but before the response had been parsed.

Bug: 110230427
Test: manual
Change-Id: I469b47e025f1c7a7ef3123d3347668f0541e6f2d
2018-06-20 07:42:05 -07:00
TreeHugger Robot
dc48c4bcaa Merge "MediaPlayer2: rename MediaPlayer2EventCallback to EventCallback" 2018-06-20 01:25:14 +00:00
Jean-Michel Trivi
5977362564 AudioManager: javadoc update for volume methods
Update the javadoc of setStreamVolume and adjustStreamVolume methods
  to document when they can throw a SecurityException.

Bug: 74121980
Test: make offline-sdk-docs
Change-Id: Ie5deba1261b11c80c4181e93c2c1ff75aeb1ecd4
2018-06-19 17:17:57 -07:00
Wei Jia
f3b7e15ca7 MediaPlayer2: rename MediaPlayer2EventCallback to EventCallback
Test: MediaPlayer2Test
Bug: 109928575
Change-Id: I5ee0b18b9d0898e248752b6bfa9e1e9fbe228a84
2018-06-19 11:05:56 -07:00
Sungsoo Lim
c3b5295b0f Remove log spam in MediaRouter
Bug: 110007356
Test: build
Change-Id: I249154eaf3c009429bb9731ca38b9e5eec271670
2018-06-15 17:37:48 +00:00
Dongwon Kang
ec3b696398 Fix a typo on MediaTimestamp.getAnchorSytemNanoTime()
Test: build
Bug: 109732775
Change-Id: I977edc128c14618241ea50fc6f91bc9672b6c059
2018-06-05 16:16:18 -07:00
Aurimas Liutikas
e701dc1799 Fix broken links in @see tags in framework docs.
doclava was accidentally suppressing all these broken links
in @see tags. This CL fixes issues so we can start enfocing
checks for broken @see links.

Test: make docs
Change-Id: If7830ece85f8d1f27c991eae282230814726e115
Exempt-From-Owner-Approval: Fixing @see javadoc link issues that are currently completely broken
2018-06-04 10:15:22 -07:00
Aurimas Liutikas
62786b4431 Merge "Fix broken links in @see tags in framework docs." 2018-06-01 17:16:09 +00:00
Aurimas Liutikas
7f6953369a Fix broken links in @see tags in framework docs.
doclava was accidentally suppressing all these broken links
in @see tags. This CL fixes issues so we can start enfocing
checks for broken @see links.

Test: make docs
Exempt-From-Owner-Approval: Fixing @see javadoc link issues that are currently completely broken
Change-Id: I767e9fb9842494e5eccef2a7bdeee3877c488b5d
2018-06-01 17:15:55 +00:00
Robert Shih
31d6897ac5 Merge "MediaCodec.CryptoInfo: expose subsample encryption pattern" into pi-dev am: e3348a2593
am: ef157649d5

Change-Id: I38a9da260726d0a07366047662be57a6e4bf8fd0
2018-05-30 11:30:25 -07:00
Robert Shih
ef157649d5 Merge "MediaCodec.CryptoInfo: expose subsample encryption pattern" into pi-dev
am: e3348a2593

Change-Id: I6eaaabc353304ee29aa677bf03d94384ddede51c
2018-05-30 11:13:45 -07:00
Robert Shih
e3348a2593 Merge "MediaCodec.CryptoInfo: expose subsample encryption pattern" into pi-dev 2018-05-30 17:43:58 +00:00
Robert Shih
97825a4fd0 MediaCodec.CryptoInfo: expose subsample encryption pattern
Bug: 31215085
Test: com.google.android.media.gts.WidevineMp4TempTests
Change-Id: I6965adc646684053633530e39258b171724b34bc
2018-05-25 17:44:56 -07:00
Jaewan Kim
ad4c8f0f96 Merge "Differentiate MediaBrowsers in a process for MediaBrowserService" into pi-dev am: 0e7a307e14
am: 0349869c06

Change-Id: I1ae64f0ac0192afd4e6fc777a1ed4b2b7dd579a3
2018-05-24 17:26:14 -07:00
Daisuke Teranishi
7c6c3f8b97 Merge "Use correct filename when adding to ringtone" am: daff857ffd am: 24062f05d3
am: 2e92e5c30b

Change-Id: I36e7f3d6787deb0c1efdcdaf55d209f55dcdc625
2018-05-24 17:03:53 -07:00
Jaewan Kim
0349869c06 Merge "Differentiate MediaBrowsers in a process for MediaBrowserService" into pi-dev
am: 0e7a307e14

Change-Id: I455466d79d0c1b534d87b33cdb787194422a51bf
2018-05-24 12:39:29 -07:00
Daisuke Teranishi
2e92e5c30b Merge "Use correct filename when adding to ringtone" am: daff857ffd
am: 24062f05d3

Change-Id: Id9d89491c5604b1611b22f215827f55de98f8ac2
2018-05-24 12:18:14 -07:00
TreeHugger Robot
0e7a307e14 Merge "Differentiate MediaBrowsers in a process for MediaBrowserService" into pi-dev 2018-05-24 09:59:28 +00:00
Daisuke Teranishi
ce4d67b6d0 Use correct filename when adding to ringtone
If the title of the music file includes "/", it's recognized
as a directory separator.
Use correct filename to select the file properly.

Bug: 80202253
Test: Add mp3 which title includes "/" to ringtone

Change-Id: I9bb05f6fe2d7d4dbbdf4f67db7ac6fde04707979
2018-05-24 11:39:33 +09:00
Ajay Panicker
1286597ecd Merge "Add field to set A2DP device volume on connect (1/2)" into pi-dev am: d8e8126abe
am: 695cc44f56

Change-Id: Ideb1172fb7f705945a3ec81af36b7281217e529c
2018-05-23 18:41:51 -07:00
jiabin
b27269e865 Merge "Avoid race condition when broadcasting device list changed." into pi-dev am: 2914820ebf
am: ce48867cf9

Change-Id: I6a5962aec5d3a632547ec20bd06b9c05cd2979fb
2018-05-23 17:32:29 -07:00
Wei Jia
bf65767b40 Merge "MediaPlayer: sanity check track before dereferencing" into pi-dev am: 1ba53717fe
am: 100a7a3907

Change-Id: I3b3df1d18d93f2114b1a02ad6ca35d62a0ac2999
2018-05-23 13:11:29 -07:00
Marius Renn
3389bb2b2c Merge "Adds support for hardware buffers in ImageWriter Images." into pi-dev am: f3703f9ef7
am: 3aac10aff9

Change-Id: Ia07dafac00279d9e9a18c19c5febf68a3ea59be3
2018-05-23 12:15:20 -07:00
Ajay Panicker
d8e8126abe Merge "Add field to set A2DP device volume on connect (1/2)" into pi-dev 2018-05-23 18:58:28 +00:00
Eric Laurent
3e6fb63090 Add field to set A2DP device volume on connect (1/2)
Add a field to setBluetoothA2dpDeviceConnectionStateInt() to allow
Bluetooth to set a volume for the new device when it connects.

Bug: 79529581
Test: Switch repeatedly between devices and see that the old volume isn't
used on the new device or the new volume isn't used on the old device.
Change-Id: I909fa3f40818c595fc977695fbfa1214f9a4de72
2018-05-23 17:24:55 +00:00
TreeHugger Robot
2914820ebf Merge "Avoid race condition when broadcasting device list changed." into pi-dev 2018-05-23 15:24:23 +00:00
TreeHugger Robot
1ba53717fe Merge "MediaPlayer: sanity check track before dereferencing" into pi-dev 2018-05-23 02:35:15 +00:00
Marius Renn
f3703f9ef7 Merge "Adds support for hardware buffers in ImageWriter Images." into pi-dev 2018-05-23 01:35:11 +00:00
jiabin
8c3a767b2d Avoid race condition when broadcasting device list changed.
Since broadcastDeviceListChanged could be called in different threads,
there would be race condition causing mutilple callback due to
mPreviousPorts is not thread safe.

Bug: 80138804
Test: run TestDeviceList app in toolbox and cts
Change-Id: I0aa70dc45594bca263ea6f36703f22fe0293f679
2018-05-22 17:56:09 -07:00
Wei Jia
aea5de9410 MediaPlayer: sanity check track before dereferencing
Test: media post submit tests passed
Bug: 78175875
Change-Id: I6a23fc859a077eba03a17a562a7c3bb01d97e85b
2018-05-22 15:26:01 -07:00
renn
be09219f61 Adds support for hardware buffers in ImageWriter Images.
This allows dequeuing private image buffers from ImageWriters,
and accessing their hardware buffers.

Bug: 79422702
Test: verified cts locally
Change-Id: Ia003ffa0af305fad8ca9407f5379a3c9c1ab07b5
2018-05-22 20:43:07 +00:00
Ricardo Garcia
6897b975f1 Merge "Fix DynamicsProcessing effect defaults and documentation typo" into pi-dev am: 7d195a5a87
am: bbb7ab957c

Change-Id: I4403b485caaf5e918503ea99edf64e8c5930c55f
2018-05-22 11:32:08 -07:00
Ricardo Garcia
7d195a5a87 Merge "Fix DynamicsProcessing effect defaults and documentation typo" into pi-dev 2018-05-22 18:00:06 +00:00
rago
39276259c7 Fix DynamicsProcessing effect defaults and documentation typo
Fixing level for default values of Dynamics Processing effect.
Fixing typo on documentation

Bug: 79712497
Test: manual testing and sound amplifier test
Change-Id: I54b2bd728dc502839cdde97327c840b825811c3c
2018-05-21 19:01:45 -07:00
Jaewan Kim
bca492d684 Merge "Differentiate MediaController in a process for MediaSession" into pi-dev am: 43688e8f2f
am: a31254bde1

Change-Id: I6b10eb78bf428cd93977d3075ae7a200b53bf92c
2018-05-21 17:41:21 -07:00
TreeHugger Robot
43688e8f2f Merge "Differentiate MediaController in a process for MediaSession" into pi-dev 2018-05-22 00:11:49 +00:00
Jaewan Kim
74ee5b36a0 Differentiate MediaBrowsers in a process for MediaBrowserService
MediaBrowserService#getCurrentControllerInfo() can have more fine
grained differentiation for multiple MediaBrowser in a package/process

Bug: 79728675
Test: Run CtsMediaTestCases
Change-Id: Ibc5076ea5ec40f059297b1e7bda9edef7107556e
2018-05-19 08:37:03 +09:00
Jaewan Kim
21c23e30b4 Differentiate MediaController in a process for MediaSession
MediaSession#getCurrentControllerInfo() can have more fine grained
differentiation for multiple MediaController in a package/process

Bug: 79728675
Test: Run CtsMediaTestCases
Change-Id: I81e94736e795ee5e7fbd28cb6cd834cc3a3b8f98
2018-05-19 08:36:51 +09:00
Jean-Michel Trivi
50bafe9e6b Merge "MediaFormat: fix javadoc for AAC-related keys" into pi-dev am: 1b3ef3cb7d
am: 6a59e737fc

Change-Id: If6819e397dbb927974ee8ef380865d10b11114a1
2018-05-18 13:59:22 -07:00
Jean-Michel Trivi
1b3ef3cb7d Merge "MediaFormat: fix javadoc for AAC-related keys" into pi-dev 2018-05-18 20:34:47 +00:00
Chong Zhang
df144052bd Merge "Add a hidden flag to indicate exif data block." into pi-dev am: 23fdce9295
am: 4c15c9e07c

Change-Id: I47a363a975cadcd9bda7d11f343d5fc44ec5b0e7
2018-05-18 10:37:39 -07:00
TreeHugger Robot
23fdce9295 Merge "Add a hidden flag to indicate exif data block." into pi-dev 2018-05-18 17:09:36 +00:00
Jean-Michel Trivi
5cf2899ccd MediaFormat: fix javadoc for AAC-related keys
Bug: 71430241
Test: make offline-sdk-docs
Change-Id: Id0d6439e0ff35af0a34d0c51cdcdafa8822fd5a9
2018-05-17 15:26:28 -07:00
Chong Zhang
2d4340e8a5 Add a hidden flag to indicate exif data block.
bug: 79476308
Change-Id: Ib86e7bd718fe54a4e3e265ce8644706038f1444c
2018-05-16 14:50:10 -07:00