395 Commits

Author SHA1 Message Date
Android (Google) Code Review
a646c56b21 Merge change 21186
* changes:
  Trigger data connection update if network type changes.
2009-08-13 15:13:47 -07:00
jsh
50e05ead5e Trigger data connection update if network type changes.
Data connection icon could be stale otherwise.
2009-08-13 15:02:18 -07:00
Wink Saville
a03ab1a6a0 Allow max_retires to be set to infinite.
Setting max_retires to infinite sets mRetryForever to true and therefore
isRetryNeeded will always be true. This is better than an alternative
which is to set max_retires to a large value such as 2147483647.
2009-08-13 14:18:00 -07:00
Android (Google) Code Review
a9085a59ec Merge change 20853
* changes:
  Add net type to mobile for mobile-required traffic
2009-08-13 14:02:08 -07:00
Wink Saville
9688c6046f Rename bcdByteToInt to gsmBcdByteToInt and beBcdByteToInt to cdmaBcdByteToInt. 2009-08-13 11:11:46 -07:00
John Wang
8c6b883cd3 Use dataRoaming in dataConnectionTracker.
Seperate dataRoaming from gsmRoaming. dataRoaming is based on +CGREG returns in GSM while gsmRoaming is based on +CREG returns. Previously, the status of dataRoaming is always treated the same as gsmRoaming. However there is a situation where +CREG returns 0 and +CGREG returns 5, i.e., gsmRoaming is off and dataRoaming is on. In such situation, the phone should setup data connection if the phone enables data service when roaming (for example, data only card). The phone shouldn't setup data connection if the phone disable data service when roaming (to prevent roaming data charge). So gsmDataConnectionTracker should use dataRoaming instead of gsmRoaming to decide if data service allowed.

	modified:   GsmDataConnectionTracker.java
	modified:   GsmServiceStateTracker.java
2009-08-13 08:42:18 -07:00
Robert Greenwalt
42acef3733 Add net type to mobile for mobile-required traffic
This also refactors ConnectivityService a bit towards supporting multiple simultaneous connections by making each a seem like a seperate Network with it's own stateTracker, etc.
Also adds tracking of process death to clean orphaned startUsingNetworkFeature features.
2009-08-12 16:08:25 -07:00
Android (Google) Code Review
aaa1fa96e1 Merge change 21006
* changes:
  Fix the issue of incorrect conversion of the plus sign in a dial string.
2009-08-12 15:48:31 -07:00
Tang@Motorola.com
18e7b98c1c Fix the issue of incorrect conversion of the plus sign in a dial string.
The issue is that the plus sign in a dial string is always converted
to the IDP (International Dial Prefix).

This fix implements a plus sign conversion mechanism based on the default
telephone numbering system that the phone is activated and the current telephone
number system that the phone is camped on. Currently, we only support the cases
where the default and current telephone numbering system are NANP.
2009-08-12 15:41:33 -07:00
jsh
71a08c1d78 am 4cc16a7b: Merge change 20859 into donut
Merge commit '4cc16a7b9f146c4a324202db6b1777d2e0150fc3'

* commit '4cc16a7b9f146c4a324202db6b1777d2e0150fc3':
  Fix for sending 16-bit SMS message with header.
2009-08-12 12:36:35 -07:00
jsh
7f304d2cce Fix for sending 16-bit SMS message with header.
Header length was missing from the PDU.  This addresses http://b/issue?id=2040561
2009-08-11 17:25:37 -07:00
Android (Google) Code Review
7d89133364 Merge change 20683
* changes:
  Add operator name in network selection.
2009-08-11 12:07:16 -07:00
Jeff Sharkey
f28ca902ad Update getNumberFromIntent() to read from both providers.
This method is used by the Phone app to decode ACTION_CALL
Intents, resolving to a real phone number.  Because the
columns are changing with the new provider, I added logic
to query using the correct columns for the authority of the
requested Uri.
2009-08-11 10:11:03 -07:00
johnwang
c6f79ce6bc Add operator name in network selection.
Save the operator name during network selection. The name will be used by UI to provide network selection notification. See bug 1414247.

	modified:   java/com/android/internal/telephony/PhoneBase.java
	modified:   java/com/android/internal/telephony/gsm/GSMPhone.java
