Commit Graph

6134 Commits

Author SHA1 Message Date
Shubang
15985cbafa Remove dispatchKeyEventToHdmi()
Bug: 62270867
Test: cts
Change-Id: I9aad52ee0c8605cc23ac3640d77d7d51d6a55991
2017-10-09 14:28:39 -07:00
Chong Zhang
7a5469865b Merge "Use rotation from MediaMetadataRetriever directly" into oc-mr1-dev am: 106aeb324d
am: 0764ce28cf

Change-Id: I59a84542c4cfc2cb48627396642dd2d4bbdc2291
2017-10-06 05:39:50 +00:00
Chong Zhang
0764ce28cf Merge "Use rotation from MediaMetadataRetriever directly" into oc-mr1-dev
am: 106aeb324d

Change-Id: I5d7bbd0a3fb5f291f79a2e9009319eb4e57848a4
2017-10-06 05:29:43 +00:00
TreeHugger Robot
106aeb324d Merge "Use rotation from MediaMetadataRetriever directly" into oc-mr1-dev 2017-10-06 05:20:14 +00:00
Chong Zhang
9af92dadc9 Use rotation from MediaMetadataRetriever directly
MediaMetadataRetriever now reports rotation in clockwise,
no longer need to translate.

bug: 67470228

Test: verified rotation using test app attached in bug
Change-Id: Ifebcf25ea302477818e2e03db1e55525db985e67
2017-10-05 15:13:54 -07:00
Eric Laurent
cc78a9b636 Merge "Fix Cell broadcast sound in total silence" into oc-mr1-dev am: 77ee4f2ff2
am: 8916db215f

Change-Id: Ie7fc5c28a0a6de7309f065a3b001bdd8190fa95e
2017-10-04 15:14:59 +00:00
Eric Laurent
8916db215f Merge "Fix Cell broadcast sound in total silence" into oc-mr1-dev
am: 77ee4f2ff2

Change-Id: Ib39341f455b82750ef357dbf41d8815fb303844d
2017-10-04 14:56:26 +00:00
Eric Laurent
77ee4f2ff2 Merge "Fix Cell broadcast sound in total silence" into oc-mr1-dev 2017-10-04 14:45:01 +00:00
Wonsik Kim
a9361e9115 Merge "fix AmrInputStream.read() hang" am: 5b6a02eb8b am: 4c2bbbf552 am: b7079d6381
am: ce29a4c77a

Change-Id: Ia99a5f14249a5f3cbcc6543533f5af128fe2ae85
2017-10-03 21:57:22 +00:00
Wonsik Kim
ce29a4c77a Merge "fix AmrInputStream.read() hang" am: 5b6a02eb8b am: 4c2bbbf552
am: b7079d6381

Change-Id: Ia0627f67855e56487818043b974953a33baf701f
2017-10-03 21:42:14 +00:00
Wonsik Kim
4c2bbbf552 Merge "fix AmrInputStream.read() hang"
am: 5b6a02eb8b

Change-Id: I7aff9043ec95d2f41e5d3301b01707f5dff4bef2
2017-10-03 21:18:10 +00:00
Treehugger Robot
5b6a02eb8b Merge "fix AmrInputStream.read() hang" 2017-10-03 20:37:36 +00:00
Kweku Adams
62b4224757 incidentd: Adding RankingHelper data to NotificationManager proto output.
BUG: 65750824
Test: flash on device and look at incident.proto output
Change-Id: I9323cc109d96715b2114aa405eda79ae4c109c14
2017-10-03 12:35:48 -07:00
Jerry Zhang
c8d44372e6 Merge "Add moveObject method to change object's path and parent." am: 33a200e572 am: 0f09ac317d am: f9696617bd
am: 3a13ab1fd3

Change-Id: I58a1ca9b3b5e63e73eb4db58ac3588f6bf9e3249
2017-10-03 00:44:23 +00:00
Wonsik Kim
e1b8b7bf0f fix AmrInputStream.read() hang
Test: AmrInputStream.read() no longer hangs
Change-Id: I5b3e1c7667891ce250e447c32213511077c5b5df
2017-10-02 17:44:02 -07:00
Jerry Zhang
3a13ab1fd3 Merge "Add moveObject method to change object's path and parent." am: 33a200e572 am: 0f09ac317d
am: f9696617bd

Change-Id: Ia6ba6d0cf89879914894d35a0dbf110d905966ac
2017-10-03 00:33:02 +00:00
Jerry Zhang
0f09ac317d Merge "Add moveObject method to change object's path and parent."
am: 33a200e572

