Commit Graph

197 Commits

Author SHA1 Message Date
Robert Greenwalt
8a02401129 resolved conflicts for merge of e139167c to master
Change-Id: Ic4d8aae7dd457457d9cc8ba081b273e425729f86
2011-06-08 10:01:06 -07:00
Jeff Sharkey
d2a458750e Map network identity using ConnectivityService.
Instead of deriving network identity based on raw subsystem broadcasts,
listen for updates from ConnectivityService.  Added atomic view of all
active NetworkState, and build map from "iface" to NetworkIdentity set
for stats tracking.

To avoid exposing internal complexity, INetworkStatsService calls use
general templates.  Added TelephonyManager mapping to classify network
types using broad labels like "3G" or "4G", used to drive templates.

Cleaned up Objects and Preconditions.

Change-Id: I1d4c1403f0503bc3635a59bb378841ba42239a91
2011-06-07 23:09:25 -07:00
Robert Greenwalt
e139167c91 am 5df69fad: resolved conflicts for merge of 8de47a2f to honeycomb-LTE
* commit '5df69fad6e5021d2862bff0553a510f8d6729fbd':
  Reveal some network constants.
2011-06-07 13:12:29 -07:00
Robert Greenwalt
5df69fad6e resolved conflicts for merge of 8de47a2f to honeycomb-LTE
Change-Id: I8193235a4c7e574635e17b2eb05bb5420a3c6749
2011-06-07 12:45:41 -07:00
Jean-Baptiste Queru
59242cf65e am 54ab72e1: am 038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format."
* commit '54ab72e1c389905adb074bd7c799a33b4f513679':
  Adding support for parsing of SMS-CB pdus in UMTS format.
2011-06-06 11:33:52 -07:00
Wink Saville
3699c3d7c8 am 5b4e2440: Merge "Refactor ServiceStateTracker handling of radio technology." into honeycomb-LTE
* commit '5b4e24400a4f1a6c67efd08ab2cda3389f78144e':
  Refactor ServiceStateTracker handling of radio technology.
2011-06-03 10:21:07 -07:00
Wink Saville
db09b5db60 Refactor ServiceStateTracker handling of radio technology.
Also add a little more debugging.

Change-Id: I832872c876b290a3e83a79068059a21894472a1d
2011-06-03 09:06:28 -07:00
Wink Saville
147510145f am 2e543dc1: Merge "CdmaLte: Use SPN from SIM card if SIM card is presend" into honeycomb-LTE
* commit '2e543dc188c3c2e8f8a785e403c95b7e22fa6262':
  CdmaLte: Use SPN from SIM card if SIM card is presend
2011-06-02 18:24:28 -07:00
Kazuhiro Ondo
c91c7f92c9 CdmaLte: Use SPN from SIM card if SIM card is presend
Change-Id: Ib766216ed5ec2522942e87d548d0af27c0553cec
2011-06-02 13:58:11 -07:00
Robert Greenwalt
97ab2d4f86 Reveal some network constants.
Since we've already decided to inc the sdk version we should try to get these in too.

bug:4500218
Change-Id: I6dcb401bf30f1b06f02be0a93681a190d7ee5775
2011-05-31 12:06:08 -07:00
Jean-Baptiste Queru
038e8f9984 Merge "Adding support for parsing of SMS-CB pdus in UMTS format." 2011-05-25 08:06:17 -07:00
Wink Saville
74af525e40 am 55ab1ac2: Merge "Add getLteOnCdamMode." into honeycomb-LTE
* commit '55ab1ac27f0e5ba6169e38b9ced197a9ff588f2b':
  Add getLteOnCdamMode.
