4 years agoMerge tag android-4.4.2_r1 rel-tegranote-r6-partner daily-2014.08.08.0_rel-tegranote-r6-partner
Harry Hong [Thu, 10 Jul 2014 01:55:53 +0000]
Merge tag android-4.4.2_r1

5 years agoFix OOBE crash/DoS after receiving 0-byte WAP push.
Jake Hamby [Tue, 3 Dec 2013 21:21:40 +0000]
Fix OOBE crash/DoS after receiving 0-byte WAP push.

Add a try/catch block around the code in WapPushOverSms.dispatchWapPdu(),
so we don't get into a reboot trap on receiving weirdly formed messages.
Only catch ArrayIndexOutOfBoundsException, which is difficult to
prevent inside dispatchWapPdu() for 0-byte PDUs or other unusual
contents. The caller should probably catch any unhandled exceptions of other types and log them with stack traces.

Bug: 11967705
Change-Id: Iabfec68d2564dd438d45c80cdba877bf19fa0397

5 years agoif provisioning apn conditionally restart the radio.
Wink Saville [Fri, 15 Nov 2013 17:20:38 +0000]
if provisioning apn conditionally restart the radio.

Some radios need a swift kick in the butt after provisioning.

Bug: 11673637
Change-Id: Ie758a303fd751d204fd6baa60217e88df6376aae

5 years agoMerge "Telephony: unchange SIM info from CDMAPhone when SIM exists" into klp-dev
Wink Saville [Thu, 14 Nov 2013 00:38:33 +0000]
Merge "Telephony: unchange SIM info from CDMAPhone when SIM exists" into klp-dev

5 years agoMerge "Do not attempt to configure null preferred activity" into klp-dev
David Braun [Wed, 13 Nov 2013 23:42:08 +0000]
Merge "Do not attempt to configure null preferred activity" into klp-dev

5 years agoDo not attempt to configure null preferred activity
David Braun [Wed, 13 Nov 2013 23:01:24 +0000]
Do not attempt to configure null preferred activity

On non-phone devices the default SMS app is null. During the set/get paths
we would not try to configure the activity, but during the package update
path we called 'getDefaultSendToApplication" and configured it without
validating that it is non-null. This change adds the null check.

Bug: 11482259 When default SMS app changes we need to update the default app for the SEND intent
Change-Id: I227cfd803fd0667d78918a720b5a6eae9d57ea9d

5 years agoTelephony: unchange SIM info from CDMAPhone when SIM exists
Wink Saville [Wed, 13 Nov 2013 21:33:43 +0000]
Telephony: unchange SIM info from CDMAPhone when SIM exists

This change is to prevent for updating the properties of 3GPP SIM
from the CDMAPhone when the 3GPP SIM exists on the card.

Bug: 11189478
Bug: 11360679
Change-Id: If849f8e0d6d6a1750cae045e35f3f92d73db4a20

5 years agoMerge "Use settings DB only when mcc/mnc matches SIM" into klp-dev
Robert Greenwalt [Wed, 13 Nov 2013 21:04:00 +0000]
Merge "Use settings DB only when mcc/mnc matches SIM" into klp-dev

5 years agoMerge "Update preferred activity for SMS related SENDTO intents" into klp-dev
David Braun [Wed, 13 Nov 2013 19:34:46 +0000]
Merge "Update preferred activity for SMS related SENDTO intents" into klp-dev

5 years agoUse settings DB only when mcc/mnc matches SIM
Sungmin Choi [Tue, 12 Nov 2013 06:53:57 +0000]
Use settings DB only when mcc/mnc matches SIM

Bug: 11600521
Change-Id: Iaeb1f279bf454ad0e7b933b8ac97d6384d599b59

5 years agoUpdate preferred activity for SMS related SENDTO intents
David Braun [Tue, 12 Nov 2013 21:38:52 +0000]
Update preferred activity for SMS related SENDTO intents

Updates the preferred SENDTO activity for sms/mms schemes so that the user
will not see an intent disambiguation dialog for SENDTO sms/mms.

- Update preferred activity on set default SMS app
- Update preferred activity on "secure" get default SMS app
- Update preferred activity on package install/uninstall

Bug:11482259 When default SMS app changes we need to update the default app for the SEND intent
Change-Id: Ib2752fe84389f1c50cf2aa5841e75c3913b94e18

5 years agoNotify all ApnContexts on a conn of Disconnect
Robert Greenwalt [Tue, 12 Nov 2013 18:17:53 +0000]
Notify all ApnContexts on a conn of Disconnect

Without this you can end up with default thinking
it's connected when it's actually not.

bug:10212445
Change-Id: Iffe3bf2064ac6c9f8e68ddb0d2b5115deaac2033

5 years agoFix documenation IMS registration state.
Wink Saville [Sat, 9 Nov 2013 00:38:56 +0000]
Fix documenation IMS registration state.

Bug: 11599127
Change-Id: Id0016bca45ea84983c9280f55b0b1ccdcececc03

5 years agoMerge "SMS over IMS bug fixes" into klp-dev
Wink Saville [Fri, 8 Nov 2013 23:28:56 +0000]
Merge "SMS over IMS bug fixes" into klp-dev

