Commit Graph

7582 Commits

Author SHA1 Message Date
TreeHugger Robot
a6d819a455 Merge "MediaDrm: create Executor overload for callback APIs" 2019-03-13 04:01:18 +00:00
Hyundo Moon
8514ea820f Merge "Allow registering multiple RemoteVolumeController" 2019-03-13 02:59:35 +00:00
Robert Shih
26269a1a8a MediaDrm: create Executor overload for callback APIs
Bug: 123939401
Bug: 28674524
Test: MediaDrmMockTest & MediaDrmClearkeyTest
Change-Id: Ibf0bd90994ca5e6f337efe439f748ae6b618d38f
2019-03-12 19:44:28 +00:00
TreeHugger Robot
b64c10bc06 Merge "AudioPolicy: add synchronous unregister method" 2019-03-12 18:30:27 +00:00
Jean-Michel Trivi
cada37225b AudioPolicy: add synchronous unregister method
Add a method to synchronously unregister an AudioPolicy. This method
   also flushes the AudioRecord and AudioTrack instances that
   were associated with any AudioMix created by this policy.

Bug: 119057550
Test: see bug
Change-Id: Ia58ccdaf8a50580bcdd49aa2f6e204f0f6c7f814
2019-03-12 08:54:05 -07:00
Hyundo Moon
a676fdcbee Allow registering multiple RemoteVolumeController
Bug: 126890783
Test: flashed and change volume while casting
Change-Id: I6e0624161c29f9d4d81ade218d3bcfb2a0429351
2019-03-12 16:49:32 +09:00
Hyundo Moon
ec6bf88434 Merge "Revert Media 1.0 API changes introduced for making 1.0 updatable" 2019-03-12 04:06:32 +00:00
Hyundo Moon
c3ce09eef7 Revert Media 1.0 API changes introduced for making 1.0 updatable
This CL reverts API changes which were introduced by below CLs:
 - "761c475: AML: Make config_mediaMetadataBitmapMaxSize as @SystemApi"
 - "888b791: Make AudioManager.FLAG_FROM_KEY as @SystemApi"
 - "3d1353a: AML: Unhide KeyEvent.isMediaSessionKey()"

Bug: 128245348
Test: atest CtsMediaTestCases:android.media.cts.MediaSessionTest;
      atest CtsMediaTestCases:android.media.cts.MediaControllerTest;
      atest CtsMediaTestCases:android.media.cts.MediaBrowserTest;
Change-Id: I263a958bf340336f699adb28424241fd00e46e28
2019-03-11 20:19:09 +09:00
TreeHugger Robot
b68d06c312 Merge "Add Javadoc" 2019-03-11 09:58:36 +00:00
Jin Seok Park
73f1091c90 Merge "[Exif] Throw NPE after checking @NonNull parameters" 2019-03-11 05:48:08 +00:00
Jin Seok Park
aa6721354b Merge "[Exif] Prevent infinite loop" 2019-03-11 05:46:08 +00:00
Jin Seok Park
235e74a562 Add Javadoc
This CL adds Javadoc for clarifying the relationship between the
framework and AndroidX versions of ExifInterface.

Bug: 122276930
Test: N/A
Change-Id: I096a7322348046662f02b07c98956dad7501a1cf
2019-03-11 11:46:49 +09:00
Jin Seok Park
b2084952df [Exif] Prevent infinite loop
This CL fixes the previous implementation which stored the current
position of the file instead of the offset to the next IFD.

Bug: 63800695
Test: Run test file with malformatted thumbnail data
Change-Id: Iab5b9a1a8203e8de1027ecfb887e4f504a27151e
2019-03-11 10:36:39 +09:00
Jin Seok Park
ec83faffbb [Exif] Throw NPE after checking @NonNull parameters
Bug: 127896321
Test: Run cts
Change-Id: Ia70bb4d3ce34f151056d2df07a8d8d8e61d07fe3
2019-03-10 21:43:48 +09:00
Jean-Michel Trivi
463b5d191b Merge "PlayerBase volume: make it a volume multiplier" 2019-03-08 19:52:18 +00:00
Jean-Michel Trivi
8ba7d40602 PlayerBase volume: make it a volume multiplier
Make PlayerBase / PlayerProxy volume control act as a multiplier,
  not as an override of the volume set by the subclass
Bug: 78930229
Test: see test app in bug