2009-08-10 17:10:32 -07:00
johnwang
597f2b7022 Add ro.telephony.disable-call check in dialing.
When ro.telephony.disable-call is set to true the phone disable actual calls. It provides a way to test in user-debug builds for stability runs. See bug 2031157.

	modified:   java/com/android/internal/telephony/TelephonyProperties.java
	modified:   java/com/android/internal/telephony/cdma/CdmaCallTracker.java
	modified:   java/com/android/internal/telephony/gsm/GsmCallTracker.java

	modified:   java/com/android/internal/telephony/TelephonyProperties.java
	modified:   java/com/android/internal/telephony/cdma/CdmaCallTracker.java
	modified:   java/com/android/internal/telephony/gsm/GsmCallTracker.java
2009-08-10 17:10:32 -07:00
Tammo Spalink
e00dd1e5a3 Make GSM 7-bit encoding properly deal with initial padding.
For CDMA, clean up the GSM encapsulation to properly align
user data payload after the user data header.

Addresses http://buganizer/issue?id=2007011
2009-08-10 14:12:35 +08:00
Wink Saville
3918e13b24 Add configurable data-retry.
Add RetryManager and change GsmDataConnectionTracker and
CdmaDataConnectionTracker to use it.

Add TelephonyUtilsTest which tests RetryManager.
2009-08-09 15:23:45 -07:00
Christian Gustafsson
e4ebbd29f7 CDMA voicemail notification fixes
1.  Convert the voicemail count of a VM notification from
    BCD to decimal. That way the user will not be notified
    of 16 new VM when there are only 10.
    Ref: 3GPP2 C.S0015-B / 4.5.12 Number of Messages.
2.  Allow VMN-95 notifications without "User Data" to be
    processed. Only mandatory items for VMN-95 are
    "Message Identifier" and "Number of Messages".
    Ref: 3GPP2 C.S0015-B / 4.3.5 Voice Mail Notification.
2009-08-09 12:11:51 -07:00
Wink Saville
5221dfdec9 Revert "Disable data call in emergency call"
Temporary rollback of this change, for now the radio can prevent data traffic,
but that's not the desired long-term solution.

This reverts commit 79ef673d56e2599932b8b7f13695d23b4df54d09.
2009-08-08 22:06:01 -07:00
Jinghui Guo
9e652dcc21 Touch activation screen shown up fix
During the time of OTA activation screen startup, the app needs
to get MIN by calling getCdmaMin(). The issue in current code is that
OTA app calls getCdmaMin() before framework gets MIN data from lower
layer.

To fix this issue, framework will be providing the following new APIs
to applications for checking if MIN data is ready:
1. isMinInfoReady():
   Check if mMin variable in getCdmaMin() has been assigned a non-null value.
2. registerForSubscriptionInfoReady():
   Apps uses this API to register for notification.
3. unregisterForSubscriptionInfoReady():
   This API is used by apps to unregister notification.

Framework will be sending out the notification in the following situations:
1. when mMin is assigned a non-null MIN value;
2. When app calls register API and MIN is ready.
2009-08-07 10:35:11 -07:00
jsh
d1cb1d22af Bubble up SMS send fail error code to the app.
Framework portion of the fix for http://b/1978375:
We'll pass up the error code returned by the RIL on send failure.
2009-08-06 13:23:04 -07:00
Libin Tang
33777d2096 Fix the issue of datacall not being reinitiated after exiting
Emergency Callback Mode.
2009-08-05 11:29:38 -07:00
Tammo Spalink
2d65082b15 fix CDMA SMS ASCII decode and mapping 2009-08-05 11:12:53 +08:00
Android (Google) Code Review
529fcf97ea Merge change 9684
* changes:
  Add a DISCONNECTING call state.
