616 Commits

Author SHA1 Message Date
Robert Greenwalt
9c4ed1394b am f9610b38: Merge "Make the DUN apn data secure." into froyo
Merge commit 'f9610b3842e030138c1dc327a3a467aaea02c227' into kraken

* commit 'f9610b3842e030138c1dc327a3a467aaea02c227':
  Make the DUN apn data secure.
2010-06-06 12:10:00 -07:00
Robert Greenwalt
77b32ddbbe Make the DUN apn data secure.
Rather than come out of the user-modifiable APN DB, the DUN APN data will
come first from a built-in resource and then potentially overriden by a secure
setting (which is gservices upgradable).

Also made the "require-dun" setting secure-setting overridable.
bug:2736390

Change-Id: I1e4644c3839f06c977b83797641f3948785146a2
2010-06-04 11:13:34 -07:00
The Android Open Source Project
3aecdb9d7e merge from open-source master
Change-Id: Ib711450566694550d9cb9ba01c25599010d2e5e4
2010-05-18 12:47:02 -07:00
Jean-Baptiste Queru
e25863c909 fix build
Change-Id: I86ee569ec81e6c690f7697237be7d94307014142
2010-05-18 11:54:42 -07:00
The Android Open Source Project
5ccb8b8c4d merge from open-source master
Change-Id: Ib90da5365c873e542d79f036c32ec9b178cd8da0
2010-05-18 11:08:12 -07:00
Jean-Baptiste Queru
d87ed5a5c5 Merge "Fix some typos and other cosmetic cleanups in telephony framework." 2010-05-18 10:34:42 -07:00
Jake Hamby
9f36f51844 Fix updating and deleting FDN entries with an empty alpha identifier.
- Fix AdnRecord.buildAdnString() to generate the correct record when alpha
identifier is empty. This allows the user to update an FDN entry to remove
the alpha identifier. Previously the entire entry would be deleted because
an empty record was generated here when the alpha identifier was empty,
rather than a record containing the phone number with an empty alpha tag.
Also, return null if the number or alpha tag are too long.

- Fix bug in IccProvider.delete() where efType was compared against local
FDN constant rather than IccConstants.EF_FDN. This would always return
false. Comparing with IccConstants.EF_FDN gives the intended behavior.

Change-Id: I0ea75d7e107c7318c9a48ae6e0a15845a718f4c0
2010-05-18 10:26:21 -07:00
Jean-Baptiste Queru
27b2267c0d Merge "Abort FDN delete when number is empty (instead of name)" 2010-05-18 10:14:14 -07:00
The Android Open Source Project
55b7d1243f merge from open-source master
Change-Id: I3e36061d7ba4b8a3962bf8391d663b861a4ede38
2010-05-14 13:52:52 -07:00
Jean-Baptiste Queru
a2adf8f394 Merge "SetLocaleByCarrier, only if its not an unknown carrier." 2010-05-14 11:39:06 -07:00
Jake Hamby
390de22024 Fix some typos and other cosmetic cleanups in telephony framework.
- Fix typos in Javadoc and comments.
- Fix Javadoc @link references to other classes/methods.
- Rename MISSING_UKNOWN_APN to MISSING_UNKNOWN_APN in DataConnection.
- Remove unused (and misspelled) RETRYIES_* consts in RetryManager.

Change-Id: I3b44ac8320d6c1e4c350be600c7ef266aaf735e4
2010-05-13 17:44:26 -07:00
The Android Open Source Project
b1110149cc merge from open-source master
Change-Id: I88a580162b34a80d1e3e7987b7a301c253afa0e8
2010-05-13 14:50:16 -07:00
Jean-Baptiste Queru
ecfb185eed Merge "Preserve '+' in phone numbers imported from SIM." 2010-05-13 11:06:28 -07:00
The Android Open Source Project
79090cb3da merge from open-source master
Change-Id: Ifb008642faddf6b83769cdaa5bd67d21591b9eaa
2010-05-12 14:54:38 -07:00
The Android Open Source Project
4adacd23d4 merge from open-source master
Change-Id: If6730b50627b2231bd345e594d8d30a37557849e
2010-05-12 14:53:25 -07:00
The Android Open Source Project
ccfd99b1e2 merge from open-source master
Change-Id: Ib092e6ae5151bbcdf56b9b3a7adbaee7bb5df8b5
2010-05-12 14:39:38 -07:00
The Android Open Source Project
7d9526445c merge from open-source master
Change-Id: Ib5ea9745c2b652d64646e3e28c12e63815321ff9
2010-05-12 14:10:23 -07:00
Naveen Kalla
052203e50c Change license for the UUS Information file.
Change-Id: Idd77e9078354a46605142c2eb704823aaa7d560d
2010-05-12 12:02:09 -07:00
The Android Open Source Project
fb234bbe5e merge from open-source master
Change-Id: I022d0781a232396e2b8a67a420ecf50e64b87d8c
2010-05-12 11:58:14 -07:00
Samuel Holmberg
ce2a97aeb8 Preserve '+' in phone numbers imported from SIM.
Contacts with phonenumbers beginning with '+' lose the '+' in the
phonebook when imported from SIM.

