Merge commit '6e1e1c6b781969e2af287ee7dd5074e215dc0725'
* commit '6e1e1c6b781969e2af287ee7dd5074e215dc0725':
fix issue 2096657: Sholes: residue shutter sound heard ONCE while taking a picture AFTER the volume is turned off.
Merge commit '7838887af4e63a1d31d98a9c4d31e1c40dabe297'
* commit '7838887af4e63a1d31d98a9c4d31e1c40dabe297':
Fix issue 2097083: STREAM_SYSTEM should be at max volume.
Merge commit '3df6afc153d25c32b986b9935874e0dc9e90ec3d'
* commit '3df6afc153d25c32b986b9935874e0dc9e90ec3d':
Fix issue #2097313: Latin IME crashes first use
Merge commit '13cb90a745a91ae5be76420bb7374b44a9b2317e'
* commit '13cb90a745a91ae5be76420bb7374b44a9b2317e':
Fix the issue that dialing *86 during call, the dialing voicemail screen is not shown.
Merge commit '1a3af62bfb3583ac2fece18523927587b6b6a277' into eclair-plus-aosp
* commit '1a3af62bfb3583ac2fece18523927587b6b6a277':
fix issue 2096657: Sholes: residue shutter sound heard ONCE while taking a picture AFTER the volume is turned off.
Merge commit 'cabd01f42afd0661d6a29217c62353c2eae3149a' into eclair-plus-aosp
* commit 'cabd01f42afd0661d6a29217c62353c2eae3149a':
Fix issue 2097083: STREAM_SYSTEM should be at max volume.
Do not ramp volume if the first frame of a track is processed after the track was stopped.
In the case of very short sounds, the track stop request can be received by AudioFlinger just after the start request before the first frame is mixed by AudioMixer. In this case, the track is already in stopped state and initial volume is applied with a ramp for the first frame processed which should not be the case: initial volume change is always applied immediatelly.
Merge commit '558340f2143b5efe4bc14b901ae1dc1b8cec7901' into eclair-plus-aosp
* commit '558340f2143b5efe4bc14b901ae1dc1b8cec7901':
add conditional verbose logging for when sending a SMS message.
Merge commit '0c36a517cd01a7112460a96f9f0fa2badf8f7015' into eclair-plus-aosp
* commit '0c36a517cd01a7112460a96f9f0fa2badf8f7015':
Add private API for data with presence.
Merge commit 'e3c393d3d14dab5b1eab37d2c52b7283df253f7f' into eclair-plus-aosp
* commit 'e3c393d3d14dab5b1eab37d2c52b7283df253f7f':
Fix issue #2097313: Latin IME crashes first use
Merge commit 'e2c9187b993a652fa8fdad516461ab66caa96cb4' into eclair-plus-aosp
* commit 'e2c9187b993a652fa8fdad516461ab66caa96cb4':
Fix the issue that dialing *86 during call, the dialing voicemail screen is not shown.
Merge commit 'bdd52b264af8f562dd368d40b66771c88d45127f' into eclair-plus-aosp
* commit 'bdd52b264af8f562dd368d40b66771c88d45127f':
Fix issue #2097060: Screen all messed up when setup wizard finished
The new code to rebuild the window list was missing some app tokens.
Also there were a few other smaller bugs floating around.
Change-Id: I7734917af0b76ee4aa304e6a5321401d87640f89
The change fixes the issue that dialing *86 during the call, the dialing voicemail
screen is not shown, instead it shows feature code screen.
For CDMA, when flash is sent to the network, there is no response from the
network to indicate if the feature code is completed or not. This is different
from MMI code in GSM network. So it's confusing to show any UI to indicate MMI
(feature code) for CDMA.
The change is to remove the feature code handling in CDMAPone, and handle the
feature code dialing the same way as the 3 way call dialing. Basically, when
feature code is dialed, the dialing screen will be shown.
Merge commit '9d6783e774c5ade517dbba7c28cf3a16fdb4e635'
* commit '9d6783e774c5ade517dbba7c28cf3a16fdb4e635':
[Issue 2087123] Suppressing all exception when trying to load a photo for the in-call UI
Merge commit '622da6829f11f0cacdbd6fe3b58f230d98115ed5' into eclair-plus-aosp
* commit '622da6829f11f0cacdbd6fe3b58f230d98115ed5':
[Issue 2087123] Suppressing all exception when trying to load a photo for the in-call UI
Merge commit '5f7cee89ca6670cefe91192e364037ee6ce39b19' into eclair-plus-aosp
* commit '5f7cee89ca6670cefe91192e364037ee6ce39b19':
Add updated API diff based on 4.xml.
Merge commit '2a2058f5a31e3bace3d0284fb1259a9ddcbec3a5' into eclair
* commit '2a2058f5a31e3bace3d0284fb1259a9ddcbec3a5':
Add updated API diff based on 4.xml.
Merge commit '8fb913661cb8088b3b4797374a9a912c41af276a'
* commit '8fb913661cb8088b3b4797374a9a912c41af276a':
Simple app to create a gl2 context and dump the strings.
