TreeHugger Robot
cc74108336
Merge "Update Dolby surround sound display names"
2018-07-19 23:31:35 +00:00
Robert Shih
507537ee16
Merge changes from topic "am-9e4fa925-b00a-40e6-8fb0-e5a4244e6284" into oc-dev am: e43837e258 am: dccb62bcca am: 64cb4be887 am: c450d1401e
...
am: deb8dbad23
2018-07-16 14:20:21 -07:00
Robert Shih
deb8dbad23
Merge changes from topic "am-9e4fa925-b00a-40e6-8fb0-e5a4244e6284" into oc-dev am: e43837e258 am: dccb62bcca am: 64cb4be887
...
am: c450d1401e
2018-07-16 13:58:38 -07:00
Robert Shih
c450d1401e
Merge changes from topic "am-9e4fa925-b00a-40e6-8fb0-e5a4244e6284" into oc-dev am: e43837e258 am: dccb62bcca
...
am: 64cb4be887
2018-07-16 13:38:43 -07:00
Robert Shih
64cb4be887
Merge changes from topic "am-9e4fa925-b00a-40e6-8fb0-e5a4244e6284" into oc-dev am: e43837e258
...
am: dccb62bcca
2018-07-16 13:13:13 -07:00
Robert Shih
dccb62bcca
Merge changes from topic "am-9e4fa925-b00a-40e6-8fb0-e5a4244e6284" into oc-dev
...
am: e43837e258
2018-07-16 12:51:28 -07:00
Chong Zhang
71ffe730af
Merge "Fix broken javadoc link in MediaFormat" into pi-dev am: 15ae72085f
...
am: 741bcbee62
2018-07-16 12:33:46 -07:00
Chong Zhang
741bcbee62
Merge "Fix broken javadoc link in MediaFormat" into pi-dev
...
am: 15ae72085f
2018-07-16 12:25:32 -07:00
Dean Wheatley
1ba2d5ea79
Update Dolby surround sound display names
...
Bug: 63901775
Test: make
Change-Id: I27b969067c210c1684cbc53db3fade6175795498
2018-07-13 14:22:51 -07:00
Android Build Merger (Role)
7b414ce710
[automerger] Fix TrackInfo parcel write am: 0d2dc943dc am: 00b57fc9b7 am: 1bce1217ca am: 47c831e675 am: d6143e9307
...
Change-Id: I67d3d47cf3ba616d8b8d963d7092895621f63200
2018-07-13 06:57:21 +00:00
Android Build Merger (Role)
47c831e675
[automerger] Fix TrackInfo parcel write am: 0d2dc943dc am: 00b57fc9b7 am: 1bce1217ca
...
Change-Id: I29f00c9b6dca76c5b780d659d122e08a0d7e581c
2018-07-13 06:57:08 +00:00
Android Build Merger (Role)
1bce1217ca
[automerger] Fix TrackInfo parcel write am: 0d2dc943dc am: 00b57fc9b7
...
Change-Id: Ida72e9fed175aa9497af5c5f607640c07cb04cf5
2018-07-13 06:57:02 +00:00
Android Build Merger (Role)
00b57fc9b7
[automerger] Fix TrackInfo parcel write am: 0d2dc943dc
...
Change-Id: I7ea941c8cffa147d2c6a46f0428899bf001a2672
2018-07-13 06:56:56 +00:00
Robert Shih
0d2dc943dc
Fix TrackInfo parcel write
...
Bug: 77600398
Change-Id: Ia316f1c5dc4879f6851fdb78fe8b9039579be7bc
2018-07-12 23:56:38 -07:00
Wei Jia
80f59318d2
MediaPlayer2: skip commands when in error state
...
Test: cts
Bug: 109928575
Change-Id: I1b2d4a2336e09856ed4ffba15f8c47577101c4b5
2018-07-12 14:52:06 -07:00
TreeHugger Robot
102dc30c29
Merge "MediaPlayer2: clean up setDataSource"
2018-07-11 17:52:31 +00:00
Wei Jia
67d1dd8439
MediaPlayer2: clean up setDataSource
...
Test: cts
Bug: 109928575
Change-Id: Ib50e99599e8c27c9d9c9340e0517bd81a4e6b2d2
2018-07-10 14:26:28 -07:00
Chong Zhang
55135d5d5f
Fix broken javadoc link in MediaFormat
...
bug: 74979696
Change-Id: I83965f3d1d395cb0953da9605b27861a1d84cde7
2018-07-09 11:39:35 -07:00
Dake Gu
50b816222e
TvInputManager: fix leaking Context when failed create Session
...
If TvInputManagerService fails and returns null token, TvInputManager
does not create a Session object, so the onSessionReleased() will not
be executed. mSessionCallbackRecordMap does not clear the entry
in this case.
Bug: 110959874
Test: Create a TVView, call tune() with invalid id, run adb shell
dumpsys meminfo and check activity count is not leaking.
Change-Id: Id0c81a99cb222bac98778e5d494ebd8665cf950f
2018-07-06 17:55:04 +00:00
Wei Jia
726db8c9a3
MediaPlayer2: merge EventHandler with TaskHandler
...
Test: cts
Bug: 109928575
Change-Id: I0de22e4730dcb187194d72bf912013d5ad5a48ad
2018-07-03 16:57:38 -07:00
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
2018-06-20 15:40:22 -07:00
Marco Nelissen
7a72844fd5
Merge "Fix race condition in MediaHTTPConnection" into pi-dev
...
am: d7c87b74d9
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
2018-05-30 11:30:25 -07:00
Robert Shih
ef157649d5
Merge "MediaCodec.CryptoInfo: expose subsample encryption pattern" into pi-dev
...
am: e3348a2593
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
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
2018-05-24 17:03:53 -07:00
Jaewan Kim
0349869c06
Merge "Differentiate MediaBrowsers in a process for MediaBrowserService" into pi-dev
...
am: 0e7a307e14
2018-05-24 12:39:29 -07:00
Daisuke Teranishi
2e92e5c30b
Merge "Use correct filename when adding to ringtone" am: daff857ffd
...
am: 24062f05d3
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
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
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
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
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