This was only noticable on ADN-records with unknown NPI-values which
isn't very usual.

Change-Id: I181249759ae3d4181dd3cf627c7a588394b80419
2010-05-11 15:21:43 -07:00
Naveen Kalla
0a5174a6e9 Add support for EVDO Rev B
Change-Id: I8588e8b342c51f4b79bced8ef8fe60d57f07aefa
2010-05-11 10:12:07 -07:00
Naveen Kalla
24440cf8a9 Support for User to User Signaling (UUS)
Enabling passing UUS information during MO and MT calls.

Change-Id: I31621c0a9d3c0607d99d18c49bb6c593cadd0327
2010-05-11 09:19:47 -07:00
Jean-Baptiste Queru
cf1250c149 Merge "Support to display message when operation is blocked due to FDN being enabled" 2010-05-11 09:13:19 -07:00
Naveen Kalla
18573e9281 Support to display message when operation is blocked due to FDN being enabled
The terminal disallows USSD, SMS, Voice Call and Supplementary services
operations for numbers not in the Fixed Dialing Number (FDN) list when the
FDN service is enabled. FDN_CHECK_FAILURE error is sent from the RIL and the
message needs to be displayed to indicate the failure.

Change-Id: I49bd63f69a3f0201125b17cd16db2e8fcf93ddc3
2010-05-11 09:12:00 -07:00
Jean-Baptiste Queru
ef2cf71420 Merge "Notify user regarding invalid number during MO call." 2010-05-11 09:08:24 -07:00
Mikael Danielsson
ac6461c69e Abort FDN delete when number is empty (instead of name)
Changed FDN delete to abort when number is empty rather than
when name is empty

3GPP TS 31.102 (USIM application) v9.1.0 states in chapter
4.2.24 EFFDN (Fixed Dialling Number) that the Dialling Number
field is mandatory whereas the Alpha Identifier is optional.
The current implementation of the user interface for editing
the fixed dialling list blocks creation and deletion list
entries without a name (corresponding to the Alpha Identifier)
but instead permits entries without a number. This is incompatible
with the USIM specification and
implementation.

This contribution corrects the implementation in line with
the USIM specification.

Change-Id: I7e2ca06e20401b517d705fc45c8b873b5c21cc4c
2010-05-10 16:30:02 -07:00
The Android Open Source Project
f4dffd8a45 merge from open-source master
Change-Id: I4c28751bd84b41259b12b0f3e3307e11234c8b64
2010-05-06 15:18:59 -07:00
Jean-Baptiste Queru
7751667c68 Merge "Telephony: Add PUK MMI code support for CDMA RUIM phones" 2010-05-05 16:30:53 -07:00
Jean-Baptiste Queru
12849c8021 Merge "Type Zero Sms should not be displayed/stored/notified." 2010-05-05 16:18:30 -07:00
The Android Open Source Project
f78964490d merge from open-source master
Change-Id: Ia9e1f4e049f5870386ea29ddb6e3ef028ea918da
2010-05-05 15:57:42 -07:00
Jean-Baptiste Queru
0938ef4215 Merge "telephony: Fix CID when CID is unknown" 2010-05-05 13:15:24 -07:00
Naveen Kalla
6308e48d40 Notify user regarding invalid number during MO call.
When user dials an invalid number, network returns an error indicating
"unobtainable number" (See the Table 10.5.123/3GPP TS 24.008 for
the possible failure causes). Changes done to display message to
indicate user that an invalid number has been dialed.

Change-Id: I477d64bc3b59cc205396f911ff9630c640f619f3
2010-04-23 09:43:15 -07:00
Wei Huang
9666bbdf1b am 7b88af67: Merge "bug #2618035: applying Moto\'s patch to fix a email/shortcode parsing bug." into froyo
Merge commit '7b88af679a9a3b5737343bb996ef392b76d19e73' into froyo-plus-aosp

* commit '7b88af679a9a3b5737343bb996ef392b76d19e73':
  bug #2618035: applying Moto's patch to fix a email/shortcode parsing bug.
