1821 Commits

Author SHA1 Message Date
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
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
Robert Greenwalt
7675faa70d am 8745caaf: am dbcc57c6: Fix dependencyMet issues regarding hipri APN.
* commit '8745caaf25e9f2d50125a793b7d02fc4522ba4ba':
  Fix dependencyMet issues regarding hipri APN.
2011-06-30 18:23:34 -07:00
Kazuhiro Ondo
c0c07d4ff6 am 012b86d4: DataConnection was cleaned up too early if it\'s already disconnecting
* commit '012b86d4294182497c4c72a318e0f4cbe5075a44':
  DataConnection was cleaned up too early if it's already disconnecting
2011-06-30 18:00:06 -07:00
Kazuhiro Ondo
012b86d429 DataConnection was cleaned up too early if it's already disconnecting
Fix one logic failure introduced in patch for bug 4901019.

Bug: 4970726
Change-Id: Ifc4071b1cbf0c19fbd8356d7dcc16f9df39d4b54
2011-06-30 17:26:54 -07:00
Robert Greenwalt
2bfa2e65f4 Remove unused setHttpProxy.
bug:3487057
Change-Id: If5069a233dd787ff490a136a233e812ee17beef5
2011-06-30 16:58:00 -07:00
Robert Greenwalt
672c468c45 am a2267451: Don\'t ever report a null ServiceState
* commit 'a2267451ddf91cc330f4c283e86811e38328915b':
  Don't ever report a null ServiceState
2011-06-30 14:50:32 -07:00
Robert Greenwalt
a2267451dd Don't ever report a null ServiceState
Report out of service if we don't know any better.  Sometimes when switching radios
we were finding nulls reported - it crashed some code and highlighted this problem.
If we don't have a service state we're certainly out of service, so this isn't a lie.

bug:4553701
Change-Id: I094798a5f9f39f45c0ba30179aaa8f88f9b3e405
2011-06-30 12:42:57 -07:00
Kazuhiro Ondo
0562efd1ea am f3f9967e: Make sure to update data availability in call setup capable triggers.
* commit 'f3f9967e22201276d65f4be6006aca1cecc2a604':
  Make sure to update data availability in call setup capable triggers.
2011-06-29 17:24:56 -07:00
Kazuhiro Ondo
f3f9967e22 Make sure to update data availability in call setup capable triggers.
As "startUsingNetworkFeature()" now can trigger the initial data
connection instead of default data, FW needs to make sure each
MobileDataStateTracker is updated with the data availability
on each "data-setup capable" trigger.

Bug: 4970825
Change-Id: I6a7e479ecc1534cd723a2e8beece6b8bcd398ea7
2011-06-29 15:37:26 -07:00
John Wang
f9ab96f9d3 Revert "Do not merge. Return null id for Non-phone device."
This reverts commit cea03df201dc6659654234bc5fbfebf1b6a06e42

Change-Id: I68470e729d9304f1c27473a71334e1b0de99ff01
2011-06-29 15:36:35 -07:00
Robert Greenwalt
8745caaf25 am dbcc57c6: Fix dependencyMet issues regarding hipri APN.
* commit 'dbcc57c6f1602da324609ddbaf76f836504733ae':
  Fix dependencyMet issues regarding hipri APN.
2011-06-29 15:22:50 -07:00
Robert Greenwalt
dbcc57c6f1 Fix dependencyMet issues regarding hipri APN.
If the system says a dependency isn't met for accessing the default APN,
apps should not be able to turn on the hipri APN either.  This change
prevents apps from adjusting the dependencyMet setting on hipri and
internally ties its dependencyMet to that of the default APN.

bug:4643411
Change-Id: I7e609ff9bb1b85a3a6a41095052f0194d03be979
2011-06-29 14:28:53 -07:00
Daisuke Miyakawa
b93b8b4976 Merge "Use upper case country codes in Country.java" 2011-06-29 08:23:06 -07:00
Wink Saville
a099fefec5 am cf2980ff: am 29d1dde9: Merge "Data connection retry pattern could be broken by PDP sharing" into honeycomb-LTE
* commit 'cf2980ffef2780ab41eb196f398df482b105312e':
  Data connection retry pattern could be broken by PDP sharing
2011-06-27 19:59:40 -07:00
Wink Saville
cf2980ffef am 29d1dde9: Merge "Data connection retry pattern could be broken by PDP sharing" into honeycomb-LTE
* commit '29d1dde972acaaf3685b60de3da00c1809c510f9':
  Data connection retry pattern could be broken by PDP sharing
2011-06-27 19:57:20 -07:00
Daisuke Miyakawa
3746f2d914 Use upper case country codes in Country.java
Previously external/libphonenumber accepted lower case
country codes (e.g. "us") but now it doesn't for performance reason.
Actually ISO 3166-1 doesn't allow lower cases, so we should not rely
on them.

Need to fix unit tests for PhoneNumberUtils, as it implicitly
relies on the previous behavior.

See also I3a3e6db84ed0d24290b1be19651fa9a82de4cc39

Bug: 4941319
Change-Id: If16f6531f274a0faf5e28724854409ca9b00a669
2011-06-27 15:20:46 -07:00
Kazuhiro Ondo
1e5c72c704 Data connection retry pattern could be broken by PDP sharing
If a DataConnection is pending re-connect alarm, the new request
from another ApnContext sharing the same DC could disrupt
the re-connection pattern currently engaged.

This patch is to ensure the new request for PDP sharing
scenario will not trigger another SETUP_DATA request if
reconnection alarm is set in AlarmManager.

