4 years agoMerge remote-tracking branch 'l-mr1-release' into rel-st8-l-partner rel-st8-l-r4-partner rel-st8-l-r5-partner rel-st8-l-r6-partner rel-st8-l-r7-partner
Roger Ma [Tue, 24 Mar 2015 13:09:44 +0000]
Merge remote-tracking branch 'l-mr1-release' into rel-st8-l-partner

Change-Id: Icf781a0d77107f056384ec402f3fe13543611189

4 years agomerge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Wed, 11 Mar 2015 00:12:51 +0000]
merge in lmp-mr1-release history after reset to lmp-mr1-dev

4 years agomerge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Wed, 4 Mar 2015 23:18:43 +0000]
merge in lmp-mr1-release history after reset to lmp-mr1-dev

4 years agoLightweight fix for incorrect locale changes - DO NOT MERGE
Neil Fuller [Tue, 3 Mar 2015 23:32:06 +0000]
Lightweight fix for incorrect locale changes - DO NOT MERGE

Previously, if the sim's MCC locale is reported AND
the user didn't have a persistent locale setting, then
the device locale would change.

This modifies the logic to only allow device locale changes
if the user has not explicitly set a locale and the user has
not completed setup.

An MCC-based update is still (erroneously) considered a
user-actioned change.

This is only intended to affect users that previously had an
unrecognized MCC. Android does a better job of recognizing
MCCs and we don't want those users that have received an OTA
to suddenly experience a locale change.

Bug: 19232829
Change-Id: I5b150573ec84f453bff54f3ca331b63e2c4d32d3

4 years agoNotify subscriptionInfoChanged in setPlmnSpn even without sim.
Sanket Padawe [Fri, 27 Feb 2015 18:45:35 +0000]
Notify subscriptionInfoChanged in setPlmnSpn even without sim.

Bug: 19476978
Change-Id: I3f87c60f3de2f9e317061466d6c57bca0efc821d

4 years agoSet carrierName of subInfo to null while creating/updating subInfo.
Sanket Padawe [Tue, 24 Feb 2015 21:27:37 +0000]
Set carrierName of subInfo to null while creating/updating subInfo.

Bug: 19476304
Change-Id: Ia16465584cf31858bbf1ae36cfdbf21184de10d7

4 years agoAdding a new param to calculateLength for SMS to indicate if called for a rel-22-l-mr1-partner rel-22r11-partner rel-22r16-partner rel-22r18-partner
Amit Mahajan [Thu, 19 Feb 2015 02:08:21 +0000]
Adding a new param to calculateLength for SMS to indicate if called for a
segment of multipart msg.

Encoding type is calculated separately for entire msg vs individual
segments. Change is to avoid overwriting the calculated value for
individual segment based.

Bug: 19399335
Change-Id: I8e89b7596e9c7440ace0486eceb1252094c373fa

4 years agoReverting change which uses spnoverride to set ONS.
Sanket Padawe [Mon, 16 Feb 2015 20:18:29 +0000]
Reverting change which uses spnoverride to set ONS.

Bug: 19386079
Change-Id: I1417d55415be88a90c350fbe2533889630117503

4 years agomerge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Tue, 17 Feb 2015 02:01:21 +0000]
merge in lmp-mr1-release history after reset to lmp-mr1-dev

4 years agomerge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Fri, 13 Feb 2015 09:10:44 +0000]
merge in lmp-mr1-release history after reset to lmp-mr1-dev

4 years agoPass new connection object to telecomm layer after a phone switch.
Sanket Padawe [Fri, 13 Feb 2015 00:39:33 +0000]
Pass new connection object to telecomm layer after a phone switch.

+ Connection object is passed to telecomm layer when phone switch happens
during emergency call.

Bug: 19363089
Change-Id: I4b86cc13491afe2768678c5bb03c1ca480924d19

4 years agoTreat a SIM power cycle as first boot.
Robert Greenwalt [Thu, 12 Feb 2015 02:27:17 +0000]
Treat a SIM power cycle as first boot.

TL;DR - forget the previous subId used only for optimization
purposes if we get a SIM_READY notification.

