Commit Graph

6093 Commits

Author SHA1 Message Date
Sungsoo Lim
816d1e39d6 Merge "Change the route name for USB headset" 2017-09-18 04:28:47 +00:00
TreeHugger Robot
6bc7eba04e Merge "MediaPlayer: add notifyAt for TimeProvider" 2017-09-15 20:15:35 +00:00
Wei Jia
c02f09d0d1 MediaPlayer: add notifyAt for TimeProvider
Test: TimeProvider gets correct media time when playback rate is not 1.0
Bug: 65204641
Change-Id: I5020515415e14a2c37eec0d1ece511518b9239e7
2017-09-15 09:11:51 -07:00
Jean-Michel Trivi
c547bd8a9f Merge "AudioPlaybackConfiguration: prevent race condition on mIPlayerShell" into oc-mr1-dev am: 982ee8e6c3
am: 2d7ef64f47

Change-Id: Ib4bd34bf0915afdd3e6c91c2ad34594e1e373a36
2017-09-15 11:35:33 +00:00
Sungsoo Lim
60aa8b99a0 Change the route name for USB headset
Bug: 37749497
Test: manual by connecting a USB headset
Change-Id: I0c6e0233da5d4006d62adc1f2b4534a0180485d0
2017-09-15 16:05:43 +09:00
Jean-Michel Trivi
2d7ef64f47 Merge "AudioPlaybackConfiguration: prevent race condition on mIPlayerShell" into oc-mr1-dev
am: 982ee8e6c3

Change-Id: Ifa18821b2ae5b3103f5025df88c0e545bdca56af
2017-09-15 02:28:28 +00:00
Jean-Michel Trivi
982ee8e6c3 Merge "AudioPlaybackConfiguration: prevent race condition on mIPlayerShell" into oc-mr1-dev 2017-09-15 01:37:55 +00:00
Hangyu Kuang
6bf9548f41 Merge "MediaMuxer: Fix a typo in java doc." into oc-mr1-dev am: 7dd0c6924e
am: e0ba566aae

Change-Id: Idb8cbe7ee53e8d3eb2cc59b6fc163f88adad4df0
2017-09-14 21:55:39 +00:00
Jean-Michel Trivi
776a399314 AudioPlaybackConfiguration: prevent race condition on mIPlayerShell
Synchronize changes to mIPlayerShell after release of corresponding
  player.
Flush binder commands when a player is released, in AudioService
  and in the clients that have an AudioPlaybackCallback implementation.
  Do the same in MediaSessionService, which directly implements
  the IPlaybackConfigDispatcher interface, without going through
  the AudioPlaybackCallback registration and notification
  mechanisms.

Test: adb shell /system/bin/write_sine_callback -m2 -pl
Bug: 65450109
Change-Id: I2f0697e0e164283284ce30d2cc736c4f8df270c4
2017-09-14 10:00:28 -07:00
Hangyu Kuang
e0ba566aae Merge "MediaMuxer: Fix a typo in java doc." into oc-mr1-dev
am: 7dd0c6924e

Change-Id: I6eef1bed8894f907177f21eb2550a9465b45c257
2017-09-14 02:15:00 +00:00
Hangyu Kuang
ceb5729a5e MediaMuxer: Fix a typo in java doc.
Bug: 63965858
Test: None as just document.
Change-Id: I4c849a02c3b19d8cf23e92a960cfde023e213ca1
2017-09-13 11:09:27 -07:00
Insun Kang
61330a3346 Merge "MediaSession: Remove pending callback messages when setCallback(null) is called." 2017-09-11 02:11:46 +00:00
Insun Kang
62cef488de MediaSession: Remove pending callback messages when setCallback(null) is called.
setCallback(null) is supposed to clear registered callbacks.
Previously, setCallback(null) doesn't remove pending callback messages
and so belated callbacks are called quite frequently after
setCallback(null) is done. This CL reduces major number of such cases by
removing pending callback messages.

