664 Commits

Author SHA1 Message Date
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
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
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
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
059fe88115 Cosmetic cleanups to SMSDispatcher classes.
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
2010-08-19 17:40:37 -07:00
Hung-ying Tyan
a4cb657e3a CallManager: add setAudioMode()
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
2010-08-18 10:21:10 +08:00
Hung-ying Tyan
8eac20eacd SIP: implement conference call
Change-Id: Ifd420ed95e77e744c6aff28ac63e7363f97d9dc6
2010-08-18 10:00:36 +08:00
Hung-ying Tyan
912e0f7d9e CallManager: do not deliver ring event if fg call is live.
Change-Id: If5b1bca1f09557a2ee4de9ba429d80a0393279a0
2010-08-17 17:52:34 +08:00
Jake Hamby
17f616823a Fix character count bug and Javadoc typos in SMS (with test cases)
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
2010-08-13 14:01:31 -07:00
Jake Hamby
a8f39537ca Fix typo and bug in CTS test class.
- Fix Javadoc typo in PhoneSubInfo.java
- Fix ArrayIndexOutOfBoundsException in SimulatedCommands.java

Change-Id: I40dcd52cf9d6990f1f845fca5c1d61cdff93f4d7
2010-08-13 12:16:15 -07:00
John Wang
c159c84699 Update switch call and accept call.
Change-Id: Ifdd1af77e3eca08f6c931605ecfb275835b78709
2010-08-12 14:52:39 -07:00
Hung-ying Tyan
1777a2748b SIP: remove unused file.
Change-Id: Ifb3582da888926e62775a73a6b3080d15f1c3e42
2010-08-11 16:48:14 +08:00
Chung-yih Wang
2725a65512 Fix a bug in unregisterPhone().
Change-Id: Ifaef66d45043dc5376688a77f9d18124a9c29576
2010-08-11 14:22:34 +08:00
Chung-yih Wang
f57324cf4f Add getSipUri() for identification.
Change-Id: Iabffd38ad554c34a34977c833e6699747cbf0f63
2010-08-11 11:13:49 +08:00
Hung-ying Tyan
8e63ddb4c7 SIP: clean up unused class and fields.
Change-Id: I79ed7fb324fea9a52946340055b5ea1d389a926a
2010-08-10 12:00:45 +08:00
Hung-ying Tyan
8fb2e6e472 PhoneFactory: add makeSipPhone()
Change-Id: I8e7abb0623724d24c6f82829ff06663a31ba32fb
2010-08-09 17:15:35 +08:00
Hung-ying Tyan
d122805bbf CallManager: add getAllPhones().
Change-Id: I50589aaec55925d93c392f15a22c70d2a6634b87
2010-08-09 16:14:15 +08:00
Chung-yih Wang
ccd0b6953f Revert "Revert "Move SIP telephony related codes to framework.""
This reverts commit cde66df44240cfe5a7bec12ac52464c3bf26c14f.

Change-Id: I87da883b45350ec8f7da71e9bd392b075ea30ca7
2010-08-05 14:21:19 +08:00
Chung-yih Wang
cde66df442 Revert "Move SIP telephony related codes to framework."
This reverts commit b631dcf3eb449ddec756bea330f4e70b996ffb9e.
2010-08-05 13:25:38 +08:00
Chung-yih Wang
b631dcf3eb Move SIP telephony related codes to framework.
+ hardcode the sip service for build dependency.

Change-Id: Ib0e9717c9b87eb6e06ffa3a7b01ae31184de61bb
2010-08-05 11:11:58 +08:00
John Wang
62f066a14a Merge "Add register methods in CallManager "do not merge"" into gingerbread 2010-08-04 18:54:55 -07:00
jsh
05a5a88a17 Add support for PSC of serving cell.
Bug: 2465036
2010-08-03 14:50:18 -07:00
John Wang
0b80ac9825 Add register methods in CallManager "do not merge"
Cherry-picked from master.

Add register methods used by PhoneApp into CallManager class.

For most register methods, CallManager acts as an pass-through

register to handle register and unregister phone case.