We moved some code that poked the modem from a SIM_READY handler
to a onSubscriptionChanged handler and also protected it
with logic to only fire if the subId changed.  This caused
us to not poke the modem on SIM power cycle.  Some modems
do a SIM power cycle on airplane mode.  The result was
on these modems we weren't causing the modem to register with
the network after airplane mode.

This was often masked because if we were setup to try a
data call these devices were configured to try the data call
regardless of data registration and the act of trying a data call
would cause the modem to register with the network.

If during airplane mode you had turned on wifi, telephony would
stop trying to setup a data call (so we don't poke the network
all the time when on a better wifi connection) and the restoration of
that data request has been blocked until data-registration in the
new multisim code.

bug:19194287
Change-Id: I21b76b7c62a6161d8422b11a831c3747591c56f3

4 years agomerge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Tue, 10 Feb 2015 14:11:59 +0000]
merge in lmp-mr1-release history after reset to lmp-mr1-dev

4 years agoSmsSenderCallback: Run the callback with the phone UID.
Shishir Agrawal [Mon, 9 Feb 2015 23:05:52 +0000]
SmsSenderCallback: Run the callback with the phone UID.

The SmsSenderCallback needs to run as the phone UID because of checks that
ensure only the messaging app or phone process can run that code.

Also modifies SmsUsageMonitor to allow phone process to make calls.

Bug: 19302541
Change-Id: Ic6b8141fbf15f42696e9b86d3c599ef2ec4ebd1c

4 years agomerge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Mon, 9 Feb 2015 14:10:20 +0000]
merge in lmp-mr1-release history after reset to lmp-mr1-dev

4 years agoReduce binder call when determing whether or not to use CDMA format for
Xia Ying [Thu, 5 Feb 2015 20:39:29 +0000]
Reduce binder call when determing whether or not to use CDMA format for
MO SMS

Only checking whether or not to use CDMA format for MO SMS one time for
the whole message body.

Bug: 19283927
Change-Id: I0e629f68d77cae17d18a80b1f8fa343e0afa8c00

4 years agoMerge "Reduce binder call when determing whether or not to use CDMA format for MO...
Amit Mahajan [Fri, 6 Feb 2015 05:26:55 +0000]
Merge "Reduce binder call when determing whether or not to use CDMA format for MO SMS" into lmp-mr1-dev

4 years agoReduce binder call when determing whether or not to use CDMA format for
Xia Ying [Thu, 5 Feb 2015 20:39:29 +0000]
Reduce binder call when determing whether or not to use CDMA format for
MO SMS

Only checking whether or not to use CDMA format for MO SMS one time for
the whole message body.

Bug: 19283927
Change-Id: I0e629f68d77cae17d18a80b1f8fa343e0afa8c00

4 years agoMerge "Supress phone number from logcat." into lmp-mr1-dev
Sanket Padawe [Thu, 5 Feb 2015 20:51:48 +0000]
Merge "Supress phone number from logcat." into lmp-mr1-dev

4 years agoSupress phone number from logcat.
Sanket Padawe [Thu, 5 Feb 2015 19:46:22 +0000]
Supress phone number from logcat.

Bug: 19251204
Change-Id: Iba489fdd84cc2085cf23290e162d3b561e458214

4 years agomerge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Thu, 5 Feb 2015 14:13:11 +0000]
merge in lmp-mr1-release history after reset to lmp-mr1-dev

4 years agoFix mistake of calling wrong method to return sim country iso
Ye Wen [Wed, 4 Feb 2015 23:42:22 +0000]
Fix mistake of calling wrong method to return sim country iso

b/19240047

Change-Id: If155f682ec06e377b4c5e6b05494631112812146

4 years agoMerge "Add comments to explain what we're currently doing" into lmp-mr1-dev
Robert Greenwalt [Wed, 4 Feb 2015 19:02:38 +0000]
Merge "Add comments to explain what we're currently doing" into lmp-mr1-dev

4 years agomerge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Wed, 4 Feb 2015 14:10:11 +0000]
merge in lmp-mr1-release history after reset to lmp-mr1-dev

4 years agoAdd comments to explain what we're currently doing
Robert Greenwalt [Wed, 4 Feb 2015 00:39:54 +0000]
Add comments to explain what we're currently doing

The IMS merging of call state is non-obvious from the outside and while
the code here works it's a bit vulnerable to well-intended changes.

