Robert Greenwalt
1eeeae59d0
Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE
2011-04-08 16:31:03 -07:00
Robert Greenwalt
ac9c73ae61
Merge "Fix notification of disconnected networks." into honeycomb-LTE
2011-04-08 16:22:06 -07:00
Robert Greenwalt
1b6c758c29
Fix getActiveApnTypes for GsmDCT.
...
Change-Id: I42e71f0cbe31289f16623de38141213f547aa13f
2011-04-08 16:07:37 -07:00
Robert Greenwalt
6b01e4cdf8
Fix notification of disconnected networks.
...
Reorder - set state and then report the state, else we always report disconnecting which
is interpreted as still connected.
Change-Id: I95f5fe9ccee0d7ee9a03f78ae5b614af2ba0860b
2011-04-08 15:52:23 -07:00
Wink Saville
d5226cff8d
am 4a28096d: am 73ad388a: Merge "Check different CellLocation type in GsmDataConnectionTracker" into honeycomb-LTE
...
* commit '4a28096dec16666d9425cb8e23641985f963a4f3':
Check different CellLocation type in GsmDataConnectionTracker
2011-04-08 15:31:24 -07:00
Robert Greenwalt
f034932be6
am 01f8f290: am 63edf6c4: Rename PhoneBase\'s DataConnectionTracker member.
...
* commit '01f8f290cd2c01c7ed9a1966f39fa74032352dc8':
Rename PhoneBase's DataConnectionTracker member.
2011-04-08 15:31:21 -07:00
Wink Saville
de56db46c4
resolved conflicts for merge of 4b1a37d7 to master
...
Change-Id: I872f40b0e0de534a37e3cf6bdc4d175b66226188
2011-04-08 14:57:51 -07:00
Wink Saville
4a28096dec
am 73ad388a: Merge "Check different CellLocation type in GsmDataConnectionTracker" into honeycomb-LTE
...
* commit '73ad388aae28213dd3f47bcac1b52c671e3cacc7':
Check different CellLocation type in GsmDataConnectionTracker
2011-04-08 13:23:24 -07:00
Wink Saville
73ad388aae
Merge "Check different CellLocation type in GsmDataConnectionTracker" into honeycomb-LTE
2011-04-08 13:20:20 -07:00
Robert Greenwalt
01f8f290cd
am 63edf6c4: Rename PhoneBase\'s DataConnectionTracker member.
...
* commit '63edf6c4f5795009e55f2ae9556550c38daa9774':
Rename PhoneBase's DataConnectionTracker member.
2011-04-08 12:23:49 -07:00
Robert Greenwalt
63edf6c4f5
Rename PhoneBase's DataConnectionTracker member.
...
Was called mDataConnection, but this is more confusing now that we have multiple
DataConnections. Changed it to the more correct mDataConnectionTracker.
Change-Id: I3cdc4f2897d60e5b0885891744aa6ff2db27af37
2011-04-08 11:54:01 -07:00
Kazuhiro Ondo
8968f9f6d4
Check different CellLocation type in GsmDataConnectionTracker
...
Addressing phone app crash in GsmDataConnectionTracker when CDMALTEPhone
is used. CDMALTEPhone uses CDMA SST so getCellLocation() was returning
an instance of CdmaCellLocation. This was causing a crash when GsmDCT
type casts the instance as GsmCellLocation.
This patch tries to check the instance type before retrieving corresponding
cell id.
Change-Id: I6ac9cd4dc078552dc58d4d9350494a7b608c2b98
2011-04-08 11:42:51 -07:00
Wink Saville
4b1a37d725
am 5203a5bc: Cleanup debugging.
...
* commit '5203a5bc28a5ae432eab236780b2f97bdec71dbf':
Cleanup debugging.
2011-04-08 11:35:11 -07:00
Wink Saville
5203a5bc28
Cleanup debugging.
...
Change-Id: I4c61b6716a6d03d70bc1e9013954d6b2002cec54
2011-04-08 11:14:23 -07:00
Wink Saville
5008e92d1f
am b9381109: am 1905e166: Merge "DataConnection: set CID to the correct value." into honeycomb-LTE
...
* commit 'b93811091d8e412d1247ee1f4506b7db1439235d':
DataConnection: set CID to the correct value.
2011-04-08 10:44:43 -07:00
Wink Saville
b93811091d
am 1905e166: Merge "DataConnection: set CID to the correct value." into honeycomb-LTE
...
* commit '1905e166ed40ee11e80476848ef40e817512f740':
DataConnection: set CID to the correct value.
2011-04-08 10:41:09 -07:00
Wink Saville
1905e166ed
Merge "DataConnection: set CID to the correct value." into honeycomb-LTE
2011-04-08 10:38:25 -07:00
Robert Greenwalt
c9fb9888ce
am 2ce73e77: am 9c7f433c: Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTE
...
* commit '2ce73e77c99effb9521db15c882529ccbafd57a6':
Fix isApnTypeActive in GDCT.
2011-04-08 10:11:43 -07:00
Robert Greenwalt
2ce73e77c9
am 9c7f433c: Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTE
...
* commit '9c7f433c80fd2014562f8d161e6a34710fe475d6':
Fix isApnTypeActive in GDCT.
2011-04-08 10:09:03 -07:00
Robert Greenwalt
9c7f433c80
Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTE
2011-04-08 10:07:31 -07:00
Robert Greenwalt
2915875fb6
am e3e535a9: am 4410660e: Fix ISO country code of Slovenia.
...
* commit 'e3e535a9c6b35971b54becc912e45da0f8b3f727':
Fix ISO country code of Slovenia.
2011-04-08 10:07:26 -07:00
Robert Greenwalt
37c75ae06b
DataConnection: set CID to the correct value.
...
import of partner change 5930
Change-Id: Iaa2d282f6f9292a57dfceedad676c9e3ad64f903
2011-04-08 10:05:58 -07:00
Robert Greenwalt
e3e535a9c6
am 4410660e: Fix ISO country code of Slovenia.
...
* commit '4410660e02c04b29d323c6d3bf81633fd07b6411':
Fix ISO country code of Slovenia.
2011-04-08 10:05:01 -07:00
Robert Greenwalt
4410660e02
Fix ISO country code of Slovenia.
...
Misread an IBM site and thought it was sl-sl, but really it is sl-si.
fixes public bug 16021
Change-Id: I5b262a2b424fe2a0904f623f82449a539ede0fdb
2011-04-08 09:53:55 -07:00
Robert Greenwalt
7a093b2c35
Fix isApnTypeActive in GDCT.
...
The single active APN makes no sense now. Add override function to
do the right thing.
Also makes ApnContext threadsafe.
Change-Id: I4302595e8818b7d31bdd32b5fdf4e3de1cd81ed8
2011-04-08 09:39:57 -07:00
Joe Onorato
43a17654cf
Remove the deprecated things from Config.java. These haven't been working since before 1.0.
...
Change-Id: Ic2e8fa68797ea9d486f4117f3d82c98233cdab1e
2011-04-07 19:23:05 -07:00
Wink Saville
5f66c953a7
am 7183a7a5: Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall." into honeycomb-LTE
...
* commit '7183a7a584397142ab7347d6f721011d743fb699':
Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall.
2011-04-07 16:51:50 -07:00
Wink Saville
1dd2ada5cf
Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall.
...
Added CommandsInterface.registerForRilConnected which allows components
to register for when the ril connects and provides the version of the
ril to the registrants or a -1 if the ril disconnects.
For ril version 6 RIL.setupDataCall needs to have RadioTechnology + 2
as the radioTechnology parameter when the rilVersion is >= 6.
DataConnection then uses registersForRilConnected to get the ril
version and provide the proper radioTechnology value to
RIL.setupDataCall
Change-Id: Iacba764b9e38a4a138d186ccf1625fea760cc56d
2011-04-07 14:34:29 -07:00
Robert Greenwalt
f4a29403ae
resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp
...
Change-Id: I0962138f6ecb1ed54fda25524d8850b086f13c4f
2011-04-07 14:13:52 -07:00
Robert Greenwalt
70c3d1c23b
Merge "Add external dependency API." into honeycomb-LTE
2011-04-07 13:02:28 -07:00
John Wang
91bc0f818c
am 574d3c4b: Merge "Refactor onSetupConnectionCompleted." into honeycomb-LTE
...
* commit '574d3c4b2cb120314b68bffa34aed2545d1b1158':
Refactor onSetupConnectionCompleted.
2011-04-07 12:46:21 -07:00
John Wang
574d3c4b2c
Merge "Refactor onSetupConnectionCompleted." into honeycomb-LTE
2011-04-07 12:44:14 -07:00
John Wang
d3ba7d5bec
Refactor onSetupConnectionCompleted.
...
Refactor the part of setting linkProperties based
on data call responses.
Bug:3501569
Change-Id: I02bf0558e2f8a5924197b8c06f19673279dec815
2011-04-07 12:37:05 -07:00
Robert Greenwalt
d55a6b498d
Add external dependency API.
...
An APN will not be connected to if some external dependency is not met.
bug:3486704
Change-Id: I7d94df343b260013efd11faa978deb13f07f1389
2011-04-07 12:28:37 -07:00
Wink Saville
004da7e2e0
am 1b87f1db: Merge "Add getCdmaSubscriptionSource to CommandsInterface." into honeycomb-LTE
...
* commit '1b87f1db89e82d00445a43c4593d8c5ea5d2633f':
Add getCdmaSubscriptionSource to CommandsInterface.
2011-04-06 17:54:11 -07:00
Wink Saville
d31fdf0565
Add getCdmaSubscriptionSource to CommandsInterface.
...
This was accidentally not added previously and it had an
extra parameter.
Change-Id: Ic48ab9e637a5343b63d3e03377acd2679b0f77e0
2011-04-06 16:55:39 -07:00
Wink Saville
22cfcaee24
am 0b8e313c: Merge "Data Retry fix after failure due to permanent causes." into honeycomb-LTE
...
* commit '0b8e313c7f97f9cb34e2ba555182621889b69a16':
Data Retry fix after failure due to permanent causes.
2011-04-01 16:36:25 -07:00
Wink Saville
44ff718f62
Data Retry fix after failure due to permanent causes.
...
Change-Id: I86d5a2dc9394dac93c4350159f4d99cf19aedec9
2011-04-01 14:45:49 -07:00
Wink Saville
7c6f532ae9
am dacb8090: Merge "Airplane mode on always timed out when camping on LTE" into honeycomb-LTE
...
* commit 'dacb80901dfbd7cc18a6f1ede6ca334ed42c038f':
Airplane mode on always timed out when camping on LTE
2011-04-01 10:32:37 -07:00
Wink Saville
4aff3e363c
am 0198fff9: Rename ro.telephony.lte_on_cdma to telephony.lte_on_cdma.
...
* commit '0198fff90430d9f974b0284fc3659434406c751b':
Rename ro.telephony.lte_on_cdma to telephony.lte_on_cdma.
2011-04-01 10:30:44 -07:00
Wink Saville
dacb80901d
Merge "Airplane mode on always timed out when camping on LTE" into honeycomb-LTE
2011-04-01 10:28:22 -07:00
Wink Saville
95bc2b7564
Airplane mode on always timed out when camping on LTE
...
While on LTE, GsmDataConnectionTracker is implicitly associated with CdmaServiceTracker.
CdmaServiceTracker asynchronously waits for the disconnection of data before turning off
the Radio but GsmDataConnection does not notify the disconnection due to different logic
in GsmServiceTracker.
This fix is to have common airplane mode toggle logic on both GSM and CDMA flavors.
Change-Id: I67ff82a59a2243856ae3e7c5e37b5726bcbf3c94
2011-04-01 10:11:18 -07:00
Wink Saville
0198fff904
Rename ro.telephony.lte_on_cdma to telephony.lte_on_cdma.
...
This allows the system property to be updated at runtime and
for testing.
Change-Id: I75788e5fa70efdbb9186b9f03baac1d9e6b3febd
2011-04-01 08:53:12 -07:00
Wink Saville
2a936154f6
am b90f9c37: Merge "Telephony: Add Powerdown Cause to PDP Deactivate Message." into honeycomb-LTE
...
* commit 'b90f9c370e5b1b1825016e48b864e8eda6d5f89c':
Telephony: Add Powerdown Cause to PDP Deactivate Message.
2011-03-31 15:52:58 -07:00
Wink Saville
b90f9c370e
Merge "Telephony: Add Powerdown Cause to PDP Deactivate Message." into honeycomb-LTE
2011-03-31 15:51:07 -07:00
Wink Saville
261306889e
Telephony: Add Powerdown Cause to PDP Deactivate Message.
...
Modem needs to know if PDP deactivation is due to UE power down so that it can do detach.
Change-Id: Ie63f90f005845fcd6bfab421f193058b6e2e78d5
2011-03-31 15:46:25 -07:00
Wink Saville
cac1411e99
am 11feacb3: Merge "Telephony: Cleanup of SIM handling in CdmaLteSST." into honeycomb-LTE
...
* commit '11feacb348e624bcdbb073a32c1fc1d8bdc7bae3':
Telephony: Cleanup of SIM handling in CdmaLteSST.
2011-03-31 13:19:06 -07:00
Wink Saville
11feacb348
Merge "Telephony: Cleanup of SIM handling in CdmaLteSST." into honeycomb-LTE
2011-03-31 13:16:41 -07:00
Wink Saville
72ec108b0c
am b136aa6c: Merge "Telephony: Update LTE RILConstants to match ril.h" into honeycomb-LTE
...
* commit 'b136aa6c9a1c043ff91357cea9e0b6597c904507':
Telephony: Update LTE RILConstants to match ril.h
2011-03-31 10:26:12 -07:00
Ramesh Sudini
e80d327676
Telephony: Cleanup of SIM handling in CdmaLteSST.
...
Change-Id: I41ae595bae035b2dfd2e32e4d54a754c27962567
2011-03-30 12:15:38 -07:00