1313 Commits

Author SHA1 Message Date
Robert Greenwalt
746ef9b8f0 am 2c507b92: Merge "Use a cached context when possible." into honeycomb
* commit '2c507b92c242951e4fb2e807431c10d73e4bf778':
  Use a cached context when possible.
2011-02-02 13:19:15 -08:00
Wink Saville
837491cacb Merge "Provide default value for operator numeric for CDMA." 2011-02-02 12:16:48 -08:00
Robert Greenwalt
6e2884817d Use a cached context when possible.
It's always possible after services have been registered, so it's just early
in the process that's a problem.  Lie correctly in those early cases and fix this
in MR1.

bug:3415254
Change-Id: I95811d1efd676fde01f66b742393d3aa4623482f
2011-02-02 10:57:35 -08:00
Jean-Baptiste Queru
b65060282d am e7c6eea7: am 61b06be2: am 155b0ee0: Merge from open-source gingerbread
* commit 'e7c6eea7b42c233fe4de61b72e4f72e7614909e1':
  fix for supporting 3 digits MNC code
2011-02-02 09:55:06 -08:00
Jean-Baptiste Queru
e7c6eea7b4 am 61b06be2: am 155b0ee0: Merge from open-source gingerbread
* commit '61b06be285ef03381b1d788996650863a1606b36':
  fix for supporting 3 digits MNC code
2011-02-02 09:51:38 -08:00
Jean-Baptiste Queru
61b06be285 am 155b0ee0: Merge from open-source gingerbread
* commit '155b0ee0498cf863091f3f83a752eaaedf1257f8':
  fix for supporting 3 digits MNC code
2011-02-02 09:48:52 -08:00
Jean-Baptiste Queru
8226140cca Merge from gingerbread
Change-Id: Ifb3d42aa0f3772ca545f739df347eeb0ca7f58dd
2011-02-02 09:47:43 -08:00
Jean-Baptiste Queru
155b0ee049 Merge from open-source gingerbread
Change-Id: Iec6167bec8423e39dde053f23969c1c76e10a461
2011-02-02 09:45:32 -08:00
Eric Laurent
7c38e05914 am 6f2c1c92: am 0990484c: am 3d4069a2: Allow TTY mode for GSM Phones
* commit '6f2c1c92681d8e3664accae2a03058e38ea411f6':
  Allow TTY mode for GSM Phones
2011-02-02 08:34:57 -08:00
Eric Laurent
6f2c1c9268 am 0990484c: am 3d4069a2: Allow TTY mode for GSM Phones
* commit '0990484c3ef96c6f0553374675b76fed54b5b164':
  Allow TTY mode for GSM Phones
2011-02-02 08:30:57 -08:00
Eric Laurent
0990484c3e am 3d4069a2: Allow TTY mode for GSM Phones
* commit '3d4069a2e0c1c23244ead88a177ec06a2ef7a7d1':
  Allow TTY mode for GSM Phones
2011-02-02 08:28:25 -08:00
Sang-Jun Park
ba34751426 fix for supporting 3 digits MNC code
Default Android MNC value has a 2 digit but it should be supported a 3 digit
MNC in India. (should be supported both 2 and 3 digits MNC)

Change-Id: I69373d196b29bccd06653841f24cbfe3886834fb
Signed-off-by: Sang-Jun Park <sj2202.park@samsung.com>
2011-02-02 19:12:31 +09:00
Wink Saville
12bf1133bd am ff34565f: am 1bf518d8: Merge "Add TelephonyManager.getCurrentPhoneType" into honeycomb
* commit 'ff34565fcb366d4bd0066bd7fe6f588e42a9a9cc':
  Add TelephonyManager.getCurrentPhoneType
2011-02-01 21:06:38 -08:00
Wink Saville
9d72be3318 Add TelephonyManager.getCurrentPhoneType
The new method getCurrentPhoneType has the old behavior of getPhoneType
and does not check for voice capable. This allows code to assume
the old behavior.

bug: 3198435
Change-Id: I0542838ceca2f757cceb6cd7f795e95fe886523e
2011-02-01 19:22:15 -08:00
Wink Saville
1a24a9c1d4 am 566cd74f: am 4b77bbd2: Merge "Have getPhoneType return PHONE_TYPE_NONE for non-voice capable devices." into honeycomb
* commit '566cd74f5686b480d2e3d49c4505c45df7712587':
  Have getPhoneType return PHONE_TYPE_NONE for non-voice capable devices.