2011-05-13 09:20:08 -07:00
Wink Saville
5e9270bfd5 Add getLteOnCdamMode.
Change-Id: Iebf027f956d543d7a69cad64aaba47900937a785
2011-05-12 13:37:32 -07:00
Jake Hamby
ee60f3fb1b resolved conflicts for merge of 18cc814c to honeycomb-plus-aosp
Change-Id: I2b569ada3baec2dc486296623063bc2b504c5e96
2011-05-10 15:52:15 -07:00
Wink Saville
ba54feb094 am 45364dc4: Merge "Telephony: Signal Strength Changes." into honeycomb-LTE
* commit '45364dc4bfe3e6118ad61f1d38489fe63418699a':
  Telephony: Signal Strength Changes.
2011-05-09 17:02:07 -07:00
Ramesh Sudini
5d7b9271b3 Telephony: Signal Strength Changes.
Change-Id: Ia406d21d860533e699a90d15130edcbc705ec645
2011-05-09 10:57:42 -07:00
Jake Hamby
18cc814c94 am 4d53cb02: Merge "Enable support for SMS national language shift tables." into gingerbread
* commit '4d53cb02168fe35104d7e644dd9b3efd8ca4c91b':
  Enable support for SMS national language shift tables.
2011-05-05 13:31:03 -07:00
Conley Owens
737b5c58c9 am 520dd927: am 9355a24a: Merge "Fixing wrong Japanese phone formatter."
* commit '520dd927cbe02ae52add1f90e282750582a9e95e':
  Fixing wrong Japanese phone formatter.
2011-04-29 17:15:13 -07:00
Jake Hamby
b49a73dfc4 Enable support for SMS national language shift tables.
Add support for encoding and decoding SMS 7 bit user data using the
national language shift tables defined in 3GPP TS 23.038 (GSM/UMTS only),
including the new tables added in Release 9 for Indic languages.

Decoding is always supported, but encoding is only enabled for the
specific language tables added to the new integer array resources
"config_sms_enabled_single_shift_tables" and
"config_sms_enabled_locking_shift_tables" defined in
frameworks/base/core/res/res/values/config.xml. The default empty arrays
should be overridden in an OEM overlay for the specific nationalities where
SMS national language shift table encoding is allowed/mandated (e.g. Turkey).
GsmAlphabet.countGsmSeptets() will try to find the most efficient encoding
among all combinations of enabled locking shift and single shift tables.
If no 7 bit encoding is possible, 16 bit UCS-2 encoding will be used.

This change also fixes a bug in the decoder: when an escape septet
is followed by a septet with no entry in the extension (single shift)
table, TS 23.038 Table 6.2.1.1 states that the MS shall display
the character in the main GSM 7 bit default alphabet table, or the
active national language locking shift table. Previously, we were
decoding this sequence as a space character. Two consecutive escape
septets will continue to decode as a space character, according to
Note 1 of table 6.2.1.1.

Change-Id: I4dab3f0ffe39f3df2064ed93c9c05f26e274d18b
2011-04-06 14:20:04 -07:00
Wink Saville
94191d4349 am 651f38d7: Merge "Change stopship to todo." into honeycomb-mr1
* commit '651f38d71788d6b1d50cb6c9810ba31f903407d9':
  Change stopship to todo.
2011-03-17 18:00:55 -07:00
Wink Saville
e5d6e10a73 Change stopship to todo.
For MR1 LTE isn't supported so the various lte routines aren't used
and are not a stopship.

bug: 4126216
Change-Id: I2a5f86161b616b57c6fe4b9de85db2492914009a
2011-03-17 16:50:42 -07:00
Ramesh Sudini
f57276154a Do not merge: Telephony: Corrections to LTE and eHRPD constant values.
LTE and EHRPD values are not consistent with ril.h

Change-Id: I76d1ff408a37960873f537772637ff3ae3ac056f
2011-03-14 13:44:30 -07:00
Wink Saville
9d7d62801d Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
This reverts commit eca208fae6
and is the first of the LTE commits in master being back ported
to the LTE branch.

Change-Id: I17d4a1b779ed74bc7dfb409d2c1a30f60fdb27c7
2011-03-14 12:25:04 -07:00
Keiji Ariyama
77359e7af3 Fixing wrong Japanese phone formatter.
http://code.google.com/p/android/issues/detail?id=15383