2009-08-04 16:28:13 -07:00
jsh
e7a9201edb Add a DISCONNECTING call state.
This indicates to the UI that the hangup command has been received by the
Telephony layer and passed down to the RIL, but we have not yet been notified
of a successful DISCONNECT.

Addresses http://b/issue?id=1659876.
2009-08-04 11:30:09 -07:00
Tang@Motorola.com
dfb8f07a95 Fix WPS Queued pip tone not working issue.
The alert pitch included in the signal information record
should not be involved in the calculation for Pip tone type
mapping.
2009-08-03 12:06:40 -07:00
Tammo Spalink
98aed46992 relax ia5 parsing, and combine with ascii 2009-08-03 10:30:10 +08:00
Richard Meng
a1c94ae4f7 Handle SMS during CDMA emergency callback mode
If in emergency callback mode, any 3rd party application tries
to send Message using telephony API, return a NO_SERVICE error code.
2009-07-31 09:31:26 -07:00
johnwang
106d27140b Add technology and authentication type in setupDataCall.
SetupDataCall needs radio technology parameter to identify CDMA and GSM type. 0 means CDMA and 1 means GSM. The values are different from GSM_PHONE and CDMA_PHONE. Add authType parameter to identify PAP/CHAP authentication. Currently the authType is set to use both PAP and CHAP in CDMA phone.

	modified:   telephony/java/com/android/internal/telephony/CommandsInterface.java
	modified:   telephony/java/com/android/internal/telephony/RIL.java
	modified:   telephony/java/com/android/internal/telephony/RILConstants.java
	modified:   telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java
	modified:   telephony/java/com/android/internal/telephony/gsm/PdpConnection.java
	modified:   telephony/java/com/android/internal/telephony/test/SimulatedCommands.java
2009-07-31 01:31:12 -07:00
Satish Roddom
bd55b0cb15 Second word lost when SMS is received from email
When SMS is sent from a email address, Email Gateway server sends a string
containing from address, message text.  Current code is treating the first
word as from_address, second word as subject and rest of the string as message_body.
Because of this second word is getting stored in separate variable and not as part
of message text, so second word is always lost.
2009-07-30 17:25:23 -07:00
Android (Google) Code Review
992c1ebda1 Merge change 9260
* changes:
  Fix crash while dialing "*228;1"
2009-07-30 16:14:38 -07:00
Android (Google) Code Review
20b8e3a347 am 1247a644: Merge change 9243 into donut
Merge commit '1247a6444bb9f006e0b9def5cd15d626785424bb'

* commit '1247a6444bb9f006e0b9def5cd15d626785424bb':
  Clean up RIL_SIM_* in RILConstants
2009-07-30 16:07:57 -07:00
Android (Google) Code Review
ae7d38ad92 Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2009-07-30 16:07:30 -07:00
Jaikumar Ganesh
ab752276ee am 0da3bdb4: Fix public API caused due to CDMA changes.
Merge commit '0da3bdb476086db02a1076780676b21e239c79d6'

* commit '0da3bdb476086db02a1076780676b21e239c79d6':
  Fix public API caused due to CDMA changes.
2009-07-30 16:07:11 -07:00
John Wang
0d45e37069 Clean up RIL_SIM_* in RILConstants
GET_SIM_STATUS now returns structure RIL_CardStatus. So RIL_SIM_* status are obsoleted.

	modified:   java/com/android/internal/telephony/RILConstants.java
2009-07-30 15:45:12 -07:00
Libin Tang
d903014c1f Fix crash while dialing "*228;1" 2009-07-30 15:44:39 -07:00
Libin Tang
d23b2cd28c Fix CDMA ERI/roaming indicator issues
- If the SID is not in NAM and PRL, the phone should use default Roaming
  Indicator
- If a system is acquired that matches the NAM but does NOT match the PRL,
  the device shall display a FLASHING roaming indicator
