drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,213 Commits 1 Branch 0 Tags
Commit Graph

916 Commits

Author SHA1 Message Date
Chung-yih Wang
4f24aed2a1 am 66907078: Merge "Fix the dialing from contact for internet address." into gingerbread 
Merge commit '669070787cc10377c2e5c3fa187babc728d96245' into gingerbread-plus-aosp

* commit '669070787cc10377c2e5c3fa187babc728d96245':
  Fix the dialing from contact for internet address.
 2010-09-08 10:32:13 -07:00
Lorenzo Colitti
c3a5cf07d1 Merge "Framework changes for IPv6 / IPv4v6 data calls." 2010-09-08 09:30:45 -07:00
Chung-yih Wang
6f0f870f16 Fix the dialing from contact for internet address. 
the bug is http://b/issue?id=2982290

+Log outbound proxy address if exists for debugging.
 2010-09-08 18:26:05 +08:00
Lorenzo Colitti
b60c9ba335 Framework changes for IPv6 / IPv4v6 data calls. 
Change-Id: I172fbcf3fcc4af3822aa16afac7015e675ccd007
 2010-09-07 19:46:23 -07:00
Hung-ying Tyan
8fbc471199 am f870ee81: am d580eee2: Merge "SipPhone: switch to its own phone type PHONE_TYPE_SIP." into gingerbread 
Merge commit 'f870ee81089ddf5e0388f8b4c7b6a1d437d39ce0'

* commit 'f870ee81089ddf5e0388f8b4c7b6a1d437d39ce0':
  SipPhone: switch to its own phone type PHONE_TYPE_SIP.
 2010-09-07 19:43:33 -07:00
Hung-ying Tyan
f870ee8108 am d580eee2: Merge "SipPhone: switch to its own phone type PHONE_TYPE_SIP." into gingerbread 
Merge commit 'd580eee29b50e1f11485b655fe5e6cc5a564615b' into gingerbread-plus-aosp

* commit 'd580eee29b50e1f11485b655fe5e6cc5a564615b':
  SipPhone: switch to its own phone type PHONE_TYPE_SIP.
 2010-09-07 19:40:40 -07:00
Hung-ying Tyan
d580eee29b Merge "SipPhone: switch to its own phone type PHONE_TYPE_SIP." into gingerbread 2010-09-07 19:37:33 -07:00
Hung-ying Tyan
8744f87985 SipPhone: switch to its own phone type PHONE_TYPE_SIP. 
Change-Id: Ie33cfe92e59665864dbebbb38895e8e85f6db2e6
 2010-09-07 20:01:24 +08:00
Chung-yih Wang
577afc1c15 am b65fd472: am b6264a87: Fix the build. 
Merge commit 'b65fd4726ce625958876ee0b68c622839f33a64c'

* commit 'b65fd4726ce625958876ee0b68c622839f33a64c':
  Fix the build.
 2010-09-05 22:03:42 -07:00
Chung-yih Wang
b65fd4726c am b6264a87: Fix the build. 
Merge commit 'b6264a8795ed9469c80727123e3cafda1b07eda3' into gingerbread-plus-aosp

* commit 'b6264a8795ed9469c80727123e3cafda1b07eda3':
  Fix the build.
 2010-09-05 22:01:38 -07:00
Chung-yih Wang
b6264a8795 Fix the build. 
Change-Id: Icfeec3372dcde30723c49565649be03a4dd33c06
 2010-09-06 12:58:18 +08:00
Chung-yih Wang
e2aded2d54 am 2143ade8: am b12baad9: Add equals() funcation for SipPhone. 
Merge commit '2143ade8030b8765e8744f5ff1ad90343f7fbfcd'

* commit '2143ade8030b8765e8744f5ff1ad90343f7fbfcd':
  Add equals() funcation for SipPhone.
 2010-09-05 21:16:16 -07:00