Adding rules that Japanese number start with 050 and 060.

Change-Id: Id324d7ecfb18b348230a3903b356647045700d80
2011-03-11 03:27:29 +09:00
Wink Saville
eca208fae6 DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
This reverts commit 2b8bcfe5b7.

Change-Id: Ifc4e9aaccb54e065a36380710694cd6e4d347636
2011-03-03 09:53:52 -08:00
Wink Saville
2b8bcfe5b7 LTE Changes for Telephony including Multiple PDN support and IPV6 support
Added init for CDMAPhone.java

Change-Id: I2392b5ad3382ee1993537b8477ef00dd036c6fe9
2011-02-24 18:23:36 -08:00
Wink Saville
5284090631 Changes for ril.h version 6.
Change-Id: Iacd9d362c4836546ac277cf3571227d426a721aa
2011-02-18 12:40:47 -08:00
Robert Greenwalt
5e9bf7a908 Merge "Add new network type for HSPA+." 2011-02-02 16:42:10 -08:00
Robert Greenwalt
9e4ba121dc Add new network type for HSPA+.
Change-Id: Ia949a02e5cb66bc9f7d4d5e7e771e592231c729b
2011-02-02 15:41:44 -08:00
Wink Saville
1938e314e3 Have SmsMessage use getCurrentPhoneType
Although our first tablet doesn't support SMS messages there are testing
scenarios where they can be used. To preserve proper behavior now that
getPhoneType can return PHONE_TYPE_NONE use getCurrentPhoneType.

bug: 3198435
Change-Id: I48ef294f563351c66971b4e89e6dcb3326b0ae92
2011-02-02 14:19:55 -08:00
Robert Greenwalt
6e2884817d Use a cached context when possible.
It's always possible after services have been registered, so it's just early
in the process that's a problem.  Lie correctly in those early cases and fix this
in MR1.

bug:3415254
Change-Id: I95811d1efd676fde01f66b742393d3aa4623482f
2011-02-02 10:57:35 -08:00
Wink Saville
9d72be3318 Add TelephonyManager.getCurrentPhoneType
The new method getCurrentPhoneType has the old behavior of getPhoneType
and does not check for voice capable. This allows code to assume
the old behavior.

bug: 3198435
Change-Id: I0542838ceca2f757cceb6cd7f795e95fe886523e
2011-02-01 19:22:15 -08:00
Wink Saville
9b9e6778dd Have getPhoneType return PHONE_TYPE_NONE for non-voice capable devices.
bug: 3198435
Change-Id: I1a19863c106a9394dbc941f396400e31dca95b92
2011-01-31 17:33:05 -08:00
Jean-Baptiste Queru
7ea919c44b Merge 6b739dc7 from gingerbread
Change-Id: If94889da67977aff7daa1e201c10cd51b7e2fff8
2011-01-29 12:59:20 -08:00
Robert Greenwalt
aa3866e6fa am 6b739dc7: Merge "Add some network types that OEM\'s are asking for." into gingerbread
* commit '6b739dc7292452227cdd8abd90658f4db8f0ce70':
  Add some network types that OEM's are asking for.
2011-01-29 06:55:38 -08:00
Robert Greenwalt
e12aec941d Add some network types that OEM's are asking for.
Adding them hidden so that if OEM's are rolling their own at least they can
use the same values.  Will mark them unhidden in a future sdk release.

bug:3395729
Change-Id: I90eabe036a96e1aa7c8cac49ca51efd9b1776a0c
2011-01-28 14:48:37 -08:00
Henrik Hall
4f95b1250f Adding support for parsing of SMS-CB pdus in UMTS format.
This enables RIL to dispatch pdus in both GSM or UMTS format.
The RAT that was used will be transparent to clients.

Change-Id: I57c53ec79496d274e18b3fee196551af97c0857d
2011-01-11 10:44:11 +01:00
John Wang
c049f9ad5b Block SMS service for non-sms-capable device.
If device doesn't support sms service, SMSDispatcher
will ignore incoming SMS in dispatching messge and return
ERROR_NO_SERVICE in sending sms messgae.