bug:19160309
Change-Id: I07c100dac544a3687d3efd6567b56c6e4376eefb

4 years agoRemove phone number being displayed from logs
Sanket Padawe [Tue, 3 Feb 2015 21:58:26 +0000]
Remove phone number being displayed from logs

Bug: 19251204
Change-Id: I5391fa2033ddb8cb41e11cb23aa16485369cd13e

4 years agomerge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Tue, 3 Feb 2015 14:10:12 +0000]
merge in lmp-mr1-release history after reset to lmp-mr1-dev

4 years agoMerge "Fixing conference merge where only one party is added to conference." into...
Tyler Gunn [Mon, 2 Feb 2015 15:49:21 +0000]
Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev

4 years agomerge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Mon, 2 Feb 2015 14:10:08 +0000]
merge in lmp-mr1-release history after reset to lmp-mr1-dev

4 years agoadd missing import android.os.Binder.
The Android Automerger [Sat, 31 Jan 2015 00:12:33 +0000]
add missing import android.os.Binder.

4 years ago[DS] Correct the access method for telephony system property
Legler Wu [Thu, 22 Jan 2015 19:09:03 +0000]
[DS] Correct the access method for telephony system property

Revise the method to access telephony system property.
Add several PROPERTY_XXX_XXX_MSIM for MSIM type system properties. If
caller use the old one, it will be dispatched to new one and get by
default phone id.
Ex. PROPERTY_ICC_OPERATOR_NUMERIC

Bug: 18675498
Change-Id: I68b4de1817bb5a34d4a54685332f856e79a39d60

4 years ago[DS] Correct the access method for telephony system property
Legler Wu [Thu, 22 Jan 2015 19:09:03 +0000]
[DS] Correct the access method for telephony system property

Revise the method to access telephony system property.
Add several PROPERTY_XXX_XXX_MSIM for MSIM type system properties. If
caller use the old one, it will be dispatched to new one and get by
default phone id.
Ex. PROPERTY_ICC_OPERATOR_NUMERIC

Bug: 18675498
Change-Id: I68b4de1817bb5a34d4a54685332f856e79a39d60

4 years agoMerge "Changes to make sure READ_PHONE_STATE permission is not needed to send SMS...
Amit Mahajan [Fri, 30 Jan 2015 00:52:36 +0000]
Merge "Changes to make sure READ_PHONE_STATE permission is not needed to send SMS." into lmp-mr1-dev

4 years agoSuppress logging to avoid showing phone number.
Sanket Padawe [Thu, 29 Jan 2015 19:22:36 +0000]
Suppress logging to avoid showing phone number.

Bug: 19193581
Change-Id: If8e35b6c8386a0e92cd1e89172b6dd1f0c220bc1

4 years agoMerge "Suppress logging to avoid showing phone number." into lmp-mr1-dev
Sanket Padawe [Thu, 29 Jan 2015 21:57:30 +0000]
Merge "Suppress logging to avoid showing phone number." into lmp-mr1-dev

4 years agoFixing conference merge where only one party is added to conference.
Tyler Gunn [Thu, 29 Jan 2015 19:48:03 +0000]
Fixing conference merge where only one party is added to conference.

- added "swap calls" flag to the onCallMerged listener.  This is used
to indicate that the fg/bg calls need to be swapped after the merge.
- changed how we get the connect time for the conference.  This is now
stored when a conference merge is started (required because of the delaying
of merge complete; one of the calls is already non-existent at the time
we want to get the connect time).

Bug: 18960042
Change-Id: Icc4b60756d333373fe181612824b0c13c076408b

4 years agoSuppress logging to avoid showing phone number.
Sanket Padawe [Thu, 29 Jan 2015 19:22:36 +0000]
Suppress logging to avoid showing phone number.

Bug: 19193581
Change-Id: If8e35b6c8386a0e92cd1e89172b6dd1f0c220bc1

4 years agoChanges to make sure READ_PHONE_STATE permission is not needed to send SMS.
Amit Mahajan [Thu, 29 Jan 2015 02:08:59 +0000]
Changes to make sure READ_PHONE_STATE permission is not needed to send SMS.

Bug: 19112332
Change-Id: I7da30ebcebaf57f713acc6938626930dbc51d1f2

