1339 Commits

Author SHA1 Message Date
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
Wink Saville
48f53ec7f4 Add two more parameters too RIL_REQUEST_SETUP_DATA_CALL, DO NOT MERGE
Add DNS and gateway as parameters to RIL_REQUEST_SETUP_DATA_CALL so that
system properties aren't used for passing these to the ril. System
properties that are read right after a write doesn't always see the
result of the write. Another words writing system properties are not
not sequentially consistent.

Bug: 3364487
Change-Id: Ib7cba74346395323f3feb927281695663d9935ac
2011-01-19 22:38:24 -08:00
John Wang
e732ab01f0 am ae451252: am 8d48c3d2: Merge "Enable AUTO_TIME_ZONE settings." into honeycomb
* commit 'ae451252f425525efd4ade9adbd023a00a89c3e7':
  Enable AUTO_TIME_ZONE settings.
2011-01-18 20:43:41 -08:00
John Wang
8d48c3d21f Merge "Enable AUTO_TIME_ZONE settings." into honeycomb 2011-01-18 11:43:53 -08:00
John Wang
759aca9d20 Enable AUTO_TIME_ZONE settings.
There are separate settings for AUTO_TIME and AUTO_TIME_ZONE.

Modify *ServiceStateTracker to monitor AUTO_TIME and AUTO_TIME_ZONE changes
separately and reset NITZ time and timezone accordingly.

bug: 3304255
Change-Id: Ie430f7b4a256618bea87672b3628d1223ea6e36a
2011-01-18 11:11:06 -08:00
Robert Greenwalt
212c63bc61 Merge "Moving gsm.NetworkInfo to OperatorInfo" 2011-01-16 15:53:37 -08:00
Robert Greenwalt
3caa1bd106 Moving gsm.NetworkInfo to OperatorInfo
NetworkInfo had a bad name collision, wasn't gsm specific and was
really about operators.

Change-Id: Ic99108a3d0e2b3115f023398f85d9c7e5a3e38be
2011-01-16 15:31:22 -08:00
Wink Saville
d1afa8fec0 am eb731123: am a47aa87a: Merge "Set mIsMinInfoReady and mCurrentOtasp before notifcations." into honeycomb
* commit 'eb7311231203b7943027fd9992a5a59f67799615':
  Set mIsMinInfoReady and mCurrentOtasp before notifcations.
2011-01-16 10:44:28 -08:00
Wink Saville
ad8c32f302 Set mIsMinInfoReady and mCurrentOtasp before notifcations.
We were sending a notification before setting mIsMinInfoReady and
mCurrentOtasp. This causes a race and it's possible that
OtaUtils.maybeDoOtasp is called before before they are set.
In this case the activation would not occur.

Bug: 3339109
Change-Id: I3baf8992d58af63a5cc07a14cc33157fd1c5aaa3
2011-01-15 07:47:03 -08:00
Wink Saville
2ee400bbfa Merge "Support RIL_REQUEST_SETUP_DATA_CALL version 5." 2011-01-14 06:36:14 -08:00
Wink Saville
abea3b892b Support RIL_REQUEST_SETUP_DATA_CALL version 5.
Change-Id: I091166f368f4641b514d51ec4ca281c9b526491c
2011-01-13 17:44:01 -08:00
Robert Greenwalt
19b9ab46a9 Turn off DUN connection after tethering.
Use matching feature type when turning tethering off or the request is ignored.

Also, turn on DUN apn right away so that we don't fail aggressive test cases.

Also don't report connections for enabled apn's that we're no longer connected to.

bug:3332880
bug:3338033
Change-Id: I7db2dfd4879f03465bc9f6d39488c078570dcaf3
2011-01-12 15:52:10 -08:00
Hung-ying Tyan
65a7f147de Get mute state from active call.
Currently, PhoneUtils.getMute() returns the mute state from the foreground phone.
When a SIP call is muted and then put on hold, the call is moved to background
and the SipPhone becomes background phone. At this point, PhoneUtils.getMute()
incorrectly returns false from the idle foreground phone (i.e., GSMPhone).

CallManager provides getMute() but it's not used anywhere. This CL fixes the
method and I'll have another CL to have PhoneUtils.getMute() take advantage of
it.