2011-02-01 15:30:29 -08:00
Eric Laurent
3d4069a2e0 Allow TTY mode for GSM Phones
TTY mode should not be restricted to CDMA phones as some GSM carriers
support it.
TTY support is enabled by overlaying the tty_enabled boolean property
in packages/apps/Phones/res/values/config.xml

Also corrected wrong comments on TTY methods.

Change-Id: I48dbc2be51c3dcdaedc1838b85134edc7012be3c
2011-02-01 15:25:41 -08:00
Sang-Jun Park
c5996b9969 Fix delivery report error with PENDING status in SMS
1. According to TS 23.040, TP-Status values is changed properly.
2. When processing Status Report, it should be checked whether tpStatus is PENDING or FAILED.

Change-Id: I91c315cfb363f3e4b936c6b6b1a01083687a580f
2011-02-01 10:05:28 -08:00
Wink Saville
fe629782f3 Provide default value for operator numeric for CDMA.
If the RIL_REQUEST_OPERATOR response[2], the numeric for the operator,
is bad use the system property ro.cdma.home.operator.numeric.

bug: 3383515
Change-Id: I9abddc477d57c350a4c9a445242eaa7627cd5f69
2011-01-31 18:11:31 -08:00
Wink Saville
9b9e6778dd Have getPhoneType return PHONE_TYPE_NONE for non-voice capable devices.
bug: 3198435
Change-Id: I1a19863c106a9394dbc941f396400e31dca95b92
2011-01-31 17:33:05 -08:00
Wink Saville
9fbf9c2ddb am bac75416: am cde85d57: Merge "Add debug for tracking bug 3404006." into honeycomb
* commit 'bac75416d1cead62ca54e6e78206da64507146ba':
  Add debug for tracking bug 3404006.
2011-01-30 23:17:35 -08:00
Wink Saville
cde85d5738 Merge "Add debug for tracking bug 3404006." into honeycomb 2011-01-30 23:12:35 -08:00
Wink Saville
ea9af9e97b Add debug for tracking bug 3404006.
We need some additional debugging to help diagnose the cause
of this bug. There is no logic changes just additional debugging.

Change-Id: Ifc5d1c82904042fa87fd3b5b1066f58b62e7359c
2011-01-30 16:16:20 -08:00
The Android Open Source Project
b2abd8c424 Mass merge from gingerbread - do not merge
Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
2011-01-30 12:40:38 -08:00
Jean-Baptiste Queru
7ea919c44b Merge 6b739dc7 from gingerbread
Change-Id: If94889da67977aff7daa1e201c10cd51b7e2fff8
2011-01-29 12:59:20 -08:00
Robert Greenwalt
b46062bc08 am f8fdec50: resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp
* commit 'f8fdec50c7871b640c13cfe3e2e7a3b449f62f69':
  Add some network types that OEM's are asking for.
2011-01-29 09:35:28 -08:00
Robert Greenwalt
f8fdec50c7 resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp
Change-Id: I7a3445f7df2a66c70f630fa63ceb4ae150d70963
2011-01-29 09:32:04 -08:00
Hung-ying Tyan
dd75788eda am cc019c0c: Merge "Get mute state from active call." into gingerbread
* commit 'cc019c0caa0dd984404dea4d6623ae9d7b8474f1':
  Get mute state from active call.
2011-01-29 09:31:40 -08:00
John Wang
6630698e24 am 93300ce2: Merge "Enable recovery in RIL wakelock release check." into gingerbread
* commit '93300ce2d398195d5616a2e924eb4a785274538e':
  Enable recovery in RIL wakelock release check.
2011-01-29 07:29:42 -08:00
Robert Greenwalt
aa3866e6fa am 6b739dc7: Merge "Add some network types that OEM\'s are asking for." into gingerbread
* commit '6b739dc7292452227cdd8abd90658f4db8f0ce70':
  Add some network types that OEM's are asking for.
2011-01-29 06:55:38 -08:00
Robert Greenwalt
e12aec941d Add some network types that OEM's are asking for.
Adding them hidden so that if OEM's are rolling their own at least they can
use the same values.  Will mark them unhidden in a future sdk release.