4 years agomerge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Thu, 29 Jan 2015 14:10:28 +0000]
merge in lmp-mr1-release history after reset to lmp-mr1-dev

4 years agoMerge "Check line1number override and use it instead for subscription." into lmp...
Junda Liu [Thu, 29 Jan 2015 02:36:11 +0000]
Merge "Check line1number override and use it instead for subscription." into lmp-mr1-dev

4 years agoMerge "Change getDeviceId to take phoneId." into lmp-mr1-dev
Stuart Scott [Thu, 29 Jan 2015 01:55:49 +0000]
Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev

4 years agoMerge "Handle network change messages when phone tries to switch to GSM from CDMA...
Sanket Padawe [Thu, 29 Jan 2015 01:23:31 +0000]
Merge "Handle network change messages when phone tries to switch to GSM from CDMA." into lmp-mr1-dev

4 years agoHandle network change messages when phone tries to switch to GSM from CDMA.
Sanket Padawe [Thu, 29 Jan 2015 00:53:04 +0000]
Handle network change messages when phone tries to switch to GSM from CDMA.

Bug: 19165700
Change-Id: I995308853b04db29e76e87303beec02ff32f231e

4 years agoMerge "Fix dump to not require extra permissions." into lmp-mr1-dev
Robert Greenwalt [Thu, 29 Jan 2015 00:37:57 +0000]
Merge "Fix dump to not require extra permissions." into lmp-mr1-dev

4 years agoFix dump to not require extra permissions.
Robert Greenwalt [Thu, 29 Jan 2015 00:26:57 +0000]
Fix dump to not require extra permissions.

Otherwise bugreports fail to collect the information.
Alternatively we could require you have the dump permission
AND whatever else, but that seems silly - you already have
permission to collect system dumps so they should work.

bug:19134027
Change-Id: I0f6bf3029f6230c759b94e04235d32c7a06ccea3

4 years agoCheck line1number override and use it instead for subscription.
Junda Liu [Wed, 28 Jan 2015 22:10:17 +0000]
Check line1number override and use it instead for subscription.

Bug: b/19143556
Change-Id: I7bceea2ed39a075e66db2a5487296d4d33e2a941

4 years agoMerge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev
xinhe [Wed, 28 Jan 2015 21:42:05 +0000]
Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev

4 years agoChange getDeviceId to take phoneId.
Stuart Scott [Wed, 28 Jan 2015 19:32:04 +0000]
Change getDeviceId to take phoneId.

bug:18827144
Change-Id: I0aec0d95c372c9bf65939310f0c85baaf526b0d6

4 years agoSprint: MMS cannot be sent in the UK
xinhe [Wed, 28 Jan 2015 18:32:47 +0000]
Sprint: MMS cannot be sent in the UK

     This is due to Sprint network at UK is actually GSM/UMTS. Thus we need GSM phone with CSIM to provide Nai too.

Bug:18241756
Change-Id: Iffe7dc2bee9c93cddfb4c94dcf477f2474d71ea8

4 years agomerge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Wed, 28 Jan 2015 14:09:58 +0000]
merge in lmp-mr1-release history after reset to lmp-mr1-dev

4 years agomerge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Tue, 27 Jan 2015 14:10:07 +0000]
merge in lmp-mr1-release history after reset to lmp-mr1-dev

4 years agoFix regression that stores data SMS automatically
Ye Wen [Tue, 27 Jan 2015 00:31:34 +0000]
Fix regression that stores data SMS automatically

A previous CL (ag/586092) accidentally auto persists data SMS sent by
non-default SMS app (which should only do that for text SMS).

b/19150134

Change-Id: I2f907b22aea2ce01bae3455a656f0e5a31978328

4 years agoCorrecting issue where video call icon shows for all calls.
Tyler Gunn [Mon, 26 Jan 2015 21:43:58 +0000]
Correcting issue where video call icon shows for all calls.

The issue is in the ImsPhoneConnection code which checks for the
VideoState of the current call.  There was some work done at the RIL
level to restructure what the various ImsCallProfile instances mean.
When this code was written, getLocalCallProfile() was intended to refer
to the capabilities of the current call.  This has since changed so that
there are 3 profiles:
getCallProfile() -- the actual profile.
getLocalCallProfile() -- what the local device supports.
getRemoteCallProfile() -- what the remote device supports.

