6 years agoRIL changes for supporting generic SIM communication.
Shishir Agrawal [Thu, 28 Nov 2013 00:24:52 +0000]
RIL changes for supporting generic SIM communication.

Exposes four new commands through RIL.java:
  - RIL_REQUEST_SIM_TRANSMIT_BASIC (AT+CSIM - TS 27.007)
  - RIL_REQUEST_SIM_OPEN_CHANNEL (AT+CCHO - TS 27.007)
  - RIL_REQUEST_SIM_CLOSE_CHANNEL (AT+CCHC - TS 27.007)
  - RIL_REQUEST_SIM_TRANSMIT_CHANNEL (AT+CGLA - TS 27.007)

Change-Id: Iee4d950d37a6097493cd945e611c914c40827215

6 years agoMerge commit '3ab4c135be3d5d3bf529f63ef932f95526401feb' into HEAD
The Android Open Source Project [Fri, 22 Nov 2013 18:35:25 +0000]
Merge commit '3ab4c135be3d5d3bf529f63ef932f95526401feb' into HEAD

6 years agoMerge "Telephony: Add + for international number for MT SMS"
Wink Saville [Thu, 21 Nov 2013 22:36:47 +0000]
Merge "Telephony: Add + for international number for MT SMS"

6 years agoMerge "Delete unused GSMPhone debugging code."
Narayan Kamath [Thu, 31 Oct 2013 14:19:07 +0000]
Merge "Delete unused GSMPhone debugging code."

6 years agoDelete unused GSMPhone debugging code.
Narayan Kamath [Thu, 24 Oct 2013 08:39:08 +0000]
Delete unused GSMPhone debugging code.

Manual cherry picks of internal changes:
9bb18bb9f325269c213eaed8f25ff1f1843093f7
67d6ba34ef5299b98a8d53f19bd499be1ec176ba

I've manually cherry picked them because the branches
are substantially different, and the changes are
dependant on each other.

Change-Id: I63ba8b93f77d461dc1d01252805e0804ba678c43

6 years agoam 218c5c36: Merge "Do not allow SMS event receivers to abort the broadcast" into...
Wei Huang [Thu, 17 Oct 2013 01:57:15 +0000]
am 218c5c36: Merge "Do not allow SMS event receivers to abort the broadcast" into klp-dev

* commit '218c5c362e47d943a98813bac9e1eeae6f366434':
  Do not allow SMS event receivers to abort the broadcast

6 years agoam 49c9c9f2: Merge "Persist SMS messages sent by other than the default SMS app"...
Wei Huang [Thu, 17 Oct 2013 01:53:58 +0000]
am 49c9c9f2: Merge "Persist SMS messages sent by other than the default SMS app" into klp-dev

* commit '49c9c9f29092dfab12e455847e30bb77724064f5':
  Persist SMS messages sent by other than the default SMS app

6 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

6 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

6 years agoam 43ea0720: merge in klp-release (no-op)
Ed Heyl [Thu, 17 Oct 2013 00:56:42 +0000]
am 43ea0720: merge in klp-release (no-op)

* commit '43ea072095dfc9208bd7af66d1702fba32d6c039':
  telephony: Set profile DATA_PROFILE_TETHERED when DUN type
  Revert "Stop using the sim mnc/mcc to set wifi country."

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

6 years agoam ffe6e682: Clear CDMA latitude/longitude when location setting is off.
Jake Hamby [Wed, 16 Oct 2013 23:44:00 +0000]
am ffe6e682: Clear CDMA latitude/longitude when location setting is off.

* commit 'ffe6e68213ae3220497188fed814e271b472292a':
  Clear CDMA latitude/longitude when location setting is off.

6 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

6 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

6 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

6 years agoam 5eee0d4d: telephony: Fix "R" icon displayed when device is searching or in LTE
Wink Saville [Wed, 16 Oct 2013 17:18:39 +0000]
am 5eee0d4d: telephony: Fix "R" icon displayed when device is searching or in LTE

* commit '5eee0d4d68b2a768aa5d27875cd0f2e44c2bd272':
  telephony: Fix "R" icon displayed when device is searching or in LTE

6 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

6 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