Bug: 63446360
Test: Ran cts test
adb shell am instrument -w -e class \
android.media.cts.MediaSessionTest#testSetCallbackWithNull \
android.media.cts/android.support.test.runner.AndroidJUnitRunner

Change-Id: I7192b0a61a2114390f10734bbb48aeac56a19fe3
2017-09-07 14:15:29 +09:00
Kai Wang
a8595bbfee Merge "MediaBrowserService: Clean up ConnectionRecord when browser is dead" into oc-mr1-dev am: bbf55bb7ae
am: 86baa82d01

Change-Id: I509f5d8ae4c8224ee1e7b8ceffd2a65f1da1254c
2017-09-05 23:21:07 +00:00
Kai Wang
86baa82d01 Merge "MediaBrowserService: Clean up ConnectionRecord when browser is dead" into oc-mr1-dev
am: bbf55bb7ae

Change-Id: I4e14e80a31c0eed3c897e35720bff1f694f7a007
2017-09-05 20:56:01 +00:00
Kai Wang
bbf55bb7ae Merge "MediaBrowserService: Clean up ConnectionRecord when browser is dead" into oc-mr1-dev 2017-09-05 20:40:25 +00:00
Ivan Lozano
9f6a292f6a Merge "Moving IPlayer.aidl to frameworks/av/." 2017-09-01 23:07:07 +00:00
kai
8e67b4d9f1 MediaBrowserService: Clean up ConnectionRecord when browser is dead
This CL cleans up connectionRecords when binder dead and the connection
is lost.

Bug: 65132577
Test: check the number of ConnectionRecord, kill the media app, check
      the number again.
Change-Id: I8b31745bcee220b9e70c3f43d7fc9d8dc3f6b83a
2017-09-01 10:50:01 -07:00
Ivan Lozano
330d876a62 Moving IPlayer.aidl to frameworks/av/.
As part of migrating native binder services to AIDL, this moves IPlayer.aidl to
the frameworks/av/ project and links in the new AIDL generated binder library to
the JNI libraries.

Test: run cts --module CtsMediaTestCases
Bug: 64223827

Change-Id: I7e346a471b98c78ceb35dceed9e6c0df1000cfb1
2017-09-01 08:24:14 -07:00
Sungsoo Lim
bdbec44257 Merge "Track the global setting of BT A2DP on/off" into oc-mr1-dev am: cc2478f90c
am: 0047534b7f

Change-Id: Iaa02ab736989e55660ad6813fcaa97e2b411a27e
2017-09-01 02:13:26 +00:00
Sungsoo Lim
0047534b7f Merge "Track the global setting of BT A2DP on/off" into oc-mr1-dev
am: cc2478f90c

Change-Id: Iacf556474e361882d4928750a71add65af0180d9
2017-09-01 02:01:58 +00:00
Sungsoo Lim
76512a3d80 Track the global setting of BT A2DP on/off
The default phone speaker, bluetooth audio devices, and wired audio
devices are handled as system audio routes. When an app starts to
make sound to a system audio route, the system audio route will be
selected with the following order.

1. The slected route by the app after the latest connection of
   an audio device.
2. The lastly connected audio device.
3. The default phone speaker if not connected.

Bug: 64811580
Test: Passed MediaRouterTest, manual
Change-Id: I77badb14596bc661c44237957504164f5476e595
2017-08-31 15:57:56 +09:00
Wonsik Kim
b9e8678d27 Merge "At STARTED_AS_NEXT, offload MediaPlayer.start() to a separate thread" into oc-mr1-dev am: 52700a9795
am: 7558ef1b2d

Change-Id: I1462ddec436262f342ee658b93b9d96ea36ff3ca
2017-08-31 04:38:11 +00:00
Chong Zhang
c658124d50 Merge "Add heif format to ExifInterface" into oc-mr1-dev am: e034a1f5ed
am: 3985765a17