On a video capable device, getLocalCallProfile() appears to now return
DO NOT MERGE "Video", where it did not in the past.

There must have been a change in the modem code recently which has caused
this to show up now (where it was not an issue in the past).

Bug: 19144923
Change-Id: If58d58a073feb05e3509570eaac4dc02749ca212
(cherry picked from commit 1259a64380b7943d0dfe965ee721b4d29ee662ce)

4 years agomerge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Mon, 26 Jan 2015 14:11:04 +0000]
merge in lmp-mr1-release history after reset to lmp-mr1-dev

4 years agoIMS:silent redial/srvcc call cleanup.
Libin.Tang@motorola.com [Tue, 20 Jan 2015 16:18:14 +0000]
IMS:silent redial/srvcc call cleanup.

When silent redial or srvcc occurs. the IMSPhone call state is not set to idle
even after the call is ended. Also, the mConnection in mHandoverCall is not
cleaned up. This CL is to fix these 2 issues.

Bug:  19035679
Change-Id: I6bee704e2d7d8bf05ca1a910d25af4a02347328b

4 years agoAdd an API to access the CDMAPhone/GSMPhone call tracker state for DCTracker to check
Libin.Tang@motorola.com [Tue, 20 Jan 2015 17:49:45 +0000]
Add an API to access the CDMAPhone/GSMPhone call tracker state for DCTracker to check

As concurrent voice/data is not supported for all RATs, the DCTracker checks
the default phone's call state through getState API as one of the conditions
to set up data call.
For device supports VOLTE, the default phone's getState reflects the
default phone(CDMAPhone/GSMPhone) and IMS phone call state.
So the data call can't set up if the VOLTE call is in progress.
As IMSPhone call state should not impact the data call setup, this CL is
to add an API to access the CDMAPhone/GSMPhone call tracker state for
DCTracker to check.

Bug: 19090488
Change-Id: I96bb29f80d81fa6b39e2e05f1d7f47a72244ed9b

4 years agoMerge "Change to append subId to network selection related sharedPreferences." into...
Amit Mahajan [Fri, 23 Jan 2015 18:40:26 +0000]
Merge "Change to append subId to network selection related sharedPreferences." into lmp-mr1-dev

4 years agoMerge "IMS:silent redial/srvcc call cleanup." into lmp-mr1-dev
Pavel Zhamaitsiak [Fri, 23 Jan 2015 17:33:52 +0000]
Merge "IMS:silent redial/srvcc call cleanup." into lmp-mr1-dev

4 years agoIMS:silent redial/srvcc call cleanup.
Libin.Tang@motorola.com [Tue, 20 Jan 2015 16:18:14 +0000]
IMS:silent redial/srvcc call cleanup.

When silent redial or srvcc occurs. the IMSPhone call state is not set to idle
even after the call is ended. Also, the mConnection in mHandoverCall is not
cleaned up. This CL is to fix these 2 issues.

Bug:  19035679
Change-Id: I6bee704e2d7d8bf05ca1a910d25af4a02347328b

4 years agoFix the issue that Volte call is not cleaned up properly from telephony
Libin.Tang@motorola.com [Wed, 21 Jan 2015 04:14:55 +0000]
Fix the issue that Volte call is not cleaned up properly from telephony
framework when call failure is notified through dial command response.

Bug: 19054326
Change-Id: I09feb74b36244fed05a59bb1e11bb32e08fa63cf

4 years agoMerge "Add an API to access the CDMAPhone/GSMPhone call tracker state for DCTracker...
Pavel Zhamaitsiak [Fri, 23 Jan 2015 01:41:32 +0000]
Merge "Add an API to access the CDMAPhone/GSMPhone call tracker state for DCTracker to check" into lmp-mr1-dev

4 years agomerge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Thu, 22 Jan 2015 14:10:03 +0000]
merge in lmp-mr1-release history after reset to lmp-mr1-dev

4 years agoRemove _REPLACE_PENDING flag from SIM_CHANGED.
Robert Greenwalt [Thu, 22 Jan 2015 02:08:35 +0000]
Remove _REPLACE_PENDING flag from SIM_CHANGED.

