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

2053 Commits

Author SHA1 Message Date
Kazuhiro Ondo
9820a9d299 am 4281817f: Allow suggestedRetryTime to indicate no retry is needed. 
* commit '4281817f6b624cb51926eb24fa78c68cd9431dce':
  Allow suggestedRetryTime to indicate no retry is needed.
 2011-07-24 09:11:42 -07:00
Wink Saville
deb62be2e8 Merge "Configure RAT dependent retry pattern in GSM DCT." into honeycomb-LTE 2011-07-24 09:11:28 -07:00
Kazuhiro Ondo
4281817f6b Allow suggestedRetryTime to indicate no retry is needed. 
If suggestedRetryTime is 0x7fffffff then no retry is needed
and the framework should not initiate a retry.

Bug: 4949208
Change-Id: I3756ef6a3e93beec4ee95863cbc111b9952e5e06
 2011-07-24 08:10:53 -07:00
Kazuhiro Ondo
789df167fa Configure RAT dependent retry pattern in GSM DCT. 
In case GSM DCT is used with EHRPD, retry pattern should follow
the ones for CDMA.

Bug: 5058426
Change-Id: Id9badc9ac14fb20ac62c1746061f056fa2f9ed1b
 2011-07-23 13:48:12 -07:00
Kazuhiro Ondo
3372c1ef78 am b7ad442c: am 1c82f56f: Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME 
* commit 'b7ad442c90146f736c6268c21e34a87fbcab6335':
  Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
 2011-07-21 18:19:21 -07:00
Kazuhiro Ondo
b7ad442c90 am 1c82f56f: Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME 
* commit '1c82f56f2453a8a7c83090017ab2427a74829b9a':
  Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
 2011-07-21 18:15:26 -07:00
John Wang
1a15b03f62 Merge "Remove APN type in notifyDataConnection." 2011-07-21 17:06:08 -07:00
Kazuhiro Ondo
1c82f56f24 Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME 
Fix to resolve conflicting ERI and CSIM SPN. CSIM SPN should be
only used when camping SID/NID is listed in CDMAHOME record.

Bug: 5057486
Change-Id: I6c5961bb53cc6257237fa5a93a0acd067b12d009
 2011-07-21 17:04:58 -07:00
John Wang
343112fb15 Remove APN type in notifyDataConnection. 
Using APN_TYPE_ALL in notifyDataConnection causes data
connection state to be set as DISCONNECTED all the time
because apnTypeToId returns INVALID_ID for APN_TYPE_ALL.

bug:4972999
Change-Id: Ieb79194575dd97fa4bd7ef2bd8202030aa282d84
 2011-07-21 14:46:11 -07:00
Kazuhiro Ondo
aed294985c am 5abddc73: am bf361b59: Return IMEI SV if CDMA-LTE mode is used 
* commit '5abddc73a57da304029b6034b13f69079dcbd83a':
  Return IMEI SV if CDMA-LTE mode is used
 2011-07-19 12:41:58 -07:00
Kazuhiro Ondo
5abddc73a5 am bf361b59: Return IMEI SV if CDMA-LTE mode is used 
* commit 'bf361b59e4e6c1c7c710e73260a77e9937f1fb59':
  Return IMEI SV if CDMA-LTE mode is used
 2011-07-19 12:39:39 -07:00
Kazuhiro Ondo
bf361b59e4 Return IMEI SV if CDMA-LTE mode is used 
IMEI and IMEI SV should be available in CDMA-LTE hybrid system.
IMS SV value is not yet returned.

Bug: 5042972
Change-Id: I733825e95f802605e06887951e226d26baea8ff2
 2011-07-19 12:06:12 -07:00
Wink Saville
865e684652 am 6e8c7dd2: am cd4636ec: Add LteOnCdmaDevice system property. 
* commit '6e8c7dd2128b2a46f5d56ed46d4d530af6ad38f5':
  Add LteOnCdmaDevice system property.
 2011-07-18 18:42:41 -07:00
Wink Saville
6e8c7dd212 am cd4636ec: Add LteOnCdmaDevice system property. 
* commit 'cd4636ec08a50ab890acab0cf0c3c3f07f91896a':
  Add LteOnCdmaDevice system property.
 2011-07-18 18:39:41 -07:00
Wink Saville
cd4636ec08 Add LteOnCdmaDevice system property. 
Provide a system property which may be
optionally set at build time.

Change-Id: I253ff0df7c8f8c5627c775fb0cff2cb831157eed
 2011-07-18 11:32:55 -07:00
Dianne Hackborn
de4c26fa1a Fix a couple static leaks. 
Change-Id: If2564dc822fbcb3bb3baf270ad2b3c29c78bf421
 2011-07-17 13:49:27 -07:00
Robert Greenwalt
d9212d3088 resolved conflicts for merge of 8550f3b8 to master 
Change-Id: If2881b8b7faea5139af83a37cba04ccac5904f81
 2011-07-15 10:52:54 -07:00