Change-Id: I1cb5527a9bb1a63cb960cbc7d38aa955353a28c9
2017-08-31 03:36:24 +00:00
Wonsik Kim
7558ef1b2d Merge "At STARTED_AS_NEXT, offload MediaPlayer.start() to a separate thread" into oc-mr1-dev
am: 52700a9795

Change-Id: I1691d29774c95fc87c1230ec85fbcf78838e6e42
2017-08-31 03:13:34 +00:00
Wonsik Kim
e8b4c97bdf At STARTED_AS_NEXT, offload MediaPlayer.start() to a separate thread
Fixes: 65210445
Fixes: 64915666
Test: adb shell am instrument -e size small -w 'android.media.cts/android.support.test.runner.AndroidJUnitRunner'
Change-Id: I73f1cebdd4b990e28f8d466f129e781cba2b5bbf
2017-08-31 00:28:36 +00:00
Chong Zhang
3985765a17 Merge "Add heif format to ExifInterface" into oc-mr1-dev
am: e034a1f5ed

Change-Id: I36fb2559b52bb778acff72954012704da8a85ff9
2017-08-30 23:40:46 +00:00
TreeHugger Robot
e034a1f5ed Merge "Add heif format to ExifInterface" into oc-mr1-dev 2017-08-30 23:05:12 +00:00
Chong Zhang
6f80587e8b Add heif format to ExifInterface
Get heif dimension and rotation from MediaMetadataRetriever.

Bug: 64077740
Change-Id: I711ac70d356dbfd9128a30ab33c0dfd81a4ae17e
2017-08-30 11:33:07 -07:00
Jean-Michel Trivi
47733c46bb Merge "AudioService: log changes in OP_PLAY_AUDIO" into oc-mr1-dev am: 8da5c64628
am: 60e09929e7

Change-Id: I0c21870cc808d16076c907a1760bb1940ef0ff87
2017-08-30 01:14:40 +00:00
Jean-Michel Trivi
60e09929e7 Merge "AudioService: log changes in OP_PLAY_AUDIO" into oc-mr1-dev
am: 8da5c64628

Change-Id: I9df4f18b59ed2d8434c66754820304bd9082f9e9
2017-08-29 22:43:19 +00:00
Glenn Kasten
cad0be854d Merge "Fix Bluetooth typos" 2017-08-29 21:05:57 +00:00
Jean-Michel Trivi
3120059d5b AudioService: log changes in OP_PLAY_AUDIO
Log changes to AppOpsManager.OP_PLAY_AUDIO in live player

Test: "adb shell dumpsys audio" after entering silence mode
Bug: 62258749
Bug: 64286665
Change-Id: Ia1c202c5b8b25e14f7c2e85060a256dc69433909
2017-08-29 11:39:56 -07:00
Jean-Michel Trivi
6a708bcc87 Merge "AudioService: log volume commands and origin" into oc-mr1-dev am: c3fcd65e61
am: 0453f8189c

Change-Id: I14b55b8f61aa7c75373bb9c656904c372563eacd
2017-08-29 16:55:51 +00:00
Jean-Michel Trivi
0453f8189c Merge "AudioService: log volume commands and origin" into oc-mr1-dev
am: c3fcd65e61

Change-Id: I8cd88be04af0aea7bde9b10bc82b839613898eb4
2017-08-29 16:43:44 +00:00
Jean-Michel Trivi
cf17036a21 AudioService: log volume commands and origin
Add volume logger for volume events.
Move AudioService event definitions to separate file.

Test: change volume with volume buttons and dumpsys audio
Bug: 64470715

Change-Id: I25db849bffb4a41a737d226cfc40e2c6f7e0ecc0
2017-08-28 16:26:52 -07:00
bokyung.kim
e2d814e5b6 Merge "Fixed mimetype error of PPT file" am: 3c28e2b280 am: 148414cd2c am: 1190da1b1e
am: 54238c6a10

Change-Id: I2268e389fd24cece3a677d888f1745d75c35ceea
2017-08-28 22:57:54 +00:00
bokyung.kim
54238c6a10 Merge "Fixed mimetype error of PPT file" am: 3c28e2b280 am: 148414cd2c
am: 1190da1b1e

