Robert Greenwalt
8a02401129
resolved conflicts for merge of e139167c to master
...
Change-Id: Ic4d8aae7dd457457d9cc8ba081b273e425729f86
2011-06-08 10:01:06 -07:00
Jeff Sharkey
d2a458750e
Map network identity using ConnectivityService.
...
Instead of deriving network identity based on raw subsystem broadcasts,
listen for updates from ConnectivityService. Added atomic view of all
active NetworkState, and build map from "iface" to NetworkIdentity set
for stats tracking.
To avoid exposing internal complexity, INetworkStatsService calls use
general templates. Added TelephonyManager mapping to classify network
types using broad labels like "3G" or "4G", used to drive templates.
Cleaned up Objects and Preconditions.
Change-Id: I1d4c1403f0503bc3635a59bb378841ba42239a91
2011-06-07 23:09:25 -07:00
Wink Saville
2b2c31f603
am 7f13d0ed: am c368831d: Merge "Preferred network discrepancy after rild is restarted." into honeycomb-LTE
...
* commit '7f13d0ed408c3ddce5b061c4370d99ba15d027b7':
Preferred network discrepancy after rild is restarted.
2011-06-07 17:54:25 -07:00
Robert Greenwalt
e139167c91
am 5df69fad: resolved conflicts for merge of 8de47a2f to honeycomb-LTE
...
* commit '5df69fad6e5021d2862bff0553a510f8d6729fbd':
Reveal some network constants.
2011-06-07 13:12:29 -07:00
Robert Greenwalt
5df69fad6e
resolved conflicts for merge of 8de47a2f to honeycomb-LTE
...
Change-Id: I8193235a4c7e574635e17b2eb05bb5420a3c6749
2011-06-07 12:45:41 -07:00
Wink Saville
7f13d0ed40
am c368831d: Merge "Preferred network discrepancy after rild is restarted." into honeycomb-LTE
...
* commit 'c368831d62ce68d6c9c83d7e49e5db11c47ebd85':
Preferred network discrepancy after rild is restarted.
2011-06-07 11:03:25 -07:00
Wink Saville
05d69edc0b
Preferred network discrepancy after rild is restarted.
...
If the preferred network had updated before rild restarts,
the new setting value is ignored on RIL_CONNECT event.
bug: IKXEVERESTLTE-1494
Change-Id: Iec6395187c0d749208904db857b80e28f7d92c21
2011-06-07 10:44:43 -07:00
Jean-Baptiste Queru
cc19d9059f
am 59242cf6: am 54ab72e1: am 038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format."
...
* commit '59242cf65ec775ccb6cb3639df4eab6af09f3108':
Adding support for parsing of SMS-CB pdus in UMTS format.
2011-06-06 12:56:29 -07:00
Jean-Baptiste Queru
59242cf65e
am 54ab72e1: am 038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format."
...
* commit '54ab72e1c389905adb074bd7c799a33b4f513679':
Adding support for parsing of SMS-CB pdus in UMTS format.
2011-06-06 11:33:52 -07:00
Robert Greenwalt
1e36ddabed
am 89c1eb8e: am 80a19e67: Merge "Promote Telephony\'s isDataPossible." into honeycomb-LTE
...
* commit '89c1eb8edcf2920b4f72e2ca63817a901e2340d7':
Promote Telephony's isDataPossible.
2011-06-03 18:01:46 -07:00
John Wang
03133d50a3
am 0b1923ce: am 3b71239a: Merge "Add supplyPuk to do SIM puk unlock." into honeycomb-LTE
...
* commit '0b1923ce512d278336aab0c780d439b655e29b1c':
Add supplyPuk to do SIM puk unlock.
2011-06-03 17:35:46 -07:00
Kazuhiro Ondo
cd11cc711a
am 76273dd1: am 77c94113: Data recovery failure due to apn/dc state stuck in "disconnecting"
...
* commit '76273dd16d856f98de3f063a6c04caad2d374728':
Data recovery failure due to apn/dc state stuck in "disconnecting"
2011-06-03 17:34:08 -07:00
Wink Saville
da3505993c
am 3699c3d7: am 5b4e2440: Merge "Refactor ServiceStateTracker handling of radio technology." into honeycomb-LTE
...
* commit '3699c3d7c8a450cc39fd1c3db23b64208bd43353':
Refactor ServiceStateTracker handling of radio technology.
2011-06-03 16:35:08 -07:00
Wink Saville
ed1a9022a1
am 14751014: am 2e543dc1: Merge "CdmaLte: Use SPN from SIM card if SIM card is presend" into honeycomb-LTE
...
* commit '147510145f7b619f86a71065f2d62f444aee7f3d':
CdmaLte: Use SPN from SIM card if SIM card is presend
2011-06-03 15:55:25 -07:00
Wink Saville
3144ca294b
am ade2a546: am 1076f5ff: Merge "Read CSIM records in LTE on CDMA mode" into honeycomb-LTE
...
* commit 'ade2a5467c8f6fbb115df6a1e5730758db4e620c':
Read CSIM records in LTE on CDMA mode
2011-06-03 15:55:20 -07:00
Robert Greenwalt
89c1eb8edc
am 80a19e67: Merge "Promote Telephony\'s isDataPossible." into honeycomb-LTE
...
* commit '80a19e67d1cd3710dbbfa52767a994512d20f694':
Promote Telephony's isDataPossible.
2011-06-03 15:46:08 -07:00
Robert Greenwalt
80a19e67d1
Merge "Promote Telephony's isDataPossible." into honeycomb-LTE
2011-06-03 15:42:48 -07:00
John Wang
0b1923ce51
am 3b71239a: Merge "Add supplyPuk to do SIM puk unlock." into honeycomb-LTE
...
* commit '3b71239aca01fb029d9acd2c606b7be9b8f32d66':
Add supplyPuk to do SIM puk unlock.
2011-06-03 14:09:13 -07:00
John Wang
3b71239aca
Merge "Add supplyPuk to do SIM puk unlock." into honeycomb-LTE
2011-06-03 14:01:59 -07:00
Robert Greenwalt
c5e626c393
am 903cd57f: am ddae8936: Merge "Remove redundent getCurrentCdmaDataConnectionState" into honeycomb-LTE
...
* commit '903cd57f67fee8708cc6349ca1aac4de01831798':
Remove redundent getCurrentCdmaDataConnectionState
2011-06-03 13:58:47 -07:00
Kazuhiro Ondo
76273dd16d
am 77c94113: Data recovery failure due to apn/dc state stuck in "disconnecting"
...
* commit '77c9411306b6b3d210d22214d596272c9728cf5e':
Data recovery failure due to apn/dc state stuck in "disconnecting"
2011-06-03 12:19:23 -07:00
Kazuhiro Ondo
77c9411306
Data recovery failure due to apn/dc state stuck in "disconnecting"
...
If rild is reset while RIL_DEACTIVATE_DATA_CALL is pending
response, the ApnContext is not force cleaned up since
link to DCAC is cleared in the begining of release.
This patch fixes:
1) Hold DCAC reference until the DC is disconnected. This is
to ensure DC won't be stuck in DcDisconnectingState so force
reset can kick in.
2) In "clearCleanUpConnection", make sure the status of ApnContext
can be reset to IDLE even if no reference to DCAC.
Change-Id: Ic69271da7c6bc9dcb2c38ec53a9bd2e8ce785adc
2011-06-03 11:42:48 -07:00
Wink Saville
3699c3d7c8
am 5b4e2440: Merge "Refactor ServiceStateTracker handling of radio technology." into honeycomb-LTE
...
* commit '5b4e24400a4f1a6c67efd08ab2cda3389f78144e':
Refactor ServiceStateTracker handling of radio technology.
2011-06-03 10:21:07 -07:00
Robert Greenwalt
352dbc44a4
Promote Telephony's isDataPossible.
...
bug:3481357
Change-Id: I83cb40cd5bb86d98abbb7152190b2277470fa160
2011-06-03 09:51:03 -07:00
Wink Saville
db09b5db60
Refactor ServiceStateTracker handling of radio technology.
...
Also add a little more debugging.
Change-Id: I832872c876b290a3e83a79068059a21894472a1d
2011-06-03 09:06:28 -07:00
Conley Owens
e30277b091
am 1bbcc695: am 10b364b4: am 4cf0eee7: Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager."
...
* commit '1bbcc6953ae692206052e62b6adae15e221ec356':
Fixing concurrency issue on IccPhoneBookInterfaceManager.
2011-06-02 18:53:25 -07:00
Ed Heyl
31e61185a6
resolved conflicts for merge of 39ddeae0 to master
...
Change-Id: I84f00b97470c2a4a2d19492aef4b65942db2f69f
2011-06-02 18:49:11 -07:00
Wink Saville
147510145f
am 2e543dc1: Merge "CdmaLte: Use SPN from SIM card if SIM card is presend" into honeycomb-LTE
...
* commit '2e543dc188c3c2e8f8a785e403c95b7e22fa6262':
CdmaLte: Use SPN from SIM card if SIM card is presend
2011-06-02 18:24:28 -07:00
Wink Saville
ade2a5467c
am 1076f5ff: Merge "Read CSIM records in LTE on CDMA mode" into honeycomb-LTE
...
* commit '1076f5ff27d35a5a807043bdea49aa40404d9c6b':
Read CSIM records in LTE on CDMA mode
2011-06-02 18:24:20 -07:00
Wink Saville
2e543dc188
Merge "CdmaLte: Use SPN from SIM card if SIM card is presend" into honeycomb-LTE
2011-06-02 18:21:50 -07:00
John Wang
98c7781ca8
Add supplyPuk to do SIM puk unlock.
...
Change-Id: I48654091ac3133a0c405448871b0a2f1ed3ded4b
2011-06-02 17:49:49 -07:00
Kazuhiro Ondo
7ec9ab88d7
am a36c8f69: am 57675037: Further fix for SIM detection.
...
* commit 'a36c8f693d935d75657271d89f57884f5df1a92d':
Further fix for SIM detection.
2011-06-02 16:51:45 -07:00
Wink Saville
2d6ebd559c
am 205a2c3a: am 178b0660: Merge "DataConnection FailCause should use errorCode rather than ordinal." into honeycomb-LTE
...
* commit '205a2c3a3e6f50039bf296ad0af22f9a93f7eaf9':
DataConnection FailCause should use errorCode rather than ordinal.
2011-06-02 16:22:23 -07:00
Wink Saville
8806be91fd
am 08c00205: am 885f8cd7: Merge "DataConnection : Have a separate alarm for each APN type." into honeycomb-LTE
...
* commit '08c00205a7df0c9af94e4869b800be05eb38c660':
DataConnection : Have a separate alarm for each APN type.
2011-06-02 15:08:29 -07:00
Wink Saville
ce7aa22515
am 37a4069f: am e55e5e7c: Merge "Derive ICC status from multiple application status for UICC" into honeycomb-LTE
...
* commit '37a4069ff957ee64caba52b3f9f5d4ac70f4ea7b':
Derive ICC status from multiple application status for UICC
2011-06-02 15:08:13 -07:00
Kazuhiro Ondo
c46a085eed
Read CSIM records in LTE on CDMA mode
...
In case of CDMA and LTE hybrid system, UICC card contains
both USIM and CSIM data. FW needs to read out from both
to aqcuire information required for the service.
Change-Id: I4a714252bc97c037fa419352f23d8f38f6206406
2011-06-02 14:04:24 -07:00
Kazuhiro Ondo
c91c7f92c9
CdmaLte: Use SPN from SIM card if SIM card is presend
...
Change-Id: Ib766216ed5ec2522942e87d548d0af27c0553cec
2011-06-02 13:58:11 -07:00
Robert Greenwalt
903cd57f67
am ddae8936: Merge "Remove redundent getCurrentCdmaDataConnectionState" into honeycomb-LTE
...
* commit 'ddae89368129397c8df55bcdef9fcf36e4ff5fa5':
Remove redundent getCurrentCdmaDataConnectionState
2011-06-01 09:12:07 -07:00
Wink Saville
d1a1c09cb0
am 7f9d3210: am f55e0346: Merge "Remove or disable some verbose debugging." into honeycomb-LTE
...
* commit '7f9d3210cbef5c5e797f78fd3a2f836979de32e3':
Remove or disable some verbose debugging.
2011-05-31 23:41:32 -07:00
Robert Greenwalt
a4e82851e9
Remove redundent getCurrentCdmaDataConnectionState
...
replace with existing and generic getCurrentDataConnectionState.
bug:3487138
Change-Id: I8a5e85afd316252eedeacb2a042450124702defd
2011-05-31 16:25:58 -07:00
Robert Greenwalt
97ab2d4f86
Reveal some network constants.
...
Since we've already decided to inc the sdk version we should try to get these in too.
bug:4500218
Change-Id: I6dcb401bf30f1b06f02be0a93681a190d7ee5775
2011-05-31 12:06:08 -07:00
Conley Owens
1bbcc6953a
am 10b364b4: am 4cf0eee7: Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager."
...
* commit '10b364b4bea8537f955bbbb8b9b40061264b29c9':
Fixing concurrency issue on IccPhoneBookInterfaceManager.
2011-05-29 09:00:21 -07:00
Ed Heyl
39ddeae0b6
Merge "resolved conflicts for merge of a38fad37 to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-05-29 08:21:53 -07:00
Kazuhiro Ondo
a36c8f693d
am 57675037: Further fix for SIM detection.
...
* commit '57675037aa279e715a966e2888a31c97381a5fe4':
Further fix for SIM detection.
2011-05-27 19:32:04 -07:00
Kazuhiro Ondo
57675037aa
Further fix for SIM detection.
...
Refining SIM ready condition on UICC w/ multiple apps.
Also migration for RIL to use SIM_READY indication in case of UICC
presence instead of current NV_READY message.
Change-Id: I3445a628e2d32a24292e6a69785fe72422481221
2011-05-27 18:36:05 -07:00
Wink Saville
205a2c3a3e
am 178b0660: Merge "DataConnection FailCause should use errorCode rather than ordinal." into honeycomb-LTE
...
* commit '178b066096d94f078fdb32bf9f66755bae34819d':
DataConnection FailCause should use errorCode rather than ordinal.
2011-05-27 09:15:19 -07:00
Wink Saville
178b066096
Merge "DataConnection FailCause should use errorCode rather than ordinal." into honeycomb-LTE
2011-05-27 09:03:48 -07:00
Ramesh Sudini
98288aa3de
DataConnection FailCause should use errorCode rather than ordinal.
...
Change-Id: I45c5bca73b04f74eee7ab4858c8e28350e0ffb89
2011-05-27 08:59:20 -07:00
Wink Saville
08c00205a7
am 885f8cd7: Merge "DataConnection : Have a separate alarm for each APN type." into honeycomb-LTE
...
* commit '885f8cd75f27ec6dc8ca75233bbcdc86ed041c8c':
DataConnection : Have a separate alarm for each APN type.
2011-05-26 18:23:17 -07:00
Wink Saville
37a4069ff9
am e55e5e7c: Merge "Derive ICC status from multiple application status for UICC" into honeycomb-LTE
...
* commit 'e55e5e7c406bdedc67c6e536c981146e2b335b43':
Derive ICC status from multiple application status for UICC
2011-05-26 18:21:29 -07:00