1453 Commits

Author SHA1 Message Date
John Wang
4567847d46 Add "canDial" check.
For bug #3164802.

CallManager allow a new phone call only if ALL of the following are true:

- Phone is not powered off
- There's no incoming or waiting call
- There's available call slot in either foreground or background
- The foreground call is ACTIVE or IDLE or DISCONNECTED.

Change-Id: I0124d600fd8c63b8c608301f3889b3faec47f1db
2010-12-01 10:26:49 -08:00
Hung-ying Tyan
db4245291b am ed34b244: am d7116ff1: Merge "Do not suppress error feedback during a SIP call." into gingerbread
* commit 'ed34b244f1665b604d2a291db504415b10a514d7':
  Do not suppress error feedback during a SIP call.
2010-12-01 09:21:36 -08:00
David Brown
1cc52df752 am 4c11eee7: am 04639ba0: Reduce the outrageous verbosity of CallerInfo.toString().
* commit '4c11eee7ec3dafe943af7f4222e29b550163e58c':
  Reduce the outrageous verbosity of CallerInfo.toString().
2010-12-01 09:21:22 -08:00
David Brown
a4d785688c am b9c19be7: am 91abcb62: Merge "Fix bug 3121292: Contact photo not shown correctly for SIP calls" into gingerbread
* commit 'b9c19be7c198dcdac7a37ea4af901af5179933d9':
  Fix bug 3121292: Contact photo not shown correctly for SIP calls
2010-12-01 09:20:58 -08:00
Hung-ying Tyan
ed34b244f1 am d7116ff1: Merge "Do not suppress error feedback during a SIP call." into gingerbread
* commit 'd7116ff1f0d1a3c14992273d0b899c3b71ba6d3f':
  Do not suppress error feedback during a SIP call.
2010-11-30 22:55:37 -08:00
Hung-ying Tyan
d7116ff1f0 Merge "Do not suppress error feedback during a SIP call." into gingerbread 2010-11-30 22:53:26 -08:00
David Brown
4c11eee7ec am 04639ba0: Reduce the outrageous verbosity of CallerInfo.toString().
* commit '04639ba0a939988d00131e61458807dac650f9c3':
  Reduce the outrageous verbosity of CallerInfo.toString().
2010-11-30 18:11:21 -08:00
Hung-ying Tyan
ebf28fa3f0 am 0e58a952: am 0bba9535: Merge "Throw proper exceptions in SipManager" into gingerbread
* commit '0e58a9529895e270dae90e69486a59e41de714b8':
  Throw proper exceptions in SipManager
2010-11-30 16:23:54 -08:00
David Brown
04639ba0a9 Reduce the outrageous verbosity of CallerInfo.toString().
Bug: 3121292
Change-Id: Ia8383891ef29a003acbd627b25ce87a187ef95c0
2010-11-30 15:49:48 -08:00
David Brown
b9c19be7c1 am 91abcb62: Merge "Fix bug 3121292: Contact photo not shown correctly for SIP calls" into gingerbread
* commit '91abcb624a6a873a2becbbf0f8186d6533daeb89':
  Fix bug 3121292: Contact photo not shown correctly for SIP calls
2010-11-30 15:24:42 -08:00
David Brown
91abcb624a Merge "Fix bug 3121292: Contact photo not shown correctly for SIP calls" into gingerbread 2010-11-30 15:20:45 -08:00
Wink Saville
2ebb3a2d9b am f3166799: Merge "Fix GSM permanent failure handling, DO NOT MERGE." into gingerbread
* commit 'f316679971be356dbb01f991e95742bc5f2a8383':
  Fix GSM permanent failure handling, DO NOT MERGE.
2010-11-30 11:46:34 -08:00
Hung-ying Tyan
0e58a95298 am 0bba9535: Merge "Throw proper exceptions in SipManager" into gingerbread
* commit '0bba9535413f9ceefe03f1cef9ddaddccd05cae5':
  Throw proper exceptions in SipManager
2010-11-30 11:46:01 -08:00
Wink Saville
f316679971 Merge "Fix GSM permanent failure handling, DO NOT MERGE." into gingerbread 2010-11-30 08:15:41 -08:00
Hung-ying Tyan
4189d99b6e Do not suppress error feedback during a SIP call.
Bug: 3124788
Change-Id: Ia0a06f72336d1795515428eba0c9f875c32d13d1
2010-11-30 17:00:45 +08:00
Hung-ying Tyan
0bba953541 Merge "Throw proper exceptions in SipManager" into gingerbread 2010-11-30 00:51:22 -08:00
Robert Greenwalt
d576483787 Make the internal data-disable mechanism internal
Break links to the outside world and limit its use.
A new public, persisted and separate mechanism will be coming soon.

Change-Id: Ia51a663125f7fe583e6d5d93bc2253f4e318847b
2010-11-29 10:54:34 -08:00
Wink Saville
26f5a384d8 Use apn types instead of host when sending notifications.
Previously we were passing the apn host not the type and this
caused us to sometimes not send out network change notifications.