Change-Id: I9567c2dbffb9e482b906f94c2d991a404ad4626e
2010-08-02 15:33:48 -07:00
John Wang
4de9d20260 Handle call list in CallManager "do not merge".
Cherry-picked from master.
Update APIs to access foregroudCalls, backgroudCalls, and ringingCalls
     * 1. APIs to access list of calls
     * 2. APIs to check if any active call, which has connection other than
     * disconnected ones, pleaser refer to Call.isIdle()
     * 3. APIs to return first active call
     * 4. APIs to return the connections of first active call
     * 5. APIs to return other property of first active call

Change-Id: Ic30e28018d14e496e9427f96fec8a7c2ff7c1549
2010-08-02 15:18:17 -07:00
John Wang
ccd88b6594 Create CallManager class "do not merge"
Cherry-pick from master.
Initial check-in to support multiple call channels.

Change-Id: I387bab4d69ee38d738c5e0e0a51f1ac6607b9759
2010-08-02 15:13:53 -07:00
Wink Saville
1540a7ea1a am c69f5be0: Add PhoneSubInfo.getCompleteVoiceMailNumber.
Merge commit 'c69f5be0ed3529564e5db6874de52775c2c99007' into gingerbread

* commit 'c69f5be0ed3529564e5db6874de52775c2c99007':
  Add PhoneSubInfo.getCompleteVoiceMailNumber.
2010-08-02 12:02:42 -07:00
Wink Saville
c69f5be0ed Add PhoneSubInfo.getCompleteVoiceMailNumber.
PhoneSubInfo.getVoiceMailNumber now returns only the network
portion of the voicemail number. Use the new method
PhoneSubInfo.getCompleteVoiceMailNumber to get the netowrk
portion and the post dial portion.

Bug: 2881483
Change-Id: I7637d4fa0ffa046b4eebc4d599719bb668c940b5
2010-08-02 11:07:51 -07:00
Xia Wang
374fe5c446 Remove voice mail number verification for testing on no-sim device
Change-Id: Iaf9e419b8d03e330864d64c05aee730d33994003
2010-07-07 18:43:17 -07:00
Robert Greenwalt
9c4ed1394b am f9610b38: Merge "Make the DUN apn data secure." into froyo
Merge commit 'f9610b3842e030138c1dc327a3a467aaea02c227' into kraken

* commit 'f9610b3842e030138c1dc327a3a467aaea02c227':
  Make the DUN apn data secure.
2010-06-06 12:10:00 -07:00
Robert Greenwalt
77b32ddbbe Make the DUN apn data secure.
Rather than come out of the user-modifiable APN DB, the DUN APN data will
come first from a built-in resource and then potentially overriden by a secure
setting (which is gservices upgradable).

Also made the "require-dun" setting secure-setting overridable.
bug:2736390

Change-Id: I1e4644c3839f06c977b83797641f3948785146a2
2010-06-04 11:13:34 -07:00
The Android Open Source Project
54525412c2 am 3aecdb9d: merge from open-source master
Merge commit '3aecdb9d7e92b1a91860600feefb5c0062b652cf' into kraken

* commit '3aecdb9d7e92b1a91860600feefb5c0062b652cf':
  fix build
  Fix some typos and other cosmetic cleanups in telephony framework.
2010-05-18 12:49:01 -07:00
The Android Open Source Project
3aecdb9d7e merge from open-source master
Change-Id: Ib711450566694550d9cb9ba01c25599010d2e5e4
2010-05-18 12:47:02 -07:00
Jean-Baptiste Queru
e25863c909 fix build
Change-Id: I86ee569ec81e6c690f7697237be7d94307014142
2010-05-18 11:54:42 -07:00
The Android Open Source Project
143c3d32f4 am 5ccb8b8c: merge from open-source master
Merge commit '5ccb8b8c4d6eabcc984559ef9e71efdbb3de00d3' into kraken

* commit '5ccb8b8c4d6eabcc984559ef9e71efdbb3de00d3':
  Fix updating and deleting FDN entries with an empty alpha identifier.
  Abort FDN delete when number is empty (instead of name)