Change-Id: Iabb8c9989ad35140ab1c752fb70741f52e56c04d
2017-10-03 00:04:03 +00:00
TreeHugger Robot
72a23105c9 Merge "Reduce time consuming when a lot of audio port event happen continually." 2017-10-02 23:58:51 +00:00
Jerry Zhang
952558d4e5 Add moveObject method to change object's path and parent.
This is needed to implement the MTP MOVE_OBJECT operation.

Bug: 66679910
Test: Move objects and folders, verify mediastore is consistent
Change-Id: I2f4f0c43134fb3ff82745166c051712cc1736b7f
2017-10-02 11:48:38 -07:00
Marco Nelissen
e93e6c5ef1 Merge "AmrInputStream is not a public API" am: c3b1442d52 am: fa55320f5d am: 9bda8fddf2
am: 14d8ba7736

Change-Id: I869b0944ad119d9adc83ec21e15ae791294d7230
2017-09-29 20:32:10 +00:00
Marco Nelissen
14d8ba7736 Merge "AmrInputStream is not a public API" am: c3b1442d52 am: fa55320f5d
am: 9bda8fddf2

Change-Id: Ib6e7f401af259e422aee6ca7d18703f380ef08f6
2017-09-29 20:21:30 +00:00
Marco Nelissen
fa55320f5d Merge "AmrInputStream is not a public API"
am: c3b1442d52

Change-Id: Iee0e6dfa9907dc70fcf5dae7fcbcf14b8bcb9ffb
2017-09-29 20:04:54 +00:00
Marco Nelissen
323d2a56ec AmrInputStream is not a public API
and nobody should be using it. Add some warnings to that effect.

Change-Id: I8029ccd665fd147b4708a68f61c6aa055004a5c1
2017-09-29 10:15:34 -07:00
Sungsoo Lim
f143ca9f16 Merge "Make RoutInfo.select() called in app's main thread" into oc-mr1-dev am: 6e326268c1
am: aee660bb47

Change-Id: Idc830072c057861c9c6498d190a5b4aafaa3f1cb
2017-09-29 09:22:28 +00:00
Sungsoo Lim
aee660bb47 Merge "Make RoutInfo.select() called in app's main thread" into oc-mr1-dev
am: 6e326268c1

Change-Id: I91a4e5422a92f3e7571a1ffc7fb19d0594f116e2
2017-09-29 08:43:07 +00:00
Sungsoo Lim
133a24e095 Make RoutInfo.select() called in app's main thread
Bug: 66995486
Test: passed MediaRouter test
Test: Checked theat IllegalStateException doesn't happen
Change-Id: Idb75998cd7910a430e68ea928d28c9908260d5fc
2017-09-29 14:25:15 +09:00
Eric Laurent
e5a351cb92 Fix Cell broadcast sound in total silence
PlayerBase:
 Update player volume when the audio attributes are updated in case
we need to unmute
PlaybackActivityMonitor:
 Unmute alarm stream if needed when an alarm with flag
 FLAG_BYPASS_INTERRUPTION_POLICY starts from an app with
 privileged permission MODIFY_PHONE_STATE.

Bug: 63617557
Test: check sound with cell broadcast in total silence
Change-Id: Ifacb1d96a2d8d44047d9f9642d1e672fcf756cda
2017-09-28 18:00:01 -07:00
jiabin
c4ecaa52b8 Reduce time consuming when a lot of audio port event happen continually.
Since the AudioPortEventHandler runs in application's main thread, it
may cause ANR if there are a lot of setForceUse calling by the
application continually in a short time. The root cause is that there
may be a lot of audio port event from the native side when there are a
lot of device switching request. In this case, updating audio port cache
may take a long time due to inconsistency between audio port generation
and patches generation.
To solve this problem, we only check the generation once when ports and
patches are both requested to return earlier. In the meantime, we only
repeat the last audio port event since we will refresh the ports cache
every time when we receive the event.

Bug: 64952619
Test: keep switching output device in hangout video/voice chat
Change-Id: I3164c4e331950a481b76ce890d8c1403fd9b98ee
2017-09-27 14:26:08 -07:00
Sungsoo Lim
a8a1e989eb Merge "Select correct system audio route in updateAudioRoutes" into oc-mr1-dev
am: 43d5d86cda