Also rename of getActivceApn to getActiveApnHost to make
the method clearer on what is being returned and add some debug.

A future change will rename ApnSetting.apn to ApnSetting.host
and getActiveApnString.

bug: 2995554
Change-Id: I0c405b0f823f62c9596968c8516b820d9f8a94f2
2010-11-24 16:44:29 -08:00
Wink Saville
dd97d83ff7 Promote ActiveApn and methods to DataConnectionTracker.
Also, add getActiveApnType.

Change-Id: If44d2c35617a1ad385a7e5b7c1028751ded3ead2
2010-11-24 11:28:58 -08:00
Wink Saville
ac711639ae Merge "Promote ApnSetting to com.android.internal.telephony." 2010-11-24 10:15:56 -08:00
Wink Saville
176935c605 Promote ApnSetting to com.android.internal.telephony.
Change-Id: I8244331c123ccb33704dd7ae8342327a1a3f7124
2010-11-23 22:59:21 -08:00
Jean-Baptiste Queru
8503144665 resolved conflicts for merge of 8484e57f to master
Change-Id: I6a8cc70250fd2be9a1e9a728940a1e9f5721a653
2010-11-22 16:43:59 -08:00
Jean-Baptiste Queru
8484e57f30 resolved conflicts for merge of e4ae7fc3 to gingerbread-plus-aosp
Change-Id: I2e0a0ed622bc4c32d79936b30ebbf9068b3bdee8
2010-11-22 16:32:34 -08:00
Wink Saville
804043193a Remove pingtest in GsmDataConnectionTracker.
The pingtest have been disabled since petit-four and ping's use is
being deprecated. Removing the ping test code, if needed use
InetAddress.isReachable instead.

bug: 1824738
Change-Id: I42b3de85b67b82dc6389e7a2234afa7b1d687209
2010-11-20 11:57:56 -08:00
Robert Greenwalt
434203a277 Notify all VMs when proxy changes.
bug:2700664
Change-Id: I74cc6e0bd6e66847bf18f524ce851e3e9d2c4e87
2010-11-19 10:24:30 -08:00
Henrik Hall
95bc625e29 Enabling cell broadcast (SMS-CB) support in the platform.
Adding a simple API enabling applications to control SMS-CB reception.
Implementing parsing, assembly and dispatching of SMS-CB messages over GSM.

Change-Id: Iee841605a45a3af60c7602af175056afb03a38da
2010-11-19 15:00:00 +01:00
Wink Saville
a0d712694a Use TextUtils.isEmpty to simplify code.
Change-Id: I189c7c124419373c747c42504e656343728d0a15
2010-11-18 16:07:42 -08:00
Wink Saville
36d26c9290 Merge "Fix SPN_STRINGS_UPDATED_ACTION." 2010-11-18 15:42:04 -08:00
Wink Saville
0fa0d40b25 Fix SPN_STRINGS_UPDATED_ACTION.
Change EXTRA_SHOW_SPN and EXTRA_SHOW_PLMN to be false if spn and plmn
are null or empty respectively. For CDMA EXTRA_SHOW_SPN is always false.

bug: 3191159
Change-Id: Ic13b946cee10b123ec4960f2d22e13c8cb1dd20d
2010-11-18 15:16:42 -08:00
Jean-Baptiste Queru
9314feb971 am 977d01f3: am 27c06bab: Merge "Release reference when putting RILRequest back into the pool."
* commit '977d01f392d820da82e9bfdc00166302ca4d21f7':
  Release reference when putting RILRequest back into the pool.
2010-11-17 18:11:31 -08:00
Jean-Baptiste Queru
977d01f392 am 27c06bab: Merge "Release reference when putting RILRequest back into the pool."
* commit '27c06bab513a1893444d50bb5dedbad5c0100029':
  Release reference when putting RILRequest back into the pool.
2010-11-17 18:09:08 -08:00
Wink Saville
ae95eaeb43 Merge "Fix GSM permanent failure handling." 2010-11-17 17:17:28 -08:00
Wink Saville
0761131306 Fix GSM permanent failure handling.
Wait until all APN's have been tried before checking for permanent errors
and then, don't do retires only if all of the APN's had permanent errors.

Also, don't disable the requested apn type because if we do we won't
be able to setup data because there won't be an apn type.

This was tested by creating a new non existent APN, I chose:
  Name="badapn1"
  APN="badapn1"
  Server="noapn.com"

Then selecting "badapn1" will cause a permanent error.

bug: 3202729
Change-Id: I0a2160a852c5dcdd07ae06f93b3b77c29406af4b
2010-11-17 15:50:50 -08:00
Wink Saville
a20d02c2e1 Fix GSM permanent failure handling, DO NOT MERGE.
Wait until all APN's have been tried before checking for permanent errors
and then, don't do retires only if all of the APN's had permanent errors.

Also, don't disable the requested apn type because if we do we won't
be able to setup data because there won't be an apn type.