Change-Id: I4c189425282c1a709648e0be14791c3382e83e82
2019-03-08 11:43:49 -08:00
Andy Hung
63e82d75ae Merge "Add MediaMetrics TestApi entries for hidden fields" 2019-03-08 02:07:44 +00:00
Paul Mclean
4df03675ec Merge "Surface MicrophoneDirectionAPI in MediaRecorder" 2019-03-07 23:06:06 +00:00
Andy Hung
12dc446394 Add MediaMetrics TestApi entries for hidden fields
Test: CTS Audio(Record|Track)Test#testMediaMetrics
Bug: 127700128
Change-Id: I1413ef9e7f898bb6e1c662353f998bfa170e1413
2019-03-06 15:31:52 -08:00
Andy Hung
55f1a27a42 Deprecate unsupported MediaMetrics constants for AudioTrack, AudioRecord
Test: Audio(Record|Track)Test#testMediaMetrics
Bug: 127485355
Change-Id: I3097208a7132f81f8d96b205e28e0229917c137f
2019-03-06 15:31:38 -08:00
Paul McLean
b6a7bde6b9 Surface MicrophoneDirectionAPI in MediaRecorder
Bug: 126185930
Test: MicrophoneDirectionTest app
Change-Id: I056a45ed8312b33593b6102546652676d5f9ec1b
2019-03-06 11:58:35 -07:00
TreeHugger Robot
1a033dafa4 Merge "Add flag to indicate muting haptic channels." 2019-03-06 17:16:51 +00:00
Jeff Sharkey
715b34be65 Merge "Add trivial nullability annotations." 2019-03-06 16:17:56 +00:00
Jeff Sharkey
ba4acd5575 Add trivial nullability annotations.
Bug: 126702077, 126701263, 126700858, 126700497
Test: manual
Change-Id: Ic6599f59e6e079097a35cb2bf24c59a87627c8b7
Exempt-From-Owner-Approval: Trivial API annotations
2019-03-05 19:48:55 -07:00
Hongwei Wang
4348edc9db Merge "Addresses the API review feedback on HwAudioSource" 2019-03-06 00:01:00 +00:00
Hongwei Wang
a1561e5ee3 Addresses the API review feedback on HwAudioSource
Added `boolean HwAudioSource.isPlaying()`

Bug: 127464783
Test: m -j
Change-Id: Idb0e0772da009c2d9116275de9ef1b4a1bb4afc5
2019-03-05 10:58:00 -08:00
TreeHugger Robot
8ca08a2156 Merge "Add @NonNull to Audio Playback Capture functions" 2019-03-05 06:42:12 +00:00
Kevin Rocard
15ed4c360a Add @NonNull to Audio Playback Capture functions
That allows better integration with tools and Kotlin.

Test: atest android.media.cts.AudioPlaybackCaptureTest
Bug: 126700282
Change-Id: I921d0b5580ad861c732f7b076142968e4da9989c
Signed-off-by: Kevin Rocard <krocard@google.com>
2019-03-04 23:07:38 +00:00
TreeHugger Robot
a59197e3aa Merge "PlayerBase: hide deprecateStreamTypeForPlayback" 2019-03-04 22:18:35 +00:00
Hongwei Wang
0932f508f3 Merge "Addresses API review feedback on AudioProductStrategies" 2019-03-04 21:39:06 +00:00
Hongwei Wang
0add7733f3 Merge "Addresses API review feedback on AudioVolumeGroup(s)" 2019-03-04 21:39:06 +00:00
Hongwei Wang
fbc743f129 Merge "Addresses API review feedback on HwAudioSource.Builder" 2019-03-04 21:39:06 +00:00
TreeHugger Robot
0718be8cfa Merge "AudioService: make all BT device updates async" 2019-03-04 21:25:40 +00:00
TreeHugger Robot
e7979eb41f Merge "MediaPlayer2: address API council comments" 2019-03-04 20:08:38 +00:00
Hongwei Wang
0f95b328d0 Addresses API review feedback on AudioProductStrategies
Bug: 126700467
Test: m -j
Change-Id: I29223f93c96173a5875455860d8fd0ae2542146f
2019-03-04 10:08:03 -08:00
Jean-Michel Trivi
2f52ac69f8 PlayerBase: hide deprecateStreamTypeForPlayback
This method was only in docs, not in implementation, and
  was never meant to be used by applications.
Bug: 126701135
Bug: 126702126
Bug: 126702177
Test: javap --class-path prebuilts/sdk/28/public/android.jar 'android.media.MediaPlayer' | grep deprecateStreamTypeForPlayback