Robert Greenwalt
8550f3b86a resolved conflicts for merge of 0a46db5d to honeycomb-plus-aosp 
Change-Id: I0f1bea54d999ab3ef10400ee67bd4d3b2a5d1783
 2011-07-15 09:55:48 -07:00
Robert Greenwalt
0a46db5d88 Apply the dns and route diff which we get a change 
bug:5008973
Change-Id: Ib99e43d9d852452cc1f2aea6bef07bbd194f28cc
 2011-07-14 18:12:14 -07:00
Wink Saville
76326a9d7d am 3810361e: am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE 
* commit '3810361e4a3e93d3c8a10aaeec54f65dfcc2d03d':
  Remove STOPSHIP but allow seamless Handoff when possible.
 2011-07-14 10:55:58 -07:00
John Wang
726492eae9 am 28d92afc: am 2ac78a2d: Merge "Add getImei() to Phone interface." into honeycomb-LTE 
* commit '28d92afc0a17cbf9149a0c8be9c8795d6f3306a5':
  Add getImei() to Phone interface.
 2011-07-14 10:49:38 -07:00
Wink Saville
3810361e4a am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE 
* commit '6d1d16c324a681dd966d47497a71a02eac512234':
  Remove STOPSHIP but allow seamless Handoff when possible.
 2011-07-13 14:19:12 -07:00
Wink Saville
6d1d16c324 Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE 2011-07-13 14:15:19 -07:00
Wink Saville
e822225f7a Remove STOPSHIP but allow seamless Handoff when possible. 
If an address is removed we must reset the connection but
only for the connections associated with that address. For
now we're doing the "all" addresses for a type (IPv6 or IPv4)
in the future we only need to reset a particular addresses
connections.


Bug: 4981919
Change-Id: I97f8071a3ed6f827ed22f32216ca5011bfe6c1d9
 2011-07-13 13:44:13 -07:00
John Wang
28d92afc0a am 2ac78a2d: Merge "Add getImei() to Phone interface." into honeycomb-LTE 
* commit '2ac78a2da52b29f6ac72294072d7ca87d991dab1':
  Add getImei() to Phone interface.
 2011-07-13 10:21:38 -07:00
Wink Saville
c4f5d33ea6 am 0ddd9960: am 12b91edc: Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE 
* commit '0ddd99600675aaf5f514ac6bb30d345c4b66f8c2':
  Add a property so that CSIM provision check can be bypassed
 2011-07-12 16:38:22 -07:00
Jeff Sharkey
099b3d2179 Merge "Watch for external Secure.DATA_ROAMING changes." 2011-07-12 15:18:41 -07:00
Kazuhiro Ondo
64bd196fe4 am a9e00a4a: am 89799e72: Fix incorrect ERI banner format 
* commit 'a9e00a4ac806751d8af0d9386ee3ae9bd18492b4':
  Fix incorrect ERI banner format
 2011-07-12 14:56:59 -07:00
John Wang
2ea7e443b2 Add getImei() to Phone interface. 
Need IMEI to be displayed in LTE Settings. Since getDeviceId() returns MEID for LTE device,
getImei() is added to return IMEI for all devices. getImei returns null if not set (as SipPhone).

bug:4983512
Change-Id: Idfe2ec8de514f330248db7a9de7e241f9a38cb96
 2011-07-11 17:00:16 -07:00
Jeff Sharkey
9e6615afab Watch for external Secure.DATA_ROAMING changes. 
Continue reading/writing Secure.DATA_ROAMING, but also observe
external changes and reevaluate connection state.

Bug: 5011957
Change-Id: Idc6589cf251adcf3110d9c9eb4ef1bd5fb936d14
 2011-07-11 16:20:23 -07:00
Wink Saville
0ddd996006 am 12b91edc: Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE 
* commit '12b91edc81763b69090bf5815bc8d59ab8d8f342':
  Add a property so that CSIM provision check can be bypassed
 2011-07-10 19:35:14 -07:00
Wink Saville
12b91edc81 Merge "Add a property so that CSIM provision check can be bypassed" into honeycomb-LTE 2011-07-10 19:33:54 -07:00
Kazuhiro Ondo
e5d891e84e Add a property so that CSIM provision check can be bypassed 
To support test environment where a call box is used with
non-provisioned SIM.

Bug: 5010622
Change-Id: I0dd2d3c2d199f600e5979c865f97b41e2fbb706d
 2011-07-10 19:18:21 -07:00
Kazuhiro Ondo
a9e00a4ac8 am 89799e72: Fix incorrect ERI banner format 
* commit '89799e72eee54935ec5830f89dfd0a7d32983917':
  Fix incorrect ERI banner format
 2011-07-10 17:21:52 -07:00
Kazuhiro Ondo
89799e72ee Fix incorrect ERI banner format 
Fix conflicting display issue with ERI and CSIM SPN test.
Do not display them together but only override ERI text with CSIM
SPN in home area.

