The issue this change fixes can be reproduced by following steps:
1. Originate and connect a call to remote party #1 that is not in Contacts.
2. Receive a call from the remote party #2 that is not in Contacts, the
call waiting tone is sounded and the call waiting screen is displayed.
3. Press menu key and ignore the call, and the call waiting screen is
dismissed and the remote party #2 is forwarded to voice mail.
When we ignore the incoming call, Phone gets stuck with incoming call
screen.
The fix is:
1. Update phone state promotly based on the call waiting state.
2. Remove new call handling in handlePollCalls() function because in CDMA,
the call drop should be determnited by the number of calls in the call
list.
This flag was unnecessary because the lower level GPS code already checks for this
and this was causing problems for a GPS implementation that does not use /etc/gps.conf
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '3735df20ae9994a759aa9464534d57eab4af4011'
* commit '3735df20ae9994a759aa9464534d57eab4af4011':
MountListener: When we connect to vold, explicitly mount external storage.
Merge commit '97a67cc281805566d429d4ca6570348fcf6dabd9'
* commit '97a67cc281805566d429d4ca6570348fcf6dabd9':
sdutil: Up the mount/unmount wait times to account for disk check + reaper time
Merge commit 'abccd7eaa52d0b8579ba3d1c954dfe7529945c0f'
* commit 'abccd7eaa52d0b8579ba3d1c954dfe7529945c0f':
DO NOT MERGE. Implement IMSI function for CDMA phones
Merge commit '0a6a05cdb57561e2d932a62a018c83ca5667f4da'
* commit '0a6a05cdb57561e2d932a62a018c83ca5667f4da':
DO NOT MERGE - Disable settings backup in Donut
* changes:
Adding public intents for TTS to enable checking for TTS data, installing TTS data, and finding out when the TTS queue has finished processing.
In Metadata, implemented the method that unmarshall the data from
a metadata parcel an return java entities.
Add 2 new types of metadata (Boolean and Date) and fixed an issue
in TimedText: the w3c standard specify a duration as well as the
time to be played => added a duration field.
In MetadataParserTest.java:
Moved the util private methods at the bottom of the file.
Added new tests for the getters (GETTERS section)
* changes:
MountListener: When we connect to vold, explicitly mount external storage. Vold no longer mounts storage automatically so it doesnt interfere with the framework booting.
Merge commit 'fae76f5bdeed68efd85805db143b0426de92f7e0'
* commit 'fae76f5bdeed68efd85805db143b0426de92f7e0':
Fix issue #1985502: Sapphire (and any other device) reports that it has a hard keyboard
Merge commit '9ce081aa2493dc163a42decfd4e1756b5c55a834'
* commit '9ce081aa2493dc163a42decfd4e1756b5c55a834':
Add ability to delay messages in Filter based on constraint. Use this to delay 500ms for delete keys in the search dialog.
Merge commit 'eb09c6a07abf58b4da2c4baf3800a1f96e3b0731'
* commit 'eb09c6a07abf58b4da2c4baf3800a1f96e3b0731':
Issue #1969025: need api for launching intent as if it were coming from another component
Merge commit '58d19d1f6321161fdcd10140fe7b9d9053f80bd2'
* commit '58d19d1f6321161fdcd10140fe7b9d9053f80bd2':
Fix bug that would cause files with blank title tags to not be shown in the music app.
Merge commit '65d99c3cbf149776c7ec4ea1f3cb1f4470d2be83'
* commit '65d99c3cbf149776c7ec4ea1f3cb1f4470d2be83':
Fixing a race condition that causes synthesis to not be aborted
Merge commit '2493097cb077b772af779bf14251e3ac0fff95f8'
* commit '2493097cb077b772af779bf14251e3ac0fff95f8':
Fix the style of preferences headers in the light theme.
Merge commit '8e3c3f6461b53dc587ba92b3fe8cfbeb985f8514'
* commit '8e3c3f6461b53dc587ba92b3fe8cfbeb985f8514':
Only parse search suggestions that look like HTML
Merge commit '5380aa29470274de5b3e445d577ef0834cfacb71'
* commit '5380aa29470274de5b3e445d577ef0834cfacb71':
Get rid of drawing hacks for search dialog suggestions