This flag is useful if the bcast is a complete snapshot of state
but in multisim it's only half of the story and was causing us
to lose state info when different sim bcasts were close together.

This should be thought about and/or reverted in the future (b/19100123).

bug:18947244
Change-Id: I912274b215d41665a8c179d74aa7f1b897985799

4 years agoMerge "Fixing resume of FG call after failure to merge IMS calls." into lmp-mr1-dev
Tyler Gunn [Wed, 21 Jan 2015 23:32:56 +0000]
Merge "Fixing resume of FG call after failure to merge IMS calls." into lmp-mr1-dev

4 years agoChange to append subId to network selection related sharedPreferences.
Amit Mahajan [Fri, 16 Jan 2015 00:03:32 +0000]
Change to append subId to network selection related sharedPreferences.

Bug: 19023266
Change-Id: Ia7b2ac5b37d5abb1231288caf923336bf0bec9e1

4 years agoAdd an API to access the CDMAPhone/GSMPhone call tracker state for DCTracker to check
Libin.Tang@motorola.com [Tue, 20 Jan 2015 17:49:45 +0000]
Add an API to access the CDMAPhone/GSMPhone call tracker state for DCTracker to check

As concurrent voice/data is not supported for all RATs, the DCTracker checks
the default phone's call state through getState API as one of the conditions
to set up data call.
For device supports VOLTE, the default phone's getState reflects the
default phone(CDMAPhone/GSMPhone) and IMS phone call state.
So the data call can't set up if the VOLTE call is in progress.
As IMSPhone call state should not impact the data call setup, this CL is
to add an API to access the CDMAPhone/GSMPhone call tracker state for
DCTracker to check.

Bug: 19090488
Change-Id: I96bb29f80d81fa6b39e2e05f1d7f47a72244ed9b

4 years agoDon't send SIM_STATE_CHANGED before boot.
Shishir Agrawal [Tue, 20 Jan 2015 23:42:47 +0000]
Don't send SIM_STATE_CHANGED before boot.

Missed call point in ag/607433.

Bug: 18802536
Change-Id: I42ffc2d16944096573a4a45dba0b6607e8829e05

4 years agoDon't launch broadcast receiver processes during boot
Christopher Tate [Tue, 20 Jan 2015 22:13:48 +0000]
Don't launch broadcast receiver processes during boot

Broadcasts that can be sent before the boot process has completed must
be restricted to registered receivers, at least while still in the
middle of booting.

Bug 19060618

Change-Id: If920de397a6a735d6c525bf314fb2f718393576e

4 years agoRevert "Make SubscriptionController thread safe and some cleanup."
Stuart Scott [Tue, 20 Jan 2015 18:27:50 +0000]
Revert "Make SubscriptionController thread safe and some cleanup."

This reverts commit f34c3ae44f20f7454cda82628e8d23bff3198130.

bug:19029410
Change-Id: Iff8e99429565f8b43d4cbf5c8457e25691ba626c

4 years agoMerge "Don't launch broadcast receiver processes during boot" into lmp-mr1-dev
Christopher Tate [Tue, 20 Jan 2015 22:54:50 +0000]
Merge "Don't launch broadcast receiver processes during boot" into lmp-mr1-dev

4 years agoDon't launch broadcast receiver processes during boot
Christopher Tate [Tue, 20 Jan 2015 22:13:48 +0000]
Don't launch broadcast receiver processes during boot

Broadcasts that can be sent before the boot process has completed must
be restricted to registered receivers, at least while still in the
middle of booting.

Bug 19060618

Change-Id: If920de397a6a735d6c525bf314fb2f718393576e

4 years agoRevert "Make SubscriptionController thread safe and some cleanup."
Stuart Scott [Tue, 20 Jan 2015 18:27:50 +0000]
Revert "Make SubscriptionController thread safe and some cleanup."

This reverts commit f34c3ae44f20f7454cda82628e8d23bff3198130.

bug:19029410
Change-Id: Iff8e99429565f8b43d4cbf5c8457e25691ba626c

4 years agomerge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Mon, 19 Jan 2015 14:10:01 +0000]
merge in lmp-mr1-release history after reset to lmp-mr1-dev

4 years agoMake UICC code subID-less.
Shishir Agrawal [Tue, 13 Jan 2015 22:45:35 +0000]
Make UICC code subID-less.

