Merge commit 'd580eee29b50e1f11485b655fe5e6cc5a564615b' into gingerbread-plus-aosp
* commit 'd580eee29b50e1f11485b655fe5e6cc5a564615b':
SipPhone: switch to its own phone type PHONE_TYPE_SIP.
Merge commit 'dc243482d6e104c4a3cddaa694c2ee3c628c2c20' into gingerbread-plus-aosp
* commit 'dc243482d6e104c4a3cddaa694c2ee3c628c2c20':
Add API to get all foreground calls.
Merge commit '55a2df8c773f2b0af02d0a47fa5be4f14fcbf419' into gingerbread-plus-aosp
* commit '55a2df8c773f2b0af02d0a47fa5be4f14fcbf419':
Telephony: Control operator selection using EF_CSP data.
As per CPHS4_2.WW6, CPHS B.4.7.1, the most significant bit of
Value Added Services Group(0xC0) info, controls operator selection menu.
-If this bit is set, display operator selection menu to user.
-If this bit is not set do not display operator selection menu to user,
set Network Selection Mode to Automatic.
Change-Id: Icca4898abced0b0beb94c3434448a26eae72008b
and fix the bug of re-assigning connectTime's in SipConnection,
and adding synchronization for SipPhone to be thread-safe,
and set normal audio mode when call not on hold instead of on hold in SipAudioCallImpl,
and fix re-entrance problem in CallManager.setAudioMode() for in-call mode.
Change-Id: I54f39dab052062de1ce141e5358d892d30453a3a
Merge commit '6864b3e2f4e67be847b2ae054f2f9c388f115722' into gingerbread-plus-aosp
* commit '6864b3e2f4e67be847b2ae054f2f9c388f115722':
Adds the ability to Android to initiate a 2 Digit Call.
Merge commit 'b2cc86da29452769ff6210f1dfef4b51aac1d75e' into gingerbread-plus-aosp
* commit 'b2cc86da29452769ff6210f1dfef4b51aac1d75e':
Change CDMAPhone.getDeviceId to return MEID or ESN.
Merge commit '3158cf689f4994ec53c3b727f9b6ad7751a5551b' into gingerbread
* commit '3158cf689f4994ec53c3b727f9b6ad7751a5551b':
Change CDMAPhone.getDeviceId to return MEID or ESN.
Merge commit '4b1bdc0209650436ebe0dad1020080cc891e97b6' into gingerbread-plus-aosp
* commit '4b1bdc0209650436ebe0dad1020080cc891e97b6':
DO NOT MERGE Fixing Connectivity
Passing Gateway addr info from telephony into ConnectivityService so it can
add/remove the default route as needed. Fixed differently on master.
bug:2927822
Change-Id: I9a3ee7cd23c4717e7c60098f0595aa3f77c44b15
Cleaned up some typos and other small fixes in SMSDispatcher in
preparation for checking in my SMS bug fixes. This change doesn't
fix any bugs, but it shouldn't introduce any either.
- Removed unused import statements
- Removed unused private constants and fields
- Fixed typos in Java comments and private constants
- Added generic type parameter to mSTrackers ArrayList
- Removed unnecessary casts
- Fixed indentation of mResultReceiver in SMSDispatcher
- Removed call to get unused smsc in CDMA sendSMS()
- Changed "|=" to "=" in boolean assignment where the variable
was initialized to false (thus the two operators are equivalent)
Change-Id: Ic19a63a7ef5cdccc7be86043c2a1b863ec8af652
Merge commit 'f6354aca3a4d0571a66747d9cdc247a1d411d660' into gingerbread-plus-aosp
* commit 'f6354aca3a4d0571a66747d9cdc247a1d411d660':
CallManager: do not deliver ring event if fg call is live.
When in a call, different audio modes need to be applied based on phone type.
(For example, SIP call needs to be in MODE_NORMAL while GSM call in MODE_IN_CALL.)
Originally, it's handled in PhoneUtils.setAudioMode(). It makes more sense now
to handle the actual logic in CallManager.
Change-Id: I58d8f31d6b4afe22f88da442daac2010781de801
Over here the phone number to the switch-board is "99". Trying
to call "99" on an Android device dont work as expected (it
works on other devices though).
Exception (1) to Call initiation is:
If the user of the device is already in a call and enters a
Short String without any #-key at the end and the length of
the Short String is equal or less than 2 the phone shall
initiate a USSD/SS commands.
Exception (2) to Call initiation is:
If the user of the device enters one digit followed by the
#-key. This rule defines this String as the "#-String" which
is a USSD/SS command. The phone shall initiate a USSD/SS
commands.
Change-Id: I950ac10b347b8e9d113d208b08c3e2c7cdb50221
Merge commit '3f442ece257d416b48f7803a4cc263f0215faa0d' into gingerbread-plus-aosp
* commit '3f442ece257d416b48f7803a4cc263f0215faa0d':
Fix character count bug and Javadoc typos in SMS (with test cases)
Merge commit '4f170821678099010ec593d2b5a081e0f8adf92d' into gingerbread-plus-aosp
* commit '4f170821678099010ec593d2b5a081e0f8adf92d':
Fix typo and bug in CTS test class.
Fix a character count bug I discovered while working on related SMS
bugs. Includes a new set of test cases to verify the fix for the
buggy calculateLength() methods ("runtest frameworks-telephony").
You can also verify that the counter works properly in the Mms app
by typing characters until the boundary is crossed where an
additional message part is required. The counter should count down
to 0 characters remaining before increasing the message count.
Change-Id: I4de68b82dfc53dcae094865798f2c0235a355d43
Merge commit 'c636b846160482fbebd9a3792d52b9ff864228f2' into gingerbread-plus-aosp
* commit 'c636b846160482fbebd9a3792d52b9ff864228f2':
Enhance WspTypeDecoder to decode Content Type Parameters
Merge commit 'c4c4c98c5ca6b4c017a5b429a6bd80a440c63559' into gingerbread-plus-aosp
* commit 'c4c4c98c5ca6b4c017a5b429a6bd80a440c63559':
In CW Interrogation service class is not sent.
As per 3GPP TS 24.083, section 1.6 UE doesn't need to send service class
parameter in call waiting interrogation to network. Some networks return error
if service class is sent. So setting service class to SERVICE_CLASS_NONE.
Change-Id: I396963d568573b88795ad2cf1844eb2e047b459e