5 years agoMerge "Fix GSMPhone.getServiceState() when mSST is null." into klp-dev
Jake Hamby [Fri, 8 Nov 2013 23:08:58 +0000]
Merge "Fix GSMPhone.getServiceState() when mSST is null." into klp-dev

5 years agomerge in release branch changes (no-op).
Ed Heyl [Fri, 8 Nov 2013 21:23:50 +0000]
merge in release branch changes (no-op).

5 years agoFix GSMPhone.getServiceState() when mSST is null.
Jake Hamby [Fri, 8 Nov 2013 20:33:42 +0000]
Fix GSMPhone.getServiceState() when mSST is null.

Prevent NPE when getServiceState() is called on GSMPhone after
removeReferences() is called on it.

Bug: 11561165
Change-Id: I77c3638dc33b24711db2d8541b067e17e30255a1

5 years agoSMS over IMS bug fixes
Sukanya Rajkhowa [Wed, 30 Oct 2013 04:06:08 +0000]
SMS over IMS bug fixes

This change includes the following:
1) SMS over IMS remaining patches which address review comments

2) Fix for Bug:11378993
For MT SMS over IMS, if an application uses the createFromPdu(byte[] pdu) API
instead of createFromPdu(byte[] pdu,String format) API, we first try to create
SmsMessage from raw PDU with the format of active phone. That either returns a
valid SmsMessage object or throws a RuntimeException causing the correct format
to be used the next time. If GsmSmsAddress is not valid, we should throw
a RuntimeException which is handled by createFromPdu(byte[] pdu)

3) Fix for Bug:11424054
Register for ICC changes and handle new SMS on ICC

Bug: 11378993, 11424054
Change-Id: I94bcfcf93d8205c2916997091617899c6ebdd5e5

5 years agomerge in klp-mr1-release history after reset to klp-dev
The Android Automerger [Wed, 6 Nov 2013 14:00:54 +0000]
merge in klp-mr1-release history after reset to klp-dev

5 years agoMerge "Add single-pdn arbitration." into klp-dev
Robert Greenwalt [Tue, 5 Nov 2013 23:58:24 +0000]
Merge "Add single-pdn arbitration." into klp-dev

5 years agoMerge "problem to send SMS message by bluetooth MAP profile." into klp-dev
Zhihai Xu [Tue, 5 Nov 2013 23:42:30 +0000]
Merge "problem to send SMS message by bluetooth MAP profile." into klp-dev

5 years agoMerge "add SMS write permission for bluetooth package to support MAP profile." into...
Zhihai Xu [Tue, 5 Nov 2013 23:40:34 +0000]
Merge "add SMS write permission for bluetooth package to support MAP profile." into klp-dev

5 years agoAdd single-pdn arbitration.
Robert Greenwalt [Thu, 31 Oct 2013 00:22:44 +0000]
Add single-pdn arbitration.

If a device or network can only support a single data connection
then we need to tear down lower priority connections in favor
of higher priority requests.

bug:10212445
Change-Id: I5ff38ae3be993aee51b6716045e6857b4f2942af

5 years agoMerge "Do not display dialog when PUK attempts remaining is 0." into klp-dev
Wink Saville [Tue, 5 Nov 2013 19:26:56 +0000]
Merge "Do not display dialog when PUK attempts remaining is 0." into klp-dev

5 years agomerge in klp-mr1-release history after reset to klp-dev
The Android Automerger [Tue, 5 Nov 2013 14:04:10 +0000]
merge in klp-mr1-release history after reset to klp-dev

5 years agoUse new PhoneNumberUtils method for CDMA MO SMS formatting.
Jake Hamby [Mon, 4 Nov 2013 23:26:01 +0000]
Use new PhoneNumberUtils method for CDMA MO SMS formatting.

For CDMA networks, convert "+" prefix to "011" if the home network
is using the North American Numbering Plan (NANP). Previously the
roaming network numbering plan was also checked, but for MO SMS,
only the home network numbering plan is relevant.

Bug: 11360679
Change-Id: Ia54f00c0ff2012622003ed4003b7fb59451b0bea

5 years agoDo not display dialog when PUK attempts remaining is 0.
Wink Saville [Mon, 4 Nov 2013 20:15:54 +0000]
Do not display dialog when PUK attempts remaining is 0.

When using MMI codes to set a new pin and the attempts remaining becomes
zero the lock screen, KeyguardSimPukView, will be handling resetting the
PIN using the PUK. Therefore we set the MmiCode state to CANCELLED which
causes the dialog to be dismissed. If we don't do this then after setting
the new PIN from the lock screen the dialog will still be present
indicating the user still needs to set the PIN.

Bug: 9928717
Change-Id: Ic7dc51ba684a1fd623f2cab0a89f40ef8ff491d5

5 years agoWhen phone changes update InBoundSmsHandlers and CellBroadcastHandlers.
Wink Saville [Thu, 31 Oct 2013 18:50:52 +0000]
When phone changes update InBoundSmsHandlers and CellBroadcastHandlers.

Without this change for devices where the phone can change, for instance
on N5 with Sprint the phone will change from a GSMPhone to a CDMALTEPhone
and messages will not be sent to the appropriate handler.

For Sprint this was most readily seen when the voice mail notification
wasn't sent to the notification manager.

Bug: 11254397
Change-Id: Ia0e764cf6fa04208a7e194a35435f251a177309f