MSIM code introduced code in the UICC objects that refer to the subIds.
This is potentially very dangerous becuase subIds are only initialized after
the UICC object is completely initialized. Hence using subId in the UICC code
could lead to lots of properties being not set correctly.

The new code, uses the phoneId everywhere within the UICC code, which is
initialized when the UICC object is created and will remain constant for the
lifetime of the UICC object.

Bug: 18748407
Change-Id: I1f50abc40b8592751cdeca2de2c76ac9f2d40768

4 years agoMerge "Change to update carrier text after subId is updated." into lmp-mr1-dev
Amit Mahajan [Fri, 16 Jan 2015 01:03:08 +0000]
Merge "Change to update carrier text after subId is updated." into lmp-mr1-dev

4 years agoChange to reset network settings on SIM change instead of IMSI change.
Amit Mahajan [Thu, 15 Jan 2015 01:51:37 +0000]
Change to reset network settings on SIM change instead of IMSI change.

Bug: 19012822
Change-Id: I22403636d36282c6d9a7c7063640051c93afea5b

4 years agoFixing resume of FG call after failure to merge IMS calls.
Tyler Gunn [Thu, 15 Jan 2015 21:43:14 +0000]
Fixing resume of FG call after failure to merge IMS calls.

The problem was due to a bug in switchWaitingOrHoldingAndActive.  When
we start a swap between FG and BG calls, a flag mSwitchingFgAndBgCalls is
set so that we can detect situations where the swap fails and "unswap" the
calls.

The original switchWaitingOrHoldingAndActive which occurs when dialing out
the new call to add to the conference was failing to toggle
mSwitchingFgAndBgCalls back off because no onCallResume is received (this
is where the flag was turned off in the past).

To fix this I reset the mSwitchingFgAndBgCalls flag when we get an unhold
and do not request a resume.

Bug: 19034876
Change-Id: If9f2360bbf3d7294b856ab021e3a0a8c46f2d928

4 years agomerge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Thu, 15 Jan 2015 14:09:59 +0000]
merge in lmp-mr1-release history after reset to lmp-mr1-dev

4 years agoChange to reset network settings on SIM change instead of IMSI change.
Amit Mahajan [Thu, 15 Jan 2015 01:51:37 +0000]
Change to reset network settings on SIM change instead of IMSI change.

Bug: 19012822
Change-Id: I22403636d36282c6d9a7c7063640051c93afea5b

4 years agoChange to update carrier text after subId is updated.
Amit Mahajan [Thu, 15 Jan 2015 01:15:29 +0000]
Change to update carrier text after subId is updated.

Bug: 18752574
Change-Id: I9cb8b7d26fca1654bd2323bd5555a1cfc4e9877d

4 years agoMerge "Make SubscriptionController thread safe and some cleanup." into lmp-mr1-dev
Wink Saville [Wed, 14 Jan 2015 19:40:07 +0000]
Merge "Make SubscriptionController thread safe and some cleanup." into lmp-mr1-dev

4 years agoMerge "[DS] Load SPN from System or Oem image" into lmp-mr1-dev
Stuart Scott [Wed, 14 Jan 2015 18:44:55 +0000]
Merge "[DS] Load SPN from System or Oem image" into lmp-mr1-dev

4 years agomerge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Wed, 14 Jan 2015 14:10:09 +0000]
merge in lmp-mr1-release history after reset to lmp-mr1-dev

4 years agoMake SubscriptionController thread safe and some cleanup.
Wink Saville [Mon, 12 Jan 2015 23:35:30 +0000]
Make SubscriptionController thread safe and some cleanup.

Use synchronized(mLock) on all public methods except getInstance which
is now synchronized on the class.

Change all members variables to private and non-static except sInstance
which will remain static.

Reduce logging in SubscriptionController.

Bug: 18716459
Change-Id: I679a7f184359ae8182c61308694354138a808b43

4 years agoMerge "Add additional debug logging." into lmp-mr1-dev
Wink Saville [Wed, 14 Jan 2015 00:51:52 +0000]
Merge "Add additional debug logging." into lmp-mr1-dev

