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

1873 Commits

Author SHA1 Message Date
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
Jake Hamby
ab79ee4adc Enable full support for SMS Cell Broadcast. 
Implement full support for SMS Cell Broadcast (3GPP TS 23.041).
Includes support for ETWS and CMAS emergency message types.
Includes GSM and UMTS support (CDMA will be added later).

Note: the change to GsmAlphabet.java is only necessary if the
SMS national languages support patch has been applied. If that
change has not been applied, then the changes to GsmAlphabet.java
in this patch set can safely be ignored.

Change-Id: Ia0362c53695b8ef9a0982f558f1cffa912def34b
 2011-06-01 15:54:20 -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
Wink Saville
885f8cd75f Merge "DataConnection : Have a separate alarm for each APN type." into honeycomb-LTE 2011-05-26 18:19:08 -07:00
Kazuhiro Ondo
e14a59e96c Derive ICC status from multiple application status for UICC 
If UICC with multiple applications are used, delive the status
based on both status instead of just looking at one.

Change-Id: I98cf689327e5302bb4174985935511aff02939f6
 2011-05-26 17:09:25 -07:00
Ramesh Sudini
69d0855ed2 DataConnection : Have a separate alarm for each APN type. 
Change-Id: I0769f3e2a7c60bd833af7c24eb661d368bac2598
 2011-05-26 17:09:07 -07:00
Simon Wilson
62388cfc1f resolved conflicts for merge of a38fad37 to honeycomb-plus-aosp 
Conflicts:
	telephony/java/com/android/internal/telephony/cdma/SmsMessage.java

Change-Id: I4c808c752954c5d1f752f4b4c02ad41ea491e416
 2011-05-26 12:53:15 -07:00
Wink Saville
7f9d3210cb am f55e0346: Merge "Remove or disable some verbose debugging." into honeycomb-LTE 
* commit 'f55e0346a5a40714be8a7e1571ff65e6ef1a9949':
  Remove or disable some verbose debugging.
 2011-05-26 11:07:18 -07:00
Wink Saville
3b13b2c9d1 Remove or disable some verbose debugging. 
Change-Id: I930689502f2a76bf72e315331d66a9259135c6b8
 2011-05-26 06:36:08 -07:00
Jean-Baptiste Queru
54ab72e1c3 am 038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format." 
* commit '038e8f99845e171c0d9d606f5697e36b1b684d01':
  Adding support for parsing of SMS-CB pdus in UMTS format.
 2011-05-25 09:04:40 -07:00
Jean-Baptiste Queru
038e8f9984 Merge "Adding support for parsing of SMS-CB pdus in UMTS format." 2011-05-25 08:06:17 -07:00
Wink Saville
c9e3608fa6 am 5faaaa5f: am 543c3146: Merge "Handle ProvideLocalInfo stk command." into honeycomb-LTE 
* commit '5faaaa5f5af3ef1b82178bc36933bede5ad0c5d7':
  Handle ProvideLocalInfo stk command.
 2011-05-24 19:53:59 -07:00
Conley Owens
10b364b4be am 4cf0eee7: Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager." 
* commit '4cf0eee755046734568959ac01f207b108e449c0':
  Fixing concurrency issue on IccPhoneBookInterfaceManager.
 2011-05-24 15:01:18 -07:00
Conley Owens
4cf0eee755 Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager." 2011-05-24 14:05:05 -07:00
Wink Saville
5faaaa5f5a am 543c3146: Merge "Handle ProvideLocalInfo stk command." into honeycomb-LTE 
* commit '543c3146cb011380e4328e049abf97bc797db95a':
  Handle ProvideLocalInfo stk command.
 2011-05-24 10:10:13 -07:00
Kazuhiro Ondo
38b6999d9e Handle ProvideLocalInfo stk command. 
Change-Id: I4cb685f7d8e7442185e927fa0d49531b96eeab08
 2011-05-24 10:04:09 -07:00
Wink Saville
fb9eebc427 am 9a8ea20d: am 070eecef: Merge "Map multiple apnType to one DataConnection fixes." into honeycomb-LTE 
* commit '9a8ea20d4b3975d3f771364fb9f2272c32f8cad1':
  Map multiple apnType to one DataConnection fixes.
 2011-05-24 08:42:10 -07:00
Wink Saville
9a4285474c am b1817383: am d3924fe9: Merge "Data Connection: Use Alarm for all delayed data retries." into honeycomb-LTE 
* commit 'b1817383050986413805fbbf2c1cc5c03417574d':
  Data Connection: Use Alarm for all delayed data retries.
 2011-05-24 08:42:05 -07:00
Kazuhiro Ondo
3dbc571e62 am 6056e326: am f96a6150: Data reconnection issue after airplane mode 
* commit '6056e3268a0aa114ad99e3e6ddaebe0ebfa6035e':
  Data reconnection issue after airplane mode
 2011-05-24 02:56:15 -07:00
Kazuhiro Ondo
eb1fbf7a45 am 8e1f6ece: am 4c88be65: GSM DCT: Update poll stats to support multi-links 
* commit '8e1f6eceb3fbdb478e83f14d021a77ee339ffb2e':
  GSM DCT: Update poll stats to support multi-links
 2011-05-24 02:56:08 -07:00
Wink Saville
cb3fad5cbe am 7abbf93c: am 15cd6ec2: Tear down connection with unwanted linkproperty change 
* commit '7abbf93c854cd7d272183b674373e989a05da6dd':
  Tear down connection with unwanted linkproperty change
 2011-05-24 02:38:17 -07:00
Wink Saville
2879343291 Fix build. 
A merge accidentally included a line that was deleted.

Change-Id: Id383b1d8808f1c4b12d3ad1372270601f92f5989
 2011-05-23 21:56:11 -07:00
Wink Saville
595881ee5e am f8d70b14: am 5f353de9: Merge "Notify RIL that PDP reset is triggered due to data stall" into honeycomb-LTE 
* commit 'f8d70b14e4285d17d83cc4853f50b44d6a55fbc7':
  Notify RIL that PDP reset is triggered due to data stall
 2011-05-23 20:49:05 -07:00
John Wang
5ea7a29387 am b7a13791: am 393eb0d0: Merge "Add UI to handle SIM swap." into honeycomb-LTE 
* commit 'b7a13791a12eef57434b84a97609d98e03e17009':
  Add UI to handle SIM swap.
 2011-05-23 20:48:57 -07:00
Wink Saville
9ddcdd98d9 am 0ba62525: am 2b534e77: Merge "Fix broken data retry" into honeycomb-LTE 
* commit '0ba625259e8c4af3df2c7823fc1d18b42d760a44':
  Fix broken data retry
 2011-05-23 18:25:52 -07:00
Wink Saville
ed5af6d93b am 61a5ab57: am f89ea7a5: Merge "Change getLteOnCdmaModeStatic to dynamically determine its result." into honeycomb-LTE 
* commit '61a5ab57b8a11d134ed3cfcab24a23d26ea4ddf0':
  Change getLteOnCdmaModeStatic to dynamically determine its result.
 2011-05-23 17:18:29 -07:00
Soojung Shin
a38fad37c2 am 4e4ad341: SmsMessage: convert + to international dialing prefix 
* commit '4e4ad34159dc1c720a3e6145bb9f14c60fb1a3f7':
  SmsMessage: convert + to international dialing prefix
 2011-05-23 15:11:04 -07:00