Chung-yih Wang
2143ade803 am b12baad9: Add equals() funcation for SipPhone. 
Merge commit 'b12baad9357c6e6aec1f7d84fd041c54fe963407' into gingerbread-plus-aosp

* commit 'b12baad9357c6e6aec1f7d84fd041c54fe963407':
  Add equals() funcation for SipPhone.
 2010-09-05 21:12:57 -07:00
Chung-yih Wang
b12baad935 Add equals() funcation for SipPhone. 
Since we will use sipuri to match the same phone object.

Change-Id: I582779e51e447bb8d822c105cf0d682651c138d2
 2010-09-06 12:05:46 +08:00
Robert Greenwalt
70af574b3d Some cleanup of Proxy class. 
Switch to using InetSocketAddress.

Change-Id: Ibdb97fcd2d06eecaa1e847b78267180156089f27
 2010-09-03 16:18:41 -07:00
John Wang
9096a427ce am 419126a6: am dc243482: Merge "Add API to get all foreground calls." into gingerbread 
Merge commit '419126a6969be5384742b2fbf5f8507d0513c8db'

* commit '419126a6969be5384742b2fbf5f8507d0513c8db':
  Add API to get all foreground calls.
 2010-09-03 14:17:20 -07:00
John Wang
419126a696 am dc243482: Merge "Add API to get all foreground calls." into gingerbread 
Merge commit 'dc243482d6e104c4a3cddaa694c2ee3c628c2c20' into gingerbread-plus-aosp

* commit 'dc243482d6e104c4a3cddaa694c2ee3c628c2c20':
  Add API to get all foreground calls.
 2010-09-03 14:08:32 -07:00
John Wang
dc243482d6 Merge "Add API to get all foreground calls." into gingerbread 2010-09-03 14:06:20 -07:00
Brad Fitzpatrick
4f3c5589c8 am 9eb32c96: am a2f2141c: Merge "More SharedPreferences commit() -> apply() changes." into gingerbread 
Merge commit '9eb32c96c872512c8aedc8627a4b96e9ea2a1a28'

* commit '9eb32c96c872512c8aedc8627a4b96e9ea2a1a28':
  More SharedPreferences commit() -> apply() changes.
 2010-09-03 13:27:51 -07:00
Brad Fitzpatrick
9eb32c96c8 am a2f2141c: Merge "More SharedPreferences commit() -> apply() changes." into gingerbread 
Merge commit 'a2f2141c84923e34e003bec92b7435ea79b02ee8' into gingerbread-plus-aosp

* commit 'a2f2141c84923e34e003bec92b7435ea79b02ee8':
  More SharedPreferences commit() -> apply() changes.
 2010-09-03 12:49:44 -07:00
Brad Fitzpatrick
fa8e271636 More SharedPreferences commit() -> apply() changes. 
Change-Id: Ibc844d72d463434722a349f5bbc02889a9feb0ee
 2010-09-03 11:18:28 -07:00
John Wang
20bb22964e Add API to get all foreground calls. 
Change-Id: I38293b2d7841f5d8708a7b9b516f686ab15de2b1
 2010-09-02 17:12:28 -07:00
Dmitri Plotnikov
bcc2f7589a Merge "Added new method to format the phone number when neccessary." 2010-08-30 17:48:05 -07:00
Robert Greenwalt
37e65ebb7e Rename NetworkProperties to LinkProperties 
Also add copy constructors and use them when giving out data.

Change-Id: Id320eb8fb91d0bd250305ce7bb4f628570215615
 2010-08-30 15:54:37 -07:00
Jean-Baptiste Queru
1ace4163fa resolved conflicts for merge of ff749b9a to master 
Change-Id: Ieb368754b84a47179b75cbae8fcd7d971893b7af
 2010-08-30 14:00:27 -07:00
Jean-Baptiste Queru
ff749b9a0d am 55a2df8c: Merge "Telephony: Control operator selection using EF_CSP data." 
Merge commit '55a2df8c773f2b0af02d0a47fa5be4f14fcbf419' into gingerbread-plus-aosp