6 years agoam e3f6e6a1: Fix b10864885
Wink Saville [Wed, 16 Oct 2013 00:15:57 +0000]
am e3f6e6a1: Fix b10864885

* commit 'e3f6e6a186ac6efe15faa0aa9f1df0333e114ed7':
  Fix b10864885

6 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

6 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

6 years agoam 76e1ee73: Merge "Make SmsApplication checks more defensive" into klp-dev
David Braun [Sun, 13 Oct 2013 23:22:46 +0000]
am 76e1ee73: Merge "Make SmsApplication checks more defensive" into klp-dev

* commit '76e1ee73bd112e78361e659dc97afb01ed9c7ca0':
  Make SmsApplication checks more defensive

6 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

6 years agoam 21fe62ac: telephony: redirect call barring MMI code to other purpose
duho.ro [Sun, 13 Oct 2013 23:02:19 +0000]
am 21fe62ac: telephony: redirect call barring MMI code to other purpose

* commit '21fe62acc2d11ace0410b2b6d83263a96081c092':
  telephony: redirect call barring MMI code to other purpose

6 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

6 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

6 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

6 years agoam 1260f1c6: Support SMS over IMS
Sukanya Rajkhowa [Thu, 10 Oct 2013 23:41:30 +0000]
am 1260f1c6: Support SMS over IMS

* commit '1260f1c6c909f2940989b72afe1b91fd83845eaa':
  Support SMS over IMS

6 years agoam 6f2a3e1e: Reorganize IccSmsInterfaceManager
Sukanya Rajkhowa [Thu, 10 Oct 2013 23:41:30 +0000]
am 6f2a3e1e: Reorganize IccSmsInterfaceManager

* commit '6f2a3e1ea86ae7ae2e04eb95582e54eec7a2f864':
  Reorganize IccSmsInterfaceManager

6 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

6 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

6 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

6 years agoam 45df2644: telephony: Set profile DATA_PROFILE_TETHERED when DUN type
Sungmin Choi [Thu, 10 Oct 2013 20:50:31 +0000]
am 45df2644: telephony: Set profile DATA_PROFILE_TETHERED when DUN type

* commit '45df26444864daad60afdd4d121ab4043da3834b':
  telephony: Set profile DATA_PROFILE_TETHERED when DUN type

6 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

6 years agoTelephony: Add + for international number for MT SMS
Sudheer Reddy Yampalla [Fri, 22 Mar 2013 05:04:07 +0000]
Telephony: Add + for international number for MT SMS

Add + if international number is not having + at starting.

Change-Id: I0000b0685181f17ba6b5b0eaaba60a77971e7908
Bug: 10951615

6 years agoam fa5c44e9: merge in KQS81M
Ed Heyl [Tue, 8 Oct 2013 22:57:53 +0000]
am fa5c44e9: merge in KQS81M

* commit 'fa5c44e9d2a21d069fb166ce799bcba972062b67':
  Handle SIGNAL_LOST(-3) as a retryable error.
  wappush: Use valid index for pdu including garbages
  Ensure that a default SMS app is configured at boot
  In Cdma Lte SST use CssIndicator for concurrent Voice & Data.
  Add code to handle voice radio technology of LTE.
  Fix voicemail notification for Sprint.
  Telephony: Ignore events on a destroyed phone
  Add support for a provisioning apn.
  UICC : add support empty alpha id for BIP

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

6 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

6 years agoam 002b8c6f: Merge "Do not allow default SMS application to be set or get on non...
David Braun [Mon, 7 Oct 2013 18:15:38 +0000]
am 002b8c6f: Merge "Do not allow default SMS application to be set or get on non-phone devices" into klp-dev

* commit '002b8c6f5095a36bd09f2b6de6c4b3e1125c6158':
  Do not allow default SMS application to be set or get on non-phone devices

6 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

6 years agoam f9b1f2e2: am bffd2117: am ef3149f4: Fix build.
Wink Saville [Mon, 7 Oct 2013 01:18:36 +0000]
am f9b1f2e2: am bffd2117: am ef3149f4: Fix build.

* commit 'f9b1f2e2b45049d6f8cb455f379f2e36f5642b6a':
  Fix build.

