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 '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 'e00d660aba91a7a682f83b2e0216296b0f3cca64' into eclair-plus-aosp
* commit 'e00d660aba91a7a682f83b2e0216296b0f3cca64':
Simple app to create a gl2 context and dump the strings.
Merge commit '1ff041180c66ef6f1020cf5314a665d319e9ac86' into eclair-plus-aosp
* commit '1ff041180c66ef6f1020cf5314a665d319e9ac86':
dumpstate: Add option to output to socket, disable code that switched to nonroot
This makes the system a little more careful to not start third party
code until it is ready to.
Also fix a little bug in SyncManager that would cause it to crash
during boot if sync was in a failure state.
Change-Id: Ib2d287d8441d155d393fe740a5f98690895fd358
This will be used to allow running dumpstate as root from the init process
to enable gathering debugging information that requires root to access.
Change-Id: I5bb7e83071fad2b377e549058f318a5118194061
Signed-off-by: Mike Lockwood <lockwood@android.com>