2010-05-18 11:17:01 -07:00
The Android Open Source Project
5ccb8b8c4d merge from open-source master
Change-Id: Ib90da5365c873e542d79f036c32ec9b178cd8da0
2010-05-18 11:08:12 -07:00
Jean-Baptiste Queru
d87ed5a5c5 Merge "Fix some typos and other cosmetic cleanups in telephony framework." 2010-05-18 10:34:42 -07:00
Jake Hamby
9f36f51844 Fix updating and deleting FDN entries with an empty alpha identifier.
- Fix AdnRecord.buildAdnString() to generate the correct record when alpha
identifier is empty. This allows the user to update an FDN entry to remove
the alpha identifier. Previously the entire entry would be deleted because
an empty record was generated here when the alpha identifier was empty,
rather than a record containing the phone number with an empty alpha tag.
Also, return null if the number or alpha tag are too long.

- Fix bug in IccProvider.delete() where efType was compared against local
FDN constant rather than IccConstants.EF_FDN. This would always return
false. Comparing with IccConstants.EF_FDN gives the intended behavior.

Change-Id: I0ea75d7e107c7318c9a48ae6e0a15845a718f4c0
2010-05-18 10:26:21 -07:00
Jean-Baptiste Queru
27b2267c0d Merge "Abort FDN delete when number is empty (instead of name)" 2010-05-18 10:14:14 -07:00
The Android Open Source Project
12b6f6eaee am 55b7d124: merge from open-source master
Merge commit '55b7d1243f15395a102971e8fdc57444638729ac' into kraken

* commit '55b7d1243f15395a102971e8fdc57444638729ac':
  SetLocaleByCarrier, only if its not an unknown carrier.
2010-05-14 13:54:56 -07:00
The Android Open Source Project
55b7d1243f merge from open-source master
Change-Id: I3e36061d7ba4b8a3962bf8391d663b861a4ede38
2010-05-14 13:52:52 -07:00
Jean-Baptiste Queru
a2adf8f394 Merge "SetLocaleByCarrier, only if its not an unknown carrier." 2010-05-14 11:39:06 -07:00
Jake Hamby
390de22024 Fix some typos and other cosmetic cleanups in telephony framework.
- Fix typos in Javadoc and comments.
- Fix Javadoc @link references to other classes/methods.
- Rename MISSING_UKNOWN_APN to MISSING_UNKNOWN_APN in DataConnection.
- Remove unused (and misspelled) RETRYIES_* consts in RetryManager.

Change-Id: I3b44ac8320d6c1e4c350be600c7ef266aaf735e4
2010-05-13 17:44:26 -07:00
The Android Open Source Project
e28776bbd7 am b1110149: merge from open-source master
Merge commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9' into kraken

* commit 'b1110149cccc3b99e59ead34ca46e5ac026f6db9':
  Use integer for loop counter instead of float
  New test in FrameworkTest for the VelocityTracker class
  Preserve '+' in phone numbers imported from SIM.
2010-05-13 14:56:02 -07:00
The Android Open Source Project
b1110149cc merge from open-source master
Change-Id: I88a580162b34a80d1e3e7987b7a301c253afa0e8
2010-05-13 14:50:16 -07:00
Jean-Baptiste Queru
ecfb185eed Merge "Preserve '+' in phone numbers imported from SIM." 2010-05-13 11:06:28 -07:00
The Android Open Source Project
1f35de2a2e am 79090cb3: merge from open-source master
Merge commit '79090cb3da132d07cd3888ef9242df9872fb4aa1' into kraken

* commit '79090cb3da132d07cd3888ef9242df9872fb4aa1':
  Change license for the UUS Information file.
  Remove ProximityAlerts Receiver when last ProximityAlert expires.
2010-05-12 15:06:13 -07:00
The Android Open Source Project
d6e24ca28b am 4adacd23: merge from open-source master
Merge commit '4adacd23d4c91569b16fe50419f1a91f68d805bd' into kraken

* commit '4adacd23d4c91569b16fe50419f1a91f68d805bd':
  Add support for EVDO Rev B
2010-05-12 14:56:00 -07:00
The Android Open Source Project
79090cb3da merge from open-source master
Change-Id: Ifb008642faddf6b83769cdaa5bd67d21591b9eaa
2010-05-12 14:54:38 -07:00