bug: 3250029
bug: 3038102
Change-Id: Ic72a9192aa128c43cf31da04907620bc680656c6
2010-12-10 15:29:03 -08:00
John Wang
488a0d5ece Merge "Add iDEN to getNetworkTypeName." 2010-12-09 12:53:01 -08:00
Nick Kralevich
1234ce117a Modify emergency number detection
It's possible for an application to dial an emergency
number by appending extra digits to the phone number.

For example, one could dial "9111" instead of "911",
and a strict .equals wouldn't detect this as an emergency
number.

Replace .equals() with .startsWith()

Change-Id: I87f34fc2b9bbee2c4fa6be511bcc3b955559e0a9
2010-12-07 11:27:20 -08:00
John Wang
4d76f36422 Add iDEN to getNetworkTypeName.
For bug 2667143.

Integrated Digital Enhanced Network (iDEN) is a mobile telecommunications

technology which provides its users the benefits of a trunked radio and

a cellular telephone.

Change-Id: I4a1f5dbdd22a2c4ce5252688053ec4a47805d6b9
2010-12-06 10:25:52 -08:00
Jean-Baptiste Queru
8503144665 resolved conflicts for merge of 8484e57f to master
Change-Id: I6a8cc70250fd2be9a1e9a728940a1e9f5721a653
2010-11-22 16:43:59 -08:00
Jean-Baptiste Queru
8484e57f30 resolved conflicts for merge of e4ae7fc3 to gingerbread-plus-aosp
Change-Id: I2e0a0ed622bc4c32d79936b30ebbf9068b3bdee8
2010-11-22 16:32:34 -08:00
Henrik Hall
95bc625e29 Enabling cell broadcast (SMS-CB) support in the platform.
Adding a simple API enabling applications to control SMS-CB reception.
Implementing parsing, assembly and dispatching of SMS-CB messages over GSM.

Change-Id: Iee841605a45a3af60c7602af175056afb03a38da
2010-11-19 15:00:00 +01:00
Wink Saville
e613adcc55 Cleanup some debug output.
Change-Id: Iac39e7ffb1f7409647ce112f9347c42d2909846a
2010-11-16 16:11:41 -08:00
Robert Greenwalt
8e7e0a9fd5 Fix data state change callbacks
Initial state should be unknown or we miss the first connected change.
Don't send a disconnected msg when changing network types.
Filter out redundent disconnects.
Add some logging.

bug:3060742
Change-Id: Idc797c1276b7417337a91ed60b12b1bf392d57c0
2010-11-09 16:28:51 -08:00
Robert Greenwalt
962a990a45 Add some network/phone type constants.
Support for LTE (and SIP-based voice) and the stepping-stone eHPRD.

bug:3125398
Change-Id: Ied3d96fa09d9c758a82a2fd1817f55db711d1a4f
2010-11-03 17:02:37 -07:00
Wink Saville
fd2d013027 Add PhoneStateListener.onOtaspChanged.
Bug: 3102320
Change-Id: I46e8d33a4ed80e5e074e92135653d57598d4c865
2010-11-01 11:46:57 -07:00
David Brown
a23935ab33 am bd6d5098: am d07833f5: Don\'t manually create CallerInfo objects from SipPhone
Merge commit 'bd6d5098a7995429713ae0ae43b3f666f7b9aed3'

* commit 'bd6d5098a7995429713ae0ae43b3f666f7b9aed3':
  Don't manually create CallerInfo objects from SipPhone
2010-10-11 17:48:47 -07:00
David Brown
bd6d5098a7 am d07833f5: Don\'t manually create CallerInfo objects from SipPhone
Merge commit 'd07833f54b6e8e361b666ae16efa15fdf60159de' into gingerbread-plus-aosp

* commit 'd07833f54b6e8e361b666ae16efa15fdf60159de':
  Don't manually create CallerInfo objects from SipPhone
2010-10-10 16:44:01 -07:00