Commit Graph

13276 Commits

Author SHA1 Message Date
Wei Jia
726db8c9a3 MediaPlayer2: merge EventHandler with TaskHandler
Test: cts
Bug: 109928575
Change-Id: I0de22e4730dcb187194d72bf912013d5ad5a48ad
2018-07-03 16:57:38 -07:00
TreeHugger Robot
e341d4a88f Merge "MediaPlayer2: move SubtitleData listener into EventCallback" 2018-07-03 18:08:03 +00: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
Dongwon Kang
443d78e68f Merge "Clean up libmedia2_jni Android.bp" 2018-06-28 22:20:16 +00:00
Dongwon Kang
10a67ef68a Clean up libmedia2_jni Android.bp
- Remove unnecessary source files
- Use shared-lib if there is NDK or NDK-compliant version

Test: build
Bug: 63934228
Change-Id: I23347678d53f43e6732065270d52e28d753e15bc
2018-06-27 16:58:38 -07:00
Emilian Peev
27668c754b Merge "ImageReader: Set inverse diplay transform if needed" into pi-dev am: 9504cd35ec
am: 9f6920c40d

Change-Id: I9ce2084f66bdc10176baeb1213d0b0215cc2bf6b
2018-06-27 12:43:28 -07:00
Emilian Peev
9f6920c40d Merge "ImageReader: Set inverse diplay transform if needed" into pi-dev
am: 9504cd35ec

Change-Id: Ie16f3b2f24bf556ae37c4e32e869d9454578fd07
2018-06-27 12:34:49 -07:00
Emilian Peev
da49a5ed33 ImageReader: Set inverse diplay transform if needed
Image transform sometimes could be missing the inverse
display flag. Any buffers that pass through BQs will
have this bit reset and moved in a separate buffer item
field. To restore and pass the original transform forward
check whether the flag got reset and re-enable it
accordingly.

Bug: 110641448
Test: Manual using application,
Camera CTS

Change-Id: Ia849f62333be40038a02768563b2f93e2ccf61ce
2018-06-26 10:17:34 +01: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
TreeHugger Robot
6f7ad58662 Merge "Add __INTRODUCED_IN annotations to <amidi/midi.h>." 2018-06-20 22:04:15 +00: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
Elliott Hughes
c73a4671dd Add __INTRODUCED_IN annotations to <amidi/midi.h>.
Bug: https://github.com/android-ndk/ndk/issues/706
Test: builds
Change-Id: I3f68f1e7c407b1208e943d15f74a9f32846a04b6
2018-06-18 12:17:17 -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
TreeHugger Robot
b1e8a6f64e Merge "Fix a typo on MediaTimestamp.getAnchorSytemNanoTime()" 2018-06-09 02:01:40 +00:00
TreeHugger Robot
611488ceac Merge "com.android.mediadrm.signer is built with java_sdk_library" into pi-dev-plus-aosp 2018-06-07 01:20:04 +00:00
Emilian Peev
9d29b3b343 Merge "media: Check window connect status in ImageWriter" into pi-dev am: 596fea9581
am: d60a056d7c

Change-Id: I0ae2650118a26fc2e13885faac3373f50c7ae1a6
2018-06-06 14:58:20 -07:00
Emilian Peev
d60a056d7c Merge "media: Check window connect status in ImageWriter" into pi-dev
am: 596fea9581

Change-Id: If1fee999ef937e74bf4ac23380e27dbea231655a
2018-06-06 14:51:26 -07:00
Emilian Peev
2adf40392e media: Check window connect status in ImageWriter
ImageWriter clients could pass invalid or already
connected surface during initialization. Check the
status after trying to connect to the producer
interface and raise an exception if necessary.

Bug: 80086132
Test: Camera CTS
Change-Id: I46810885046a3b89ea18510574c22db27e812a9c
2018-06-06 09:57:15 +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
7f6641b890 Merge "Fix broken links in @see tags in framework docs." 2018-06-04 19:51:34 +00:00
Sundong Ahn
be0f557e3a Merge "com.android.media.tv.remoteprovider is built with java_sdk_library" am: bd83ac0ecc am: 7295fd2af4
am: 9217ae6feb

