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

1654 Commits

Author SHA1 Message Date
Ed Heyl
31e61185a6 resolved conflicts for merge of 39ddeae0 to master 
Change-Id: I84f00b97470c2a4a2d19492aef4b65942db2f69f
 2011-06-02 18:49:11 -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
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
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
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
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
Soojung Shin
4e4ad34159 SmsMessage: convert + to international dialing prefix 
When sending an SMS to an international number in the format
+401234567890, the "+" should be converted to the International
Dialing Prefix (in the US, 011). However, the device drops this
"+" altogether in the outbound data burst message causing the message
to fail or be sent to the wrong address.

Change-Id: If25c092d283f1703b49cf52d0379efa54639f093
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
 2011-05-23 15:02:32 -07:00
Wink Saville
9a8ea20d4b am 070eecef: Merge "Map multiple apnType to one DataConnection fixes." into honeycomb-LTE 
* commit '070eecef394175d7344cdadde675e8977a1609f0':
  Map multiple apnType to one DataConnection fixes.
 2011-05-23 13:42:14 -07:00
Wink Saville
b181738305 am d3924fe9: Merge "Data Connection: Use Alarm for all delayed data retries." into honeycomb-LTE 
* commit 'd3924fe9f6c99bc92ed86195e07ba82d39043812':
  Data Connection: Use Alarm for all delayed data retries.
 2011-05-23 13:42:11 -07:00
Wink Saville
070eecef39 Merge "Map multiple apnType to one DataConnection fixes." into honeycomb-LTE 2011-05-23 13:39:03 -07:00
Ramesh Sudini
a95bce0b29 Map multiple apnType to one DataConnection fixes. 
With current design the code maps to the same DC, but no indications go out.
With this, making it more async in nature that the request goes all the way
to DC and all the data indications would be triggered by parallel paths through DCT.

Change-Id: I4c6e64912dafe19154d910bbd0441b10ada36cff
 2011-05-23 12:01:40 -07:00
Ramesh Sudini
a88d76b772 Data Connection: Use Alarm for all delayed data retries. 
Change-Id: I5045c3a10808b75f1ca3174bd1c16f332d5f7fa8
 2011-05-23 12:01:31 -07:00
Kazuhiro Ondo
6056e3268a am f96a6150: Data reconnection issue after airplane mode 
* commit 'f96a6150e4e6c37f8952456bf9f84714f622713d':
  Data reconnection issue after airplane mode
 2011-05-21 13:02:17 -07:00
Kazuhiro Ondo
8e1f6eceb3 am 4c88be65: GSM DCT: Update poll stats to support multi-links 
* commit '4c88be655e387011c6d57c6d68b5deb94f6ce601':
  GSM DCT: Update poll stats to support multi-links
 2011-05-21 12:50:18 -07:00
Kazuhiro Ondo
f96a6150e4 Data reconnection issue after airplane mode 
ApnContext and DC were not disassociated when force
"cleanUpConnection" was called. Causing the setup
request was not happening if applyNewStatus() was
the trigger.

Change-Id: I6d73a53edb72bb9ab4ebb92fffd06e6fe1f0c4aa
 2011-05-21 12:49:41 -07:00
Kazuhiro Ondo
4c88be655e GSM DCT: Update poll stats to support multi-links 
Change-Id: I654e38e71f9576ed2c4da59af563be04bc87045c
 2011-05-21 11:57:41 -07:00
Wink Saville
7abbf93c85 am 15cd6ec2: Tear down connection with unwanted linkproperty change 
* commit '15cd6ec250d22a093af3961ae1ec3cbbdd49d6b1':
  Tear down connection with unwanted linkproperty change
 2011-05-21 11:13:07 -07:00
Wink Saville
15cd6ec250 Tear down connection with unwanted linkproperty change 
Make sure to disconnect the link when RIL reported link property change
which could cause connectivity issue. (i.e. IP address)

Change-Id: I6601ef53e4561bdc7d2760d00e134b8431512cb2
 2011-05-21 10:05:26 -07:00
Wink Saville
f7bc0e28bf am 16e8d22b: Fix build. 
* commit '16e8d22b206fb0c8b8b5a243ea13e08597f60ebc':
  Fix build.
 2011-05-20 23:37:28 -07:00
Wink Saville
16e8d22b20 Fix build. 
A merge accidentally included a line that was deleted.

Change-Id: I991488ace290e5eb8eef3ca73f49c07d391028f5
 2011-05-20 23:31:29 -07:00
Wink Saville
f8d70b14e4 am 5f353de9: Merge "Notify RIL that PDP reset is triggered due to data stall" into honeycomb-LTE 
* commit '5f353de96beca0a400796887e737314a62e35b6a':
  Notify RIL that PDP reset is triggered due to data stall
 2011-05-20 17:26:58 -07:00
Wink Saville
5f353de96b Merge "Notify RIL that PDP reset is triggered due to data stall" into honeycomb-LTE 2011-05-20 17:23:45 -07:00