Change-Id: I0eb5f50a6ac95d5512fbae9888b37a3c64917902
2017-08-28 22:47:34 +00:00
bokyung.kim
148414cd2c Merge "Fixed mimetype error of PPT file"
am: 3c28e2b280

Change-Id: I24b9dcf6506c53e26b901f74442f64bb28198611
2017-08-28 22:27:38 +00:00
bokyung.kim
9806330b52 Fixed mimetype error of PPT file
Change mimetype of PPT file to match MS specification.
(MimeUtils.java matched the MS specification)

Test: Check mimetype of DB after saving PPT file.

Change-Id: Ie559499ae39bc527fcc656ba37f28845af209e6c
Signed-off-by: bokyung.kim <bokyung.kim@lge.com>
2017-08-28 13:16:35 -07:00
Ajay Panicker
f4e5177f1f Merge "Add equal overloads to some MediaDescription and MediaQueue objects (2/3)" into oc-mr1-dev am: 619503b279
am: 8fdd245b7e

Change-Id: Ie1cc15209b789e271615ccd07b0c89d00d5627e8
2017-08-28 19:51:53 +00:00
TreeHugger Robot
619503b279 Merge "Add equal overloads to some MediaDescription and MediaQueue objects (2/3)" into oc-mr1-dev 2017-08-28 19:26:41 +00:00
Glenn Kasten
a24e99121a Fix Bluetooth typos
Test: builds OK
Change-Id: Ib5f6a7ac0fe444bd9d64445584668dbdc91f86ce
2017-08-28 11:45:51 -07:00
Jean-Michel Trivi
743cfba7e2 Merge "AudioManager: permission annotations" into oc-mr1-dev am: 72cf1a4fa2
am: 3be893e449

Change-Id: Ife6cd6b5772df03f0511c42b635984e840496626
2017-08-28 16:47:44 +00:00
Jean-Michel Trivi
26ae15f487 AudioManager: permission annotations
Add permission annotations on audio focus @SystemApi methods.
Ignore REQUIRE_PERMISSION error (125) for:
 - deprecated abandonAudioFocus() method: the check is on the
    request call
 - isHdmiSystemAudioSupported() method, it's not clear if it's
    being used.

Test: remove "-hide 125" in Android.mk and make, verify no errors\
    on AudioManager.java
Bug: 62343127

Change-Id: I62526db0c6dabcc34224c589506d611519de6abc
2017-08-25 19:20:49 -07:00
Jerry Zhang
29b3cfa21d Merge changes from topic "am-2cfb180af8604b6fac1598107a7b546e" into oc-mr1-dev-plus-aosp
am: 54c6447f47

Change-Id: I13aeac421ecf7a54f16e0fd6aaa19be3f513be4a
2017-08-24 23:10:06 +00:00
Jerry Zhang
4de4655f0d Merge changes from topic "mtp-user" into oc-mr1-dev
* changes:
  Add additional context to MtpDatabase
  Reset functions to null when user changes.
2017-08-24 22:13:40 +00:00
Jean-Michel Trivi
d2f450bed6 Merge "Audio event logging" into oc-mr1-dev am: 9961d6968e
am: 87dfc5bb4e

Change-Id: Ief454ea5fd405cb902a06851d3b5e966266c84e4
2017-08-24 19:42:48 +00:00
TreeHugger Robot
9961d6968e Merge "Audio event logging" into oc-mr1-dev 2017-08-24 19:04:47 +00:00
Ajay Panicker
6edb68bea6 Add equal overloads to some MediaDescription and MediaQueue objects (2/3)
Bug: 64686424
Test: Connect to carkit and see that NowPlayingChanged only gets sent when
      the queue changes, run cts test
Change-Id: I58c9dd0bf976485a2efefd042cd667ee433e07e1
2017-08-24 17:37:38 +00:00