5 years agoproblem to send SMS message by bluetooth MAP profile.
Zhihai Xu [Thu, 31 Oct 2013 23:52:28 +0000]
problem to send SMS message by bluetooth MAP profile.

Currently SMSDispatcher will add the message to Sms.Sent database
for all non default SMS application.
This won't work for Bluetooth MAP profile.
In the bluetooth MAP spec, at 5.8 PushMessageFunction,
there are a parameter to control how to send the message by Bluetooth MAP.
Transparent:This parameter may be used to indicate to the MSE(phone)
that no copy of the message shall be kept in the 'Sent' folder
after the message was sent. This is especially useful for telematics applications,
 e.g., frequent sending of car's speed and position for traffic measurements
(floating car data).
This application parameter is optional. The value of this parameter is "OFF"
(keep messages in 'Sent' folder) and "ON" (don't keep messages in Sent' folder).
If Transparent is "ON", we shouldn't put the message in Sent folder.
SMSDispatcher always put the message in Sms.Sent
which is mapped to the Sent folder in bluetooth MAP.
Prefer to let bluetooth to decide whether put the message in Sms.Sent based
on Transparent parameter value.

bug:11454636
Change-Id: I2e6c8deb5c4ed8bc9a3d90d492f4d4eb7dac7e5c

5 years agoMerge "When phone changes update InBoundSmsHandlers and CellBroadcastHandlers." into...
Wink Saville [Thu, 31 Oct 2013 20:46:08 +0000]
Merge "When phone changes update InBoundSmsHandlers and CellBroadcastHandlers." into klp-dev

5 years agoadd SMS write permission for bluetooth package to support MAP profile.
Zhihai Xu [Wed, 30 Oct 2013 19:34:57 +0000]
add SMS write permission for bluetooth package to support MAP profile.

bug:11415002
Change-Id: I177210e4139560b066ae40f100ca09ea35805359

5 years agoWhen phone changes update InBoundSmsHandlers and CellBroadcastHandlers.
Wink Saville [Thu, 31 Oct 2013 18:50:52 +0000]
When phone changes update InBoundSmsHandlers and CellBroadcastHandlers.

Without this change for devices where the phone can change, for instance
on N5 with Sprint the phone will change from a GSMPhone to a CDMALTEPhone
and messages will not be sent to the appropriate handler.

For Sprint this was most readily seen when the voice mail notification
wasn't sent to the notification manager.

Bug: 11254397
Change-Id: Ia0e764cf6fa04208a7e194a35435f251a177309f

5 years agoTelephony: set default language of Canada as 'en'
duho.ro [Sun, 27 Oct 2013 03:29:09 +0000]
Telephony:  set default language of Canada as 'en'

The Canada SIM cards have the dual-IMSI functionality for the roaming
service. If it is working and the default system language is not set,
the system language can be changed by the MCC of the 2nd IMSI. So, the
default language should not be 'null'. This patch fills in the default
language of Canada as English.

Bug: 11361337
Change-Id: Iea6213e3ceca4a1cf054ebd9a13bb1d5574013b1

5 years agoFew PIN/PUK fixes
Wink Saville [Thu, 24 Oct 2013 23:56:09 +0000]
Few PIN/PUK fixes

Following changes have been made as part of this:
-> Changes done to display retry counter on wrong entry of
   PIN1,and message to indicate Code accepted/PIN1 blocked
   during PIN1 verification as per certain carrier requirements.
-> The current APIs that are used to verify the PIN and PUK only convey
   whether the operation succeeded or failed. As a result on ANY failure
   clients ask the user to re-enter the PIN.
   Add 2 new APIs that report the actual error code and returns the
   number of attempts remaing in case of failure.
-> FDN Service state was derived based on the state of PIN2. Update the
   state of FDN service based on the FACILTY_LOCK messages instead.
-> Change the default value of function getIccLockEnabled to false.
   When sim is deactivated/absent & user navigates to
   Settings->Security->Set up SIM/RUIM card lock,
   checkbox for "Lock Sim Card" option should be
   unchecked by default.
-> PIN1 can be changed only after enabling SIM lock. RIL returns
   REQUEST_NOT_SUPPORTED error if user tries to change PIN1 without
   enabling SIM lock.
   Handle the error and display appropriate message when trying to
   change PIN1 using MMI code.
-> Added MMI support for change PIN1/PIN2 and unblocking PIN2

Bug: 9928717
Change-Id: I73718c9e6a8aa7244097e0dd4593a6226ff0ac08

5 years agoMerge "more sms provider docs" into klp-dev
Scott Main [Thu, 24 Oct 2013 00:13:16 +0000]
Merge "more sms provider docs" into klp-dev

5 years agoFix bug in isOperatorConsideredNonRoaming
Robert Greenwalt [Tue, 22 Oct 2013 22:30:05 +0000]
Fix bug in isOperatorConsideredNonRoaming

Mistakenly exits if the first check of many doesn't match.

bug:11136023
Change-Id: I04883d75f32214def360292c90b2f628c4e60991

5 years agomore sms provider docs
Scott Main [Mon, 21 Oct 2013 20:47:14 +0000]
more sms provider docs

Change-Id: I1967446a9709d88625cbcbc89b70228744dbf38a

