1873 Commits

Author SHA1 Message Date
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
Wink Saville
46cd4a4bfe am 82c1a5de: Merge "Revert "CDMALTE: Get roaming status based on SID/NID"" into honeycomb-LTE
* commit '82c1a5dea305d56eb77efa7d9a730307ff6af28a':
  Revert "CDMALTE: Get roaming status based on SID/NID"
2011-06-14 14:47:04 -07:00
Wink Saville
fbef26eb55 Merge "Enforce provision check for CSIM record only." into honeycomb-LTE 2011-06-14 14:44:31 -07:00
Wink Saville
c2d17d3bea Merge "Make APN re-connect delay configuable" into honeycomb-LTE 2011-06-14 14:44:23 -07:00
Kazuhiro Ondo
98e1e28f30 Enforce provision check for CSIM record only.
Change-Id: I94bb6dd9191b24b0bd8c0e7d6267de5cd4b82be8
2011-06-14 13:55:24 -07:00
Kazuhiro Ondo
c65d52b148 Make APN re-connect delay configuable
Add configurability on hard coded timer.

Change-Id: Ic9a6ee43d9da3bd45f862aa3a21f05d836b402e3
2011-06-14 13:54:33 -07:00
Kazuhiro Ondo
23f646367d Revert "CDMALTE: Get roaming status based on SID/NID"
This reverts commit 3fc9055c7f3bc25948f17bc29582abae72fe7de1.
2011-06-14 13:53:39 -07:00
David Brown
94202fe121 Add "geoDescription" to CallerInfo
As of change https://android-git.corp.google.com/g/111296 the
libphonenumber library now provides an API ("PhoneNumberOfflineGeocoder")
to look up a geographical description string for a given number.

This change adds a new CallerInfo field called "geoDescription", and
uses the PhoneNumberOfflineGeocoder to look it up (if the contact lookup
fails) during the CallerInfoAsyncQuery sequence.

See https://android-git.corp.google.com/g/114715 for the corresponding
change under apps/Phone, to display this string (along with the raw
number) in the incoming-call UI.

Also some other minor cleanup:
  - fixed spelling of the "normalizedNumber" field
  - tiny javadoc and code style cleanup
  - slight CallManager and CallerInfo debug output cleanup

Bug: 4595580
Change-Id: I900d8f48e953d1b24983602cb5467a5c6a6c518a
2011-06-13 17:39:49 -07:00
John Wang
e1a4fcdeaa am cc44bea0: am 2addaf97: Merge "Add toString for IccCard Status and App." into honeycomb-LTE
* commit 'cc44bea0400bc6b6e995d66b705a4db0a77a7dfa':
  Add toString for IccCard Status and App.
2011-06-10 17:31:42 -07:00
John Wang
cc44bea040 am 2addaf97: Merge "Add toString for IccCard Status and App." into honeycomb-LTE
* commit '2addaf97b319e257677ac3e5bbb772ba40cfa78a':
  Add toString for IccCard Status and App.
2011-06-10 17:28:11 -07:00
John Wang
2addaf97b3 Merge "Add toString for IccCard Status and App." into honeycomb-LTE 2011-06-10 17:19:42 -07:00
Robert Greenwalt
8b7eede0bc am 75612e9c: am 1ea549e8: Merge "CDMALTE: Get roaming status based on SID/NID" into honeycomb-LTE
* commit '75612e9c3f92364ba1f0a7fce46f1df11b0a14ca':
  CDMALTE: Get roaming status based on SID/NID
2011-06-10 15:21:22 -07:00
Robert Greenwalt
75612e9c3f am 1ea549e8: Merge "CDMALTE: Get roaming status based on SID/NID" into honeycomb-LTE
* commit '1ea549e8990d2d73ccd9e92db1e7312423ee423e':
  CDMALTE: Get roaming status based on SID/NID
2011-06-10 14:13:25 -07:00
Soojung Shin
d027329cd6 Ignore duplicate WAP push PDU source/destination port if configured
Some carriers duplicate the OMADM wap push PDU source/destination
port.

e.g. MSGTYPE-TotalSegments-CurrentSegment
     -SourcePortDestPort-SourcePortDestPort-OMADM PDU

So the client has to ignore the duplicate source/destination
port.

Change-Id: I83df6e8e7d2e2e4275036a1b574247f9f40c5cf4
Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
2011-06-10 13:48:36 -07:00
Robert Greenwalt
9e7c20635f am 5a8455c3: am 75749ab1: Merge "Set locale based on SIM preferred language." into honeycomb-LTE
* commit '5a8455c3c625201f3ae6b9ce32913bf97ba61cc8':
  Set locale based on SIM preferred language.
2011-06-10 10:33:23 -07:00
John Wang
c7a58b4de0 Add toString for IccCard Status and App.
Enhance the debug info for GET_SIM_STATUS. Print out the
Card status and App status instead of Object id. It helps
to debug PUK lock and other SIM related issues.

Change-Id: I489f3933529a9719827a8799c41de8e999db6b40
2011-06-09 19:10:12 -07:00
Kazuhiro Ondo
3fc9055c7f CDMALTE: Get roaming status based on SID/NID
Change-Id: Iec70f2036c1c698331696ff9869bfb057604c637
2011-06-09 16:42:18 -07:00