6 years agoam df87bf5f: am 7351fdfb: (-s ours) am 1b8d3498: Hipri should not be enabled by defau...
Wink Saville [Mon, 7 Oct 2013 01:18:36 +0000]
am df87bf5f: am 7351fdfb: (-s ours) am 1b8d3498: Hipri should not be enabled by default. DO NOT MERGE.

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

6 years agoam 13f55c54: am e3e070ec: (-s ours) am 59986fee: Remap NONE to UNKNOWN on GENERIC_FAI...
Wink Saville [Mon, 7 Oct 2013 01:18:36 +0000]
am 13f55c54: am e3e070ec: (-s ours) am 59986fee: Remap NONE to UNKNOWN on GENERIC_FAILURES for SETUP_DATA_CALL. DO NOT MERGE.

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

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

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

6 years agoam 0cdd3c10: am 16758906: (-s ours) am f02d966c: Handling data registration and radio...
Wink Saville [Mon, 7 Oct 2013 01:18:34 +0000]
am 0cdd3c10: am 16758906: (-s ours) am f02d966c: Handling data registration and radio technology changing. DO NOT MERGE.

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

6 years agoam 8c9c5332: am 2f25f745: (-s ours) am ec56ef5d: Change DcTracker to not connect...
Wink Saville [Mon, 7 Oct 2013 01:18:34 +0000]
am 8c9c5332: am 2f25f745: (-s ours) am ec56ef5d: Change DcTracker to not connect or retry if detached. DO NOT MERGE.

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

6 years agoam cca7f8a4: am 74abae35: (-s ours) Merge commit \'89518902\' into merge-conflict
Wink Saville [Mon, 7 Oct 2013 01:18:33 +0000]
am cca7f8a4: am 74abae35: (-s ours) Merge commit \'89518902\' into merge-conflict

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

6 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.

6 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.

6 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.

6 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.

6 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.

6 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.

6 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.

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

* commit 'ef3149f4e736344e55f0fc8ceb419edf66119969':
  Fix build.

6 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.

6 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.

6 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.

6 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.

6 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.

6 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.

6 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

6 years agoam e595a18f: Merge "Revert "Stop using the sim mnc/mcc to set wifi country."" into...
Robert Greenwalt [Fri, 4 Oct 2013 20:34:31 +0000]
am e595a18f: Merge "Revert "Stop using the sim mnc/mcc to set wifi country."" into klp-dev

* commit 'e595a18f15d8073c8657ef7fa3da34986acb1a6d':
  Revert "Stop using the sim mnc/mcc to set wifi country."

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 years agoam 98cad5c9: Merge "Stop using the sim mnc/mcc to set wifi country." into klp-dev
Robert Greenwalt [Wed, 2 Oct 2013 05:21:08 +0000]
am 98cad5c9: Merge "Stop using the sim mnc/mcc to set wifi country." into klp-dev

* commit '98cad5c9c31f82eadaeada775937632a2a508147':
  Stop using the sim mnc/mcc to set wifi country.

6 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

6 years agoam 5408ebae: Merge "Add Telephony intent class to public API." into klp-dev
Jake Hamby [Tue, 1 Oct 2013 00:11:10 +0000]
am 5408ebae: Merge "Add Telephony intent class to public API." into klp-dev

* commit '5408ebae1011f71ed821c7fea1ad24fa429e2520':
  Add Telephony intent class to public API.

6 years agoam 1ec85a29: Handle SIGNAL_LOST(-3) as a retryable error.
Wink Saville [Tue, 1 Oct 2013 00:09:20 +0000]
am 1ec85a29: Handle SIGNAL_LOST(-3) as a retryable error.

* commit '1ec85a29a26bfab4e21ad68000afc637e0cf171c':
  Handle SIGNAL_LOST(-3) as a retryable error.

6 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

6 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

6 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

6 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

6 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

6 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

6 years agoam a1a02608: Merge "Revert "Revert "telephony: Set roam though same named operator...
Vineeta Srivastava [Thu, 26 Sep 2013 20:23:18 +0000]
am a1a02608: Merge "Revert "Revert "telephony: Set roam though same named operator""" into klp-dev