5 years agoChange how we use provisioning url so post works rel-tegranote-r4-partner daily-2014.02.24.0_rel-tegranote-r4-partner daily-2014.08.05.0_rel-tegranote-r6-partner
Robert Greenwalt [Thu, 17 Oct 2013 19:38:32 +0000]
Change how we use provisioning url so post works

Needed to do an http post instead of a get for one carrier.
Do this by putting an auto-submitting form in the data to be
interpreted as a html doc by the browser.  The ACTION_VIEW
intent only works on http uri, but by specifying ACTION_MAIN/
CATEGORY_APP_BROWSER we could use data:text/html.

bug:11168810
Change-Id: Ifd33e1c3c7f9f40b6add39e446e6a7d7cde22549

5 years agoMerge "Change how we use provisioning url so post works" into klp-dev
Robert Greenwalt [Thu, 17 Oct 2013 23:00:56 +0000]
Merge "Change how we use provisioning url so post works" into klp-dev

5 years agoChange how we use provisioning url so post works
Robert Greenwalt [Thu, 17 Oct 2013 19:38:32 +0000]
Change how we use provisioning url so post works

Needed to do an http post instead of a get for one carrier.
Do this by putting an auto-submitting form in the data to be
interpreted as a html doc by the browser.  The ACTION_VIEW
intent only works on http uri, but by specifying ACTION_MAIN/
CATEGORY_APP_BROWSER we could use data:text/html.

bug:11168810
Change-Id: Ifd33e1c3c7f9f40b6add39e446e6a7d7cde22549

5 years agoMerge "Do not allow SMS event receivers to abort the broadcast" into klp-dev
Wei Huang [Thu, 17 Oct 2013 01:52:13 +0000]
Merge "Do not allow SMS event receivers to abort the broadcast" into klp-dev

5 years agoMerge "Persist SMS messages sent by other than the default SMS app" into klp-dev
Wei Huang [Thu, 17 Oct 2013 01:47:10 +0000]
Merge "Persist SMS messages sent by other than the default SMS app" into klp-dev

5 years agomerge in klp-release (no-op)
Ed Heyl [Thu, 17 Oct 2013 00:43:18 +0000]
merge in klp-release (no-op)

5 years agoClear CDMA latitude/longitude when location setting is off.
Jake Hamby [Wed, 16 Oct 2013 21:27:56 +0000]
Clear CDMA latitude/longitude when location setting is off.

Clear CDMA base station latitude/longitude when returning
cell locations if user's location setting is disabled.

Bug: 11104404
Change-Id: I120c236ee57e37417ba7db3356678d33a087cc3d

5 years agoDo not allow SMS event receivers to abort the broadcast
David Braun [Wed, 16 Oct 2013 23:17:28 +0000]
Do not allow SMS event receivers to abort the broadcast

This prevent apps from aborting the SMS related broadcasts so that all
apps interested in seeing them will now receive the broadcast.

Bug: 11259375 Do not allow apps to abort SMS/MMS broadcasts
Change-Id: I2620899b580b8861efebcc39408c875b4033cc53

5 years agoPersist SMS messages sent by other than the default SMS app
David Braun [Wed, 16 Oct 2013 23:08:42 +0000]
Persist SMS messages sent by other than the default SMS app

Bug: 11256715 SmsManger.sendTextMessage() and SmsManager.sendMultiPartTextMessage() need to store the message in SmsProvider if called from non-default SMS app
Change-Id: I9f08435edd767f39863d018d59ec1d44e3d2128b

5 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Wed, 16 Oct 2013 04:14:10 +0000]
merge in klp-release history after reset to klp-dev

5 years agotelephony: Fix "R" icon displayed when device is searching or in LTE
Wink Saville [Wed, 16 Oct 2013 02:11:51 +0000]
telephony: Fix "R" icon displayed when device is searching or in LTE

Bug: 10745813, 10771508
Change-Id: I6741e14785484fe6af19d60487f4d545e568ccf9

5 years agoFix b10864885
Wink Saville [Tue, 15 Oct 2013 19:42:50 +0000]
Fix b10864885

Created getLocaleForLanguageCountry so that only one updateConfiguration
was needed to update Configuration.mcc/mnc/locale/userSetLocale. Previously
it took two updates, this streamlines the update making it more efficient.

Removed the conditional that was in setLocalFromMccIfNeeded on
getLteOnCdmaModeStatic which causes world phones that support cdma on
lte as well as gsm to not set the locale. This condiational was add to
support the multi logical SIMs for Verizon which has NV, RUIM and CSIM.

The intent of the conditional was to allow the EFpl/EFli fields of the
CSIM to be used to set the locale. But it doesn't work because of the
technique of using reading the current configuration, modifying it and
then writing it back would cause the current mode to be persisted because
of bug 11171996.

In short, bug 11171996 set the userSetLocale flag to true so when the
mcc/mnc is updated it also caused the current locale, en_US, to be
persisted not the "new" locale based on the mcc/mnc. Thus later, when the
CSIM was loaded it wouldn't be persisted anyway, because en_US was
already persisted.

Added the "persist.always.persist.locale" system property so that
you can test MccTable.updateMccMncConfiguration being called after
SetupWizard starts. Typically when starting a device that has been wiped
MccTable.updateMccMncConfigration is called before SetupWizard starts.
This means SetupWizard has the "proper" locale rather than en_US, the
default setup, when ActivityManagerService is constructed.