bug:3395729
Change-Id: I90eabe036a96e1aa7c8cac49ca51efd9b1776a0c
2011-01-28 14:48:37 -08:00
Robert Greenwalt
473df1cd24 am f7784876: am b8498f1d: Merge "Fix data network type notifications." into honeycomb
* commit 'f7784876ed2d731fae9ab8a10119f558a9adf8d7':
  Fix data network type notifications.
2011-01-28 09:54:04 -08:00
Robert Greenwalt
f7784876ed am b8498f1d: Merge "Fix data network type notifications." into honeycomb
* commit 'b8498f1dcf0b4e866c940da482930789cd6554c5':
  Fix data network type notifications.
2011-01-28 09:51:34 -08:00
Robert Greenwalt
164ca032b6 Fix data network type notifications.
These trackers have two copies of the network type: newSS and newNetworkType.  I think thats wrong,
but this was the smaller change on code that will hopefully be refactored soon.

On radio_off we were making a new, empty newSS but not clearing newNetworkType so it
still thought we were on 3G and when we reconnect and get 3G state changes new==old and we don't
send the update.  In this fix I reset newNetworkType every time we apply it to networkType.

bug:3389886
Change-Id: I294f34259dc6c6f8f445bf2cb5466c8be747e25c
2011-01-27 17:48:52 -08:00
John Wang
4376538c47 Enable recovery in RIL wakelock release check.
This is a cherry-pick Change 91968 from GB branch.

Wakelock will get released while
1) no request pending to be sent out, in which mRequestMessagesPending increases
before calling EVENT_SEND and decreases while handling EVENT_SEND.

and

2) no waiting requests sent to RIL but no replied, in which mRequestMessagesWaiting
increases while sending request and decreases while handling response.

Both will be cleared while WAKE_LOCK_TIMEOUT occurs to recovery from out of sync situation.

bug: 3369427, 3370827
Change-Id: Ibbcc95d67a292ffe20339ea9bdb0f2e4a4988da0
2011-01-26 14:40:36 -08:00
Jean-Michel Trivi
1155efdc71 am 2ba92c71: do not merge bug 3370834 Cherrypick from master
* commit '2ba92c71b5684dce700cf848bf157153c156df1d':
  do not merge bug 3370834 Cherrypick from master
2011-01-26 14:05:18 -08:00
Jean-Michel Trivi
2ba92c71b5 do not merge bug 3370834 Cherrypick from master
Cherripick from master CL 79833, 79417, 78864, 80332, 87500

Add new audio mode and recording source for audio communications
 other than telelphony.

The audio mode MODE_IN_CALL signals the system the device a phone
 call is currently underway. There was no way for audio video
 chat or VoIP applications to signal a call is underway, but not
 using the telephony resources. This change introduces a new mode
 to address this. Changes in other parts of the system (java
 and native) are required to take this new mode into account.
The generic AudioPolicyManager is updated to not use its phone
 state variable directly, but to use two new convenience methods,
 isInCall() and isStateInCall(int) instead.

Add a recording source used to designate a recording stream for
voice communications such as VoIP.

Update the platform-independent audio policy manager to pass the
 nature of the audio recording source to the audio policy client
 interface through the AudioPolicyClientInterface::setParameters()
 method.

SIP calls should set the audio mode to MODE_IN_COMMUNICATION,
 Audio mode MODE_IN_CALL is reserved for telephony.

SIP: Enable built-in echo canceler if available.
1. Always initialize AudioRecord with VOICE_COMMUNICATION.
2. If echo canceler is available, disable our echo suppressor.

Note that this CL is intentionally not correcting the
 getAudioSourceMax() return value in MediaRecorder.java as the
 new source is hidden here.

Change-Id: Ie68cd03c50553101aa2ad838fe9459b2cf151bc8
2011-01-26 11:20:01 -08:00
Wink Saville
3947716e69 am c3a2747f: am d8b525c3: Merge "Increase the default timeout from 30 to 60 seconds." into honeycomb
* commit 'c3a2747fee9f96fdcd075f582b5b4892cbecf7df':
  Increase the default timeout from 30 to 60 seconds.
2011-01-26 10:19:00 -08:00
Wink Saville
c3a2747fee am d8b525c3: Merge "Increase the default timeout from 30 to 60 seconds." into honeycomb
* commit 'd8b525c398aeda1f583ed4ed90450e0a0fc9b6ef':
  Increase the default timeout from 30 to 60 seconds.
