Merge commit '9d14e3ea22f48173070789951ee6dc64b507e13f' into kraken
* commit '9d14e3ea22f48173070789951ee6dc64b507e13f':
When updating existing entries in the media database, don't update
Merge commit '9b8b417cd1ddfb81c1b0314f033a1439fd627aa2' into froyo-plus-aosp
* commit '9b8b417cd1ddfb81c1b0314f033a1439fd627aa2':
When updating existing entries in the media database, don't update
the is_music, is_ringtone, etc columns. This ensures that custom
ringtones will still be shown in the ringtone picker after a rescan.
Bug 2594125
Change-Id: I56761240d6f6e699514169d80a445317ba0de9e2
The problem occurs if the device is powered down in silent mode. When the device restarts,
AudioService reads current ringer mode from saved settings but does not call setRingerModeInt()
to perform actions required when ringer mode changes.
The volumes of streams affected by ringer mode are actually at 0 because they are also read from settings
but their mute state is not applied correclty. When we later exit from silent mode, the streams
other than STREAM_RING that are affected by ringer mode are not restored as they are not considered
muted. This applies to STREAM_SYSTEM but also to STREAM_NOTIFICATION if its volume is controlled independently
from STREAM_RING.
The fix consists in calling setRingerModeInt() when AudioService starts.
Change-Id: Ica75b9874938dda1bc1b634c3e97db4a650d295c
Merge commit '3cd1f9f98b59d31876b17b0ddf0bd0a518dc92fd' into kraken
* commit '3cd1f9f98b59d31876b17b0ddf0bd0a518dc92fd':
Fix issue 2604270 Device auto connects to Car Dock (Media profile) after undocking.
Merge commit '3b5912602bec6ccbe8eef8a576730b1565f0067c' into froyo-plus-aosp
* commit '3b5912602bec6ccbe8eef8a576730b1565f0067c':
Fix issue 2604270 Device auto connects to Car Dock (Media profile) after undocking.
There was a regression introduced by change 4c637b9e34f4c8db69a64ad21a4e2bcfa7485b5f
fixing issue 2578813. As the A2DP device disconnection is notified to the audio policy manager
after a delay, there is a period during which the A2DP device is actually not connected but the
A2DP output is considered present by audio framework. If a playback is started during this period,
The A2DP output requests the activation of the A2DP sink which in turn triggers a reconnection
of the A2DP sink.
The fix consists in suspending the A2DP output immediately when receiving the A2DP disconnection
intent so that any activity on A2DP output is ignored until the output is actually closed by the
audio policy manager.
Change-Id: I16eaace45e12bfc970f50836b46a73b756b493f0
Merge commit '26f6163557980062dbb203388b3d0794ee0d06f7' into kraken
* commit '26f6163557980062dbb203388b3d0794ee0d06f7':
fix [2599939] "cannot play video" after open/close a video player a dozen of times
Merge commit '0a4ab1b9b4c7b891c1ecb67eed99e9c9b30c93aa' into froyo-plus-aosp
* commit '0a4ab1b9b4c7b891c1ecb67eed99e9c9b30c93aa':
fix [2599939] "cannot play video" after open/close a video player a dozen of times
get rid off the MAP_ONCE flag is MemoryHeapBase (as well as it's functionality),
this feature should not be used anymore.
the software renderer was incorrectly using the default ctor which set MAP_ONCE,
causing the leak. the software renderer itself is incorrectly used while coming
back from sleep.
Change-Id: I123621f8d140550b864f352bbcd8a5729db12b57
Merge commit 'e31724050041b4be41b7c868d531a6c00fd94587' into kraken
* commit 'e31724050041b4be41b7c868d531a6c00fd94587':
Make vCard allow users to refrain image export. Useful when
user toggles BT state.
Bug:2607218
This happens when Bluetooth is turned off, and when the headset is
still trying to connect. We get the connection result of
attempt before Bluetooth was toggled. We need to ignore this result.
Change-Id: I611232631b7f67f4a1ea803de0dcf4b749c1d8d5
Merge commit 'c86f0779d6aa60d7eb446fb33742dac6bfc3b6b8' into froyo-plus-aosp
* commit 'c86f0779d6aa60d7eb446fb33742dac6bfc3b6b8':
Make vCard allow users to refrain image export. Useful when
- basic-multi-touch-events.html - uses multi touch
- touch-target.html - uses multi touch
- touch-coords-in-zoom-and-scroll - uses eventSender.zoomPageIn(),zoomPageOut() that we do not support.
Change-Id: Ie38f7155ae87cf575fd839b5e0dc9e01adf0e485
Merge commit '8831d4dc5545cde841a0ef318b0ec870acfa0e45' into kraken
* commit '8831d4dc5545cde841a0ef318b0ec870acfa0e45':
Update the comment which supposed to be checked in
Merge commit '8f655cb6c836380778545fb13044d97ef57139d6' into froyo-plus-aosp
* commit '8f655cb6c836380778545fb13044d97ef57139d6':
Update the comment which supposed to be checked in
Basic implementation of an API for organizing a single activity into separate,
discrete pieces. Currently supports adding and removing fragments, and
performing basic lifecycle callbacks on them.
Change-Id: I6ea8e6bdb04d93f8105c2e983fe9b6532422de34