But, if you set persist.always.persist.locale to 1, persist.sys.language
to "en" and persist.sys.country to "US" and then reboot without wiping
SetupWizard will start first. As such SetupWizard will start with en_US
as its locale. A short time later MccTable.updateMccMncConfiguration will
be called and it will set the locale to the "proper" value based on the
mcc/mnc if you've set persist.always.persist.locale to 1. This allows the
testing of SetupWizard running first.

Finally I'm using Slog for logging as it makes it easier to debug the
interaction of MccTable, SetupWizard and ActivityManagerService.

Bug: b10864885
Change-Id: I19709ebf18f6d32af1b1b16ced511d331e145cf7

5 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Mon, 14 Oct 2013 02:20:32 +0000]
merge in klp-release history after reset to klp-dev

5 years agoMerge "Make SmsApplication checks more defensive" into klp-dev
David Braun [Sun, 13 Oct 2013 23:17:54 +0000]
Merge "Make SmsApplication checks more defensive" into klp-dev

5 years agoMake SmsApplication checks more defensive
David Braun [Sun, 13 Oct 2013 21:23:17 +0000]
Make SmsApplication checks more defensive

When SmsApplication::getApplication is called it will check to see if the
configured default SMS app and the phone package have the needed app ops
to work properly. If the call was made from a privilidged caller where
updateIfNeeded == true then the issue will be corrected, if the call was
made from an insecure caller we will return null indicating no default SMS
app which will cause client apps to know that they are not properly set
as the default SMS app. Either way we log an error.

When SmsApplication::setDefaultApplication is called we will ensure that
even if the previous app is no longer enabled or no longer set up as a
valid SMS app, we will still revoke it's OP_WRITE_SMS permission.

Bug: 11071837 Hangouts on KLP lost the WRITE_SMS permission
Change-Id: Ifea39a3d63e4ec3a30a6a1fa5834878dcc9ccfa0

5 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Sun, 13 Oct 2013 13:02:04 +0000]
merge in klp-release history after reset to klp-dev

5 years agotelephony: redirect call barring MMI code to other purpose
duho.ro [Fri, 27 Sep 2013 07:50:32 +0000]
telephony: redirect call barring MMI code to other purpose

Some operators redirect call barring MMI codes to other purpose.
For instance, *333# should be processed as USSD code with Indonesia
Axis SIM and Indonesia Hutchison SIM.  This change is adding an array
for call barring MMI code to config.xml. So, we can redefine the array
for redirecting the call barring MMI codes. The MMI code is compared
with the call barring MMI codes from config.xml.

Bug: 10101303

Change-Id: Ib21540a90c64e105cd4bc1864238329d594cd056

5 years agotelephony: Set profile DATA_PROFILE_TETHERED when DUN type
Sungmin Choi [Sat, 7 Sep 2013 07:22:48 +0000]
telephony: Set profile DATA_PROFILE_TETHERED when DUN type

Bug: 11152852
Change-Id: I018e3dfb9c8183b11faedc83cc40be658173c4a3

Conflicts:
src/java/com/android/internal/telephony/dataconnection/DcTracker.java

5 years agoSupport SMS over IMS
Sukanya Rajkhowa [Sat, 14 Sep 2013 02:06:47 +0000]
Support SMS over IMS

ImsSMSDispatcher is part of IccSmsInterfaceManager.
It always receives calls to send sms first and decides
whether to use ims call flow or gsm/cdma based on response
to REQUEST_IMS_REGISTRATION_STATE.

When ims is registered and sms is supported, the request also returns
sms format to use.

In case of sms over ims failure, RIL_REQUEST_IMS_SEND_SMS sets
messageRef from RIL_SMS_RESPONSE of corresponding failed MO SMS, and
sets retry field to non-zero. If voice is available, sends
RIL_REQUEST_IMS_SEND_SMS retries with data encoded based on voice tech
available.  If voice is not available, sets retry counter to max and
skips retries and sends failure to client.

Bug: 9626411

Change-Id: I4c63c8fc0eb2191847b509e66772e3de27d491ed
Signed-off-by: Ed Tam <etam@google.com>

Conflicts:
src/java/com/android/internal/telephony/gsm/GSMPhone.java

5 years agoReorganize IccSmsInterfaceManager
Sukanya Rajkhowa [Sat, 14 Sep 2013 02:01:05 +0000]
Reorganize IccSmsInterfaceManager

Move duplicate functionality of RuimSmsInterfaceManager and
SimSmsInterfaceManager to the parent IccSmsInterfaceManager.
Earlier IccSmsInterfaceManagerProxy could only support RUIM
on CDMALTEPhone and SIM on GSMPhone.New architecture allows
for RUIM and SIM support for both GSMPhone and CDMALTEPhone

Change-Id: I8a3046fd0e8c366beefea267a79e14e4b1941d09

5 years agotelephony: Set profile DATA_PROFILE_TETHERED when DUN type
Sungmin Choi [Sat, 7 Sep 2013 07:22:48 +0000]
telephony: Set profile DATA_PROFILE_TETHERED when DUN type

Bug: 11152852
Change-Id: I018e3dfb9c8183b11faedc83cc40be658173c4a3

Conflicts:
src/java/com/android/internal/telephony/dataconnection/DcTracker.java