2011-01-26 10:16:43 -08:00
Wink Saville
b260fe75c1 Increase the default timeout from 30 to 60 seconds.
The DEFAULT_WAKE_LOCK_TIMEOUT should be longer than the timeouts
of the vendor ril, aka. rild. We are seeing timeouts which are
30secs and possibly longer. An alternative would be to add
TelephonyManager.PROPERTY_WAKE_LOCK_TIMEOUT for but I feel a 60
second default is appropriate for all platforms.

Bug: 3392618
Change-Id: I63f6b211b584857999174524d4ea4efa1994dfba
2011-01-26 09:21:32 -08:00
Wink Saville
6ec87ea08a am ca7c4a5d: am 774f9be5: Merge "Add debug to CallManager#canDial." into honeycomb
* commit 'ca7c4a5d1c6bc3f312862c0311fa21d0d41ababc':
  Add debug to CallManager#canDial.
2011-01-25 11:08:53 -08:00
Wink Saville
ca7c4a5d1c am 774f9be5: Merge "Add debug to CallManager#canDial." into honeycomb
* commit '774f9be5dc02e8a7f742008872c6214e517cb8a3':
  Add debug to CallManager#canDial.
2011-01-25 11:06:24 -08:00
Hung-ying Tyan
a2e91ae115 am b30392d2: am df1cc4ef: am cc019c0c: Merge "Get mute state from active call." into gingerbread
* commit 'b30392d288c6c72a6db00a71a2ca586793161b48':
  Get mute state from active call.
2011-01-25 11:03:31 -08:00
Hung-ying Tyan
b30392d288 am df1cc4ef: am cc019c0c: Merge "Get mute state from active call." into gingerbread
* commit 'df1cc4ef9205239701bbe73f903e89a9dfd2623a':
  Get mute state from active call.
2011-01-25 10:58:42 -08:00
John Wang
b761f681e8 am c3a5b19c: am 78eb9238: am 93300ce2: Merge "Enable recovery in RIL wakelock release check." into gingerbread
* commit 'c3a5b19c9518cf4cc7206a69015c96119bf35f73':
  Enable recovery in RIL wakelock release check.
2011-01-25 10:32:31 -08:00
John Wang
c3a5b19c95 am 78eb9238: am 93300ce2: Merge "Enable recovery in RIL wakelock release check." into gingerbread
* commit '78eb92388ce30aee9b9aaa3e6c9a2de185f8d6a4':
  Enable recovery in RIL wakelock release check.
2011-01-25 10:29:44 -08:00
Wink Saville
079c8d7fd6 Add debug to CallManager#canDial.
Add some debug to trackdown why canDial is sometime
returning false, see bug 3381435.

Change-Id: I0caade5ffdf9d67cdee0557971a8918182718512
2011-01-24 23:25:31 -08:00
Hung-ying Tyan
df1cc4ef92 am cc019c0c: Merge "Get mute state from active call." into gingerbread
* commit 'cc019c0caa0dd984404dea4d6623ae9d7b8474f1':
  Get mute state from active call.
2011-01-24 21:46:23 -08:00
Hung-ying Tyan
cc019c0caa Merge "Get mute state from active call." into gingerbread 2011-01-24 21:13:08 -08:00
John Wang
78eb92388c am 93300ce2: Merge "Enable recovery in RIL wakelock release check." into gingerbread
* commit '93300ce2d398195d5616a2e924eb4a785274538e':
  Enable recovery in RIL wakelock release check.
2011-01-24 09:26:56 -08:00
John Wang
696794fc13 Enable recovery in RIL wakelock release check.
Wakelock will get released while
1) no request pending to be sent out, in which mRequestMessagesPending increases
before calling EVENT_SEND and decreases while handling EVENT_SEND.

and

2) no waiting requests sent to RIL but no replied, in which mRequestMessagesWaiting
increases while sending request and decreases while handling response.

Both will be cleared while WAKE_LOCK_TIMEOUT occurs to recovery from out of sync situation.

bug: 3369427, 3370827
Change-Id: Ib2fc54db3b155bd3fb1296ad83720b7836708caf
2011-01-21 17:46:08 -08:00