Merge commit '4f24aed2a13d9ba89e2402894353176e19571e6e'
* commit '4f24aed2a13d9ba89e2402894353176e19571e6e':
Fix the dialing from contact for internet address.
Merge commit '669070787cc10377c2e5c3fa187babc728d96245' into gingerbread-plus-aosp
* commit '669070787cc10377c2e5c3fa187babc728d96245':
Fix the dialing from contact for internet address.
Merge commit 'f870ee81089ddf5e0388f8b4c7b6a1d437d39ce0'
* commit 'f870ee81089ddf5e0388f8b4c7b6a1d437d39ce0':
SipPhone: switch to its own phone type PHONE_TYPE_SIP.
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
Since we have NetworkProperties we can remove the individual accessors
from Phone and its subclasses.
Change-Id: Id9969a880405900a63051b3ae4019d889afb1fe8
Merge commit '360ab1dfb4ca9e33a604a5e2339c87291880faff'
* commit '360ab1dfb4ca9e33a604a5e2339c87291880faff':
Adds the ability to Android to initiate a 2 Digit Call.
Merge commit 'd90348796829f3d3a443e73ea3b3f2f9e79071c2'
* commit 'd90348796829f3d3a443e73ea3b3f2f9e79071c2':
Change CDMAPhone.getDeviceId to return MEID or ESN.
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