5 years agomerge in KQS81M
Ed Heyl [Tue, 8 Oct 2013 22:40:51 +0000]
merge in KQS81M

5 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 8 Oct 2013 13:00:50 +0000]
merge in klp-release history after reset to klp-dev

5 years agoMerge "Do not allow default SMS application to be set or get on non-phone devices...
David Braun [Mon, 7 Oct 2013 18:10:44 +0000]
Merge "Do not allow default SMS application to be set or get on non-phone devices" into klp-dev

5 years agoam bffd2117: am ef3149f4: Fix build.
Wink Saville [Mon, 7 Oct 2013 00:10:55 +0000]
am bffd2117: am ef3149f4: Fix build.

* commit 'bffd2117a84bec9cfadef300177efe3b2ac4d89d':
  Fix build.

5 years agoam 7351fdfb: (-s ours) am 1b8d3498: Hipri should not be enabled by default. DO NOT...
Wink Saville [Mon, 7 Oct 2013 00:10:54 +0000]
am 7351fdfb: (-s ours) am 1b8d3498: Hipri should not be enabled by default. DO NOT MERGE.

* commit '7351fdfb5b61da990f72cdc18dead250a9e5379c':
  Hipri should not be enabled by default. DO NOT MERGE.

5 years agoam e3e070ec: (-s ours) am 59986fee: Remap NONE to UNKNOWN on GENERIC_FAILURES for...
Wink Saville [Mon, 7 Oct 2013 00:10:54 +0000]
am e3e070ec: (-s ours) am 59986fee: Remap NONE to UNKNOWN on GENERIC_FAILURES for SETUP_DATA_CALL. DO NOT MERGE.

* commit 'e3e070ec720cceb3f12d9c720e42519797aff583':
  Remap NONE to UNKNOWN on GENERIC_FAILURES for SETUP_DATA_CALL. DO NOT MERGE.

5 years agoam e065bce5: (-s ours) am e188b658: Fix NPE when exiting DcDefaultState. DO NOT MERGE.
Wink Saville [Mon, 7 Oct 2013 00:10:54 +0000]
am e065bce5: (-s ours) am e188b658: Fix NPE when exiting DcDefaultState. DO NOT MERGE.

* commit 'e065bce5478efc479d37466fd8923e0e2422ec5d':
  Fix NPE when exiting DcDefaultState. DO NOT MERGE.

5 years agoam 16758906: (-s ours) am f02d966c: Handling data registration and radio technology...
Wink Saville [Mon, 7 Oct 2013 00:10:53 +0000]
am 16758906: (-s ours) am f02d966c: Handling data registration and radio technology changing. DO NOT MERGE.

* commit '1675890645834ed5d9aee23b8de2c0d5d66d6d15':
  Handling data registration and radio technology changing. DO NOT MERGE.

5 years agoam 2f25f745: (-s ours) am ec56ef5d: Change DcTracker to not connect or retry if detac...
Wink Saville [Mon, 7 Oct 2013 00:10:53 +0000]
am 2f25f745: (-s ours) am ec56ef5d: Change DcTracker to not connect or retry if detached. DO NOT MERGE.

* commit '2f25f74592dcc0d13035f8adfdb90b7bc6a54e06':
  Change DcTracker to not connect or retry if detached. DO NOT MERGE.

5 years agoam 74abae35: (-s ours) Merge commit \'89518902\' into merge-conflict
Wink Saville [Mon, 7 Oct 2013 00:10:53 +0000]
am 74abae35: (-s ours) Merge commit \'89518902\' into merge-conflict

* commit '74abae3576f9ae6f8ad96762851d880d3853e553':
  Change DcTracker construction so only initialization is preformed. DO NOT MERGE.

5 years agoam ef3149f4: Fix build.
Wink Saville [Mon, 7 Oct 2013 00:03:52 +0000]
am ef3149f4: Fix build.

* commit 'ef3149f4e736344e55f0fc8ceb419edf66119969':
  Fix build.

5 years agoam 1b8d3498: Hipri should not be enabled by default. DO NOT MERGE.
Wink Saville [Mon, 7 Oct 2013 00:03:51 +0000]
am 1b8d3498: Hipri should not be enabled by default. DO NOT MERGE.

* commit '1b8d3498dde73d31c8d6e48050b6240164a8fcc1':
  Hipri should not be enabled by default. DO NOT MERGE.

5 years agoam 59986fee: Remap NONE to UNKNOWN on GENERIC_FAILURES for SETUP_DATA_CALL. DO NOT...
Wink Saville [Mon, 7 Oct 2013 00:03:51 +0000]
am 59986fee: Remap NONE to UNKNOWN on GENERIC_FAILURES for SETUP_DATA_CALL. DO NOT MERGE.

* commit '59986fee9e72a2298e08d118d51f22f3c86be3b4':
  Remap NONE to UNKNOWN on GENERIC_FAILURES for SETUP_DATA_CALL. DO NOT MERGE.

5 years agoam e188b658: Fix NPE when exiting DcDefaultState. DO NOT MERGE.
Wink Saville [Mon, 7 Oct 2013 00:03:50 +0000]
am e188b658: Fix NPE when exiting DcDefaultState. DO NOT MERGE.

