drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,046 Commits 1 Branch 0 Tags
Commit Graph

1914 Commits

Author SHA1 Message Date
Wink Saville
a384ff3282 am 33e1424b: Merge "Use CSIM to get provision information" into honeycomb-LTE 
* commit '33e1424b2e924e9b0162aa648137e8254f729161':
  Use CSIM to get provision information
 2011-06-08 15:03:35 -07:00
Wink Saville
799f04c09c Merge "Report data status from ApnContext even if data is detached" into honeycomb-LTE 2011-06-08 15:00:46 -07:00
John Wang
cea03df201 Do not merge. Return null id for Non-phone device. 
For non-phone device, i.e. tablet doesn't have voice capability,

getDeviceId returns null while getPhoneType returns PHONE_TYPE_NONE.

This behavior is suggested by developer scheme

http://android-developers.blogspot.com/2011/03/identifying-app-installations.html

and enforced by CTS testGetDeviceId.

bug:4464907
Change-Id: Iaa3832b7323a50deccd438cb884c8e776a7a9640
 2011-06-08 13:10:22 -07:00
Kazuhiro Ondo
2e994586ed Report data status from ApnContext even if data is detached 
While in HO, data connection type may temporary become "unknown".
This triggers TelephonyRegistry picks up the wrong data connection
state, ending up notifying bogus state to ConnectivityService.

The patch is just to pick up the status from ApnContext which
should be maintaining the right state. Also cleaned up unnecessary
lines which was added earlier phase.

Change-Id: I07e74ce55f09ad31f2d8d09e2a144dc0b600eb0c
 2011-06-08 13:05:32 -07:00
Wink Saville
0da86d4fef am a558fdf1: Merge "Fix default preferred network." into honeycomb-LTE 
* commit 'a558fdf156601a477964139fee57da29de7f31b3':
  Fix default preferred network.
 2011-06-08 12:59:37 -07:00
Kazuhiro Ondo
53f67f7e9d Use CSIM to get provision information 
In case of LTE & CDMA hybrid system, provision information will be
read from CSIM records.

Also CSIM records can be updated over the air. No data connection
attempt should be made until CSIM provisioning is notified
via SIM_REFRESH event.

Change-Id: I001db48d07d90af22104cb958df638e15e0d494a
 2011-06-08 12:59:22 -07:00
Wink Saville
a558fdf156 Merge "Fix default preferred network." into honeycomb-LTE 2011-06-08 12:56:27 -07:00
Wink Saville
d6bcfd1cd0 Fix default preferred network. 
Also, for xoom-cdma-lte devices CdmaLteServiceStateTracker#getOtasp
returns OTASP_NOT_NEEDED.

Some cleanup.


Bug: 4531115
Change-Id: I24b160062eda625ff5c3471399b9e83ae0d2869a
 2011-06-08 12:18:07 -07:00
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
Jake Hamby
22165bb54a am ae62b7b0: resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp 
* commit 'ae62b7b0bca9c46dea30ee81a7aada3e7576638b':
  Fixes for SMS Cell Broadcast support.
 2011-06-07 16:32:10 -07:00
Jake Hamby
ae62b7b0bc resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp 
Change-Id: Id13750bc01c977ab06accf8ceabc95fe5dee703a
 2011-06-07 16:24:15 -07:00
John Wang
229d3a0cbc am fc94d45f: Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE 
* commit 'fc94d45fc209dbcfdf7f57e0c04c581e1e51988b':
  Make getDeviceId return null for Non-phone device.
 2011-06-07 15:56:19 -07:00
John Wang
fc94d45fc2 Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE 2011-06-07 15:49:34 -07:00
John Wang
e19736f052 Make getDeviceId return null for Non-phone device. 
For non-phone device, i.e. tablet doesn't have voice capability,

getDeviceId returns null while getPhoneType returns PHONE_TYPE_NONE.

This behavior is suggested by developer scheme

http://android-developers.blogspot.com/2011/03/identifying-app-installations.html

and enforced by CTS testGetDeviceId.

bug:4464907
Change-Id: Iaa3832b7323a50deccd438cb884c8e776a7a9640
 2011-06-07 15:37:09 -07:00
Jake Hamby
7d259626d0 resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aosp 
Change-Id: I784e6d1946fa708f63becece070c7090cec6f1e2
 2011-06-07 15:01:50 -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
Jake Hamby
66040bbb08 Fixes for SMS Cell Broadcast support. 
Add support for ETWS primary notification messages.
Add method for easy concatenation of GSM multi-part broadcasts.
Add test cases for SmsCbHeader, SmsCbMessage and IntRangeManager.

Change-Id: Ifc646a011e79ad6c7eace9afcf84b1216eb42b7a
 2011-06-06 18:56:20 -07:00
Jake Hamby
0cb17a52ee resolved conflicts for merge of ab79ee4a to gingerbread-plus-aosp 
Change-Id: Ib885176060f65ef3286a24c7b9cae1a673666275
 2011-06-06 15:33:37 -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