- Handle corner cases for PRL is not loaded / Home SID is not programmed
- Reorganize the ERI logic
2009-07-30 15:43:12 -07:00
Jaikumar Ganesh
0da3bdb476 Fix public API caused due to CDMA changes. 2009-07-30 12:37:43 -07:00
johnwang
d2fb980060 Represent SID/NID in decimal format.
Interpret SID/NID ad decimal and add try/catch block to prevent crashing in wrong format. Update SID/NID comments.

	modified:   java/com/android/internal/telephony/CommandsInterface.java
	modified:   java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
2009-07-30 10:10:19 -07:00
Wink Saville
98ad09880b am b307c894: Fix bug 1994955 where PHONE_TYPE_CDMA was 0 and it should be 2 and added RILConstants.NO_PHONE.
Merge commit 'b307c8945d4bf8d843445f3cc6d727f4e43d90f0'

* commit 'b307c8945d4bf8d843445f3cc6d727f4e43d90f0':
  Fix bug 1994955 where PHONE_TYPE_CDMA was 0 and it should be 2 and added RILConstants.NO_PHONE.
2009-07-30 06:56:24 -07:00
yong liu
c84401fb8b CDMA Message Waiting Indication support
Add support for Message Waiting Info Record defined in 3GPP2 C.S-0005
and used for voice mail count by some CDMA networks
2009-07-29 20:54:03 -07:00
Yong Zhang
96f2747dd6 Fix wrong Singal Strength interpretation.
The issue this change fixes is that phone status bar shows full
signal strength bar even when phone is in bad signal area. The
root cause is that the signal strenth  is incorrectly interpreted.
2009-07-29 20:39:52 -07:00
Android (Google) Code Review
fc6627a892 Merge change 9054
* changes:
  Increase waiting time for data disable action in setPowerStateToDesired().
2009-07-29 17:03:04 -07:00
Yong Zhang
6afac8b292 Increase waiting time for data disable action in setPowerStateToDesired().
The issue this change fixes is that phone did not send MIP deregisteration
and LCP termination message when user powered down phone while data call was
in dormant state.  The root cause is Framework Telephony did not wait long
enough before it sent the request to power off the radio. The fix is to
increase the waiting timer.
2009-07-29 17:01:24 -07:00
Jinghui Guo
79ef673d56 Disable data call in emergency call 2009-07-29 16:58:11 -07:00
Wink Saville
b307c8945d Fix bug 1994955 where PHONE_TYPE_CDMA was 0 and it should be 2 and added RILConstants.NO_PHONE.
This bug originally reported that PHONE_TYPE_CDMA needed to be 2 because
it was public. But as far as I can tell it has never been public and it
is still marked @hide so is not public now. There is a bug in that
PHONE_TYPE_NONE and PHONE_TYPE_CDMA were both 0. But this doesn't
appear to have been a problem because PHONE_TYPE_NONE doesn't looked to be
used anywhere except in TelephonyManagerTest.
2009-07-29 10:25:09 -07:00
Tammo Spalink
f62a2bf29a allow illegal subparam sizes for CDMA SMS
addresses http://buganizer/issue?id=2008358
2009-07-29 14:31:43 +08:00
repo sync
a1fd1efb52 Voicemail number setting is throwing exception 2009-07-28 12:26:24 -07:00
Android (Google) Code Review
08e9722664 Merge change 8745
* changes:
  Refix the MT call screen stuck issue. The issue this change fixes can be reproduced by following steps: 1. Originate and connect a call to remote party #1 that is not in Contacts. 2. Receive a call from the remote party #2 that is not in Contacts, the call waiting tone is sounded and the call waiting screen is displayed. 3. Press menu key and ignore the call, and the call waiting screen is dismissed and the remote party #2 is forwarded to voice mail. When we ignore the incoming call, Phone gets stuck with incoming call screen.
2009-07-27 22:03:25 -07:00
Android (Google) Code Review
6e4cb2a001 am ecbbecf6: Merge change 8620 into donut
Merge commit 'ecbbecf6c535e7f3e1d072d43766a95aa18ee464'

* commit 'ecbbecf6c535e7f3e1d072d43766a95aa18ee464':
  Fix swapped gsm/cdma function dispatch, and 7bit text fragmentation.
2009-07-27 19:48:49 -07:00