Bug: 3323789
Change-Id: I6c37500ae93f4e95db3bcd55e24e1ecb58a57c0a
2011-01-11 15:32:30 +08:00
Wink Saville
81f573de63 Merge "Add telephony.sms.receive and telephony.sms.send properties." into honeycomb 2011-01-07 11:00:42 -08:00
Wink Saville
f4871b686f For Cdma a blank plmn is valid to show in some cases.
When roaming the plmn might be blank but we want to have
showPlmn true otherwise "No Service" is displayed.

bug: 3265611
Change-Id: Iaed8997ab0bb336c79cef1fc848526ca7a73f9a1
2011-01-07 08:37:18 -08:00
Wink Saville
cde0233512 Add telephony.sms.receive and telephony.sms.send properties.
The purpose of these properties is to allow, at boot time, the
enable and disabling of receiving and sending of SMS messages.
These properties are used to initialize two booleans within
[Gsm|Cdma]SMSDispatcher code. The two booleans are initialized
to the value of config_sms_capable and when config_sms_capable
is false the device can neither receive nor send SMS.

Under some conditions, such as testing, it could be desirable
to send and or receive SMS messages on a device where config_sms_capable
is false. With the addition of these two properties it is now possible
to use /data/local.prop to control the booleans independently.

bug: 3315489
Change-Id: I83fe6f2da7d66ff720f28b696d8d76ec388706c0
2011-01-06 21:24:34 -08:00
Hung-ying Tyan
8fd2718bf3 am 05c53067: am 273d2ea3: Merge "Fix setting audio group mode in SipPhone." into gingerbread
* commit '05c53067b613796624937214e506c58de817c8fd':
  Fix setting audio group mode in SipPhone.
2011-01-04 17:49:48 -08:00
Hung-ying Tyan
05c53067b6 am 273d2ea3: Merge "Fix setting audio group mode in SipPhone." into gingerbread
* commit '273d2ea3f986f1611d2cf303cc5b93f820c14dd3':
  Fix setting audio group mode in SipPhone.
2011-01-04 17:47:47 -08:00
Hung-ying Tyan
273d2ea3f9 Merge "Fix setting audio group mode in SipPhone." into gingerbread 2011-01-04 17:45:36 -08:00
Robert Greenwalt
e32e812b11 Always file DUN requests for tethering.
A bit of a hack so that first trySetupData call uses the proper APN in
strange edge cases.  Made a new startUsingNetworkFeature string
that ConnectivityService knows means always pass the request to telephony
even if telephony connections are not currently available.

bug:3133178
Change-Id: I2559b9cbaed4b4ec02bdf7ea78e6003ee2be64f2
2011-01-04 11:15:19 -08:00
John Wang
003f338b6f am e8522998: am 06fccc32: Merge "Clear request list while timeout." into gingerbread
* commit 'e85229988e6350a684be91c3bbf64232271c5663':
  Clear request list while timeout.
2011-01-03 08:49:05 -08:00
John Wang
e85229988e am 06fccc32: Merge "Clear request list while timeout." into gingerbread
* commit '06fccc325123bf4c9ebd04ac9300b504436724fe':
  Clear request list while timeout.
2011-01-03 08:46:47 -08:00
Lorenzo Colitti
f6254ba7f0 Fix setupDataCall breakage.
Change I1a1adc61 added a new parameter to setupDataCall,
but updated the callers incorrectly (specifying the
arguments in the wrong order). Fix the order.

Change-Id: I0e762de29ac05d387371a7cfe33a33ad16219221
2010-12-31 00:55:05 -08:00
Lorenzo Colitti
4eb4045072 Get rid of setupDataCallWithProtocol.
setupDataCallWithProtocol was introduced to introduce a
protocol parameter to setupDataCall without having to
modify its callers. This is not very useful, as there are
only two callers. Get rid of it and make setupDataCall take
the protocol parameter itself.

For now, hardcode IPv4 connectivity. When we add the
protocol field to ApnSettings, it will be fetched from
there.

Change-Id: I1a1adc616ffd9ac68be6911f054790da48e472d6
2010-12-29 17:02:54 -08:00
Hung-ying Tyan
1d12ef09a8 Fix setting audio group mode in SipPhone.
Bug: 3119690
Change-Id: I495d3c031ee4c272d360fe19553ef9726a3f8771
2010-12-29 16:07:17 +08:00