Change-Id: I0417f4e2523889259536a9f66f20167886cac790
2019-03-04 09:56:08 -08:00
Jean-Michel Trivi
aca7f5ab7c Merge "AudioTrack.StreamEventCallback: fix missing annotation" 2019-03-04 16:38:25 +00:00
Jean-Michel Trivi
22b376cd60 AudioTrack.StreamEventCallback: fix missing annotation
Bug: 124301616
Test: m -j ; make api-stubs-docs-update-current-api ; m -j
Change-Id: I6e7dbe6130e57a2dfdc2ea0cdecbd5a23d565bab
2019-03-02 17:46:58 -08:00
Jean-Michel Trivi
fa0a6004ca Merge "Audio APIs: deprecate deprecateStreamTypeForPlayback method" 2019-03-03 00:24:02 +00:00
Jean-Michel Trivi
cc0e77b16d Merge "AudioTrack: moar annotations and getters" 2019-03-02 22:39:14 +00:00
Jean-Michel Trivi
16f0a6ac2d Audio APIs: deprecate deprecateStreamTypeForPlayback method
The method deprecateStreamTypeForPlayback() is inherited from
  android.media.PlayerBase, which is hidden. This method was never
  intended to be in the SDK, but somehow ended up in the public SDK.

Bug: 126701135
Bug: 126702126
Bug: 126702177
Test: make -j api-stubs-docs-update-current-api
Change-Id: Ibdd7898f18432c2179f81cd53b132164bcd4c670
2019-03-02 12:45:11 -08:00
Jean-Michel Trivi
deaf230d08 AudioTrack: moar annotations and getters
Bug: 126698363
Bug: 124301616
Test: m -j ; make api-stubs-docs-update-current-api ; m -j
Change-Id: I91ae70a57c367308ebe52ccc7c5e579821d65151
2019-03-02 11:40:12 -08:00
Wei Jia
2fc1654ab1 MediaPlayer2: address API council comments
Test: cts
Bug: 126700359
Bug: 126701061
Bug: 126701365
Bug: 126701652
Bug: 126701657
Bug: 126701901
Bug: 126702124
Bug: 126702181
Bug: 126702182
Change-Id: I3b33d7c1a403b6d2c13b93e5937a0f1a3e4d80a1
2019-03-01 17:45:31 -08:00
Jean-Michel Trivi
fc86cfa805 AudioService: make all BT device updates async
Make AudioManager methods to (dis)connect a BT device
  (hearing aid or A2DP) and handle config update run
  on the AudioDeviceBroker event thread to prevent
  concurrency issues between BtService and AudioService.

Bug: 126239173
Test: have multiple A2DP devices connected, switch between them

Change-Id: Iefd4b4d29e28b15cbb74e8a175ee5e6cc7918c1d
2019-03-01 14:40:22 -08:00
Dongwon Kang
436a76d1fa Merge "Use Uri.toSafeString() in MediaPlayer[2].java." 2019-03-01 17:10:08 +00:00
Jeff Sharkey
9e8f83db6d All Parcelable CREATOR fields are @NonNull.
If they were null, then the Parcelable would fail to work.

Bug: 126726802
Test: manual
Change-Id: I7929ffa2f20e5de1c8e68e8263cca99496e9d014
Exempt-From-Owner-Approval: Trivial API annotations
2019-02-28 23:29:04 -07:00
Dichen Zhang
f3e094ff1b Merge "revert "HLS seeking: call readAt() on new thread"" am: 00a4170c0c am: a97abe701c
am: c47b1fc295

Change-Id: I5db7a2fee3f1db87456d880606ab9caac024ceff
2019-02-28 17:02:34 -08:00
eunyoung.moon
db21cbae34 Use Uri.toSafeString() in MediaPlayer[2].java.
Bug: 123669012
Test: play HLS/RTSP streaming
      atest CtsNetTestCases:android.net.cts.UriTest
Signed-off-by: Eunyoung Moon <eunyoung.moon@lge.com>

Change-Id: I3695b0a6f28df3dfff981de2dcd6417d227965ae
2019-02-28 16:59:53 -08:00
Dichen Zhang
c47b1fc295 Merge "revert "HLS seeking: call readAt() on new thread"" am: 00a4170c0c
am: a97abe701c

Change-Id: I4266221c9d5ebca4b5c4cb6c05a371e9ae01cf16
2019-02-28 16:46:13 -08:00
Dichen Zhang
a97abe701c Merge "revert "HLS seeking: call readAt() on new thread""
am: 00a4170c0c

Change-Id: Ia2a3db95cc56e23252b0d9df28e5c3289c1a34e5
2019-02-28 16:35:39 -08:00