* commit '55a2df8c773f2b0af02d0a47fa5be4f14fcbf419':
  Telephony: Control operator selection using EF_CSP data.
 2010-08-30 13:20:57 -07:00
Banavathu, Srinivas Naik
0e67c8926b 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
 2010-08-30 11:05:38 -07:00
Bai Tao
2a4e96067d Added new method to format the phone number when neccessary. 
Change-Id: I90fb38c1d36dc1ccf7eaa3b4cc34cd29f5151493
 2010-08-30 10:52:15 +08:00
Wink Saville
db4c91ff7b Merge "Add NetworkProperties to DataConnection." 2010-08-27 11:38:48 -07:00
Wink Saville
1f6408a96c Add NetworkProperties to DataConnection. 
Since we have NetworkProperties we can remove the individual accessors
from Phone and its subclasses.

Change-Id: Id9969a880405900a63051b3ae4019d889afb1fe8
 2010-08-27 11:15:18 -07:00
Banavathu, Srinivas Naik
1e8dd5b4a7 am eb182d78: am f3ee6f87: Telephony: Remove references to mExitECMRunnable object. 
Merge commit 'eb182d789df75be7a778a6264e658972af73800c'

* commit 'eb182d789df75be7a778a6264e658972af73800c':
  Telephony: Remove references to mExitECMRunnable object.
 2010-08-26 13:14:49 -07:00
Banavathu, Srinivas Naik
eb182d789d am f3ee6f87: Telephony: Remove references to mExitECMRunnable object. 
Merge commit 'f3ee6f87a344b185d8bde12c77440c9020378510' into gingerbread-plus-aosp

* commit 'f3ee6f87a344b185d8bde12c77440c9020378510':
  Telephony: Remove references to mExitECMRunnable object.
 2010-08-26 09:02:33 -07:00
Hung-ying Tyan
4d1b114b5f am d06e641d: am 108a06c9: Merge "CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()" into gingerbread 
Merge commit 'd06e641dbfbba672f17026c4a204c396f32a1ae1'

* commit 'd06e641dbfbba672f17026c4a204c396f32a1ae1':
  CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()
 2010-08-25 20:02:00 -07:00
Hung-ying Tyan
d06e641dbf am 108a06c9: Merge "CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()" into gingerbread 
Merge commit '108a06c9fc0e4ac8c713fa38c490475d30a3cdcf' into gingerbread-plus-aosp

* commit '108a06c9fc0e4ac8c713fa38c490475d30a3cdcf':
  CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()
 2010-08-25 19:30:03 -07:00
Hung-ying Tyan
0e05bd27be CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf() 
Change-Id: Ib0c83c373580f7be9cb1ee262cd0098c70db9c64
 2010-08-25 18:18:15 +08:00
Hung-ying Tyan
63134b3aee am 1537637c: am 3294d44b: Add confcall management to SIP calls 
Merge commit '1537637cc443a48e9afb8091b6f2ce329318f2d7'

* commit '1537637cc443a48e9afb8091b6f2ce329318f2d7':
  Add confcall management to SIP calls
 2010-08-24 12:58:22 -07:00
Jean-Baptiste Queru
5f981d97e7 am 360ab1df: am 6864b3e2: Merge "Adds the ability to Android to initiate a 2 Digit Call." 
Merge commit '360ab1dfb4ca9e33a604a5e2339c87291880faff'

* commit '360ab1dfb4ca9e33a604a5e2339c87291880faff':
  Adds the ability to Android to initiate a 2 Digit Call.
 2010-08-24 11:21:59 -07:00
Wink Saville
b422ca809c am d9034879: am b2cc86da: am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN. 
Merge commit 'd90348796829f3d3a443e73ea3b3f2f9e79071c2'

* commit 'd90348796829f3d3a443e73ea3b3f2f9e79071c2':
  Change CDMAPhone.getDeviceId to return MEID or ESN.
 2010-08-24 10:16:42 -07:00