Change-Id: I5bab35f229bbedeba548a43e078a500f5cd2a4b0
2017-09-25 07:16:48 +00:00
Sungsoo Lim
0e43c503ab Select correct system audio route in updateAudioRoutes
While update audio routes, MediaRouter had an access to the variable
of MediaRouterService.mGlobalBluetoothA2dpOn, which was updated in
the callback of AudioRoutesObserver.dispatchAudioRoutesChanged().
However, since updateAudioRoutes() was also called by the same
callback, mGlobalBluetoothA2dpOn could be used in updateAudioRoutes()
before its value was updated.

Bug: 65629167
Test: passed MediaRouterTest
Test: Manually confirmed that the issue is fixed with this CL
Change-Id: Id0034996a51a6d8d1e8bd9d2c6ca386aabbb8baf
Merged-In: Id0034996a51a6d8d1e8bd9d2c6ca386aabbb8baf
2017-09-25 10:15:49 +09:00
Sungsoo Lim
546a170bfa Select correct system audio route in updateAudioRoutes
While update audio routes, MediaRouter had an access to the variable
of MediaRouterService.mGlobalBluetoothA2dpOn, which was updated in
the callback of AudioRoutesObserver.dispatchAudioRoutesChanged().
However, since updateAudioRoutes() was also called by the same
callback, mGlobalBluetoothA2dpOn could be used in updateAudioRoutes()
before its value was updated.

Bug: 65629167
Test: passed MediaRouterTest
Test: Manually confirmed that the issue is fixed with this CL
Change-Id: Id0034996a51a6d8d1e8bd9d2c6ca386aabbb8baf
2017-09-25 09:59:03 +09:00
Ajay Panicker
12bec46613 Add equal overloads to some MediaDescription and MediaQueue objects (2/3)
am: 905d8ab843

Change-Id: I8f47786d4e0c392b008cdce80aed05ca7b1573b1
2017-09-22 17:14:36 +00:00
Ajay Panicker
905d8ab843 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
(cherry picked from commit 6edb68bea6)
2017-09-22 16:31:43 +00:00
Sungsoo Lim
65a5d03b6e Merge "Select a system audio route only when needed" into oc-mr1-dev am: d4aee713d4
am: cf874bbe6f

Change-Id: I79a44736931cea34eb6d00a62ae33b569021e9e4
2017-09-20 09:57:47 +00:00
Sungsoo Lim
cf874bbe6f Merge "Select a system audio route only when needed" into oc-mr1-dev
am: d4aee713d4

Change-Id: Ifa91341cb48c970f9b19c6f8bc0219c1a3372a9a
2017-09-20 03:02:28 +00:00
TreeHugger Robot
d4aee713d4 Merge "Select a system audio route only when needed" into oc-mr1-dev 2017-09-20 02:54:45 +00:00
Pawin Vongmasa
99da73404d Merge "Rename "bitrate-control" to "bitrate-modes"" into oc-mr1-dev am: 9b1a9b4fb9
am: 729cb8b2b5

Change-Id: If4ab02ad02b39e197b15d3b1b9c9eef6e4a87cdd
2017-09-19 01:30:01 +00:00
Pawin Vongmasa
729cb8b2b5 Merge "Rename "bitrate-control" to "bitrate-modes"" into oc-mr1-dev
am: 9b1a9b4fb9

Change-Id: Ibdfb6f003c7467f58c9232d807d52b327e2187af
2017-09-19 01:22:34 +00:00
TreeHugger Robot
9b1a9b4fb9 Merge "Rename "bitrate-control" to "bitrate-modes"" into oc-mr1-dev 2017-09-19 01:14:05 +00:00
Sungsoo Lim
f8e38e2dbb Select a system audio route only when needed
When system audio routes are changd, updateAudioRoutes is called, and
it selects a system audio route even when a none system route was
seleted.
That makes the selected route be unselected and this CL fixes it.

Bug: 65403568
Test: manual tested that the issue is fixed
Change-Id: I5df9d3e5f68cfd40fdb625937f9a8e16f4308e16
2017-09-18 13:50:56 +09:00
Sungsoo Lim
816d1e39d6 Merge "Change the route name for USB headset" 2017-09-18 04:28:47 +00:00
Pawin Vongmasa
add5a5a2f8 Rename "bitrate-control" to "bitrate-modes"
The property name that is listed in xml files is
"bitrate-modes", not bit "bitrate-control".

Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice

Bug: 65769027
Change-Id: Ifef752e05cac3b868cee76ce69f1763c075f10ec
2017-09-16 06:46:59 -07: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