Commit Graph

36 Commits

Author SHA1 Message Date
The Android Open Source Project
55b7d1243f merge from open-source master
Change-Id: I3e36061d7ba4b8a3962bf8391d663b861a4ede38
2010-05-14 13:52:52 -07:00
Jey
eccd93c7eb SetLocaleByCarrier, only if its not an unknown carrier.
Change-Id: Ia218b3622a23cc0fc1bb2c1606c832ecc561d5bf
2010-04-16 13:57:42 -07:00
Jake Hamby
633dfb6da6 Fix some typos and logging of calls to CDMA methods.
Fixed some comment typos and cleaned up logging of unexpected calls to
CDMA-specific methods on a non-CDMA device.

Change-Id: Ia6e5fba765122cbf3186fd9fecca7a3931a76dcc
2010-03-22 14:41:43 -07:00
John Wang
6a31dfa905 am 1ef6fb3b: am 8deed914: Merge "Handle RIL_UNSOL_RESEND_INCALL_MUTE." into eclair
Merge commit '1ef6fb3bbe17870673195f28eec9d1e4e43b4785'

* commit '1ef6fb3bbe17870673195f28eec9d1e4e43b4785':
  Handle RIL_UNSOL_RESEND_INCALL_MUTE.
2010-02-01 14:34:50 -08:00
John Wang
1ccc41ed93 Handle RIL_UNSOL_RESEND_INCALL_MUTE.
For bug 2400052.

Notify registered handler whenever receiving RIL_UNSOL_RESEND_INCALL_MUTE.
2010-01-29 20:04:39 -08:00
Wink Saville
02722fbd77 Convert DataConnection to an HSM and rename PdpConnection to GsmDataConnection.
Change-Id: Ia834022d04e65c42d671f63b2fec46804fe8a562
2009-12-22 14:32:07 -08:00
Wink Saville
d7d6fb3947 Telephony: Make resetting radio on a radio technology change optional
When there is a radio technology change in a multimode modem, resetting
the radio is not necessary always. Reset radio only when a property is
set. Notify applications that data connection is lost and ignore
notifications coming on the old radio technology.

Minor optimizations and bug fixes in CdmaDataConnectionTracker.
- Stop netstat polling when data connection is not active
- check all the elements of the data call list array to figure out if the
data connection is active.

Change-Id: I36785a9d1bf8ee135b574b61e9ba371faa04ffc7
2009-12-08 16:57:58 -08:00
Tammo Spalink
3cc97f8dbc Add Phone.getPhoneType() operation.
This routine returns integer values defined in the Phone interface,
derived from RILConstants values.  Direct references to the
RILConstants are replaced by references to these new ones for
consistency.

API CHANGE:
  unhide TelephonyManager.PHONE_TYPE_CDMA

Addresses issue:
http://buganizer/issue?id=1905415

Change-Id: Icfec6d457231b098c031677a66770b5e57be4a44
2009-09-24 13:19:08 +08:00
John Wang
bbd754b8fe Add ring back tone notification.
Some networks may not play ring back tone, RIL will send UNSOL ringback notification.

Apps can register for ring back tone msg and play tone to user for receiving ALERTING message.

The return value indicates to play or stop ring tone.
2009-09-20 13:40:38 -07:00
Wink Saville
a3659232ba Fix bug 2040024 phone rings only once sometimes.
The phone only rang once on rings that did't loop. In the GSM phones
the vendor ril sends a RIL_UNSOL_CALL_RING event to cause the phone
to properly play non-looping ring tones. To reproduce select a non-looping
ring tone such as "Digital Phone" and call it from another phone, the
phone will only ring once.

Three solutions were discussed:

*) Have all ring tones loop; rejected because to more space would be taken
by the silence.

*) Require all vendor RIL's to send RIL_UNSOL_CALL_RING; rejected because
it is inefficient to send a notification from the bottom of the stack.

*) Modify the PhoneApp or the audio layer; rejected because it would be
to big of change.

*) Modify the framework; this is the solution accepted.

The framework was modified to use two now properties to control the
call ring notification.

ro.telephony.multiple_call_ring: a boolean that if true the vendor ril
is assumed to send multiple RIL_UNSOL_CALL_RING messages. If false
only one is assumed and the framework will generate additional events.
(The default if absent is true).

ro.telephony.call_ring_delay: the delay in milli-seconds between
the generated events. (default if absent is 3000)

To minimize code duplication this change does some reorganization
of the PhoneBase class hierarchy and PhoneBase becomes a handler
and implements a default handleMessage method handles events associated
with call ring notification. This handler is overridden by derived
classes, CDMAPhone and GSMPhone which will pass unknown events
to PhoneBase.handleMessage and thus handle call notification for any
derived class.

Change-Id: I5b147b2b69b647d9987052f16ada41c9b66e4bf1
2009-08-28 11:10:09 -07:00
Dianne Hackborn
4a51c20ce6 I am getting tired of the java doc warnings, so fix them.
Change-Id: I2205eebae419eaf4a0992c9f5b7cd807eb843fe1
2009-08-24 17:37:32 -07:00
Wink Saville
95a1d1a89e E911 call fix in ECM
Based on the VZW requirement, phone should be still in ECM mode in 2nd emergency call.
but in the current phone call, if a 2nd emergency call is originated, ECM mode will exit.

For fixing this problem, the coding design is as below:
1. In framework, canceling the first ECM timer immediately upon the origination of the
   2nd E911 call, and restarting a new timer when the 2nd E911 ends.
2. Framework needs to syncronize the timer with phone app by sending notification to phone app to
   inform timer is canceled or re-started, since phone app needs to show how much ECM time left
   on the status bar.