* commit 'a1a02608bdc7ab7248d8a7ae7cf45e0900e53c34':
  Revert "Revert "telephony: Set roam though same named operator""

6 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

6 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

6 years agoam 81d0c210: Merge "Revert "telephony: Set roam though same named operator"" into...
Vineeta Srivastava [Thu, 26 Sep 2013 19:36:50 +0000]
am 81d0c210: Merge "Revert "telephony: Set roam though same named operator"" into klp-dev

* commit '81d0c210c9ffec188ec94afb2fe6dfe20add4b3c':
  Revert "telephony: Set roam though same named operator"

6 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

6 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

6 years agoam 14134b84: Merge "telephony: Set roam though same named operator" into klp-dev
Vineeta Srivastava [Thu, 26 Sep 2013 18:48:20 +0000]
am 14134b84: Merge "telephony: Set roam though same named operator" into klp-dev

* commit '14134b84407227c6be23ce927397433fa34907b8':
  telephony: Set roam though same named operator

6 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

6 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

6 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

6 years agowappush: Use valid index for pdu including garbages
Sungmin Choi [Thu, 29 Aug 2013 00:12:06 +0000]
wappush: Use valid index for pdu including garbages

For some operators, pdu has garbages. As a result, device does not receive
MMS or operator some requests.
To fix it, re-index pdu to use valid index for operators.

Bug: 10492745
Change-Id: Ic7262f7369403bd060d94c5da0e09f18c96ff3db

6 years agoam 21b2c181: Merge "UICC: to avoid overwriting ICC operator numeric" into klp-dev
Vineeta Srivastava [Wed, 25 Sep 2013 23:12:45 +0000]
am 21b2c181: Merge "UICC: to avoid overwriting ICC operator numeric" into klp-dev

* commit '21b2c1814fe47e88b3881d47983f79014682411e':
  UICC: to avoid overwriting ICC operator numeric

6 years agoMerge "UICC: to avoid overwriting ICC operator numeric" into klp-dev
Vineeta Srivastava [Wed, 25 Sep 2013 23:09:48 +0000]
Merge "UICC: to avoid overwriting ICC operator numeric" into klp-dev

6 years agoam 13fa971b: wappush: Use valid index for pdu including garbages
Sungmin Choi [Wed, 25 Sep 2013 23:05:36 +0000]
am 13fa971b: wappush: Use valid index for pdu including garbages

* commit '13fa971b6c6eab1578f4732c8de6fa2ba3b57ce6':
  wappush: Use valid index for pdu including garbages

6 years agoUICC: to avoid overwriting ICC operator numeric
duho.ro [Mon, 16 Sep 2013 20:54:24 +0000]
UICC: to avoid overwriting ICC operator numeric

When the SIM card is inserted and the radio tech is CDMA,
init() of CDMAPhone overwrites the ICC operator numeric as
CDMA_HOME_OPERATOR_NUMERIC. It makes some abnormal state when the
CDMA_HOME_OPERATOR_NUMERIC has a wrong value or empty.
This change is skipping the overwriting ICC operator numeric when UICC
card has a SIM/USIM application because the application has its own
operator numeric.

Bug: 10774885
Change-Id: I0171000ef38fad23858f7266ab0cae3bd314b6b1

6 years agowappush: Use valid index for pdu including garbages
Sungmin Choi [Thu, 29 Aug 2013 00:12:06 +0000]
wappush: Use valid index for pdu including garbages

For some operators, pdu has garbages. As a result, device does not receive
MMS or operator some requests.
To fix it, re-index pdu to use valid index for operators.

Bug: 10492745
Change-Id: Ic7262f7369403bd060d94c5da0e09f18c96ff3db

6 years agoAdd Telephony intent class to public API.
Jake Hamby [Fri, 13 Sep 2013 21:13:03 +0000]
Add Telephony intent class to public API.

Remove @hide from android.provider.Telephony for K release for
SMS and MMS related tables, and APN database (for MMSC info).
Helper methods are hidden except for two that use non-public APIs.

Bug: 10653081
Change-Id: I3509b122ae4e762c1c44e6b4aa8b36c8d0b62224