Hung-ying Tyan
1537637cc4 am 3294d44b: Add confcall management to SIP calls 
Merge commit '3294d44b96f63f647fba3a03604eb028e28a42bc' into gingerbread-plus-aosp

* commit '3294d44b96f63f647fba3a03604eb028e28a42bc':
  Add confcall management to SIP calls
 2010-08-24 05:00:11 -07:00
Hung-ying Tyan
3294d44b96 Add confcall management to SIP calls 
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
 2010-08-24 17:54:47 +08:00
Banavathu, Srinivas Naik
f3ee6f87a3 Telephony: Remove references to mExitECMRunnable object. 
Free mExitECMRunnable object while destroying CDMA phone.

Change-Id: I411b3e5e41a9cc76c3571a98f13f91d84523f623
 2010-08-23 22:03:28 -07:00
Jean-Baptiste Queru
360ab1dfb4 am 6864b3e2: Merge "Adds the ability to Android to initiate a 2 Digit Call." 
Merge commit '6864b3e2f4e67be847b2ae054f2f9c388f115722' into gingerbread-plus-aosp

* commit '6864b3e2f4e67be847b2ae054f2f9c388f115722':
  Adds the ability to Android to initiate a 2 Digit Call.
 2010-08-23 14:14:45 -07:00
Jake Hamby
d218526bf6 am d457053a: am 07936528: Merge "Cosmetic cleanups to SMSDispatcher classes." into gingerbread 
Merge commit 'd457053aab0763764da5b9c3e6e84e5b2935ea88'

* commit 'd457053aab0763764da5b9c3e6e84e5b2935ea88':
  Cosmetic cleanups to SMSDispatcher classes.
 2010-08-23 12:01:35 -07:00
Wink Saville
d903487968 am b2cc86da: am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN. 
Merge commit 'b2cc86da29452769ff6210f1dfef4b51aac1d75e' into gingerbread-plus-aosp

* commit 'b2cc86da29452769ff6210f1dfef4b51aac1d75e':
  Change CDMAPhone.getDeviceId to return MEID or ESN.
 2010-08-20 16:37:21 -07:00
Wink Saville
b2cc86da29 am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN. 
Merge commit '3158cf689f4994ec53c3b727f9b6ad7751a5551b' into gingerbread

* commit '3158cf689f4994ec53c3b727f9b6ad7751a5551b':
  Change CDMAPhone.getDeviceId to return MEID or ESN.
 2010-08-20 16:34:16 -07:00
Wink Saville
3158cf689f Change CDMAPhone.getDeviceId to return MEID or ESN. 
This allows devices with only ESN's to work.

bug: 2938223
Change-Id: I33939151c59f598b939e73d98f1178669d6ceb75
 2010-08-20 16:24:02 -07:00
Robert Greenwalt
2b05a95bcc am 4b1bdc02: Merge "DO NOT MERGE Fixing Connectivity" into gingerbread 
Merge commit '4b1bdc0209650436ebe0dad1020080cc891e97b6' into gingerbread-plus-aosp

* commit '4b1bdc0209650436ebe0dad1020080cc891e97b6':
  DO NOT MERGE Fixing Connectivity
 2010-08-20 12:04:07 -07:00
Robert Greenwalt
4b1bdc0209 Merge "DO NOT MERGE Fixing Connectivity" into gingerbread 2010-08-20 12:01:56 -07:00
Robert Greenwalt
8afddad7e7 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
 2010-08-20 10:01:55 -07:00
Jake Hamby
d457053aab am 07936528: Merge "Cosmetic cleanups to SMSDispatcher classes." into gingerbread 
Merge commit '07936528cfbacb19d3f70b978708a52c47a31c0e' into gingerbread-plus-aosp

* commit '07936528cfbacb19d3f70b978708a52c47a31c0e':
  Cosmetic cleanups to SMSDispatcher classes.
 2010-08-19 18:16:55 -07:00