2010-04-22 16:35:56 -07:00
Wei Huang
fdf3b26ba7 bug #2618035: applying Moto's patch to fix a email/shortcode parsing bug.
Change-Id: Ica1df6582533edf8d9a5825dbe510eeab4828309
2010-04-22 15:13:48 -07:00
John Wang
f77fff4b4e am 23c0b2eb: Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo
Merge commit '23c0b2eb5a610030ad5afe406987cb09c858ccfb' into froyo-plus-aosp

* commit '23c0b2eb5a610030ad5afe406987cb09c858ccfb':
  Add ILLEGAL_SIM_OR_ME error code.
2010-04-21 14:46:06 -07:00
John Wang
7fb4b8455c Add ILLEGAL_SIM_OR_ME error code.
It is for bug 2571583 to provide better failure information of network operator selection.

Network selection returns ILLEGAL_SIM_OR_ME when the failure is
permanent and no retries needed, such as illegal SIM, ME, HRL config, etc.

Change-Id: Iaf70bef64d3cbf35e4d9915418cbb5b78607f73e
2010-04-21 11:34:15 -07:00
The Android Open Source Project
f021d12f6f merge from open-source master
Change-Id: I08f1feae65b1dfc3f740d78654c267f2e3ae5e85
2010-04-21 09:10:43 -07:00
Alex Yakavenka
2aba0ec873 Fix printing order of phone objects creation 2010-04-19 20:28:22 -07:00
Jey
eccd93c7eb SetLocaleByCarrier, only if its not an unknown carrier.
Change-Id: Ia218b3622a23cc0fc1bb2c1606c832ecc561d5bf
2010-04-16 13:57:42 -07:00
Naveen Kalla
e9c0a6d737 Telephony: Add PUK MMI code support for CDMA RUIM phones
Add support to unlock RUIM using PUK. PUK is entered using MMI codes.
2010-04-13 14:58:41 -07:00
Naveen Kalla
c6dd77d04a telephony: Fix CID when CID is unknown
Unknown CID is indicated as 0xFFFFFFFF by ril. When telephony receives that
value, set CID to UNKNOWN.
2010-04-12 11:16:22 -07:00
Wink Saville
662262ac04 Fix a FATAL ClassCastException in DataConnection.java
bug: 2583290
Change-Id: I93e0307664427b29942b1ed1e5acbf21e78a605f
2010-04-09 08:57:31 -07:00
Dan Egnor
5945579e4e Merge "Change TrafficStats to a new JNI implementation." into froyo 2010-04-08 14:45:07 -07:00
Dan Egnor
2b4abcd0c7 Change TrafficStats to a new JNI implementation.
Also change phone's ConnectionStateTrackers to use it directly,
rather than through the INetStat binder interface.

Bug: 2578938
Change-Id: I8858e2609cbec3be845a0ce5178cb03f67e01b41
2010-04-07 19:06:29 -07:00
John Wang
56c2d2ff27 Add emergencyOnly indicator in ServiceState.
For bug 2536842 to show signal strength in Emergency mode.

The STATE_EMERGENCY_ONLY of ServiceState is not in-use.

So add a hide interface to indicate Emergency mode.

Change-Id: I19398ac5e73a722dcaaf744347f961d1fa7513ac
2010-04-07 16:06:13 -07:00
Naveen Kalla
c16889dc00 Type Zero Sms should not be displayed/stored/notified.
Type Zero messages indicated by TP_PID field set to value 0x40,
should not be displayed/stored/notified. They should only be
acknowledged.
2010-03-26 05:42:04 -07:00
The Android Open Source Project
02034d3568 merge from open-source master
Change-Id: Ie60db5faf407344b8fbe3d5c1e7c01e927ff251e
2010-03-22 15:55:38 -07:00
Jake Hamby
633dfb6da6 Fix some typos and logging of calls to CDMA methods.
Fixed some comment typos and cleaned up logging of unexpected calls to
CDMA-specific methods on a non-CDMA device.

Change-Id: Ia6e5fba765122cbf3186fd9fecca7a3931a76dcc
2010-03-22 14:41:43 -07:00
Brad Fitzpatrick
2e805b19cd Grammar fixes.
Change-Id: I77672d2260c26aee146bb6a853137c14e3db1f28
2010-03-22 10:10:51 -07:00
The Android Open Source Project
1da49e45a8 merge from open-source master
Change-Id: I23af6296f0867bea2a2da72d4eb3dda93025b1ac
2010-03-19 16:36:32 -07:00