Bug: 5008969
Change-Id: I88383acd1c7f4c5bfb1f66349ff2f37b2edbbc9c
 2011-07-10 16:26:42 -07:00
Wink Saville
e2dece12ba am 3ef341cd: am 7283bb93: Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE 
* commit '3ef341cda51d5bc35b0bc919f7514653ec194410':
  Disconnect ApnContexts in INITING state when error.
 2011-07-08 17:52:56 -07:00
Robert Greenwalt
532fee45e2 Merge "Remove unused setHttpProxy." 2011-07-08 11:06:55 -07:00
Wink Saville
3ef341cda5 am 7283bb93: Merge "Disconnect ApnContexts in INITING state when error." into honeycomb-LTE 
* commit '7283bb9323c83621a818c387bb80fe1bc9d6aa7c':
  Disconnect ApnContexts in INITING state when error.
 2011-07-08 09:40:11 -07:00
Ramesh Sudini
910e80478d Disconnect ApnContexts in INITING state when error. 
When DCT tears down a link due to error, the ApnContexts which are in INITING state are
not torndown. Due to this the DC refCount does not hit 0, and the Data Link is not torndown.

Bug: 4973894
Change-Id: If1263f360d55f6874220235fede294909db4837e
 2011-07-07 16:35:52 -07:00
Wink Saville
12f20ca200 am 19065008: am 48b6d5af: Merge "Reset FAILED ApnContext state to IDLE on data setup triggers" into honeycomb-LTE 
* commit '19065008b820ea95530d49cf1894f7481929f8e6':
  Reset FAILED ApnContext state to IDLE on data setup triggers
 2011-07-07 11:22:34 -07:00
Kazuhiro Ondo
5fa49298bf am 6716ac53: am c8e2916d: Bring back ERI into CDMA-LTE mode 
* commit '6716ac5342de7e83e5ba47f28aac40a46d1363ac':
  Bring back ERI into CDMA-LTE mode
 2011-07-07 11:22:10 -07:00
Wink Saville
19065008b8 am 48b6d5af: Merge "Reset FAILED ApnContext state to IDLE on data setup triggers" into honeycomb-LTE 
* commit '48b6d5afae76bec08c5e1194758e6db3e0f8b07c':
  Reset FAILED ApnContext state to IDLE on data setup triggers
 2011-07-06 19:05:40 -07:00
Kazuhiro Ondo
378a4380f2 Reset FAILED ApnContext state to IDLE on data setup triggers 
Make sure FAILED ApnContext state is reset to IDLE regarless of
existence of the reconnect alarm. This is to let FW re-evaluate
call setup conditions properly on data setup triggers.

Bug: 4989604
Change-Id: Ia9ec439db1df03bbd2e56803d3558542ba5f5400
 2011-07-06 18:45:06 -07:00
Kazuhiro Ondo
6716ac5342 am c8e2916d: Bring back ERI into CDMA-LTE mode 
* commit 'c8e2916d0bdbbda5fb6faf61d6f24100641d19f5':
  Bring back ERI into CDMA-LTE mode
 2011-07-06 18:04:30 -07:00
Kazuhiro Ondo
c8e2916d0b Bring back ERI into CDMA-LTE mode 
Use ERI mechanism for roaming determination in CDMA-LTE mode.
Also display SPN name from CSIM card as "SPN" field in the status bar.
PLMN field will be derived from ERI text as done in original CDMA phone.

Bug: 4970448
Change-Id: I21382b15e148a8451f4c3fcbbb5d1ed296e41b5a
 2011-07-06 17:30:52 -07:00
David Brown
23b444a2e4 Merge "Remove explicit toUpperCase after CountryDetector is fixed to return uppercase region code." 2011-07-01 13:19:37 -07:00
Kazuhiro Ondo
647ebb50b1 am c0c07d4f: am 012b86d4: DataConnection was cleaned up too early if it\'s already disconnecting 
* commit 'c0c07d4ff689a6050ef368933b9c53283a01520a':
  DataConnection was cleaned up too early if it's already disconnecting
 2011-07-01 09:21:22 -07:00
Robert Greenwalt
de89a46458 am 672c468c: am a2267451: Don\'t ever report a null ServiceState 
* commit '672c468c453ea0b5195f42150d6772ac33d1f7e3':
  Don't ever report a null ServiceState
 2011-07-01 07:56:38 -07:00
Shaopeng Jia
bc2e82d454 Remove explicit toUpperCase after CountryDetector is fixed to return 
uppercase region code.

Change-Id: I111d5792b67eb0e16a7278a731097f305cb9a059
 2011-07-01 15:04:50 +02:00
Kazuhiro Ondo
ce43bc4858 am 0562efd1: am f3f9967e: Make sure to update data availability in call setup capable triggers. 
* commit '0562efd1ea970ded01b1b47bbce790a269a60c45':
  Make sure to update data availability in call setup capable triggers.
 2011-06-30 18:23:42 -07:00