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 '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 '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 'c86f0779d6aa60d7eb446fb33742dac6bfc3b6b8' into froyo-plus-aosp
* commit 'c86f0779d6aa60d7eb446fb33742dac6bfc3b6b8':
Make vCard allow users to refrain image export. Useful when
Merge commit '8f655cb6c836380778545fb13044d97ef57139d6' into froyo-plus-aosp
* commit '8f655cb6c836380778545fb13044d97ef57139d6':
Update the comment which supposed to be checked in
Merge commit '2dc784988aa1660d02b50ed4e7d7679ba14b25b4' into froyo-plus-aosp
* commit '2dc784988aa1660d02b50ed4e7d7679ba14b25b4':
Remove fixed size restriction on the SurfaceView
Merge commit '5ce309d32e9aa28af4d2a6523ba2a4bc8e6d2f53' into froyo-plus-aosp
* commit '5ce309d32e9aa28af4d2a6523ba2a4bc8e6d2f53':
add droiddoc flag to include since-tags for api level 8
Cleanup of duplicate code
Caching Ntp data so we don't hit the network as often
Clearing out of MRU data when we switch to a new sim
Sending notification after we reset byte counts
bug:2605277
bug:2605272
bug:2597530
bug:2576057
Change-Id: I3df526bae6374f6ae56fed67b0defad2b4fabefd
Merge commit '99c5179fafcccff2bcc05b4c7fb04007bb438f67' into froyo-plus-aosp
* commit '99c5179fafcccff2bcc05b4c7fb04007bb438f67':
Force redraw in touch_up if there is a move.
The value returned is purely a function of what's passed in, all
following final members.
BUG=2606839
Change-Id: I506fb9b1f3be965576c2b3317a30ff1f990ccda3
Merge commit 'afbf9f8d6d66a0c1ba8c44a87b120bcad89ad8b5' into froyo-plus-aosp
* commit 'afbf9f8d6d66a0c1ba8c44a87b120bcad89ad8b5':
Ease contention on the mProcessStatsThread mutex in updateCpuStats.
Previously, this status icon reflected just the incoming
call behavior:
- gone for audible (with or without vibrate),
- wiggling phone for vibrate,
- silent (speaker + X) for no audible ring or vibrate.
Now that silent mode has changed (see VIBRATE_IN_SILENT),
you can easily get into a state where this icon is
confusing by setting the incoming call ringer to *never*
vibrate but setting the overall device silent state to allow
vibration (VIBRATE_IN_SILENT=true). In this case, rocking
the volume all the way down would show a wiggling phone
(because the device is in vibrate-only mode) but the status
bar would show speaker+X (because the incoming call would
neither ring nor vibrate).
Now these two icons are consistent. This means, however,
that if this special condition is set by the user (device
vibrates in silent mode, but incoming calls should never
vibrate) and the device is in silent mode, the status bar
will show a wiggling phone even though incoming calls will
not vibrate the device. This puts the ringer on a more even
footing with other apps on the device, which may elect not
to vibrate even if VIBRATE_IN_SILENT=true overall.
Bug: 2598014
Change-Id: Ib942f68738d77ab0d9b9da4fac718ae5957c133c
Merge commit '1892013643537f5fc330f5b0a02a0e9cb08b1134' into froyo-plus-aosp
* commit '1892013643537f5fc330f5b0a02a0e9cb08b1134':
Reset notification state on wifi enable
Merge commit '04152f98ffbd17f54a6b771636ff7f440f0edc78' into froyo-plus-aosp
* commit '04152f98ffbd17f54a6b771636ff7f440f0edc78':
Fix bug 2599698 Music paused by itself
Merge commit '3110bf6df1cb6d548e678cdcbb8c7349b2ac0d8a' into froyo-plus-aosp
* commit '3110bf6df1cb6d548e678cdcbb8c7349b2ac0d8a':
Fix inconsistency in how we handle light sensor when battery is low.
We believe these errors happen when the window
manager has told surface flinger to close the
native window.
If this error happens while we are creating the
EGL surface we exit the render loop (and
therefore exit the render thread.)
If the error happens while swapping the surface
we ignore it.
In either situation, we expect that the
application is about to be shut down by the
window manager, so it should not be necessary
to try and recover from the error.