3. In phone app's emergency callback mode service, the timer in this service will be canceled
   when it receives the timer cancel notification from framework; the timer will be restarted
   once it receives timer restart notification from framework.
2009-08-18 12:08:59 -07:00
Robert Greenwalt
25a5d3db3f Fix CDMA to startup/shutdown based on apn en/disab
Fixes MMS during wifi.
Also fixes CDMA for ConnectivityManager change.
2009-08-17 15:20:14 -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
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
Jaikumar Ganesh
1c42769339 Rename registerPhoneStateChange to registerPreciseCallStateChange
As registerPhoneStateChange was actually notifying CallStateChange,
rename appropriately.
2009-07-14 21:29:41 -07:00
Android (Google) Code Review
5b93050d48 am f6c96839: Merge change 6850 into donut
Merge commit 'f6c968395f9c78552763e8f2994a57cf5c6bc0c0'

* commit 'f6c968395f9c78552763e8f2994a57cf5c6bc0c0':
  Extra parameters for sendBurstDtmf.
2009-07-12 21:55:54 -07:00
jsh
dafa22a3ef Extra parameters for sendBurstDtmf.
ON length and OFF length.
Also, define PROFILEs for use with SETUP_DATA_CALL.
2009-07-10 15:52:28 -07:00
Android (Google) Code Review
e92b1e7633 am d48388ab: Merge change 5344 into donut
Merge commit 'd48388ab8239d2b0f4b8a9a4189fe9eeddddedca'

* commit 'd48388ab8239d2b0f4b8a9a4189fe9eeddddedca':
  frameworks/base: CDMA voicemail support
2009-06-25 00:10:18 -07:00
David Krause
ce099c3226 frameworks/base: CDMA voicemail support 2009-06-24 21:29:52 -07:00
Android (Google) Code Review
7699318ecd am 1e3d1b4b: Merge change 3107 into donut
Merge commit '1e3d1b4b83452286b000b8cd1997e5aef97fe2a7'

* commit '1e3d1b4b83452286b000b8cd1997e5aef97fe2a7':
  Motorola changes from 090602 through 090605
2009-06-07 22:49:49 -07:00
Wink Saville
22ccaf5321 Motorola changes from 090602 through 090605
The changes from 090602 update frameworks/base to support 3way calling
and call waiting.

The changes from 090603 completed the CdmaInformationRecords class
but the original changes submitted has been simplified, toString added
and a bug fixed where the notifications where not being handled properly.

The changes from 090605 added Prl Version, apn fixes.
2009-06-07 12:09:18 -07:00
Android (Google) Code Review
8d3002e047 am 35feec46: Merge change 2761 into donut
Merge commit '35feec46d90d434a2439765d127a9e8f68a52340'

* commit '35feec46d90d434a2439765d127a9e8f68a52340':
  TODO's from Teleca with modifications from wink.
2009-06-02 00:51:32 -07:00
Wink Saville
f315238a2b TODO's from Teleca with modifications from wink. 2009-06-01 14:39:20 -07:00
Android (Google) Code Review
a70396cd0a am f6355e24: Merge change 2399 into donut
Merge commit 'f6355e24f5382356ea197135fdeff827aabfdb90'

* commit 'f6355e24f5382356ea197135fdeff827aabfdb90':
  Motorola additions for CDMA support without CdmaSuppConnTracker
2009-05-28 20:30:45 -07:00
Wink Saville
dda5391d50 Motorola additions for CDMA support without CdmaSuppConnTracker
There are corresponding changes to hardware/ril and packages/apps/Phone
that are required to go with these changes.
2009-05-28 17:32:34 -07:00
Robert Greenwalt
b5010cc3c3 Add carrier/mcc factors to wifi-channel decision.
Uses ro.carrier and MCC when available to try to set
(non-persistingly) the number of allowed wifi channels.
Part of the fix for 1625953.
2009-05-22 09:31:41 -07:00
Wink Saville
e9b06d754a Teleca 2b changes 2009-05-18 21:47:50 -07:00
jsh
c06ce12540 Internal APIs to get/set SMSC address. 2009-05-11 16:34:16 -07:00
Robert Greenwalt
027405155f Fix Phone-based locale selection to never choose a lang-only locale.
This avoids us using the non-standard lang-only locale when communicating
off device.  Fixes 1810133.
2009-05-06 12:00:01 -07:00
Robert Greenwalt
0e1c45fd8b AI 145995: am: CL 145993 Fix Phone-oriented default-locale selection.
When several locales for a given language are available we were always
  selecting the first.
  Original author: rgreenwalt
  Merged from: //branches/cupcake/...

Automated import of CL 145995
2009-04-13 18:35:04 -07:00
Wink Saville
767a662ecd AI 144185: Integrate cdma into the main code base.
Automated import of CL 144185
2009-04-02 01:37:02 -07:00
Robert Greenwalt
88b861c8a6 AI 143900: am: CL 143898 Attempt to set the device Locale (if not already set) at phone
init based on the phone's reported carrier ID.
  Uses a core system resource string-array to contain the mapping
  of carrier ID -> default locale.  This should be set per project in
  an overlay.
  Original author: rgreenwalt
  Merged from: //branches/cupcake/...

Automated import of CL 143900
2009-03-31 18:04:05 -07:00
The Android Open Source Project
9066cfe988 auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
The Android Open Source Project
d83a98f4ce auto import from //depot/cupcake/@135843 2009-03-03 18:28:45 -08:00
The Android Open Source Project
54b6cfa9a9 Initial Contribution 2008-10-21 07:00:00 -07:00