Commit Graph

7608 Commits

Author SHA1 Message Date
Jeff Sharkey
465d20a7bb Fix synthetic RingtoneManager column.
It was querying a column that didn't exist internally; instead it
needs to fake that value for its clients.

Bug: 128349496
Test: atest android.media.cts.RingtoneTest
Change-Id: I7c3738cdb21ac5c92df55a8622b24f5c6a118154
2019-03-17 12:24:17 -06:00
Jeff Sharkey
cdc1dfd1bd Fix recent ExifInterface regression.
It needs to open files using absolute path, not relative path.

Bug: 128782519
Test: atest cts/tests/tests/provider/src/android/provider/cts/MediaStore*
Change-Id: I173b7b5dcb3c351b8554547e89e5441f9bdb19d1
2019-03-17 11:05:56 -06:00
TreeHugger Robot
5937c6e6e0 Merge "Do not ignore runID in SRTTrack" 2019-03-16 00:57:55 +00:00
TreeHugger Robot
80b1dc175b Merge "MediaPlayer: fix use after free for mMediaTimeProvider" 2019-03-16 00:11:17 +00:00
Dariusz Budner
b5f801f458 Do not ignore runID in SRTTrack
Set mRunID parameter when adding cue to the list because of
mRunID value depends if past cues are removed from the list
during active cues update. Keeping past cues on the list makes
it possible to find and set proper active cue after seeking
backward.

Bug: 68034458
Test: play video with srt subtitle and seek

Change-Id: I8439840d5925607127fadc1082913d9d91f688af
2019-03-15 14:41:43 -07:00
Robert Shih
68cee05fc3 MediaDrm: [Security,Hdcp]Level @deprecated javadoc
Bug: 127625289
Test: build
Change-Id: I1d5559eb8e46f7df7952daca09fdd0c0a55dc114
2019-03-15 14:01:52 -07:00
Wei Jia
37b6f2593f MediaPlayer: fix use after free for mMediaTimeProvider
Test: cts
Bug: 128327073
Change-Id: I4c9a9e3bfe27d6ec3d533a4ef8c5706d32221eed
2019-03-15 11:52:05 -07:00
TreeHugger Robot
72aa96ffb2 Merge "MediaDrm: @Deprecate SecurityLevel & HdcpLevel" 2019-03-15 15:58:03 +00:00
TreeHugger Robot
bd3e219046 Merge "SubtitleData: fix doc" 2019-03-15 00:41:20 +00:00
Jean-Michel Trivi
ee658bc3e4 Merge "audio: Restructure A2DP active device change" 2019-03-14 23:51:09 +00:00
Robert Shih
68c12432cb MediaDrm: @Deprecate SecurityLevel & HdcpLevel
Bug: 127625289
Test: compiles
Change-Id: Iaf18775d210ae280499a7ef059a46479b449fe5b
2019-03-14 00:30:42 -07:00
Wei Jia
1464e44385 SubtitleData: fix doc
Test: compile
Bug: 124507357
Change-Id: I2f28365a970cd66440033e41ea5dc7022ef5004a
2019-03-13 15:25:59 -07:00
Hyundo Moon
dba10310be Merge "Hide constructor of MediaController#PlaybackInfo" 2019-03-13 07:44:50 +00:00
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
Aniket Kumar Lata
d7c9598a26 audio: Restructure A2DP active device change
Make active device change asynchronous.
Restructure A2DP active device change API
for clarity and speed.
Merge active device and device config change
handlers.
Fix bug for a new A2DP device connection with
handleBluetoothA2dpActiveDeviceChange.

Bug: 122944517
Test: still needs Bt side using new interface
Change-Id: Ia2fa6b2c98ed4452880e8abca4a069b904f8cc68
2019-03-12 12:10:45 -07: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
888e5a4fb0 Hide constructor of MediaController#PlaybackInfo
This CL reverts the API change introduced by
"1dfec66: Make hidden constructor of PlaybackInfo as @SystemApi"

Bug: 128245348
Test: atest CtsMediaTestCases:android.media.cts.MediaSessionTest;
      atest CtsMediaTestCases:android.media.cts.MediaControllerTest;
      atest CtsMediaTestCases:android.media.cts.MediaBrowserTest;
Change-Id: I6deeb048d6d209baa085792edf5ef2fdd8bb1d7c
2019-03-12 17:57:00 +09: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