Bug: 4901019
Change-Id: I98b0d9af8b58fb880efdbc0246009de5cb116a54
2011-06-27 15:12:21 -07:00
Daisuke Miyakawa
b81b1c91d8 Merge "Uppercase region code so that AsYouTypeFormatter works correctly." 2011-06-24 12:32:04 -07:00
Shaopeng Jia
5b0b167f7f Uppercase region code so that AsYouTypeFormatter works correctly.
Change-Id: Iaf46ec5241a1a8984753bd6d8f9f842884efaa15
2011-06-24 13:50:43 +02:00
David Brown
cec25c4e8a CallerInfo query: Turn on "geo description" lookup for unknown numbers
With the latest version of the external/libphonenumber library
<https://android-git.corp.google.com/g/117190> we now have real data for
the PhoneNumberOfflineGeocoder.getDescriptionForNumber() feature.

So enable it in the CallerInfo query.  This means that the incoming call
UI will now show a geo description like "California" or "Maryland" (along
with the number) for unknown incoming numbers.

I also needed to work around an issue with the latest phonenumber library:
The new library apparently requires countryIso to be uppercase (e.g. "US")
but the CountryDetector.detectCountry().getCountryIso() call currently
returns "us", which causes PhoneNumberUtil.parse() to fail.  (This also
broke some ContactsProvider tests too.)  So force the countryIso to
uppercase for now.

TESTED (on Crespo):
  - Incoming calls from an unknown number:
    ==> State name is now displayed.
  - Incoming calls from a number that matches a contact:
    ==> no change in behavior

Bug: 4595580
Change-Id: I03126e1eee99d428e76bbbad5b3856be3874f549
2011-06-23 15:48:25 -07:00
David Brown
0824b928ce Merge "Update CallerInfo to use the geocoder in the updated location." 2011-06-23 14:08:56 -07:00
Wink Saville
9b897922e1 am 446a436c: am 4d9261fa: Merge "Use dataConnectionNotInUse to decide if a DC is free." into honeycomb-LTE
* commit '446a436cf3d6eb0ee2feb628efc84fda746dfe52':
  Use dataConnectionNotInUse to decide if a DC is free.
2011-06-23 07:49:30 -07:00
Wink Saville
3b14c78466 am 66c37f5d: am 64a09341: Merge "Fix handling of unsol_data_state_change with PDP sharing scenario" into honeycomb-LTE
* commit '66c37f5df2b4cf469e90a0e9f7e0b336f56e8433':
  Fix handling of unsol_data_state_change with PDP sharing scenario
2011-06-23 07:49:16 -07:00
Wink Saville
7bfb80d122 am 47e31924: am aef70d3f: Merge "Return USIM IMSI as subscriber ID in case of CDMA-LTE mode" into honeycomb-LTE
* commit '47e319247e89ab4ba30f58e5f532454ef21d15e6':
  Return USIM IMSI as subscriber ID in case of CDMA-LTE mode
2011-06-23 07:49:09 -07:00
Wink Saville
b939b4d36a am 1773120c: am ac4ff895: Merge "Special retry back-off timer in call setup failure." into honeycomb-LTE
* commit '1773120c1e9aeebc917e1bb6c1241aecfe9d6500':
  Special retry back-off timer in call setup failure.
2011-06-23 07:49:02 -07:00
Robert Greenwalt
33d0de6965 am e813ea5a: am 4906376f: Just a random fix.
* commit 'e813ea5a11db8070d2ca72cab416fa1a8fd3539c':
  Just a random fix.
2011-06-23 07:40:49 -07:00
Shaopeng Jia
e4ae434731 Update CallerInfo to use the geocoder in the updated location.
Change-Id: I9d4507a50ae473964bf2d094b7a1072d79e61e85
2011-06-23 15:54:24 +02:00
Wink Saville
446a436cf3 am 4d9261fa: Merge "Use dataConnectionNotInUse to decide if a DC is free." into honeycomb-LTE
* commit '4d9261fad3e3bdfa056f377c10f2af0a6db62542':
  Use dataConnectionNotInUse to decide if a DC is free.
2011-06-21 19:37:46 -07:00
Wink Saville
66c37f5df2 am 64a09341: Merge "Fix handling of unsol_data_state_change with PDP sharing scenario" into honeycomb-LTE
* commit '64a09341d8a16212855b7cdd16fe079e25d45838':
  Fix handling of unsol_data_state_change with PDP sharing scenario
2011-06-21 19:35:22 -07:00
Wink Saville
47e319247e am aef70d3f: Merge "Return USIM IMSI as subscriber ID in case of CDMA-LTE mode" into honeycomb-LTE
* commit 'aef70d3f73eec5b28e1255027f947d95a74b6ab9':
  Return USIM IMSI as subscriber ID in case of CDMA-LTE mode
2011-06-21 19:35:09 -07:00
Wink Saville
1773120c1e am ac4ff895: Merge "Special retry back-off timer in call setup failure." into honeycomb-LTE
* commit 'ac4ff8958eced1c56a2e9571dd754c98eaa43108':
  Special retry back-off timer in call setup failure.
2011-06-21 19:34:54 -07:00
Wink Saville
4d9261fad3 Merge "Use dataConnectionNotInUse to decide if a DC is free." into honeycomb-LTE 2011-06-21 19:32:36 -07:00
Wink Saville
64a09341d8 Merge "Fix handling of unsol_data_state_change with PDP sharing scenario" into honeycomb-LTE 2011-06-21 19:32:25 -07:00