1945 Commits

Author SHA1 Message Date
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
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
Wink Saville
aef70d3f73 Merge "Return USIM IMSI as subscriber ID in case of CDMA-LTE mode" into honeycomb-LTE 2011-06-21 19:32:16 -07:00
Kazuhiro Ondo
7c2d6fd60d Return USIM IMSI as subscriber ID in case of CDMA-LTE mode
Bug: 4764057
Change-Id: I0c7d6e2af6a597d70d2024205d358e8b9c56b57b
2011-06-21 18:02:51 -07:00
Wink Saville
d1ec23c206 Use dataConnectionNotInUse to decide if a DC is free.
Change-Id: I89cb2f46dca59d5738dd16eb657104c3158ebcd2
2011-06-21 17:58:45 -07:00
Kazuhiro Ondo
e0acd0842f Special retry back-off timer in call setup failure.
RIL might specify a special retry back-off timer only used for
temporary in a certain error scenario. This patch will be adding
new handling of "retry" override so RIL specified retry timer
can be used instead of the pre-configured one.

Bug: 4723641
Change-Id: Ia4784f022a029c79b35c4c4c01ad7e49efd56a3c
2011-06-21 16:17:03 -07:00
Kazuhiro Ondo
e303d7b318 Fix handling of unsol_data_state_change with PDP sharing scenario
The original logic was to go through each ApnContext to find
changes on the DataConnection if applicable. This was causing
an issue when an DC is shared by multiple ApnContexts. Only
the first ApnContext associated with the updated DC was detecting
the link properties change.

The change in this patch is to go through the changes by DC instead
of ApnContext. And make sure the update on a DC is propagated to
all associated ApnContexts.

Bug: 4744006
Change-Id: Ie52d62d1d5671005f9e74b1ddc24822c9013e3e4
2011-06-21 16:14:03 -07:00
Robert Greenwalt
e813ea5a11 am 4906376f: Just a random fix.
* commit '4906376f58d617083034c5899d06a73b7c1cc114':
  Just a random fix.
2011-06-20 16:46:20 -07:00
David Brown
2ef46c6587 Use a static flag to enable/disable CallerInfo "geoDescription" lookup
...and disable the lookup for now, since we don't have the latest
PhoneNumberOfflineGeocoder (from the libphonenumber library) integrated
into our tree yet.

Bug: 4595580
Change-Id: I7391cbf1558b5a23eebfff6c4ad1f6363213c9a3
2011-06-20 16:24:19 -07:00
Robert Greenwalt
4906376f58 Just a random fix.
Don't re-lookup something - use the local holding the early lookup.

Change-Id: I6d9fac89651c99a84060238c8a6f6a936b1167ea
2011-06-20 14:15:56 -07:00
David Brown
e510fa4c0b Fix permissions check in IccSmsInterfaceManager.sendText()
In android.internal.telephony.IccSmsInterfaceManager, we currently use
enforceCallingPermission() rather than enforceCallingOrSelfPermission()
to enforce the SEND_SMS permission.

The difference is that enforceCallingPermission() will ALWAYS throw a
SecurityException if you're not handling an IPC, i.e. if the request is
from the same process as the telephony framework.