This was tested by creating a new non existent APN, I chose:
  Name="badapn1"
  APN="badapn1"
  Server="noapn.com"

Then selecting "badapn1" will cause a permanent error.

bug: 3202729
Change-Id: I182c7197456c849176ce08d7d1459359f8c3b30e
2010-11-17 15:33:36 -08:00
Jean-Michel Trivi
6c97eba1b7 Merge "SIP calls should set the audio mode to MODE_IN_COMMUNICATION" 2010-11-17 14:55:10 -08:00
Kenny Root
5644b08074 Don't waste resources creating new Boolean objects
There's a static Boolean.TRUE and Boolean.FALSE that can be used without
instantiating a new Boolean object unnecessarily.

Change-Id: I30a6c6514faae0ebeb6b571bf741db6814b8cc78
2010-11-17 11:22:06 -08:00
Jean-Michel Trivi
42c5a5ed4f SIP calls should set the audio mode to MODE_IN_COMMUNICATION
Audio mode MODE_IN_CALL is reserved for telephony.

Change-Id: I66cb9ff746ad9c15b2ce3b5a6de6c69f56654d15
2010-11-17 10:58:45 -08:00
Wink Saville
e613adcc55 Cleanup some debug output.
Change-Id: Iac39e7ffb1f7409647ce112f9347c42d2909846a
2010-11-16 16:11:41 -08:00
Robert Greenwalt
45f8b8bd04 Merge "Make getDataEnabled take more into account." 2010-11-12 08:50:50 -08:00
Wink Saville
7ef3361adc GsmServiceStateTracker#getPhone should be protected not public.
Change-Id: Ie8c1ac0a38616e4794aa51b9b642d9b22008b9ff
2010-11-11 16:13:01 -08:00
Robert Greenwalt
ec44c26f42 Make getDataEnabled take more into account.
getDataEnabled and getAnyDataEnabled ignored mMasterDataEnabled.
bug: 2216392

Change-Id: Ic3ae0808d2a02057ddf5056d3e01f754f2e57f5c
2010-11-11 15:18:51 -08:00
John Wang
a6689ddbba am 1ed7d65b: am fac4a689: Merge "Fix the audio mode glitch during hangup." into gingerbread
* commit '1ed7d65b5d781d10de91a199fbd94d6d445d1def':
  Fix the audio mode glitch during hangup.
2010-11-10 19:32:42 -08:00
John Wang
1ed7d65b5d am fac4a689: Merge "Fix the audio mode glitch during hangup." into gingerbread
* commit 'fac4a689f86b0d46a2c76cec0a6ce2f4bac2a22a':
  Fix the audio mode glitch during hangup.
2010-11-10 19:28:31 -08:00
John Wang
d19f44f3e3 Fix the audio mode glitch during hangup.
Fix bug # 3136179.

Keep audio mode as IN_CALL during hangup DISCONNECTING state

to prevent the NORMAL and IN_CALL glitch in auiod setMode.

Change-Id: I5513a3d5c65bd13ac054c9718c4dbd7d6db9eaf3
2010-11-10 15:35:51 -08:00
Robert Greenwalt
8e7e0a9fd5 Fix data state change callbacks
Initial state should be unknown or we miss the first connected change.
Don't send a disconnected msg when changing network types.
Filter out redundent disconnects.
Add some logging.

bug:3060742
Change-Id: Idc797c1276b7417337a91ed60b12b1bf392d57c0
2010-11-09 16:28:51 -08:00
Wink Saville
3611e5c939 Allow DataConnectionTrackers to manage multiple data connections.
This is the first step to allow simultaneous data connections.

Bug: 2441767
Change-Id: Ia625cfe94b771a6958401adca84b80543fbdb35c
2010-11-03 17:14:16 -07:00
Robert Greenwalt
26ba124903 Merge "Add some network/phone type constants." 2010-11-03 17:05:24 -07:00
Robert Greenwalt
962a990a45 Add some network/phone type constants.
Support for LTE (and SIP-based voice) and the stepping-stone eHPRD.

bug:3125398
Change-Id: Ied3d96fa09d9c758a82a2fd1817f55db711d1a4f
2010-11-03 17:02:37 -07:00
Hung-ying Tyan
8d1b2a17d9 Throw proper exceptions in SipManager
instead of silently returning null and causing NPE in applications as returning
null is not documented in the javadoc.

Add connection to the connection list in SipCall after dial() succeeds so that
we don't need to clean up if it fails. The original code will cause the failed
connection to continue to live in the SipCall and in next dial() attempt, a new
connection is created and the in-call screen sees two connections in the call
and thus shows conference call UI.

Bug: 3157234, 3157387
Change-Id: Iabc3235f781c4f1e09384a67ad56b09ad2c12e5e
2010-11-03 18:09:31 +08:00
Irfan Sheriff
ed4f28b492 Set country code in the driver and remove channel set
With dual band support, using country code
settings is the way to go

Bug: 2936741
Change-Id: I760dce4c43b1af19ee205c28f0d287420c8d9e85
2010-11-02 16:35:56 -07:00