4 years agoMerge "Fix for call timer resetting when starting IMS conference call. 2/4" into...
Tyler Gunn [Tue, 13 Jan 2015 20:42:48 +0000]
Merge "Fix for call timer resetting when starting IMS conference call. 2/4" into lmp-mr1-dev

4 years ago[DS] Load SPN from System or Oem image
Legler Wu [Mon, 29 Dec 2014 05:44:07 +0000]
[DS] Load SPN from System or Oem image

If the timestamp of spns-conf.xml in Oem image is greater than the
one in system image then load apn from OEM image.

Bug: 18692956
Change-Id: I9c5a661231184e594871cc670eda99f99907eb73

4 years agoRename reg/unreg OnSubscriptionsChangedListener.
Wink Saville [Tue, 13 Jan 2015 00:50:09 +0000]
Rename reg/unreg OnSubscriptionsChangedListener.

To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.

Bug: 18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f

4 years agomerge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Tue, 13 Jan 2015 14:09:31 +0000]
merge in lmp-mr1-release history after reset to lmp-mr1-dev

4 years agoAdd additional debug logging.
Wink Saville [Mon, 12 Jan 2015 21:17:38 +0000]
Add additional debug logging.

Bug: 18950975
Change-Id: I2d826dc4c355d7b940fee90f1bdff946128166e6

4 years agoIMS: fix ImsPhoneConnection wakelock stuck
Libin.Tang@motorola.com [Sat, 10 Jan 2015 19:36:29 +0000]
IMS: fix ImsPhoneConnection wakelock stuck
Bug: 18965642

Change-Id: If708a0cde665fd9225138bf07db7d27e2cd36709

4 years agoMerge "Assisted dialing support of Multi-part SMS" into lmp-mr1-dev
Amit Mahajan [Mon, 12 Jan 2015 19:59:51 +0000]
Merge "Assisted dialing support of Multi-part SMS" into lmp-mr1-dev

4 years agoAssisted dialing support of Multi-part SMS
Xia Ying [Fri, 9 Jan 2015 01:12:52 +0000]
Assisted dialing support of Multi-part SMS

Bug: 18951323
Change-Id: I55eff2d5c7b8447acf0d2fc067ea443c34febc49

4 years agomerge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Mon, 12 Jan 2015 14:32:40 +0000]
merge in lmp-mr1-release history after reset to lmp-mr1-dev

4 years agoChange to not call setLine1Number() when display number is updated in
Amit Mahajan [Fri, 9 Jan 2015 22:46:14 +0000]
Change to not call setLine1Number() when display number is updated in
SubscriptionController.

Bug: 18957504
Change-Id: I83637b377d4a3af9eae1aee454da19be8a00496d

4 years agoFix for call timer resetting when starting IMS conference call. 2/4
Tyler Gunn [Fri, 9 Jan 2015 23:54:23 +0000]
Fix for call timer resetting when starting IMS conference call. 2/4

- Added support in Conference for specifying the connect time when the
conference is created.

Bug: 18959443
Change-Id: Id29f7ba878610a0a4eaf7bbd592f344af4c0ffc4

4 years agoChange to not call setLine1Number() when display number is updated in
Amit Mahajan [Fri, 9 Jan 2015 22:46:14 +0000]
Change to not call setLine1Number() when display number is updated in
SubscriptionController.

Bug: 18957504
Change-Id: I83637b377d4a3af9eae1aee454da19be8a00496d

4 years agoMerge "Make getDefaultSubId smarter and handle data only devices." into lmp-mr1-dev
Wink Saville [Thu, 8 Jan 2015 23:37:41 +0000]
Merge "Make getDefaultSubId smarter and handle data only devices." into lmp-mr1-dev

4 years agoMerge "“Pending” SMS is not sent automatically after airplane mode is turned...
Amit Mahajan [Thu, 8 Jan 2015 23:37:10 +0000]
Merge "“Pending” SMS is not sent automatically after airplane mode is turned off with VZW sim card" into lmp-mr1-dev

4 years agoMake getDefaultSubId smarter and handle data only devices.
Wink Saville [Thu, 8 Jan 2015 22:55:00 +0000]
Make getDefaultSubId smarter and handle data only devices.

Bug: 18919382
Change-Id: I9409d550cd4c3ef7bba64ca69ae0205ec3be3fec