In other words, the current code prevents the phone app from ever using
SmsManager.sendTextMessage() :-(

This change fixes IccSmsInterfaceManager.sendText() to use
enforceCallingOrSelfPermission(), and I confirmed I can now send SMSes
from the phone app.

NOTE there are a bunch of other uses of enforceCallingPermission() in the
telephony framework (all SMS-related) that we probably want to fix too,
although I'm fixing just this one for now since it's blocking a hi-pri
phone UI feature.  I opened bug 4686733 to cover the rest of the cleanup,
though.

Bug: 4686733
Change-Id: Iaffcf62c54493fa4961fb20894c974697f26e3a7
2011-06-17 01:36:20 -07:00
John Wang
e21217af64 am c6b32054: am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
* commit 'c6b32054c67901b0627ad99e4bd8b15c5cc2fb90':
  Revert "Do not merge. Return null id for Non-phone device."
2011-06-16 17:14:28 -07:00
John Wang
c6b32054c6 am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
* commit 'c826f92e6f90f4157afd4ed69c6907ff768a0d6b':
  Revert "Do not merge. Return null id for Non-phone device."
2011-06-16 16:50:05 -07:00
John Wang
fe9aa2706f Revert "Do not merge. Return null id for Non-phone device."
This reverts commit cea03df201dc6659654234bc5fbfebf1b6a06e42
2011-06-16 16:30:02 -07:00
John Wang
1766974b02 am 03cbb58e: am ff42c04d: Merge "Support SIM permanently disabled state." into honeycomb-LTE
* commit '03cbb58e2418dc22ae18a8648404382da4ee46e8':
  Support SIM permanently disabled state.
2011-06-16 12:49:17 -07:00
John Wang
03cbb58e24 am ff42c04d: Merge "Support SIM permanently disabled state." into honeycomb-LTE
* commit 'ff42c04d15e000f6295e796e154cc60c54aa078b':
  Support SIM permanently disabled state.
2011-06-16 12:34:34 -07:00
John Wang
ff42c04d15 Merge "Support SIM permanently disabled state." into honeycomb-LTE 2011-06-16 11:22:53 -07:00
John Wang
f4a9e1a8a4 Don't clean up operator properties in RuimRecords.
Don't clean up PROPERTY_ICC_OPERATOR_ISO_COUNTRY and
PROPERTY_ICC_OPERATOR_NUMERIC here. Since not all CDMA
devices have RUIM, these properties should keep the original
values, e.g. build time settings, when there is no RUIM but
set new values when RUIM is available and loaded.

bug:4552029
Change-Id: I37c2cea32b582a00873b7f85b70abe30253e1241
2011-06-15 16:33:41 -07:00
Wink Saville
3d8fcebc98 am ec18268e: am 1146bddf: Merge "Always clear settings when entering Inactive state." into honeycomb-LTE
* commit 'ec18268eb42641cd2a6ae9c8b26e35d67bb41021':
  Always clear settings when entering Inactive state.
2011-06-15 14:37:00 -07:00
Wink Saville
ec18268eb4 am 1146bddf: Merge "Always clear settings when entering Inactive state." into honeycomb-LTE
* commit '1146bddf92fc91dad384bdaea740f9472bebd911':
  Always clear settings when entering Inactive state.
2011-06-15 14:34:08 -07:00
Wink Saville
1146bddf92 Merge "Always clear settings when entering Inactive state." into honeycomb-LTE 2011-06-15 14:31:16 -07:00
Wink Saville
f3e3edb2f9 am aff9ec70: am 4d6233b2: Merge "Clean up some debug statements." into honeycomb-LTE
* commit 'aff9ec70e22abb64149e335ae2eb519c6027eb4a':
  Clean up some debug statements.
2011-06-15 14:03:31 -07:00
Wink Saville
aff9ec70e2 am 4d6233b2: Merge "Clean up some debug statements." into honeycomb-LTE
* commit '4d6233b2edd24c83efe10f4403456b8d0c87241a':
  Clean up some debug statements.
2011-06-15 13:58:20 -07:00
Wink Saville
eddc3a579c Clean up some debug statements.
Change-Id: Id60020f09dd858f2d2c83bdd8f8d4384e5bfc934
2011-06-15 13:45:29 -07:00
Marco Nelissen
181aafd75c am 9c3c3004: am d8f9a83c: resolved conflicts for merge of d027329c to gingerbread-plus-aosp
* commit '9c3c3004c4206da3f2579e863ce89a2f99269dd6':
  Ignore duplicate WAP push PDU source/destination port if configured
2011-06-15 13:44:56 -07:00
Marco Nelissen
9c3c3004c4 am d8f9a83c: resolved conflicts for merge of d027329c to gingerbread-plus-aosp
* commit 'd8f9a83cab34de38981dc3ba5ca9df8dda02dbc0':
  Ignore duplicate WAP push PDU source/destination port if configured
2011-06-15 12:20:57 -07:00
Marco Nelissen
d8f9a83cab resolved conflicts for merge of d027329c to gingerbread-plus-aosp
Change-Id: I169c415bf998b9935ab36812511573db05717b91
2011-06-15 08:58:38 -07:00
Wink Saville
0e765f8b73 Always clear settings when entering Inactive state.
Change-Id: I500b60a8122b790d60dbff5960b8c32500704b40
2011-06-15 06:41:21 -07:00
John Wang
b0b24b3df5 Support SIM permanently disabled state.
SIM card can get permanently disabled due to too many
PUK retries. The PERM_BLOCKED pin state of SIM application
represents this state.

This change decodes permanent disabled state and broadcasts it
via ICC_ABSENT intent with PERM_DISABLED reason. It also update
the lockscreen to show the prompt message.

bug:4392059
Change-Id: I5e60dd65f48f42aa2e54db4cdebf803d6e666b99
2011-06-14 16:50:03 -07:00
Wink Saville
02f4e4f981 am 5d47d203: am fbef26eb: Merge "Enforce provision check for CSIM record only." into honeycomb-LTE
* commit '5d47d203fb60f4e7c91d97fa852a23863861b011':
  Enforce provision check for CSIM record only.
2011-06-14 15:22:42 -07:00
Wink Saville
35831f198a am aad3c3cb: am c2d17d3b: Merge "Make APN re-connect delay configuable" into honeycomb-LTE
* commit 'aad3c3cbb8d6ceebcf99b80b1567f310b3216d6a':
  Make APN re-connect delay configuable
2011-06-14 15:22:38 -07:00
Wink Saville
3bcc33fdec am 46cd4a4b: am 82c1a5de: Merge "Revert "CDMALTE: Get roaming status based on SID/NID"" into honeycomb-LTE
* commit '46cd4a4bfe432ed6b483c0d6fc1045e387f22710':
  Revert "CDMALTE: Get roaming status based on SID/NID"
2011-06-14 15:22:33 -07:00
Wink Saville
5d47d203fb am fbef26eb: Merge "Enforce provision check for CSIM record only." into honeycomb-LTE
* commit 'fbef26eb55cf8a5b5a25a2b748bf16b54d398abc':
  Enforce provision check for CSIM record only.
2011-06-14 14:48:51 -07:00
Wink Saville
aad3c3cbb8 am c2d17d3b: Merge "Make APN re-connect delay configuable" into honeycomb-LTE
* commit 'c2d17d3bea02991df378237ea7058ccedb7c6a14':
  Make APN re-connect delay configuable
2011-06-14 14:47:07 -07:00