* commit 'e188b6586d6683ef1fa8dc781cbf4e66ee71a4c3':
  Fix NPE when exiting DcDefaultState. DO NOT MERGE.

5 years agoam f02d966c: Handling data registration and radio technology changing. DO NOT MERGE.
Wink Saville [Mon, 7 Oct 2013 00:03:49 +0000]
am f02d966c: Handling data registration and radio technology changing. DO NOT MERGE.

* commit 'f02d966cc7e87eaea595f05714857c4ca99a36e6':
  Handling data registration and radio technology changing. DO NOT MERGE.

5 years agoam ec56ef5d: Change DcTracker to not connect or retry if detached. DO NOT MERGE.
Wink Saville [Mon, 7 Oct 2013 00:03:49 +0000]
am ec56ef5d: Change DcTracker to not connect or retry if detached. DO NOT MERGE.

* commit 'ec56ef5d31886afbae233e5cccb8fbf78cfa01c4':
  Change DcTracker to not connect or retry if detached. DO NOT MERGE.

5 years agoMerge commit '89518902' into merge-conflict
Wink Saville [Sun, 6 Oct 2013 23:59:07 +0000]
Merge commit '89518902' into merge-conflict

* commit '89518902':
  Change DcTracker construction so only initialization is preformed. DO NOT MERGE.

5 years agoDo not allow default SMS application to be set or get on non-phone devices
David Braun [Fri, 4 Oct 2013 23:52:29 +0000]
Do not allow default SMS application to be set or get on non-phone devices

Bug: 11072894 People app should not launch into default SMS app on tablets
Change-Id: I9cedf3840f46bbc135f535b60659e5527f79a5aa

5 years agoRevert "Stop using the sim mnc/mcc to set wifi country."
Robert Greenwalt [Thu, 3 Oct 2013 21:14:32 +0000]
Revert "Stop using the sim mnc/mcc to set wifi country."

This reverts commit 78d801a78087b6a2419f0820628d0273df53203f.

bug:11064682
Change-Id: I46f5b90de417636d03bfa5932684f0ace68a3f6e

5 years agoMerge "Revert "Stop using the sim mnc/mcc to set wifi country."" into klp-dev
Robert Greenwalt [Fri, 4 Oct 2013 18:34:07 +0000]
Merge "Revert "Stop using the sim mnc/mcc to set wifi country."" into klp-dev

5 years agoFix build.
Wink Saville [Thu, 3 Oct 2013 23:42:08 +0000]
Fix build.

The merge conflicts I'd resolved internally got overwritten when pushed
up the other changes.

Change-Id: I6a3cd569e6cf1a0fb09a19379d65724d43c11bdf

5 years agoRevert "Stop using the sim mnc/mcc to set wifi country."
Robert Greenwalt [Thu, 3 Oct 2013 21:14:32 +0000]
Revert "Stop using the sim mnc/mcc to set wifi country."

This reverts commit 78d801a78087b6a2419f0820628d0273df53203f.

bug:11064682
Change-Id: I46f5b90de417636d03bfa5932684f0ace68a3f6e

5 years agoHipri should not be enabled by default. DO NOT MERGE.
Wink Saville [Fri, 16 Aug 2013 16:35:09 +0000]
Hipri should not be enabled by default. DO NOT MERGE.

This can cause it to become to become the default connection
which it is not and get started instead of default.

Change-Id: I3a223099c53423856e6adfaef4abc0274f9d4c2a

5 years agoRemap NONE to UNKNOWN on GENERIC_FAILURES for SETUP_DATA_CALL. DO NOT MERGE.
Wink Saville [Fri, 16 Aug 2013 16:34:50 +0000]
Remap NONE to UNKNOWN on GENERIC_FAILURES for SETUP_DATA_CALL. DO NOT MERGE.

Bug: 9040003
Change-Id: I749d502529fc5542b910f4e49460730070b3e4b9

5 years agoFix NPE when exiting DcDefaultState. DO NOT MERGE.
Wink Saville [Fri, 16 Aug 2013 16:34:32 +0000]
Fix NPE when exiting DcDefaultState. DO NOT MERGE.

Bug: 9263045
Change-Id: Ib3b599b2502130af248a0cffc226d8916047dc6d

5 years agoHandling data registration and radio technology changing. DO NOT MERGE.
Wink Saville [Fri, 16 Aug 2013 16:34:11 +0000]
Handling data registration and radio technology changing. DO NOT MERGE.

When the DataRegistrationState (aka DRS) or RilDataRadioTechnology changes
aka Radio Access Technology or RAT) while retrying the DataConnection
StateMachine will return the connection as lost immediately. This allows
the connection to be retried with the correct handling of the changed
DRS or RAT quickly, rather than having to wait until retires are exhausted.

Changes:

- Pass RAT in bringUp
- Add the capability to register for DRS/RAT changes with SST
- When DRS/RAT changes in DcRetryState return LOST_CONNECTION to DcTracker

Bug: 9069568
Change-Id: I897168baf17ecaedd0f1df4ef3c2263066d70ece

5 years agoChange DcTracker to not connect or retry if detached. DO NOT MERGE.
Wink Saville [Fri, 16 Aug 2013 16:33:46 +0000]
Change DcTracker to not connect or retry if detached. DO NOT MERGE.

If we're detached than there is no possibility of connecting
so fail early. Upon attaching enabled connections will be retried.