Change-Id: Ie8774e8a5d9c4c0ab417a9294c1efd1a3ee6ade3
2018-06-04 12:04:42 -07:00
Sundong Ahn
9217ae6feb Merge "com.android.media.tv.remoteprovider is built with java_sdk_library" am: bd83ac0ecc
am: 7295fd2af4

Change-Id: Ib1964e9082209649f7e909bc075da1a61efc2af1
2018-06-04 11:31:38 -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
Treehugger Robot
bd83ac0ecc Merge "com.android.media.tv.remoteprovider is built with java_sdk_library" 2018-06-04 04:54:27 +00: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
Sundong Ahn
011bb72079 com.android.mediadrm.signer is built with java_sdk_library
The com.android.mediadrm.signer is built with java_sdk_library
and api files are added by running "make update-api".
The com.android.mediadrm.signer is removed in platform.xml
since it will be made auto generation by soong when the library is
built with java_sdk_library.

Bug:77577799
Test: make -j
Test: make checkapi
Test: adb shell cmd package list libraries |\
      grep com.android.mediadrm.signer
      And check the com.android.mediadrm.signer library

Merged-In: I0e773615abe6aa8d757e489de2b9d807cd356146
Change-Id: I0e773615abe6aa8d757e489de2b9d807cd356146
(cherry picked from commit 2e1089bae4)
2018-05-31 20:16:36 +09:00
TreeHugger Robot
4769f85fad Merge "com.android.mediadrm.signer is built with java_sdk_library" 2018-05-31 11:10:01 +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
Robert Shih
203c738591 Merge "Add cleartextTrafficPermitted to MediaFrameworkTest" into pi-dev am: 300ab58e9a
am: 5ecf175573

Change-Id: Iaecb78eca49f32d155ea856630d6299b8604d8fc
2018-05-25 16:26:00 -07:00
Robert Shih
5ecf175573 Merge "Add cleartextTrafficPermitted to MediaFrameworkTest" into pi-dev
am: 300ab58e9a

Change-Id: Ib8fd78e9d876ce986d443a8422330b7d69a44c10
2018-05-25 16:15:40 -07:00
TreeHugger Robot
300ab58e9a Merge "Add cleartextTrafficPermitted to MediaFrameworkTest" into pi-dev 2018-05-25 23:01:53 +00:00
Robert Shih
9a7cca9106 Add cleartextTrafficPermitted to MediaFrameworkTest
Bug: 75276616
Test: this
Change-Id: I520950a148658e9f1602e1b4657dd0273bdaf0e2
2018-05-25 12:01:06 -07:00
Sundong Ahn
2e1089bae4 com.android.mediadrm.signer is built with java_sdk_library
The com.android.mediadrm.signer is built with java_sdk_library
and api files are added by running "make update-api".
The com.android.mediadrm.signer is removed in platform.xml
since it will be made auto generation by soong when the library is
built with java_sdk_library.

Bug:77577799
Test: make -j
Test: make checkapi
Test: adb shell cmd package list libraries |\
      grep com.android.mediadrm.signer
      And check the com.android.mediadrm.signer library

Change-Id: I0e773615abe6aa8d757e489de2b9d807cd356146
2018-05-25 13:42:57 +09: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
Dongwon Kang
795b47fb77 Merge "Merge "MediaPlayer: ensure that jni code returns after throwing exceptions." into pi-dev am: 1a9def3dc7" into pi-dev-plus-aosp
am: 42542ca0bb

Change-Id: I2c892282a2aee6b03395b1c61ebae19df8c4397c
2018-05-24 16:08:11 -07:00
Lajos Molnar
c1c6e57639 Merge "MediaCodec: make setVideoScalingMode usable for IGBP-based clients" into pi-dev am: 604064e82d
am: 226687cb4d

Change-Id: Ie4ff2a9d4a268944d96b6dbed7a0eb734cd0cd71
2018-05-24 14:22:49 -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