Bug: 9024828
Change-Id: I7b3f8f872ae9b205cf0a71a9bc4ac73df664f48d

5 years agoChange DcTracker construction so only initialization is preformed. DO NOT MERGE.
Wink Saville [Wed, 2 Oct 2013 17:31:51 +0000]
Change DcTracker construction so only initialization is preformed. DO NOT MERGE.

In initApnContexts applyNewState and onSetDependency met could cause
calls to trySetupData which can send notifications or even try to
bring up a connection. This can cause problems as not all objects are
initialized. In particular when I tried to change ApnContext#isReady
to be false it caused a call to mPhone.notifyDataConnection but mPhone
wasn't completely initialized and an NPE occurred.

Bug: 9022095
Change-Id: Ie817db2c0c1b381b1f58e87817f4b2336c7a3159

5 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Tue, 1 Oct 2013 13:01:05 +0000]
merge in klp-release history after reset to klp-dev

5 years agoMerge "Stop using the sim mnc/mcc to set wifi country." into klp-dev
Robert Greenwalt [Mon, 30 Sep 2013 21:13:37 +0000]
Merge "Stop using the sim mnc/mcc to set wifi country." into klp-dev

5 years agoMerge "Add Telephony intent class to public API." into klp-dev
Jake Hamby [Mon, 30 Sep 2013 17:18:42 +0000]
Merge "Add Telephony intent class to public API." into klp-dev

5 years agoStop using the sim mnc/mcc to set wifi country.
Robert Greenwalt [Fri, 27 Sep 2013 22:10:40 +0000]
Stop using the sim mnc/mcc to set wifi country.

bug:10513734
Change-Id: Idac32892db8ff9b5ca4c5bde4f3f3b12f0df1196

5 years agoHandle SIGNAL_LOST(-3) as a retryable error.
Wink Saville [Fri, 27 Sep 2013 17:53:46 +0000]
Handle SIGNAL_LOST(-3) as a retryable error.

Qualcomm reports SIGNAL_LOST when a signal is lost temporarily
and should be retired. If a radio technology changes then the
DataConnection will stop retrying and the DcTracker will get a
new configuration and setup a new data call. If the rat doesn't
change then DataConnection will reestablish the call on the next
retry attempt.

Bug: 10804691
Change-Id: I4d310e7f2ea2dc46c7bcdd2b8687d1ef6b901e01

5 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Sun, 29 Sep 2013 13:01:20 +0000]
merge in klp-release history after reset to klp-dev

5 years agoHandle SIGNAL_LOST(-3) as a retryable error.
Wink Saville [Fri, 27 Sep 2013 17:53:46 +0000]
Handle SIGNAL_LOST(-3) as a retryable error.

Qualcomm reports SIGNAL_LOST when a signal is lost temporarily
and should be retired. If a radio technology changes then the
DataConnection will stop retrying and the DcTracker will get a
new configuration and setup a new data call. If the rat doesn't
change then DataConnection will reestablish the call on the next
retry attempt.

Bug: 10804691
Change-Id: I4d310e7f2ea2dc46c7bcdd2b8687d1ef6b901e01

5 years agoMerge "Revert "Revert "telephony: Set roam though same named operator""" into klp-dev
Vineeta Srivastava [Thu, 26 Sep 2013 20:18:17 +0000]
Merge "Revert "Revert "telephony: Set roam though same named operator""" into klp-dev

5 years agoRevert "Revert "telephony: Set roam though same named operator""
Vineeta Srivastava [Thu, 26 Sep 2013 20:11:19 +0000]
Revert "Revert "telephony: Set roam though same named operator""

This reverts commit cd338fdb16422f47788c3bc3cdf6391f1268bbfe.

Change-Id: Ib7aa6ce911a22098461c76b5e0be191852d34bb1

5 years agoMerge "Revert "telephony: Set roam though same named operator"" into klp-dev
Vineeta Srivastava [Thu, 26 Sep 2013 19:34:47 +0000]
Merge "Revert "telephony: Set roam though same named operator"" into klp-dev

5 years agoRevert "telephony: Set roam though same named operator"
Vineeta Srivastava [Thu, 26 Sep 2013 19:34:39 +0000]
Revert "telephony: Set roam though same named operator"

This reverts commit ce0eb1a929a8abb9a99b042813e403b0d6f74fdd.

Change-Id: I324343a218e155ece9f8243cdc44ce9fffe8e5d5

5 years agoMerge "telephony: Set roam though same named operator" into klp-dev
Vineeta Srivastava [Thu, 26 Sep 2013 18:44:40 +0000]
Merge "telephony: Set roam though same named operator" into klp-dev

5 years agotelephony: Set roam though same named operator
Sungmin Choi [Mon, 23 Sep 2013 06:06:26 +0000]
telephony: Set roam though same named operator

Show roaming icon though same named operators.
Though same mcc and same operator name, some operator want to roam.
For example, users of 40485 should see the roaming icon as using 40483
network though same Reliance network.

Bug: 10699045, 10703022
Change-Id: Ife1024ef10a29e43e32040800b25feca9f51fb62

5 years agomerge in klp-release history after reset to klp-dev
The Android Automerger [Thu, 26 Sep 2013 13:01:29 +0000]
merge in klp-release history after reset to klp-dev