• Home
  • History
  • Annotate
  • only in /frameworks/opt/telephony/src/java/com/android/internal/telephony/
History log of /frameworks/opt/telephony/src/java/com/android/internal/telephony/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
309d5afed9da8bb06de355561287dbb6b4274031 28-Jun-2018 Sooraj Sasindran <sasindran@google.com> Ignore the duplicate app

Ignore duplicate sim app if another app of same type
is already in ready state.

Test: Added unit test and verified on OBDM sim card.
Bug: 110894572
Change-Id: I056263d015d6b476c75b43fcae0954fc18af79fa
(cherry picked from commit 75845a6a91d25dab483a91dbdee347b67dce6756)
icc/UiccCardApplication.java
icc/UiccProfile.java
daed5e29637607defb16881eb4bfc17d1d875137 06-Jun-2018 Sanry Huang <sanryhuang@google.com> Revert "Hide system apps until installed (2/2)"

This reverts commit f3422e6d64d5858342c82fd3b858e4923bb983ec.

Bug: 74068582
Bug: 80444486
Bug: 80316870
Bug: 109803325
Bug: 109642189
Bug: 109660260
Bug: 109649585
Bug: 109647120
Bug: 109648512
Bug: 109648513
Bug: 109647122
Change-Id: I3cf6d955723dfc33ab77e3579a5bb2fc0bac5b72
(cherry picked from commit 079d4ec78e98ef51791d7dd45723c9fa3c464b94)
icc/UiccCarrierPrivilegeRules.java
25bb144767991e70d094c28f1b265cccff475c11 04-Jun-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Share lock object between UiccSlot, UiccCard and UiccProfile." into pi-dev
98a7a2b7cd8e0c4ea787e434ed9c6c6d5ddf8d5f 01-Jun-2018 Amit Mahajan <amitmahajan@google.com> Share lock object between UiccSlot, UiccCard and UiccProfile.

Prior to P, there was a single class UiccCard that had the lock. Now
it's split between these 3 classes, but if each has a separate lock
there can be a deadlock if they call each other's APIs which they do.
The solution is to use a single lock between them which is equivalent
to how the locking mechanism was earlier.

Test: Basic telephony sanity.
Bug: 80317780
Change-Id: Iadecb726dc3bf85dcde76c70a54e191f1a55007c
elephonyComponentFactory.java
icc/UiccCard.java
icc/UiccProfile.java
icc/UiccSlot.java
icc/euicc/EuiccCard.java
1d9236038f17f2806d543785475427089157566d 01-Jun-2018 Hall Liu <hallliu@google.com> Merge "Change how RTT pipes are set" into pi-dev
64e8b45194b588e4ac9100c283e600d626815049 01-Jun-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fixed that locale was not updated after airplane mode off" into pi-dev
1f807886d0651844482a758d026e3833d08aa96d 01-Jun-2018 Nathan Harold <nharold@google.com> Merge "Set Cell Bandwidth Correctly By RegState" into pi-dev
5a4dce7cc8d7cbb0398684c7dd399dad5796d848 01-Jun-2018 Brad Ebinger <breadley@google.com> Merge "Fallback to CS properly when indicated by ImsService" into pi-dev
670f3a47cde0e3410f756927f00d03ee2ef881dc 31-May-2018 Hall Liu <hallliu@google.com> Change how RTT pipes are set

Create a new RTT text handler if none exists when
setCurrentRttTextStream is called.
Add some logging when startRttTextProcessing is called.

Bug: 80257914
Test: manual
Change-Id: I592ba1e88fb7b82376d3862d3783196dcc7d5014
msphone/ImsPhoneConnection.java
e9de5f6004ee7ea86d97e4d310056fe7f0d05c86 30-May-2018 Jack Yu <jackyu@google.com> Fixed that locale was not updated after airplane mode off

Fixed a case that when network MCC/MNC is unavailable after
airplane mode off, locale tracker did not pull cell tower info
to determine the current country.

Now telephony gets the cell info from the modem when the device
is out of airplane mode. Also it periodically gets cell info from
the modem when network MCC/MNC is unavailable.

Test: Manual + unit tests
Bug: 80261412
Change-Id: I71810284a2d0b1e767d97e8e014f2a8497a77784
ocaleTracker.java
hone.java
37d949e6dd19c774b5f5d274e6fdbb1cc69a3b8e 31-May-2018 Brad Ebinger <breadley@google.com> Fallback to CS properly when indicated by ImsService

When using the ImsService to implement SMS over IMS
and a message fails with error SEND_STATUS_ERROR_FALLBACK, we
were falling back to the "old" implementation of sending the SMS
over IMS on the RIL instead of falling back to CS.

This change marks the SMS message trackers when the message
is being handled by the ImsService SMS implementation and if
we receive the SEND_STATUS_ERROR_FALLBACK error message we now
correctly fall back directly to CS.

Bug: 80441127
Test: run ImsTestApp and send SMS over IMS
Change-Id: Id87797829a7b26896c5f4add973221eeb2b95e7f
msSmsDispatcher.java
MSDispatcher.java
dma/CdmaSMSDispatcher.java
sm/GsmSMSDispatcher.java
9e6cd9c957cd31e22b8ceb2bdc89a3e00dfc60e5 31-May-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Hide carrier key download notification" into pi-dev
a2bfbd34ffd12720169285c24e4f80f9ad1ae063 30-May-2018 Tyler Gunn <tgunn@google.com> Merge "Move MMTEL feature capabilities reset into MmTelFeatureCompatAdapter." into pi-dev
b14ddca67586d2541584beb5e7b6a15017416525 19-May-2018 Nathan Harold <nharold@google.com> Set Cell Bandwidth Correctly By RegState

During the PollState procedure, The Voice and Data
RegState Results provide an initial cell bandwidth,
which is not being properly set in cases where the
device already has CarrierAggregation by the time
the poll state finishes, or when the radio has
returned to idle but we have a new serving cell.

-Cache the last PhyChanConfig in ServiceStateTracker.

-Add support to populate the SS Bandwith in poll state
by first seeing if there is a list of phychan configs.
If it exists and is valid, use it. If not but there is
a valid bandwidth in the cell identity use that.

-Fix the RatRatcheter.isSameRatFamily() so that RATs
that lack a mapping to a family do not compare to
equal.

-Fix the Ratcheting logic so that bandwidths are only
ratcheted when there is no location change detected.

Bug: 80004809
Test: manual
Change-Id: Ibbcb8556cd4b64f12c57353b00c2c38116b31c70
atRatcheter.java
erviceStateTracker.java
d01c6d858bd8865a2c56663ce443e33890cde9f6 26-May-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fix issue no SIM broadcast under pass through mode." into pi-dev
0efb7f4b0ceb42f9173aed6530b6a7ffef6deba0 22-May-2018 Tyler Gunn <tgunn@google.com> Move MMTEL feature capabilities reset into MmTelFeatureCompatAdapter.

ImsPhoneCallTracker currently resets the feature capabilities which are
available when IMS is de-registered. Moving this to the compat adapter
as it is now expected that an ImsService which does not make use of the
compat adapter will inform the framework of capability changes prior to
de-registration.

Bug: 73076695
Test: Enable airplane mode and inspect logs to ensure feature capabilities
are reset to 0.

Change-Id: Iee2ecb3fb9f0a6edf18570fe65abb9827e048fbd
ms/MmTelFeatureCompatAdapter.java
msphone/ImsPhoneCallTracker.java
30d9361a3be1ea9bb3c2bcb1720e6eb04af2bdec 25-May-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fix the deadlock issue for eSIM." into pi-dev
b4e707c9b7ae501d1a77359f9ab2114774523e69 24-May-2018 Jordan Liu <jminjie@google.com> Hide carrier key download notification

Test: manual
Fixes: 79768612
Change-Id: Ib7360ba5370b893574e45959611a2dbb6645da6f
arrierKeyDownloadManager.java
d4e69532c8c8d25ea440ed58091ba055546bde41 18-May-2018 Holly Jiuyu Sun <jiuyu@google.com> Fix the deadlock issue for eSIM.

EuiccCard only allows one caller to open logical channel at the same
time, and would reject the second caller if the logical channel is
already open. For eSIM operations, getting profile list and sending
notifications are done asynchronously and can happen at random time.
This would cause race condition for other normal eSIM operations and
thus cause failures. We've made the LPA caller to call EuiccCard
sequentially to solve the problem. But
requestEmbeddedSubscriptionInfoListRefresh inside delete would cause
deadlock issue in LPA. Therefore, we should call just call
requestEmbeddedSubscriptionInfoListRefresh asynchronously and trigger
the callback to return.
Also, log the exception in EuiccCardController for better debugging.

Bug: 78365287
Test: test on phone
Change-Id: Iaffa1bd17e0e3d898eac11337095ede9ef544aa1
uicc/EuiccCardController.java
7186dc5fb177bbd2095646ef726bfc86b0e12e7c 24-May-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Hide system apps until installed (2/2)" into pi-dev
c533425648dd482cd42ce06b4ebb822aacc2bf2a 24-May-2018 Qingxi Li <qingxi@google.com> Fix issue no SIM broadcast under pass through mode.

Under pass-through mode, we cannot open logical channel which causes
loading EID failed. In this case, we should set EID to empty and still
send SIM_STATE_CHANGED broadcast out.

Bug: 80207753
Test: E2E
Change-Id: Ie24b3a3041db94961c35b3c32c45076b06cdfe0b
icc/euicc/EuiccCard.java
80ce47fde433a5bb406da51fbfd6bbb473c94630 23-May-2018 Pengquan Meng <mpq@google.com> Fixed ratratcher issue

Test: telephony sanity test
Bug: 80189394
Change-Id: Ie8ce6493fd19e8a8a6557d15ec702825654b48f5
atRatcheter.java
a0507a81827ccbfc1084a51588d6df65f0aa853a 23-May-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Passing data RAT for old setup data call API" into pi-dev
7465b0a9baaa9e27088324cda4f005aab40fa71d 23-May-2018 Jack Yu <jackyu@google.com> Passing data RAT for old setup data call API

The old 1.0 setup data call interface takes RAT as an input
parameter. In order to support the existing legacy devices, we
pass the data RAT instead of unknown to the vendor RIL. This change
does not impact the new setup data API, which takes access network
type as a parameter.

Test: Manual + unit tests
Bug: 79234282
Change-Id: Ibff5913f4ed48006d507281b69e5648412188a45
IL.java
af77c2284d75a84a132fc6554026b6899acf3652 23-May-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fix issue that LPA cannot receive OTA status update." into pi-dev
0d9f586153114c5df6407d7919117f49593fa149 16-May-2018 Qingxi Li <qingxi@google.com> Fix issue that LPA cannot receive OTA status update.

Bug: 80096872
Test: E2E
Change-Id: If8dd3f8dfb2cff8afda9098464972ef471e6cab5
uicc/EuiccController.java
824b64bd642a8340a1766c2b1bfd7230cfed40fa 17-May-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Notify user to select back to global mode while no service." into pi-dev
4a2277c68cfc34587be87144bb5be7f9890c7393 17-May-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fixed that locale tracker incorrectly used the invalid cell info" into pi-dev
8d1b2a2bd6b2b3655eef4b2c9de6c2f57ca1e602 17-May-2018 Xiangyu/Malcolm Chen <refuhoo@google.com> Merge "Fix bug that UiccSlot#isStateUnknown returns true in ABSENT state." into pi-dev
bd8afe30d8ed207ef0625c4a185515ebcb7e6ffd 17-May-2018 Eric Schwarzenbach <easchwar@google.com> Merge "Add logs for PhysicalChannelConfig indications" into pi-dev
5d391ebcec77aebd99e772bcfeaec1ecd8d5b469 16-May-2018 Jack Yu <jackyu@google.com> Fixed that locale tracker incorrectly used the invalid cell info

Fixed that the locale tracker used the invalid cached cell info
when airplane mode is turned on. We should clear the cache when
airplane mode is on.

The previous fix ag/4058309 was reverted because it caused crash.
This is the right fix with unit tests added.

Test: Manual
Bug: 79230575, 79861643, 79771106
Change-Id: I410c309a6afa42d98299819675afa8c3de151215
ocaleTracker.java
a12e3dabbddce9fb8669dfb06627b38f01c5efd4 16-May-2018 Malcolm Chen <refuhoo@google.com> Fix bug that UiccSlot#isStateUnknown returns true in ABSENT state.

For some cases, Uicc#mStateIsUnknown fails to be set to false. Here
it's fixed. Also, isStateUnknown will only return true if state is
null or ABSENT.

Test: manual
Bug: 79724575
Change-Id: I880a05dd9558716c9a3e78dc285fcf88662b0d25
icc/UiccSlot.java
1b2563e362a125760779c0af64a58149560fe1c4 16-May-2018 Xiangyu/Malcolm Chen <refuhoo@google.com> Merge "Broadcast state change if cardState becomes ABSENT in SlotStatus update." into pi-dev
fa931b5b58144a5140483981d4ce0de0a0f69543 16-May-2018 Jack Yu <jackyu@google.com> Merge "Revert "Fixed that locale tracker incorrectly used the invalid cell info"" into pi-dev
5af007034dd464c9e5af965dc0de5afcebdd06d0 16-May-2018 Jack Yu <jackyu@google.com> Revert "Fixed that locale tracker incorrectly used the invalid cell info"

This reverts commit 5d0e70f2c35793533ee892fcab5a42c34bb7a536.

Reason for revert: Caused boot loop crash b/79861643

Change-Id: I0484bbffd2ca75277b11014a70a15ce829591f0d
ocaleTracker.java
d5bca7ced69417750fef5efb0253eb9054ee33cf 26-Apr-2018 mavishsu <mavishsu@google.com> Notify user to select back to global mode while no service.

Currently, CarrierServiceStateTracker only check config change when network is registered or deregistered. We need to consider preferred network mode change condition to avoid any missing.

Bug: 78309534
Test: atest CarrierServiceStateTrackerTest
Change-Id: I15af0ed37aa58c6c793ccb759c19fd8b79f41b7c
arrierServiceStateTracker.java
erviceStateTracker.java
c85b130c97334fee82499a5dbe7b8f6ceee1c27b 16-May-2018 Jordan Liu <jminjie@google.com> Merge "DcTracker prioritizes preferred apn set" into pi-dev
19f358eeb937a1c26dcebbe94aba533890e110ce 16-May-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fixed that locale tracker incorrectly used the invalid cell info" into pi-dev
2abcc8f5d0dc589e7bd2f1b7ce1d7d4f0a8a5e10 09-May-2018 Jordan Liu <jminjie@google.com> DcTracker prioritizes preferred apn set

Bug: 70172263
Test: DcTrackerTest#testFetchDunApnWithPreferredApnSet and manually
verify that trySetupData sets waiting apns in correct order depending on
user selected default APN
Change-Id: Icf84e4a2fa118644761d348e6b4a3a363aba3aa5
ataconnection/DataConnection.java
ataconnection/DcTracker.java
9eac50b6b7da40f5f38277b7171b97c524f1f590 15-May-2018 Eric Schwarzenbach <easchwar@google.com> Add logs for PhysicalChannelConfig indications

Bug: 78791811
Test: compilation

Change-Id: Ia958009f0e8632b8b5b26fa5a4ff673e0f1a275f
IL.java
adioIndication.java
5d0e70f2c35793533ee892fcab5a42c34bb7a536 15-May-2018 Jack Yu <jackyu@google.com> Fixed that locale tracker incorrectly used the invalid cell info

Fixed that the locale tracker used the invalid cached cell info
when airplane mode is turned on. We should clear the cache when
airplane mode is on.

Test: Manual
Bug: 79230575
Change-Id: I3669ce4aef4d4fa5ba293478f699eb819da0faab
ocaleTracker.java
d51d6d4229931e3baf3562fc1bf37ba19780312d 15-May-2018 Pengquan Meng <mpq@google.com> Merge "Fix race condition for getSubscriberId" into pi-dev
09e47aaeffc7f61b625e3e8a105b81cff99058fe 11-May-2018 Pengquan Meng <mpq@google.com> Fix race condition for getSubscriberId

GsmCdmaPhone.getSubscriberId get the data from the cache IccRecords.
It may not the same as the IccRecords of the current uicc application,
so change it to use the IccRecords from the current uicc application.

Test: atest GsmCdmaPhone.java
Bug: 78592281
Change-Id: I05b931e2f2c2aa89eef184fbfef56ff0c2ece3eb
smCdmaPhone.java
a1d802eb4b862a9a796a36072e9b2c805360d834 08-May-2018 Malcolm Chen <refuhoo@google.com> Broadcast state change if cardState becomes ABSENT in SlotStatus update.

CardState may be updated in SlotStatus changed. When that happens, we
need to check if we need to broadcast ABSENT state update, just like we
do when uicc card status is changed.

Bug: 79190707
Test: unittest
Change-Id: I029090b82984088f6a486be91935949ab9f24184
icc/UiccSlot.java
50e68daf616783da72141f9f525a48623a72d95c 11-May-2018 Jack Yu <jackyu@google.com> Merge "Fixed crash when RAT changes with tethering on" into pi-dev
3ced483cd038e9fd14490ac33b0d1f2d8d2517a4 09-May-2018 Jack Yu <jackyu@google.com> Fixed crash when RAT changes with tethering on

We should use the orignal APN setting used for data setup
to determine if the data connection has DUN capability.

Test: Manual
Bug: 78592192
Change-Id: I57c823061d49238c9c76deb54c59dbcf95153108
ataconnection/DataConnection.java
8d82f3dedb71f729d425c18dabcf30105b6e684b 11-May-2018 Jordan Liu <jminjie@google.com> Merge "Update ApnSettings to include the apn-set-id" into pi-dev
21f6e74b368a7045981cdb718570bf872471ac0b 11-Apr-2018 Jordan Liu <jminjie@google.com> Update ApnSettings to include the apn-set-id

Bug: 70172263
Test: no behavior change; manually verify that APNs still work like
normal, run existing DcTracker and ApnSetting tests, new testToString
passes
Change-Id: I29f94dc9377771dd7e36d261a0cd7bcde3411a10
ataconnection/ApnSetting.java
ataconnection/DcTracker.java
53a1673796a15779fa896ea8fd4b8f5eb766420f 10-May-2018 Jordan Liu <jminjie@google.com> Merge "Unlock mUiccCard access in UiccProfile" into pi-dev
73c0aee46aa5e653dc8127eff20dd81b8fe0c28e 08-May-2018 sqian <shuoq@google.com> Enhance adding subscription info logs

Test: Manual
Bug: 79428110
Change-Id: I88d40204cc0719dba4ef6f65eca5d3139b8433b3
ubscriptionController.java
ubscriptionInfoUpdater.java
8f3f43e77d284dcfb94db618201233a3a11f7d59 09-May-2018 Jordan Liu <jminjie@google.com> Unlock mUiccCard access in UiccProfile

Waiting on locks for the parent mUiccCard in the UiccProfile class has
the potential to cause deadlocks. Unlocking it is safe because
UiccCard#getCardState is read only, and EuiccCard#unregisterForEidReady
and #registerForEidReady are guarded within the RegistrantList class.

Bug: 78601499
Test: builds and boots, makes calls, siminfo table is correct
Change-Id: I6bd56dadd6a2ec9849ab934002c435ee6dc33ef9
icc/UiccProfile.java
5febcd55d2dfae5fc9b5bc665fd3091bc4eaff6c 09-May-2018 android-build-team Robot <android-build-team-robot@google.com> Merge "Fixed that country code was not updated when airplane mode is on" into pi-dev
658463a5a3b286e14a60e1d5c28998a993142a42 07-May-2018 Jack Yu <jackyu@google.com> Fixed that country code was not updated when airplane mode is on

Separated the update operation into synchronous and asyncronous
version. The async version allows getting cell info from a different
thread, which is a workaround before b/78194934 is fixed. Also
added airplane mode check to prevent unnecessary cell info polling.

Test: Manual
Bug: 78681251
Change-Id: I99947139dc371254158dfdcb7c3945361432804d
ocaleTracker.java
erviceStateTracker.java
b8ed5811e5456b64838c198ba7ef7058920e3d4b 27-Apr-2018 sqian <shuoq@google.com> getRadioProxy and getOemHookProxy modification

- Remove hacky getRadioProxy() and getOemHookProxy()
in EVENT_RADIO_PROXY_DEAD due to sending message delay

- Add getOemHookProxy(null) in resetProxyAndRequestList

Since P and later devices does not support Oem Hook Service in hal,
log this information for the deprecated Oem Hook Apis when it is called
in P and its later devices (it already returns useless information when
service is null).

(verified with "Disable OEM Hook" in cuttlefish ag/3879465;
verified with "remove oem hook" in P device ag/3958422/)

Bug: 34344851
Bug: 78570593
Bug: 77496810
Test: TH tests; cuttlefish tests;
Change-Id: If1c22cd3d5ae7a8b4d081fc1a56292f9ddfb1a32
IL.java
fd13d12708b66b7c5e92ab76e298f680f9fc0cce 30-Apr-2018 Steven Moreland <smoreland@google.com> Merge "OemHook missing but called: don't infinite loop" into pi-dev
f7436df0b7bbf8e56f6e3b188b3ce1035e29d6a2 27-Apr-2018 Shuo Qian <shuoq@google.com> Merge "Restore the OEM hook implementation and usage" into pi-dev
af9e9c88dc6ff6def10520c26566c52511fd0a90 27-Apr-2018 Gil O'Neil <goneil@google.com> Merge "Exposed method as public for testing that reloads UiccProfile rules" into pi-dev
e56dc56e12c0e35e430960cefd076846239506c2 26-Apr-2018 Chen Xu <fionaxu@google.com> Merge "DO NOT MERGE fix the merge conflict for Ratratcheter" into pi-dev
498ab681c876500f0a7ea5174d5f89f79f9d6a89 26-Apr-2018 Steven Moreland <smoreland@google.com> OemHook missing but called: don't infinite loop

The previous code assumes that if an IOemHook related method
is called that IOemHook is on the device.

The infinite loop:
-> getOemHookProxy
-> getService return null
-> EVENT_RADIO_PROXY_DEAD sent
-> getOemHookProxy(null) called

Bug: 78299964
Test: cuttlefish 4G working
Change-Id: Ia841c6fdee6706a7e2fc857a378dab154d07acff
IL.java
ac009536df32d886e1bab79f07e61200ea6bdcf9 25-Apr-2018 Shuo Qian <shuoq@google.com> Restore the OEM hook implementation and usage

The current plan is to keep the OEM hook implementation in the
framework, this is for legacy device and old device upgrading
(per b/78098059).

For P launching device, the OEM hook service is removed in hal,
so the OEM hook api in framework should return something dummy, and
prevent infinite loop to get service, but these parts should be done
in seperate CLs after this restore CL is merged.

This reverts commit acc87ce9d9a91f0eb80c411ddbf66c82ef2e04d3.

Bug: 34344851
Change-Id: Ib58d9e0842ac1764f91391b1403a3d841f4a1bd9
aseCommands.java
ommandsInterface.java
efaultPhoneNotifier.java
emHookIndication.java
emHookResponse.java
hone.java
honeNotifier.java
IL.java
adioResponse.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
944e3114dc708d3cc39dced9549cdd440b656503 25-Apr-2018 fionaxu <fionaxu@google.com> DO NOT MERGE fix the merge conflict for Ratratcheter

Bug: 65695609
Test: runtest --path ServiceStateTrackerTest.java
Change-Id: I7f501ba901f6ea5fa243990639429664d2f98ab8
erviceStateTracker.java
0c65c655b395c8d771bd94d9b891fa8a2158a0ee 25-Apr-2018 Shuo Qian <shuoq@google.com> Merge "Revert "Revert "Remove the OEM hook implementation and usage""" into pi-dev
acc87ce9d9a91f0eb80c411ddbf66c82ef2e04d3 24-Apr-2018 Robert Greenwalt <rgreenwalt@google.com> Revert "Revert "Remove the OEM hook implementation and usage""

This reverts commit 73852a1d6eb29f844bc8d08bb33aca3e29b17733.

Reason for revert: Causes a critical error in Cuttlefish

Bug: 78299964

Change-Id: I66819556f2ed4bb05c133c200462b91e44d9ec23
aseCommands.java
ommandsInterface.java
efaultPhoneNotifier.java
emHookIndication.java
emHookResponse.java
hone.java
honeNotifier.java
IL.java
adioResponse.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
a036b6960d4c72e4e9b66fd98f658a6f20695aca 24-Apr-2018 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Data stall recovery attempts notification" into pi-dev
b992de1cbd8851515c0e0edf2befcb6f1b352095 24-Apr-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Update the card state and iccid for active slot" into pi-dev
f3422e6d64d5858342c82fd3b858e4923bb983ec 19-Mar-2018 sanryhuang <sanryhuang@google.com> Hide system apps until installed (2/2)

Applying this mechanism for system carrier apps to make visibility
reasonable from the user's perspective. In other words, before
hidden system apps have been installed, they wouldn't be listed
via APIs in PackageManager which are used at all apps list and
search in Settings and so on.

Test: manual
Test: atest CarrierAppUtilsTest
Bug: 74068582
Change-Id: Ia0ed11f6dd3773d72e5346875570f6a36525409b
icc/UiccCarrierPrivilegeRules.java
b84e50571d0cae3f8e21a1e761634406dce06411 22-Apr-2018 Chen Xu <fionaxu@google.com> Merge "DO NOT MERGE CarrierIdentifier listen for simrecordsOverride event" into pi-dev
a0b9d20b2c42aae3360156147cf9a0201c2d2e99 21-Apr-2018 Jack Yu <jackyu@google.com> Merge "DO NOT MERGE - Set country code even when device is not registered on network" into pi-dev
199f4fd9f4075d4b2787e4ff918ef90d28f4ff2b 13-Apr-2018 Jack Yu <jackyu@google.com> DO NOT MERGE - Set country code even when device is not registered on network

Extends the functionality of getNetworkCountryIso to support
no SIM/no service case. When no SIM/no service, it returns
the country code of nearby network (unregistered but cell info
is available to the device).

Test: Manual
Bug: 64335394
Change-Id: I3054a300aa569a0e9c99934970a2bdb3b9fcac41
ocaleTracker.java
erviceStateTracker.java
elephonyComponentFactory.java
64928c72f74688d63a20cd233c28fc089d336a7a 30-Mar-2018 Jayachandran C <jayachandranc@google.com> Data stall recovery attempts notification

Send an intent to notify the data stall recovery attempts.

Test: Manual
Bug: 77293796
Change-Id: Id565c42dc30db66deec339828d237d6c7e8473f3
ataconnection/DcTracker.java
bb4142bb4c2e1bc8417e9c98799a5209bea858fe 20-Apr-2018 Chen Xu <fionaxu@google.com> Merge "Revert "Fix the roaming searching text display in standby screen"" into pi-dev
34d5b710cf2d5f2408b53b41490efa88a57dc4f4 20-Apr-2018 fionaxu <fionaxu@google.com> DO NOT MERGE CarrierIdentifier listen for simrecordsOverride event

CarrierTestOverride is a test API to override sim records
information. It notify the listeners that new sim records is available.
For example, DcTracker will refetch and APN settings and sent out an
initial attach request to RIL. It turns out that frequent
carrierTestOverride could end up with frequent RIL requests and
eventually crash the RILD. The short term fix is notify sim records
override events without waking update other components.
The long term fix is ganrantee RIL do not crash and also try to
decouple DcTracker and other components from listening internal
sim records loaded events.

Bug: 72332597
Test: Gts carrierIdTest
Change-Id: I18f055b2b18ab55b0e1c140668b60d6688a8a47d
arrierIdentifier.java
icc/IccRecords.java
533efa190eb0b4c5cff93f3bd2ac89cabf340cbe 19-Apr-2018 Chen Xu <fionaxu@google.com> Revert "Fix the roaming searching text display in standby screen"

This reverts commit 3e9f9dbb819b1fb2ad6c0f68b00abb6fb518165c.

Bug: 78124701
Bug: 38148764

Change-Id: I266b9d24efaa1a20f1ac644d5fceb10efc954b89
(cherry picked from commit e84c09bf7b3af8b1719ef0e2259d622ce721d2c3)
Merged-in: I266b9d24efaa1a20f1ac644d5fceb10efc954b89
erviceStateTracker.java
45ef8087037dc0d21f412fc3c46cc170991dcc86 18-Apr-2018 yinxu <yinxu@google.com> Add logs for RadioConfig

Bug:78118600
Test: Unit Test

Change-Id: I4ad8adcb53a77383dc2fa3832a4a574c1ebb63d0
adioConfig.java
adioConfigIndication.java
adioConfigResponse.java
909b9acc801116e577b3856d153a8a65b691409a 19-Apr-2018 yinxu <yinxu@google.com> Update the card state and iccid for active slot

Even when the slot is active, we still need to update the card state and
iccid when receiving the slot status change.

Bug: 78250718
Test: Unit Test
Change-Id: I63470c7c5952f52fabd414a8d957224413386506
icc/UiccSlot.java
efeba18bb2510f0de75e64b22c26691583e425a9 18-Apr-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Add carrier config for partial sms raw message expiration." into pi-dev
13a555a9b583c706ffebc7c8baf9896b19907490 18-Apr-2018 Shuo Qian <shuoq@google.com> Merge "Revert "Remove the OEM hook implementation and usage"" into pi-dev
d324ff24d2ca971ee1ad3fa990aa83a0eb71544b 18-Apr-2018 Pankaj Kanwar <pkanwar@google.com> Merge "Revert "Use current active slot when physical_slot_id is not set"" into pi-dev
27e578540f227974972254638fb426051436b501 18-Apr-2018 Pankaj Kanwar <pkanwar@google.com> Revert "Use current active slot when physical_slot_id is not set"

This reverts commit c61dd4e249cdcb2152ecbd6f4afd24ae20dcf340.

Bug:78135516

Change-Id: I612f608fe3e3133d54161803bbadf7204127a9e3
icc/UiccController.java
73852a1d6eb29f844bc8d08bb33aca3e29b17733 17-Apr-2018 sqian <shuoq@google.com> Revert "Remove the OEM hook implementation and usage"

This reverts commit 6993a3eef4eed1a2f31a967d330bdd97e76fe1c5.

Bug: 34344851
Test: Treehugger
Change-Id: If12893fb1ef0da41d5f008a5232a06e98d4428a0
Merged-In: If12893fb1ef0da41d5f008a5232a06e98d4428a0
(cherry picked from commit 42b72c2351d823bf0e79b72b2fe6b140aae468ec)
aseCommands.java
ommandsInterface.java
efaultPhoneNotifier.java
emHookIndication.java
emHookResponse.java
hone.java
honeNotifier.java
IL.java
adioResponse.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
bc41956e77ff0fa4dd514fee85bf9bd07934385b 07-Apr-2018 goneil <goneil@google.com> Exposed method as public for testing that reloads UiccProfile rules

Bug: 74016670
Test: simappdialog GTS tests
Change-Id: If16e4997e0f5734a28c67efb13b21c6c698310bb
icc/UiccProfile.java
a43d71d6ebf9daa09783218bdb17a456d18aadc5 18-Apr-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Use a dummy IccCard to pass absent/unknown state" into pi-dev
96170b8afa17db4832f5f0e7fab0f64dc2428a64 17-Apr-2018 Jordan Liu <jminjie@google.com> Use a dummy IccCard to pass absent/unknown state

GsmCdmaPhone#getIccCard returns a dummy IccCard with the state set to
absent or unknown depending on UiccSlot#isStateUnknown.

Fixes: 78033484
Test: manual and new unit test testGetIccCardUnknownAndAbsent
Change-Id: I4a42ee6d4b6b14c0c02b7db709d2af6d6df90f26
smCdmaPhone.java
ccCard.java
icc/UiccSlot.java
578793973827214cba88964a6dcf4b2f4244df10 17-Apr-2018 Ying Xu <yinxu@google.com> Merge "Use current active slot when physical_slot_id is not set" into pi-dev
4ef421c1dccd279bc634dc50d46aa5f7fb8cce14 17-Apr-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fixes ImsResolver when overriding dynamic features" into pi-dev
c61dd4e249cdcb2152ecbd6f4afd24ae20dcf340 17-Apr-2018 yinxu <yinxu@google.com> Use current active slot when physical_slot_id is not set

If the physical_slot_id is not set in the IccCardState, we should route
the IccCardState update to the current active slot. If there is no
active slot, we simply use the phone ID as the slot ID.

Bug:78118600
Test: Unit Test
Change-Id: I1d6c5c12ee97384851c1ecfaf4d56128695e81d8
icc/UiccController.java
d87b763708abdf2ec120a1391f7a210e9c9d0856 16-Apr-2018 Malcolm Chen <refuhoo@google.com> Add carrier config for partial sms raw message expiration.

Everytime at boot-up, we check Sms raw table, and delete the rows
with any partial message that is too old. By default the expiration
age is 30 days, but we want to make it configurable.

Bug: 77910620
Test: sanity-test
Change-Id: I76a4bac3e986cd39e0d57f9d09d1be2be125184e
msBroadcastUndelivered.java
98b53968388c83a9230a6b9c7b751a9f20040fc6 16-Apr-2018 Jiuyu Sun <jiuyu@google.com> Merge "Override updateCardId in EuiccCard." into pi-dev
baa462f3a83b6c7956ba16f77b62a12fcb2dec1c 16-Apr-2018 Jiuyu Sun <jiuyu@google.com> Merge "Bugs fix for eUICC." into pi-dev
58292e7efb57dff6759580c0d0b1a96a284e713a 13-Apr-2018 Brad Ebinger <breadley@google.com> Merge "Update docs for Message IPC and use Messenger." into pi-dev
e8c34b7386afb410a9c2fa4812a58675b90dadb8 13-Apr-2018 Holly Jiuyu Sun <jiuyu@google.com> Override updateCardId in EuiccCard.

In UiccCard, updateCardId() will overwrite the cardID with iccid. This
is not the case for EuiccCard. EuiccCard should always use the eid as
the cardId.

Bug: 77980246
Test: test on phone
Change-Id: I3483ca6ab429e9186f1c7be3b2dd51311b0f7cbe
icc/euicc/EuiccCard.java
9c68cde9dcbc560a35b8164dff59f1a70681664d 13-Apr-2018 Pankaj Kanwar <pkanwar@google.com> Merge "carrier id cleanup" into pi-dev
d687148b8a2627ba49296e28d38580697940c5e7 06-Apr-2018 Holly Jiuyu Sun <jiuyu@google.com> Bugs fix for eUICC.

1) Bug fix on getProfile. Should have an A0 tag when creating the
request for getProfile and pad the trailing Fs back.
2) Check null on payload to avoid NPE.
3) Fix a typo on device capabilities. cdma1x should not have the
underscore.
4) Fix the bug on length cut when creating an APDU command segment.

Bug: 77661092
Test: test on phone, unit test
Change-Id: I69ac74179d96a51fdbff9eba34e17c379e5a1bdd
icc/euicc/EuiccCard.java
icc/euicc/apdu/ApduSender.java
icc/euicc/apdu/RequestBuilder.java
icc/euicc/async/AsyncResultCallback.java
d27bd6be3ed4a0d20a228767792476bdbbfc1484 10-Apr-2018 fionaxu <fionaxu@google.com> carrier id cleanup

1. carrierIdentifier should listen for SimRecords rather than Ruim/Csim
since all records are read from SimRecords.
2. carrierTestOverride should apply to SimRecords. Apply to Ruim/Csim is
a non-op
3. add registerForOperatorOverride to UiccProfile.

Bug: 72332597
Change-Id: Ia7c369b301b7c45cfc3e6dc9112dfbf5cea498b4
arrierIdentifier.java
smCdmaPhone.java
hone.java
icc/UiccProfile.java
271b4d7973c5c09cc7a069c48de258acbf777af2 12-Apr-2018 Hall Liu <hallliu@google.com> Merge "Use getDialingNumber instead of dialString for MMI" into pi-dev
9c2c625f40c79f679aafe40e197b11b942224768 06-Apr-2018 Brad Ebinger <breadley@google.com> Fixes ImsResolver when overriding dynamic features

The GTS test override for ImsService configuration
did not take into account dynamic feature queries.

Bug: 77141737
Test: atest GtsImsServiceTests
Change-Id: Iaea1c4fe0cc3c9cd376a69bf57ccb7da20dfdd4e
ms/ImsResolver.java
8a5c54f8ba1793a89bb8e18e819d1fc5b85bc1bf 11-Apr-2018 Brad Ebinger <breadley@google.com> Update docs for Message IPC and use Messenger.

1) Update docs for sendDtmf usage.
2) Update sendDtmf to include a Messenger in Message#replyTo
for IPC communication.

Bug: 77870347
Test: Manual, Telephony Unit Tests.
Change-Id: I76e965c8e231bf9d3fe97b42fccbb564378c65b6
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
23ce1441f52ae89e1a036ff74e6a51bfa3ea81b9 12-Apr-2018 Chen Xu <fionaxu@google.com> Merge "Change getGroupIdLevel1() to use subId from TelephonyManager Instance" into pi-dev
7f91b4c9d7bf2310a79685961236a7c455aaf241 11-Apr-2018 fionaxu <fionaxu@google.com> Change getGroupIdLevel1() to use subId from TelephonyManager Instance

Bug: 77905912
Test: Build
Change-Id: I7b341bda93fda9c7c8edccb43b6cff4e5f499967
honeSubInfoController.java
a065c62c6f55f7b1e9fce81eddf6f18fe294da4d 11-Apr-2018 Hall Liu <hallliu@google.com> Use getDialingNumber instead of dialString for MMI

Fix a copy-paste error introduced in an earlier CL

Change-Id: I5398e1b97dc93e6944aae5cddf0f79ca5743395d
Fixes: 77880591
Test: manual
msphone/ImsPhone.java
bd7db2a4dd79b84cbf6d6ec2fb394d4894e2581c 11-Apr-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Add status word codes for EAP-AKA" into pi-dev
a625ccdb9eb4dcd47b90f21de64fe78e9af1a72e 10-Apr-2018 Brad Ebinger <breadley@google.com> Merge "Updates IMS features when ImsService updates them" into pi-dev
52143a05fb39d12e04c92982298dd286adf78f5e 10-Apr-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Add mccmnc for unknown gid1 case in carrier Id metrics" into pi-dev
7dae182fab9d6cc5ecc4925e4abb539aa40b3a78 10-Apr-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Create UiccCard when mUiccCard is null and mCardState is not ABSENT" into pi-dev
6888dfdeee44848631f46d3a65a1da20780c30ec 10-Apr-2018 Jordan Liu <jminjie@google.com> Add status word codes for EAP-AKA

These codes can be returned by the modem when responding to calls to
TelephonyManager#getIccSimChallengeResponse(authType=EAP_AKA).
See the spec at TS 31.102 section 7.3.1.

Bug: 74392381
Test: manual
Change-Id: Iebb9611b21335e641a364ffa92d43a305b92ac8e
icc/IccIoResult.java
c09a6a7de975b17a5dc8f75a5cba9e88aabb23da 10-Apr-2018 Brad Ebinger <breadley@google.com> Merge "Adds the ability to override ImsService binding configs" into pi-dev
de72f77373b6b38cd650133c89f6cf72c55ac06b 09-Apr-2018 yinxu <yinxu@google.com> Create UiccCard when mUiccCard is null and mCardState is not ABSENT

Previously mUiccCard is only created when the mCardState is changing
from ABSENT to non ABSENT. This logic is now broken because the
mCardState may be updated in both IccCardStatus and IccSlotStatus, and
may cause the issue that mUiccCard is never created. This Cl added an
extra logic that when the mCardState is not ABSENT, while the mUiccCard
is still null, we also need to create a new mUiccCard.

Bug:77279870
Test: Unit Test
Change-Id: I0750cb118044dca6dfc12e8cf1a9cb6f143b2fdb
icc/UiccSlot.java
e0cbaff40048a1da597a9b8ad815d9a412446126 09-Apr-2018 Jordan Liu <jminjie@google.com> Merge "Do not check the carrier config for BrandOverride" into pi-dev
ddedb8b3d345bf4ec19f821b627e6648cb40fd0f 07-Apr-2018 Pengquan Meng <mpq@google.com> Merge "Fixed InboundSMSTracker issue" into pi-dev
338141547ed92d3b9d195c902032d3983d5fd1eb 06-Apr-2018 Jack Yu <jackyu@google.com> Fixed crash in subscription controller

Added null pointer check when no active subscription info
is returned.

Test: Telephony sanity tests
Bug: 77695179
Change-Id: Ifcab0f57eff5cf7e89421f0c4d378f112eadb073
ubscriptionController.java
7549b1314bca640223819c29a2ead9f282d2e9f6 05-Apr-2018 sqian <shuoq@google.com> Add mccmnc for unknown gid1 case in carrier Id metrics

Bug: 74132252
Bug: 77334923
Test: atest FrameworksTelephonyTests
Change-Id: Icc9f7dd9e86e86399c9a9aebcf0d98024ae46e90
arrierIdentifier.java
etrics/TelephonyMetrics.java
1214d9ac0a12c7c0d88e2fcfb3cfd28cd46d2f90 06-Apr-2018 Jordan Liu <jminjie@google.com> Do not check the carrier config for BrandOverride

This method is meant to return the PLMN operator name, which can be
overwritten by setOperatorBrandOverride but not the carrier config.

Bug: 31784938
Bug: 77461054
Test: manual
Change-Id: Ia5f842411a947beff8ce9f1b3d51f4455397c020
icc/UiccProfile.java
1cb661d39f7cf6c7a1e1c49056ae3bc539a30f9d 06-Apr-2018 Pankaj Kanwar <pkanwar@google.com> Merge "Fix issue where dialed CLIR MMI codes on IMS don't save setting." into pi-dev
4419d18a631493663dd50cc6e7616d74c1b48e7d 06-Apr-2018 Tyler Gunn <tgunn@google.com> Fix issue where dialed CLIR MMI codes on IMS don't save setting.

This change mirrors what is done in the GsmMmiCode class already and
ensures it is done in the Ims equivalent.

Test: Manually dial *31#, #31# and verify dial includes correct CLIR.
Bug: 77182496
Change-Id: I9faa9cf72cd6dc2e90f48341732870b2e9104f76
msphone/ImsPhoneMmiCode.java
6dd642bbcd968ec28dcde35fb21c80a1f7278c1d 05-Apr-2018 Brad Ebinger <breadley@google.com> Updates IMS features when ImsService updates them

When the ImsService calls onUpdateSupportedImsFeatures,
we now recalculate features and create/remove features
based on these changes.

Bug: 77606031
Test: GTS ImsService Test (atest GtsImsServiceTests)
Change-Id: Ie97fbff5e1eadb4e00e9bd4d1ccb56c965f0becc
ms/ImsResolver.java
ms/ImsServiceController.java
455bc2ce078ecdec70ab3741322870d7e80bc464 05-Apr-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fixed that tethering not working" into pi-dev
00d8dfc5ec8aed6b5842bb8cd64c14594d1be895 04-Apr-2018 Brad Ebinger <breadley@google.com> Adds the ability to override ImsService binding configs

Adds methods to override carrier/device ImsService
binding configs for GTS testing.

Bug: 77141737
Test: manual
Change-Id: I96d1dc04b7114bcedc38c72249d6b52f43539474
ms/ImsResolver.java
6462c0a4aed2fedaceff971c2902a439eedde3e1 04-Apr-2018 Chen Xu <fionaxu@google.com> Merge "restricted notification should reply on mSS not mNewSS" into pi-dev
cf377fc04f5e0aca1815d961827f1c6a80e275a6 04-Apr-2018 Pengquan Meng <mpq@google.com> Fixed InboundSMSTracker issue

The deleted where clause is set incorrectly when the InboundSmsTracker
created from cursor, causing the single sms from the same address are
deleted before to be delivered.

Bug:77540496
Test: existing test
Change-Id: I320f4e72b2e5026cfadd6c26dc431b53604ca2ba
nboundSmsTracker.java
02f6fc537e9e9ecd864e9b181e55a7f18d5f0fc5 03-Apr-2018 Jordan Liu <jminjie@google.com> Merge "Post notifications per subid" into pi-dev
08f2629f0dab6d464d55f88c00e44a43b66bbe9d 07-Mar-2018 Jordan Liu <jminjie@google.com> Post notifications per subid

Since SST exists per subscription, we should post notifications per
subId. We do this here by posting/canceling notifications with the
optional "tag" argument, so that the unique combination of
tag+notification-id itentifies each notification.

Bug: 69928579
Bug: 77532817
Test: manually verified that mPrevSubId is correct when
cancelAllNotifications is called on sim removal
Change-Id: Ib8836ee75715e7f274a3c365e88c30d8c7c62514
Merged-In: Ib8836ee75715e7f274a3c365e88c30d8c7c62514
erviceStateTracker.java
ec74378410bac5105c1c4f10ccbdfe475950322f 03-Apr-2018 Jack Yu <jackyu@google.com> Fixed that tethering not working

Fixed tethering not working when both DUN and Default
APN type are specified in the APN database. The data connection
with same APN for DUN was brought up incorrectly. We should reuse
the existing default connection for DUN.

Bug: 71562600
Test: Manual tests
Change-Id: Idf52c00d5371aaaa3091c9728a99905ab3b2f471
ataconnection/DcTracker.java
897bf4522d331319773b672420a60f5337163608 03-Apr-2018 Jack Yu <jackyu@google.com> Merge "Fixed that cache is not in sync with subscription database" into pi-dev
a1e5b416c1f908c8dd382a738f4e8dfa4495ad37 03-Apr-2018 fionaxu <fionaxu@google.com> restricted notification should reply on mSS not mNewSS

Bug: 70168086
Test: Build
Change-Id: I0876f94b78223e3c48fa9be7891c40a84d36772e
erviceStateTracker.java
83c687ec72da1c98d962f4d5ea8ed072d3283258 20-Feb-2018 Nathan Harold <nharold@google.com> Grant Default Perms for DataService on Bind

When we bind to a DataService, it needs a
permissions grant that allows the data service
to access information relevant to setting up
a PDN connnection either over Cell (modem) or
over WiFi (using IWLAN w/ IPsec). This CL adds
a call to grant the required permissions for
those to work.

Bug: 66955045
Test: runtest frameworks-telephony (on taimen)
Change-Id: I9ae6edc0d5e01a99b1d630556cf25810c95fa50b
ataconnection/DataServiceManager.java
991bb4335ef0f2a26c069515ecdc9ac4760d89bf 03-Apr-2018 Chen Xu <fionaxu@google.com> Merge "A test api to override carrier information" into pi-dev
b51f84fb60196b3b6a89e855f13c8274724736d4 02-Apr-2018 Jack Yu <jackyu@google.com> Fixed that cache is not in sync with subscription database

Fixed the race happened when updating the active subscription
list cache. Adding lock to protect the cache updating process.

Test: Telephony sanity tests
Bug: 71759133
Change-Id: I2004fea02be74db9ae3e9cdaf3599261c53bf3e4
ubscriptionController.java
e9d09a275cf81ae69a11ad23ffe30766f4264ba8 02-Apr-2018 Xiangyu/Malcolm Chen <refuhoo@google.com> Merge "Store NetworkServiceCallback in RegManager." into pi-dev
74f3a22c4f599baa61adca48efee4405eae9aa40 02-Apr-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Use multisim notifications" into pi-dev
d5eab58b9836f6f269950f1c2530c14f83675c91 30-Mar-2018 Malcolm Chen <refuhoo@google.com> Store NetworkServiceCallback in RegManager.

To avoid NetworkServiceCallback being garbage collected before
getting called, we keep them in a map in NetworkRegistrationManager.
Also, adding more debug messages.

Bug: 76392715
Test: existing test
Change-Id: Id9fce6e4cca8116362a0e899e465aabf81743403
Merged-In: Id9fce6e4cca8116362a0e899e465aabf81743403
etworkRegistrationManager.java
erviceStateTracker.java
fc54095a3bfa3925c16e4daed6ce6b2b58f4a93f 02-Apr-2018 Yifan Hong <elsk@google.com> Merge "IRadioConfig HAL: use default instance name." into pi-dev
ee1df74bea617d89fc7c795b3fdd47e98294093b 15-Mar-2018 Jordan Liu <jminjie@google.com> Use multisim notifications

Specify SIM number in notification text and details.

Bug: 69928579
Test: new unit tests in ServiceStateTrackerTest
Change-Id: Ie10471748cd7ed7c680f80092226aa1f344ae47a
Merged-In: Ie10471748cd7ed7c680f80092226aa1f344ae47a
erviceStateTracker.java
52d733c65408558f2994e6143110ffa5e86b9710 31-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Implement voiceRegStateResponse_1_2 and dataRegStateResponse_1_2" into pi-dev
29d555872802d6ef4a391e1e8edadd422dcb606e 30-Mar-2018 Brad Ebinger <breadley@google.com> Merge "Use @SystemApis in platform instead of hidden fields" into pi-dev
d106129577ae1c345e0f6353f035773d6349a31c 30-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "DO NOT MERGE hide restricted notification from unregistered nw" into pi-dev
081bacdc40c52ea1fb099f414ff37ca0347db016 24-Mar-2018 fionaxu <fionaxu@google.com> DO NOT MERGE hide restricted notification from unregistered nw

under poor cell coverage, devices might roams to other
network with unregistered service. We should not handle
those invalid restricted service indications from uncamped
networks. Add condition check before showing the notification

Bug: 70168086
Test: Build
Change-Id: I07637ccdbacff494038d4fc758904c430d7e6817
erviceStateTracker.java
8960458652e870ddbaf9eeda1291abed76f0e26f 21-Mar-2018 fionaxu <fionaxu@google.com> A test api to override carrier information

This API should only be used for testing purpose e.g., CTS/GTS/SL4A
By overriding carrier information, we could force a particular carrier id,
carrier's config, but also any country or carrier overlays to be loaded
when using a test SIM with a call box.

Bug: 72332597
Test: atest CtsTelephonyTestCases:CarrierIdentificationTest

Change-Id: I32fa202597b69e6eba11e86bd1096e5f1bf1a639
arrierIdentifier.java
smCdmaPhone.java
hone.java
icc/CarrierTestOverride.java
icc/IccRecords.java
icc/SIMRecords.java
2c7b51528995b3774488343d83b26114fa283d10 15-Mar-2018 Eric Schwarzenbach <easchwar@google.com> Implement voiceRegStateResponse_1_2 and dataRegStateResponse_1_2

Adds methods to create NetworkRegistrationStates from both 1.0 and 1.2
data/voice regstates.

Bug: 74826109
Test: make
Change-Id: I83cd8e1261aa296853d159d57e0524b8468e5b65
ellularNetworkService.java
adioResponse.java
584a91692e3881061d1e568161256a6313af6a99 30-Mar-2018 Yifan Hong <elsk@google.com> IRadioConfig HAL: use default instance name.

... to be consistent with other HALs.
Fixes: 77292499
Test: device has signal

Change-Id: I81ce2c95a1ee517bc509d3b8abf5d598c07f2d69
adioConfig.java
1e077be13d88c454d7ecf82d725ed803da19e513 29-Mar-2018 Brad Ebinger <breadley@google.com> Merge "Enable MO SMS during ECBM when on LTE" into pi-dev
c7107f09c3c280422701bb708f4ebdb71b7f29b4 29-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "UiccProfile should handle responses after disposed" into pi-dev
a5a74c3117988154392cf4ce7274654cfbef1529 29-Mar-2018 Brad Ebinger <breadley@google.com> Use @SystemApis in platform instead of hidden fields

Use @SystemApi API to access fields that should be private.

Bug: 77278031
Test: Manual
Change-Id: I4a0c5635f934260eb2493e768f6a441b853131f2
msphone/ImsPhone.java
msphone/ImsPhoneMmiCode.java
88d0c791f1a2920865936bd3459f33669a6d1469 20-Mar-2018 yinxu <yinxu@google.com> UiccProfile should handle responses after disposed

UiccProfile exposes the command interface. Whenever any response
messages are received after the UiccProfile is disposed, those messages
should be handled because the users who sent the requests may still be
waiting for those responses.

Bug:73950003
Test: Unit Test
Change-Id: I4e7f757974d9c0365efe0ee593b9d74ed2e04775
Merged-in: I4e7f757974d9c0365efe0ee593b9d74ed2e04775
(cherry picked from commit 03ee5f7741f250a467272b9ea5ae87be06bc60fc)
icc/UiccProfile.java
c4bbf44ef0660ae5219b9191820f40637cc12cd7 29-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Make sure CARDSTATE_ABSENT is sent out from UiccSlot." into pi-dev
b7033f197cbca58b256da5b01b08cf47358be0bf 29-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Add reporting criteria to DeviceStateMonitor and ServiceStateTracker." into pi-dev
127f5f22485982575eba72d4a047c49e447ca60b 28-Mar-2018 Brad Ebinger <breadley@google.com> Enable MO SMS during ECBM when on LTE

W should allow MO SMS during ECBM when we are on LTE.
We will now only blockMO SMS when on ECBM and
CDMA radio tech.

Bug: 77223987
Test: Manual, MO SMS during ECBM on CDMA and LTE
Change-Id: If2ab62881e0564c05e0f13cc82502d645a0a6250
msSmsDispatcher.java
MSDispatcher.java
dma/CdmaSMSDispatcher.java
sm/GsmSMSDispatcher.java
til/SMSDispatcherUtil.java
a3d5188fe326da174471025db03f5a3e4594be20 27-Mar-2018 Malcolm Chen <refuhoo@google.com> Make sure CARDSTATE_ABSENT is sent out from UiccSlot.

We need to make sure CARDSTATE_ABSENT is sent from UiccSlot to
SubscriptionInfoUpdater so that SubscriptionInfoUpdater proceeds
necessary steps. We initialize mCardState to be null (as an enum)
instead of CARDSTATE_ABSENT in UiccSlot, so that we can identify
when we first received ABSENT state update, and send out update
to SubscriptionInfoUpdater by then.

Bug: 74608255
Test: unittest
Change-Id: If50594225dc250440eb4a957d05ab78b11e94711
Merged-In: If50594225dc250440eb4a957d05ab78b11e94711
ubscriptionInfoUpdater.java
icc/UiccSlot.java
7b9fe52f3c8704ea3db92799a268780aa302d363 28-Mar-2018 Andy Chou <andychou@google.com> Merge "Specifies the carrier's default voicemail number for roaming network." into pi-dev
b70049a3225a8985e17f7bbd899b4d6c4e2013cb 28-Mar-2018 Jiuyu Sun <jiuyu@google.com> Merge "Address comments from API Review." into pi-dev
4022f62586ec8481e61332cdd4e370dd2b71a060 28-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Move permission grant to bind instead of complete" into pi-dev
22184c1bc924654d2242cbbf7f0928cc37343bf4 21-Mar-2018 Brad Ebinger <breadley@google.com> Move permission grant to bind instead of complete

We need to grant the package the correct permissions
before the service is bound to prevent race conditions
where the ImsService needs permissions in initialization.

Bug: 76102874
Test: Manual
Merged-In: I643de1a525b3c9d9832190d28703c56db81c5104
Change-Id: I7eafd91407998ecbe823bc7a69e52b58de1e32f7
ms/ImsServiceController.java
c7776a8f093a315d3baced16f57c5214116ed3d7 09-Jan-2018 Eric Schwarzenbach <easchwar@google.com> Add reporting criteria to DeviceStateMonitor and ServiceStateTracker.

Sends down per-RAN reporting criteria to the modem onRilConnected.

Updates the IndicationFilter to include the new LINK_CAPACITY_ESTIMATE
and PHYSICAL_CHANNEL_CONFIG bits.

Adds default AccessNetworkThresholds for reporting criteria threshold.

Updates LTE and WCDMA SignalStrength reporting criteria when carrier
config changes.

Bug: 70638175
Bug: 72117365
Bug: 74008993
Test: make, runtest
Change-Id: I12f724405bf31d2c48e6a52b5751ddd86f633596
(cherry picked from commit 8f2ef44cab1fdb75b4797668626bbced30c530f6)
ommandsInterface.java
eviceStateMonitor.java
smCdmaPhone.java
hone.java
IL.java
erviceStateTracker.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
747d6aa80a44f68c8a35435bd494f6a83bccafac 27-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Move alpha long/short to the base CellIdentity according API Review." into pi-dev
960cd06cffdd03988e90dec325e07baf814ce7d4 23-Mar-2018 SongFerngWang <songferngwang@google.com> Specifies the carrier's default voicemail number for roaming network.

Configure voicemail number for roaming network.

BUG: 74022701
Test: atest GsmCdmaPhoneTest#testVoiceMailNumberGsm GsmCdmaPhoneTest#testVoiceMailNumberCdma

Change-Id: I3d90ec39e29f921bea043af02fb092dca9cca8c7
smCdmaPhone.java
d2f410c0ff07c5a7b79e61bc36527b0259677de7 23-Mar-2018 Pengquan Meng <mpq@google.com> Fixed invalid pdu issue

The device may receive invalid sms pdu, i.e the pdu contins sms header
with an invalid seqNumber. This caused InboundSmsHandler crashed constantly.
This CL added the range check for the seqNumber to ensure the
InboundSmsHandler will not crash even if the seqNumber is invalid.

Test: runtest -x GsmInboundSmsHandlerTest -m
testMultiPartSmsWithInvalidSeqNumber
Bug: 72298611

Merged-In: Icf291c8530abdc2a528c5cf227cf00135281b899
Change-Id: Icf291c8530abdc2a528c5cf227cf00135281b899
(cherry picked from commit 9eec9d02937dd41fc94ad1c874f8467f4698df5c)
nboundSmsHandler.java
789430090feb6c0a75fa5195b53c90e9253002e5 24-Mar-2018 Brad Ebinger <breadley@google.com> Merge "Use correct MessageRef for ImsSmsDispatcher#onSmsReceived" into pi-dev
99736605c0048ae9a52dd6c5fc8a4337f21fe619 20-Mar-2018 Brad Ebinger <breadley@google.com> Use correct MessageRef for ImsSmsDispatcher#onSmsReceived

We were using "0" instead of the correct message ref.
This change parses the SMS pdu to get the message ref
before starting the injection.

Bug: 74551838
Test: Manual
Change-Id: I3a560b650106843dd94314e9a5b064155dea2e8b
msSmsDispatcher.java
msDispatchersController.java
649c81576a5d145fffab05896f02b433612c2847 21-Mar-2018 Malcolm Chen <refuhoo@google.com> Don't return null at Phone.getIccCard.

Phone.getIccCard used to always return a non-null object.
But getUiccProfile() can return null if SIM card is not present.
For backward compatibility consideration, we return a dummy
object instead of null.

Bug: 74608255
Test: unittest
Change-Id: Ic985e9e24c5b7fc0185d5d555a66db3e6a44c44c
Merged-In: Ic985e9e24c5b7fc0185d5d555a66db3e6a44c44c
smCdmaPhone.java
ccCard.java
icc/UiccProfile.java
8bf20cb416675744e28821f509a20ae2813ad44e 22-Mar-2018 Holly Jiuyu Sun <jiuyu@google.com> Address comments from API Review.

Bug: 74975825
Bug: 74976716
Bug: 74976875
Test: test on phone
Change-Id: I7316bb1e53e9a1a994fea0def38beffca3494226
uicc/EuiccController.java
622798d4e39ee7e8b0b946e0068dcfdf1ee73f05 22-Mar-2018 Malcolm Chen <refuhoo@google.com> Don't turn off signal strength update in power save mode.

Bug: 69644626
Test: manual
Change-Id: Ic3b5eee9bf841b51d905bc9f60587032b4cd958c
eviceStateMonitor.java
6da36e04115847978aed09edb7a4f5f5906dc9f8 22-Mar-2018 Cassie <xih@google.com> Move alpha long/short to the base CellIdentity according API Review.

Bug: 74831568
Test: Telephony sanity
Change-Id: I919a7619a9cf16b56c3ab2643ae2a0f880c66ebc
IL.java
6d2fab2e72583799e743ff8c6eec35022508b54a 22-Mar-2018 Xiangyu/Malcolm Chen <refuhoo@google.com> Merge "Revert "By default, turn on signal strength update in power save mode."" into pi-dev
9c2c0fefa8f416a7070751d0025f080a02b4a4b5 21-Mar-2018 Xiangyu/Malcolm Chen <refuhoo@google.com> Revert "By default, turn on signal strength update in power save mode."

This reverts commit ddab5bc974fa1c4be0e5d3f0f3b38cd3606b5b08.

Reason for revert:
No need for a config. We don't ever want to disable signal strength update in power save mode.

Bug: 69644626
Change-Id: Ief03746ead49e12ec29dc9255f855d78fa35753e
eviceStateMonitor.java
81831a89e39a31724fd1c0c666815c9b424b63e3 21-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "By default, turn on signal strength update in power save mode." into pi-dev
f132adcfbd4b3ecca123a1ed546036d479504d6c 21-Mar-2018 Brad Ebinger <breadley@google.com> Merge "Use directed intent for Incoming call compat" into pi-dev
e64eefdb5c9c2f5867538215318c1ca6b9bf0d3b 21-Mar-2018 Brad Ebinger <breadley@google.com> Merge "Fix ImsService Callback synchronization issues" into pi-dev
dea06479edb0ffa477b74ad2e580ac2b80fa2b83 14-Mar-2018 Brad Ebinger <breadley@google.com> Use directed intent for Incoming call compat

Sets the package name of the PendingIntent
so that the message is only broadcast to the
phone process.

Bug: 72645729
Test: Manual - Incoming Call received
Merged-In: I322168f3768b464bdc127d1b3bcd06c73b568718
Change-Id: Ibf38e6c0b6ef338c06df2f1974a8d939c9589bcf
ms/MmTelFeatureCompatAdapter.java
497b6f86cddaa13c239338d0a88e47f943322d54 21-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Move setSimOperator operation from IccRecords to UiccProfile." into pi-dev
15d1261aae3d0ee9b615770fa42e800b3f932785 21-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Map valid slotId to index for mPhoneIdToSlotId" into pi-dev
31bea73f5c868e9583d820f80abd28178358d822 21-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Remove ACTION_INTERNAL_SIM_STATE_CHANGED." into pi-dev
ddab5bc974fa1c4be0e5d3f0f3b38cd3606b5b08 20-Mar-2018 Malcolm Chen <refuhoo@google.com> By default, turn on signal strength update in power save mode.

Adding a resource overlay which decides whether we should disable
signal strength update in power save mode. And the default value
is false. Which means we keep updating signal strength in power
save mode.

Bug: 72463137
Test: manual
Change-Id: I85466e10745acfdc3b70d8884eb7e9969acedefc
eviceStateMonitor.java
cf4333f4d254ee3c08533a1db94c6515f870f674 15-Mar-2018 Amit Mahajan <amitmahajan@google.com> Move setSimOperator operation from IccRecords to UiccProfile.

This will help take both SimRecords and RuimRecords into account
based on the current app type.

Test: Basic telephony sanity, unit tests
Bug: 74529666
Change-Id: I786d535bec11d3479e1bbaa52fc5050758463b07
icc/SIMRecords.java
icc/UiccProfile.java
7957f42c8ef8f6e08e11909966b3a70d76baba58 21-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "allow users to block alert system notifications" into pi-dev
2a63f28dd26512f45b706ddab00c18c4f91bc7e4 16-Mar-2018 Malcolm Chen <refuhoo@google.com> Remove ACTION_INTERNAL_SIM_STATE_CHANGED.

Since ACTION_INTERNAL_SIM_STATE_CHANGED is only listened by
SubscriptionInfoUpdater, broadcast is unnecessary and costly. We
remove it and use a direct function call.

Bug: 72463137
Test: regression test
Change-Id: I17e7bb7445ac9d287c0ee70869adf0d011005b14
Merged-In: I17e7bb7445ac9d287c0ee70869adf0d011005b14
(cherry picked from commit 1ffbb3c56675ff4ff9a26bccbbed0519a5c12573)
honeFactory.java
ubscriptionInfoUpdater.java
icc/UiccController.java
icc/UiccProfile.java
icc/UiccSlot.java
4a371b42f32176752609ed1b696cf24b215aee76 20-Mar-2018 fionaxu <fionaxu@google.com> allow users to block alert system notifications

allow users to block notifications posted from alert channels

Bug: 70168086
Test: Manual
Change-Id: Icad6491aa4942ce747ff17f60361269d701ac035
til/NotificationChannelController.java
3f7854f913eccbaa7a0a2979546ece735dae121e 20-Mar-2018 Malcolm Chen <refuhoo@google.com> Add null check on UiccProfile before dumping.

Bug: 75282275
Test: build
Change-Id: Ib58d27d1d19d647f7a2df4a4931b211da0c3f5b2
Merged-In: Ib58d27d1d19d647f7a2df4a4931b211da0c3f5b2
(cherry picked from commit a7d66eea355587be85b26e3499f256688a084c7e)
honeFactory.java
bae42ba6207e0168f31a639fe37bba78e45c98c8 01-Mar-2018 Wileen Chiu <wileenc@codeaurora.org> Map valid slotId to index for mPhoneIdToSlotId

- Store the valid slotId in mPhoneIdToSlotId when
GET_SIM_STATUS provides a physicalSlotIndex that
is not equal to INVALID_SLOT_ID.

Bug: 74016297
Test: manual, ensure crash does not occur if GET_SLOT is not implemented
Change-Id: Iece3ee00132d923a24c12faf74b438d006e5e4e8
icc/UiccController.java
01d3a91a522d4fa8245e072b8d4410845358e687 20-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Allow carrier apps to send unpersisted SMSes without SEND_SMS." into pi-dev
19b5134d16253f62bd98ed3ec1d66394d8e267e9 16-Mar-2018 Jeff Davidson <jpd@google.com> Allow carrier apps to send unpersisted SMSes without SEND_SMS.

The new rule is that SEND_SMS is only required for apps which gain
access to this API via MODIFY_PHONE_STATE; carrier-privileged apps
(and carrier-nominated IMS apps) no longer need an additional runtime
permission.

This CL also consolidates permission checks; the SEND_SMS permission
is always checked directly next to the OP_SEND_SMS AppOps bit for
clarity, and otherwise all permissions are checked at once rather than
interspersed throughout method handling.

Bug: 70177947
Bug: 70041899
Test: Flash / boot; TreeHugger; Unit/CTS tests in topic
Change-Id: I3b1fdda4c5b3929df38ec183149557195908dd5d
ccSmsInterfaceManager.java
03ec28bcf21769954897e0aafea15ec7b45a0f9b 19-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Update ServiceState with PhysicalChannelConfigs." into pi-dev
fed8375b20f87ed643d97ad850400e09e01be866 08-Mar-2018 Brad Ebinger <breadley@google.com> Fix ImsService Callback synchronization issues

ImsService was holding a lock when calling back
ImsService status. This could lead to a situation
where a call into ImsServiceController from the
platform and a call into the ImsServiceController
from the ImsService could cause a deadlock.

Bug: 74119196
Test: Manual

Merged-In: Ib94857ef42a689f82412cbbe1c5f242824d14088
Change-Id: I9c58d7d5e2a8021cc1bfefc4ea08cb29ce8591e5
ms/ImsServiceController.java
b3372f80240e15a16cbf215286505c56717c7a97 19-Mar-2018 Brad Ebinger <breadley@google.com> Merge "Moves IMS Emergency Calling availability out" into pi-dev
c0e19daea3559f0d9c26a56637fc972b9be3d425 19-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Atoms: Mobile Connection" into pi-dev
ba018e0702b636d85567697b04cf064d7e7892b4 21-Feb-2018 Eric Schwarzenbach <easchwar@google.com> Update ServiceState with PhysicalChannelConfigs.

Updates the ServiceState cell bandwidths from PhysicalChannelConfig
indication. Uses the RatRatcheter to conditionally update the
ServiceState bandwidths iff the current PhysicalChannelConfigs have a
greater aggregate bandwidth than the current ServiceState bandwidths.
Ratchets the bandwidth list until cell change.

Bug: 72524533
Test: runtest frameworks-telephony
Change-Id: I46aaa0d4ab3660e79dab7d2dcf6105ca6575b973
Merged-In: I46aaa0d4ab3660e79dab7d2dcf6105ca6575b973
(cherry picked from commit 475cb714d1d9297cef6b72079fc30e7eac563326)
atRatcheter.java
erviceStateTracker.java
5385ffc411a39a5423949c25c8220ef15882767f 09-Mar-2018 Brad Ebinger <breadley@google.com> Moves IMS Emergency Calling availability out

Moves the IMS Emergency Calling availability
state out of ImsServiceController and into
MmTelFeatureConnection. This allows the ImsResolver
to treat FEATURE_EMERGENCY_MMTEL as a feature,
like the other FEATUREs, and push updates to
FEATURE_EMERGENCY_MMTEL to the MmTelFeatureConnection
instead of polling it.

Bug: 74389647
Test: Telephony Unit Tests, Telephony ImsService Testapp
Merged-In: I3ee49bc3669400d37a9ea605fcd6fc3fa3975a0a
Change-Id: I0e7b1ffb8b1e82e447096c8cc74d7f825c945798
ms/ImsResolver.java
ms/ImsServiceController.java
f675639d4ff4361dc0db544dc25ea72fc9bf306d 16-Mar-2018 Nathan Harold <nharold@google.com> Merge changes from topic "pick-keepalive-unsupported" into pi-dev

* changes:
Add a Test for NattKeepalive Unsupported on WLAN
Return Unsupported for Keepalive Requests on IWLAN
6cc7535c0a7cf48db7dd4cf2beaeaab212a192ff 16-Mar-2018 Jack Yu <jackyu@google.com> Merge "Renamed getNetworkId and getSystemId" into pi-dev
cd8dfe2d5f9d7018178134d7faa99a8884bf69f1 16-Mar-2018 Chen Xu <fionaxu@google.com> Merge "DO NOT MERGE fix ratratchet when CID change right before RAT change." into pi-dev
688fc35e5e3b791f66f14a6d2c800ec07aac3ae4 08-Mar-2018 Nathan Harold <nharold@google.com> Return Unsupported for Keepalive Requests on IWLAN

In order to support NATT Keepalive on IWLAN, we need
to add support to the DataService interface for the
start, stop, and unsol commands. Since this would
be a system API and the plumbing is not trivial, the
safe thing to do is to ensure that requests that come
for a WLAN-backed network are rejected.
The only potential use case for NATT keepalive offload
would be if the remote end of the tunnel terminates
behind a NATT, which is unlikely for IWLAN. Meanwhile
requests for WWAN will funnel directly to Radio, which
is unfortunate, but sufficient for all current use
cases. Thus, while the DataService interface support
should be added as a matter of completeness and
clarity, for now, we will simply reject calls to start
Keepalives on IWLAN.

Bug: 72331356
Test: compilation
Merged-In: I95681594c905c5eb26246a6b3cef4696d587f28e
Change-Id: I95681594c905c5eb26246a6b3cef4696d587f28e
(cherry picked from commit 895e3eec2262b8125830fd6f450992dee93d37cf)
ataconnection/DataConnection.java
277c6456d8361d820811de3b89acc5a079cd1fab 01-Mar-2018 fionaxu <fionaxu@google.com> DO NOT MERGE fix ratratchet when CID change right before RAT change.

There is a timing gap of updating CID and DataRAT when moving between
cell from different RAT (e.g., move from EDGE to GPRS). In that case,
cell ID remains the same when handling rat change, thus ratratchet
will not report lower rate RAT for the purpose of battery-saving.

As its hard to gurantee synchronous cell location change and RAT change,
Frameworks will bypass ratratchet on the next RAT change event
following CID change. This will fix the timeline issue but with some
degree of performance regression when cell location change is not
followed with an immediate RAT change. In that case, we still report
lower rate RAT (only for the next RAT change) and update UI etc.

Bug: 65695609
Test: ServiceStateTrackerTest.java
Change-Id: Ia9cc52fa3c9cd3d6d1fc0ec08c929f52a5752755
atRatcheter.java
erviceStateTracker.java
7e4c169a75070ab988016691cbf13e5dc02f2011 15-Mar-2018 Malcolm Chen <refuhoo@google.com> Remove IccCardProxy.

IccCardProxy is deprecated after UICC refactor. Remove the file
and all references and tests related.

Bug: 72463137
Test: unit-test
Change-Id: Id5e293233147c36e201e3ab946cb32873b90828a
Merged-In: Id5e293233147c36e201e3ab946cb32873b90828a
(cherry picked from commit 29d8d98ee7299cce703909b35e93cbad626f78ef)
ccCard.java
elephonyComponentFactory.java
icc/IccCardProxy.java
cb209509f5a3489b06a5d9b89b2c1fd8f6499c83 15-Mar-2018 Jack Yu <jackyu@google.com> Renamed getNetworkId and getSystemId

1. Renamed getNetworkId() to getCdmaNetworkId()
2. Renamed getSystemId() to getCdmaSystemId()

Test: Build
Bug: 74976831
Change-Id: Iafd330a270de128deec43d24f5047bdd704bc452
erviceStateTracker.java
953647591d9984fb075ff0eac495b26df1692093 15-Mar-2018 Chen Xu <fionaxu@google.com> Merge "rename prefered network notification" into pi-dev
103358a5a26e40d2cddaef18d176c77ef5142c9b 15-Mar-2018 Brad Ebinger <breadley@google.com> Merge "Donot disable Wi-Fi Calling when getting "registration error"" into pi-dev
da45acfc09ca8dbe6347f373b7e4070eaa0862d9 14-Mar-2018 fionaxu <fionaxu@google.com> rename prefered network notification

1. rename notification body
2. expand mobile network settings when users tap the notification.

Bug: 37578776
Test: Manual
Change-Id: Icce30a767b0c90b836530a4aedc26620249ab419
arrierServiceStateTracker.java
17f2f414f633530ae3f9bd2f10a3b59fc1690f8d 15-Mar-2018 Pengquan Meng <mpq@google.com> Merge "MSIM: Default NW mode property for each slot" into pi-dev
d70c066aac982767901aeff5619485da7c816dc2 14-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Change data connection state logic" into pi-dev
19df8124b8c2940cf12ed212af82c4802168edd9 14-Mar-2018 Eric Schwarzenbach <easchwar@google.com> Merge "Update ServiceState channel number from regState." into pi-dev
0eff7e1722a2478619221572e0eba6c95a30a195 08-Mar-2018 Pengquan Meng <mpq@google.com> Change data connection state logic

This changed the logic of DcTracker.getState(apnType), returned the
DataState of the given apn type based on the DataConnection rather than
the ApnContext.

Test: runtest -x DcTrackerTest -m testGetDataConnectionState
Bug: 65637583
Merged-In: Ibe5a8a3690db99050a19357e38e5d3f18e2f6ee9
Change-Id: Ibe5a8a3690db99050a19357e38e5d3f18e2f6ee9
(cherry picked from commit 55a508de60c75daa65eb44e16e28acfbd0e237a6)
smCdmaPhone.java
ataconnection/DataConnection.java
ataconnection/DcAsyncChannel.java
ataconnection/DcTracker.java
bc571d25924c112392699065547d1131faef2652 07-Jun-2016 Sandeep Gutta <sangutta@codeaurora.org> MSIM: Default NW mode property for each slot

Pick slot specific default Network mode value while
setting Network Mode for new subscription info record.

Bug: 28384694
Bug: 36850854
Test: manual - Checked different default NW mode can be set
for each slot.
Test: auto - Confirmed that run SubscriptionInfoUpdaterTest
and PhoneFactoryTest it has no problem.
Merged-Id: I72b11522cb51a425e28ddc407014387a20cb2cd7
Change-Id: I72b11522cb51a425e28ddc407014387a20cb2cd7
honeFactory.java
ubscriptionInfoUpdater.java
1ff35181b0ef8e87fc3a3e0e8d1259988c46006e 14-Mar-2018 Jiuyu Sun <jiuyu@google.com> Merge "Refresh subscriptions in EuiccCardController." into pi-dev
9faef40dede37b4ef7df7f763b7bec4a8ca74de8 08-Mar-2018 Holly Jiuyu Sun <jiuyu@google.com> Refresh subscriptions in EuiccCardController.

Refresh embedded subscriptions after successfully resetting profiles
before returning a result. So LPA can switch back the physical slot
after reset is done.
Do the refresh on the success delete, sucess reset and success download
cases (loadBoundProfile).
If an OEM uses both EuiccController and EuiccCardController, the time
impact of the double refresh is small.

Bug: 63628683
Test: test on phone
Change-Id: Ie01193e7180ee1a05d2dcdaeff2fe5281988bf98
uicc/EuiccCardController.java
19f59aaad59a79933d8a614fe641332f27636e75 14-Mar-2018 Qingxi Li <qingxi@google.com> Merge "Add API to check extended APDU Supported" into pi-dev
54be3d1685320c5652f7ece3e22401860d8301a6 13-Mar-2018 Brad Ebinger <breadley@google.com> Merge "Call readyForFeatureCreation for ImsService" into pi-dev
09d4d5d289767c330288effc7770a40dfabe5cd7 13-Mar-2018 Brad Ebinger <breadley@google.com> Merge "Framework Integration of dynamic query for ImsService" into pi-dev
77de86b7a27c31d5e2ae0820d8a5bcf5f07f888b 12-Mar-2018 Brad Ebinger <breadley@google.com> Call readyForFeatureCreation for ImsService

Call ImsService#readyForFeatureCreation
When the ImsServiceController is ready to
create features.

Bug: 74391574
Test: Manual, Telephony Unit Tests
Merged-In: Id04d953a719a51877a8557c3b00cf649a462adf6
Change-Id: Iefc7b90b3ae83a2e63352edd7b72cf215092f8ef
ms/ImsServiceController.java
ms/ImsServiceControllerCompat.java
5f6a521925b16e8c5f6dfdfa7dad928f65dfc362 23-Feb-2018 Brad Ebinger <breadley@google.com> Framework Integration of dynamic query for ImsService

1) Adds support for dynamic query of ImsService features.
When the ImsResolver is notified of a change to the ImsService
package (via PackageManager or CarrierConfig), we perform
an async query to the affected ImsService. The updated
feature configuration is then saved to the ImsServiceInfo
cache and features are recalculated. This will cause the
Service to create/remove features according to this
config. We currently keep the ability for "compat"
ImsServices and device default ImsServices to communicate
their feature configurations via manifest query, but
all carrier ImsServices will need to do a dynamic query
to relay feature configuration information.

2) Fixes issue where we were sometimes not unbinding
to ImsServices, even if there were no features assigned.

3) We now drop down to the device default ImsService
when the SIM card is removed.

Test: Telephony Unit Tests, Telephony Test ImsService
Bug: 72642524

Merged-In: If65f25eb6b0696b38bd55b96c1d5a64d2a112a6b
Change-Id: Ieafa99c1454606016c71e4d183adf445f4189dc2
honeFactory.java
ms/ImsResolver.java
ms/ImsServiceController.java
ms/ImsServiceFeatureQueryManager.java
17cf28d0c419bf09e01edccc1975f4cba0f0478c 20-Nov-2017 Suresh Koleti <skoleti@codeaurora.org> Donot disable Wi-Fi Calling when getting "registration error"

Donot disable Wi-Fi Calling when getting "registration error"
which will help to retry registration over WiFi by modem.

Test: Manual
Bug: 69446679
Merged-In: Ie092e3cf9bb0cfd4a45a3919ece1f7beeae58eb0
Change-Id: Ief5f08a0e6518138fddc22e440020adb8b95d43b
msphone/ImsPhone.java
2e1b5b9d9fbbbe634229bd615293a6ef74d00d4a 13-Mar-2018 Tyler Gunn <tgunn@google.com> Change getCallForwardingOption to specify voice service class.

When querying the CF status via the CommandsInterface, now specifying
the voice service class.

Test: Manually tested that this change does not cause regression.
Test: Added new unit test code.
Fixes: 71696037
Merged-In: I4ec38581882e24863f955b5a08118a2c4ed8dcf7
Change-Id: I4ec38581882e24863f955b5a08118a2c4ed8dcf7
(cherry picked from commit ec5c6e24a61cb9c593b6dbd685ebce21953f3e00)
smCdmaPhone.java
ce68a6c0fefefbd2e65ac1845c88e78ef0935fd4 13-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Allow carrier-privileged apps to access Telephony/Subscription APIs." into pi-dev
e4fbf65d1169804f3f0bb5ec5842128c31a7cf1c 12-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Allow background receivers to receive new SIM state intents." into pi-dev
af52cae7eab92d249e77ccf2bb387f554e39fdf2 12-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Added LocalLog for UICC." into pi-dev
39489667023c9432b5060ff9fbb8d1b1f4078d12 08-Mar-2018 Tej Singh <singhtejinder@google.com> Atoms: Mobile Connection

Logging for MobileConnectionStateChanged and
MobileRadioTechnologyChanged

Bug: b/72320589
Test: verified logs appeared in adb logcat -b stats
Change-Id: I9b6f6d2505a807299b786b622ba477abe84bab61
erviceStateTracker.java
ataconnection/DataConnection.java
6b4142b7f9c70c03cdcff1af2e1830d27a6a8bc2 12-Mar-2018 Amit Mahajan <amitmahajan@google.com> Allow background receivers to receive new SIM state intents.

This is to match the behavior with existing SIM_STATE_CHANGED
intent.

Test: Basic telephony sanity
Bug: 73832281
Change-Id: Iac030b55b12e43e6599830e802d51329c819e8a9
ubscriptionInfoUpdater.java
icc/UiccController.java
407c9c781a94864245166b2dd8f2351ec116a916 12-Mar-2018 Tyler Gunn <tgunn@google.com> Merge "Support enhanced call blocking function" into pi-dev
a66e5bbff6e1ef957731b65c6131d2df74d0a1e8 11-Mar-2018 Chen Xu <fionaxu@google.com> Merge "not bypass roaming checking for restricted nw request" into pi-dev
1fcdbab4cb564eb9f3f0865bab7d1ab5ab18199d 10-Mar-2018 fionaxu <fionaxu@google.com> not bypass roaming checking for restricted nw request

Bug: 74096275
Test: Manual
Change-Id: Iae57cbf231fa4be27c77c2f30ad21c50f78a4697
ataconnection/DcTracker.java
7a83e689dc97175eaf04cd3bbf583e2792df36fb 08-Mar-2018 Amit Mahajan <amitmahajan@google.com> Added LocalLog for UICC.

And some other code cleanup.

Test: Basic sanity, manually looked at a bugreport for dumped locallog
Bug: 72463963
Change-Id: Ia57b378b021ae79db6dfbbe37c74cea2dd67ccf1
ubscriptionInfoUpdater.java
icc/UiccCard.java
icc/UiccController.java
icc/UiccProfile.java
icc/UiccSlot.java
99cc5e6ad7be178e9b17e58ac55bb5136ef50ee9 21-Feb-2018 Eric Schwarzenbach <easchwar@google.com> Update ServiceState channel number from regState.

Bug: 73728783
Test: runtest frameworks-telephony
Test: manual
Change-Id: I64e2b092c2fa8a6746fc53e38c4ce6b8245e6c92
Merged-In: I64e2b092c2fa8a6746fc53e38c4ce6b8245e6c92
(cherry picked from commit b08281a7afb76ddba0b665ad44a2a2a75619064a)
erviceStateTracker.java
488734615a5e0fd38f33177c67a407e9589a4027 09-Mar-2018 Tyler Gunn <tgunn@google.com> Support enhanced call blocking function

- Add new API to support checking whether a number is block number.
This new API can use some extras for the number to enhance the check.

Bug: 28189985
Test: Manual

Merged-In: I5bfdd0c9c7945cf3abf8d7964af8c3111571126f
Change-Id: I5bfdd0c9c7945cf3abf8d7964af8c3111571126f
(cherry picked from commit b1f70b234541a704d2b70f3cb13d9976a5c89d20)
lockChecker.java
nboundSmsHandler.java
apPushOverSms.java
1b913aa987eaf137443fa270deb2d0f3519c3236 09-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "New unit tests for UiccProfile.updateExternalState()." into pi-dev
2597f0ea5b0019b79c50e1f0a39634bf31749da7 24-Feb-2018 Jeff Davidson <jpd@google.com> Allow carrier-privileged apps to access Telephony/Subscription APIs.

See frameworks/base change for more details.

Bug: 70041899
Test: TreeHugger, unit tests in topic
Change-Id: I2af73fa94ca91654d37b598641a486b04917bbad
Merged-In: I2af73fa94ca91654d37b598641a486b04917bbad
(cherry picked from commit 4d42d6892e97449eba81f4cd7543db907068a48e)
honeSubInfoController.java
ubscriptionController.java
ubscriptionInfoUpdater.java
e98fe84bfd55086bb8561465d5c5c82c763c9518 07-Mar-2018 Amit Mahajan <amitmahajan@google.com> New unit tests for UiccProfile.updateExternalState().

Test: unit tests
Bug: 72513243
Change-Id: I23432138e1c3f8db74b91cab9759594217385fdf
icc/UiccProfile.java
d8ed98b719569a05ca73623022f1fc9920f03cf5 09-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Reset carrier config on SIM_REFRESH of type RESET." into pi-dev
0bc4f60ec4b91fe6e36259658362acc3f4d943d3 08-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Send SMS over IMS regardless of SMS class" into pi-dev
306bfd0841a9f840f90f5722e8d61dd68b2ecaa0 08-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fix bug in handling sendSmsResult for SMS over IMS" into pi-dev
b62cded2ffe2e4ba4910ce0a2eea2bd1e4656fa8 08-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fix regression in IMS SMS" into pi-dev
054759f1eb06b19e81ded553f734f3171b820583 07-Mar-2018 Amit Mahajan <amitmahajan@google.com> Reset carrier config on SIM_REFRESH of type RESET.

Test: Basic telephony sanity, manual testing
Bug: 73946793
Change-Id: Ia7c78fd151e2c1a72095f816018b1f3fdf5d9f75
icc/UiccController.java
8fa955128053108b8fe10b837e405fc88386d946 08-Mar-2018 Mohamed Abdalkader <abdalkader@google.com> Send SMS over IMS regardless of SMS class

Test: Manual
Bug: 73839966
Change-Id: I5679ad029ae8af80c12efce85c18ddc81f044a85
msSmsDispatcher.java
msDispatchersController.java
ad2d021711a6fd6a0a9db8ce5d4c0161d8946c13 08-Mar-2018 Mohamed Abdalkader <abdalkader@google.com> Fix bug in handling sendSmsResult for SMS over IMS

We used to check reason instead of status.

Test: Manual
Bug: 73838993
Change-Id: I170984bcaa5b5f225cbea930f5eddf705b9f8aeb
msSmsDispatcher.java
bab9c9f5db6f14527ada315470d215eee356dcfd 01-Mar-2018 Brad Ebinger <breadley@google.com> Fix regression in IMS SMS

Fix regression in IMS SMS due to aog/577704.

Bug: 74392837
Test: Manual
Change-Id: I26daac0e000fcf1532d04f89ecd7c5d8af4a718f
msDispatchersController.java
258ed5bd03c1c2c59749bbaaa59c173f3eec0fb9 07-Mar-2018 Qingxi Li <qingxi@google.com> Add API to check extended APDU Supported

Add API UiccSlot#isExtendedApduSupported

Bug: 68999147
Test: bit FrameworksTelephonyTests:*
Change-Id: I5112b5a6a04863b41f5881ce3091174f79c9ccf4
icc/UiccSlot.java
8056bc176e486b1add4ee02e6d86c8282deb9b4d 15-Sep-2017 Sanny Shang <sanny.shang@sony.com> Support ENVELOPE (EVENT DOWNLOAD - User activity) command

The terminal shall send the ENVELOPE (EVENT DOWNLOAD - User activity)
command to the UICC when some user activity like a key-press or touch is
detected if the user activity event is a part of the current event list.
This change allows the SIM Toolkit application to support that event.
Please refer to the specification of SET UP EVENT LIST command described
in ETSI TS 102.223.

Bug: 65884891
Test: Confirmed the expected seq 1.1 of ETSI TS 102.384 TC 27.22.4.16

Change-Id: I7d3faa09cd4625db53bcfe21f90570389a4ea037
at/CatService.java
bc0269bde8a4ae57fc175f11d9a36d2985ba8116 07-Mar-2018 Nathan Harold <nharold@google.com> Merge changes from topics "pick-tdscdma", "wcdma-rscp" into pi-dev

* changes:
Test HAL 1.0 and HAL 1.2 TDSCDMA Compatibility
Update HAL1.0 Tdscmda SignalStrength Conversion
Customize the WCDMA signal strength based on RSCP
cddf2b52d506aea8b1df1f4bb3e7fab71aa8cb46 07-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Add parser for Extended APDU in ATR" into pi-dev
20d8d294bf13299396436ec4c31cb524377c7502 06-Mar-2018 Nathan Harold <nharold@google.com> Test HAL 1.0 and HAL 1.2 TDSCDMA Compatibility

Add a test that checks that the HAL changes for
TD-SCDMA compatibility between HAL 1.0 and HAL
1.2 are handled correctly by the HAL conversion
functions.

Bug: 74202653
Test: runtest -x ...RILTest.java
Merged-In: I0d45f6b599adac17e43e8488c38848f1689fb804
Change-Id: I0d45f6b599adac17e43e8488c38848f1689fb804
(cherry picked from commit 11dca507826d9c2e0ffd1369c8c0eca3e0f39676)
IL.java
87162ecfbaa9b28580d905167ae5692dd355fea0 03-Mar-2018 Nathan Harold <nharold@google.com> Update HAL1.0 Tdscmda SignalStrength Conversion

Reset the TD-SCDMA signal strength range from 25..120
to use the HAL1.2 values of 0..96.

Bug: 74202653
Test: runtest frameworks-telephony
Merged-In: I0c8ef8b83bb27b9f95331177ea9e3301a01bb99c
Change-Id: I0c8ef8b83bb27b9f95331177ea9e3301a01bb99c
(cherry picked from commit d4594e4fea4099790609920c4535bd69a19b1d36)
IL.java
85fae19c81c9b12acdfc675ff4ab62b00475443d 13-Dec-2017 Wei Huang <wei.x.huang@sony.com> Customize the WCDMA signal strength based on RSCP

To customize the WCDMA signal strength based on RSCP, acquire RSCP of
WCDMA from RIL and set it in signal strength.

Test: manual - Checked that signal bar of WCDMA signal strength can be
customized based on RSCP.
Test: auto - Passed SignalStrengthTest and ServiceStateTrackerTest.
Bug: 71329173
Change-Id: Ifdea81c7a6968fda7236663b6ebb0a8be7f64fb1
Merged-In: Ifdea81c7a6968fda7236663b6ebb0a8be7f64fb1
(cherry picked from commit 34b10db7d889e0aaaa69068a34db55a974e9a436)
IL.java
erviceStateTracker.java
6875b23d90a1f0ab15f528e878712cb8d1ff4b39 28-Feb-2018 Qingxi Li <qingxi@google.com> Add parser for Extended APDU in ATR

Bug: 68999147
Test: Included
Change-Id: I69d4c100441fe5251f89aa47bb49b78f9efdd498
icc/AnswerToReset.java
f24387f54a080dfc6e72c0511b2b3db757585edf 28-Feb-2018 fionaxu <fionaxu@google.com> API review: rename CarrierIdentification to CarrierId

Bug: 73953797
Test: unit test
Change-Id: I0940e037e9eec5f9e516597ae630d14736e00bbd
(cherry picked from commit 9171b2eec6ca1ddc85f7cea64786b5e80740570b)
Merged-in: I0940e037e9eec5f9e516597ae630d14736e00bbd
arrierIdentifier.java
941a4d75512d0096f6c8ffd5c3f06fc0c1234308 03-Mar-2018 Nathan Harold <nharold@google.com> Replace Manual Parceling for CellInfoCdma am: a8af56d7dd am: f88dd6f372
am: 4b7dda255b

Change-Id: I557f55b12ce409b5d2753117173394bfb5c7bb8a
4b7dda255b2de4df4a05c07c314f9be949009435 03-Mar-2018 Nathan Harold <nharold@google.com> Replace Manual Parceling for CellInfoCdma am: a8af56d7dd
am: f88dd6f372

Change-Id: I258434d6fecc1f8aefdc5c8f592ba91f8ef2e704
f88dd6f372f9876448302992cf5688596869fc78 03-Mar-2018 Nathan Harold <nharold@google.com> Replace Manual Parceling for CellInfoCdma
am: a8af56d7dd

Change-Id: I6dac2347528654533cb3f1cf06cc6a72c484c264
b8207a415beae6cbf1af88ac51a5ebc86b678159 03-Mar-2018 nharold <nharold@google.com> Merge "Pipe Radio 1.2 LCE to DataConnection" am: 0555c8156f am: 3649d4ee8c
am: e912db20b3

Change-Id: I9d6dd5907e159331f5695e18f7a3999b97fb8c14
e912db20b39ad4670c22579ace74881a14b86cfe 03-Mar-2018 nharold <nharold@google.com> Merge "Pipe Radio 1.2 LCE to DataConnection" am: 0555c8156f
am: 3649d4ee8c

Change-Id: Ia52ce4774b5098126639114d286f4292ffa7d603
0555c8156fc30d72bd8053b1c14ea79de232405c 03-Mar-2018 nharold <nharold@google.com> Merge "Pipe Radio 1.2 LCE to DataConnection"
021d8b3e0051d104173acb68ea918fc9d41b676c 03-Mar-2018 sqian <shuoq@google.com> Merge "Add mccmnc into local telephony proto and metrics" am: aa3b7d0252 am: dc99b31a15
am: 55e2379c4a

Change-Id: I2351b7d7ebdc9526d55ee9a21f23bf79682fb02d
55e2379c4affee43c59f3687727cf382beb3a9ea 03-Mar-2018 sqian <shuoq@google.com> Merge "Add mccmnc into local telephony proto and metrics" am: aa3b7d0252
am: dc99b31a15

Change-Id: Ibb5913b548eab12dc4af976d7d980f70274e3d43
692f961dfcf4bdb0aa6a487d1e281f4a75f76488 03-Mar-2018 Holly Jiuyu Sun <jiuyu@google.com> Merge "Fix issues on EuiccCard constructor." am: ebb1de56b9
am: 06f02d4db8

Change-Id: I26fa4182dd72396083aac3197951ff9654472d04
baece8c63121b5e3660ecc716bcff87f73f791ff 27-Feb-2018 Hall Liu <hallliu@google.com> Fix RTT property setting

Don't start the RTT text reader until the IMS stack gives us a call
profile with RTT set to on.

Bug: 73832960
Test: manual
Change-Id: Ic85d16f602140d34c9680c3a1cb33e01b5cf02c7
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
99a3a76517bfb95ced43a1092578fb00366c2083 23-Jan-2018 sqian <shuoq@google.com> Add mccmnc into local telephony proto and metrics

Bug: 72335257
Test: atest FrameworksTelephonyTests
Change-Id: I97b3b85ddc12b22839393d4899ad8a9b6d7fa7d3
arrierIdentifier.java
etrics/TelephonyMetrics.java
ebb1de56b93db54fab647fd3d4213c896614819b 02-Mar-2018 Holly Jiuyu Sun <jiuyu@google.com> Merge "Fix issues on EuiccCard constructor."
611c8e44c8b4f725a4526efd163926f0a243a1e6 02-Mar-2018 Malcolm Chen <refuhoo@google.com> Merge "Lower TIMEOUT of imsConfig.setFeatureValue" am: 9a0a3e9f6a am: bf504ce926
am: 12775c1522

Change-Id: Ibfcc9cbd992b830fabf8171e96a042c090bf6e19
12775c1522e9f1b5220bdefb8bf7303a9499401d 02-Mar-2018 Malcolm Chen <refuhoo@google.com> Merge "Lower TIMEOUT of imsConfig.setFeatureValue" am: 9a0a3e9f6a
am: bf504ce926

Change-Id: I8acbfc49bf3724e656bca692aa16be13971d4569
9a0a3e9f6ac27d0b2bf23d7aec64391245a0b04c 02-Mar-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Lower TIMEOUT of imsConfig.setFeatureValue"
c069e2ee64059fe76d0656520e2d60d40e6a96c0 01-Mar-2018 Jack Yu <jackyu@google.com> Merge "Fix NullPointerException during setupDataCall" am: b38959c818 am: f168f9b36a
am: b55e303ea0

Change-Id: I4d0601a3a93f4a7dc66b25853ad09ccbe4fbf9a5
b55e303ea0fbe8457020de5d0c31bd33ae7b75e7 01-Mar-2018 Jack Yu <jackyu@google.com> Merge "Fix NullPointerException during setupDataCall" am: b38959c818
am: f168f9b36a

Change-Id: I3d7e4dccf16a249eb3669b52c3283c46f9108ee5
037eea07adb97a77ab9414dccd8ab438564beffd 15-Feb-2018 Holly Jiuyu Sun <jiuyu@google.com> Fix issues on EuiccCard constructor.

1) Lazy-initialize mEidReadyRegistrants. Otherwise, mEidReadyRegistrants, which is a member
in EuiccCard, should only be accessed after the constructor of UiccCard is finished.
2) remove a todo in UiccController since getCardId() has been added.
3) Check whether EuiccCard is null in EuiccCardController.

Bug: 38206971
Test: test on phone
Merged-In: I6a195d7b80df0490fb10304f666d41aba2dcfbf1
Change-Id: I6a195d7b80df0490fb10304f666d41aba2dcfbf1
uicc/EuiccCardController.java
icc/UiccController.java
icc/euicc/EuiccCard.java
b38959c8182606e50e69d65d3bf15258a534fbeb 01-Mar-2018 Jack Yu <jackyu@google.com> Merge "Fix NullPointerException during setupDataCall"
c9c479bbd8e8a091fe7758c65c90027755489e83 01-Mar-2018 Jack Yu <jackyu@google.com> Merge "Added indication update mode support" am: 5a747c1a60
am: 1414e9967d

Change-Id: Ifcba3acd2f16de30c1710ad694d8a0619975188e
5a747c1a60b6f7d0b401955bcda944cd5a7e4bc5 01-Mar-2018 Jack Yu <jackyu@google.com> Merge "Added indication update mode support"
486dc86cf8bfe701232d5b43fef610fbf1a686bc 01-Mar-2018 Jiuyu Sun <jiuyu@google.com> Merge "Fix issues on EuiccCard constructor."
7afdb3942adde7efd33b5af5556fead92243e49c 08-Feb-2018 Nathan Harold <nharold@google.com> Pipe Radio 1.2 LCE to DataConnection

-Add a new LinkCapacityEstimate class to handle
both 1.0 and 1.2 formats of LCE for sending to
DataConnection.
-Convert to a multi-registrant so that all active
data connections can receive LCE updates.
-Add conversion for 1.2 LCE HAL to framework LCE.
-Automatically register for LCE when data connections
become active.
-If 1.2 or greater HAL is detected, we no longer start
the LCE service in the modem: rather it's always-on.

Bug: 72117292
Test: runtest frameworks-telephony
Change-Id: I076f2af404855cf961380559793b7328d7b83372
aseCommands.java
inkCapacityEstimate.java
IL.java
adioIndication.java
adioResponse.java
ataconnection/DataConnection.java
est/SimulatedCommands.java
e6265b3ac109f5ec88113c8b210e51c5f85e6914 28-Feb-2018 Jack Yu <jackyu@google.com> Added indication update mode support

Adde the indication update mode support so that a system
component can control the behavior of indication update. This
will be used by the bluetooth stack when some BT devices such like
carkit is connected, modem will continue update the signal strength
even when the screen is off.

Test: Manual
Bug: 65112388
Merged-In: I725002afd47e14682cf2ffa669f0686167e13802
Change-Id: I725002afd47e14682cf2ffa669f0686167e13802
(cherry picked from commit dfd6dd7c9b95606eeafcc84f42d6f8076fa68b92)
eviceStateMonitor.java
smCdmaPhone.java
hone.java
014495e4376ec853899a43b8dca4a8c874aba1d5 01-Mar-2018 Sandeep Gutta <sangutta@codeaurora.org> Fix NullPointerException during setupDataCall

To Avoid NPE do not send null ArrayList to IRadio.setupDataCall().

Change-Id: I448e513fa13ba6e2b9750a3d89db0fa7ecb4e8f7
IL.java
c473ed1dc1c6079ff575da9ddbb97908a1ec729e 01-Mar-2018 Eric Schwarzenbach <easchwar@google.com> Merge "Plumb PhysicalChannelConfig all the way up." am: ad8f0fdd98 am: 7d4d4fc5e6
am: 66d8a868d1

Change-Id: I37b61df3c39d9d0aa43e6907ff9ed02cdaa159a9
66d8a868d184f977afd6918118ffd50368d9df18 01-Mar-2018 Eric Schwarzenbach <easchwar@google.com> Merge "Plumb PhysicalChannelConfig all the way up." am: ad8f0fdd98
am: 7d4d4fc5e6

Change-Id: I21a48055c4f1ead681c16cf468cd66c221319b95
06538174713f5fb489c1fb34909acee1c0c5d407 01-Mar-2018 Malcolm Chen <refuhoo@google.com> Lower TIMEOUT of imsConfig.setFeatureValue

Lower TIMEOUT of CountDownLatch for imsConfig.setFeatureValue from
5 seconds to 2 seconds to prevent possible ANR of phone process.
Reset latch in the for loop.
Added addtional log when setFeatureValueReceived is triggered for
future analysis.

Bug: 73785453
Test: existing unittest
Change-Id: Ib88aa022b116e7bf5dd5550d8472466c3389611d
ms/MmTelFeatureCompatAdapter.java
ad8f0fdd98162e6a09762e71a58f9a8d686d65d4 01-Mar-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Plumb PhysicalChannelConfig all the way up."
825221b6a199a5b19a85d661edd4eac6817b9015 15-Feb-2018 Holly Jiuyu Sun <jiuyu@google.com> Fix issues on EuiccCard constructor.

1) Lazy-initialize mEidReadyRegistrants. Otherwise, mEidReadyRegistrants, which is a member
in EuiccCard, should only be accessed after the constructor of UiccCard is finished.
2) remove a todo in UiccController since getCardId() has been added.
3) Check whether EuiccCard is null in EuiccCardController.

Bug: 38206971
Test: test on phone
Change-Id: I6a195d7b80df0490fb10304f666d41aba2dcfbf1
uicc/EuiccCardController.java
icc/UiccController.java
icc/euicc/EuiccCard.java
8546143a10c5699c4af52b407040ac5af4913566 28-Feb-2018 Brad Ebinger <breadley@google.com> Merge "Integrates ImsService shouldProcessCall API" am: 1f6b16a85b am: cd71640a9d
am: 441c0d9a4d

Change-Id: If52f2ec8a50c3ebc3bbe31553f83f8f0bcffbfb2
441c0d9a4dd2db079196bc0716410165953c7f07 28-Feb-2018 Brad Ebinger <breadley@google.com> Merge "Integrates ImsService shouldProcessCall API" am: 1f6b16a85b
am: cd71640a9d

Change-Id: I38eff5f91e034107b0c539bc49b6f1392fa91756
2b3e442b79584c9bb19e4083a9479e3577df6ae2 28-Feb-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Added indication update mode support"
1f6b16a85b5fa80ba43f2bda6e93c8be7db1bf30 28-Feb-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Integrates ImsService shouldProcessCall API"
a8af56d7ddc5b3e7781aaa792a44c2c18539ab2f 27-Feb-2018 Nathan Harold <nharold@google.com> Replace Manual Parceling for CellInfoCdma

CellInfoCdma has a number of legacy fields with very
strange values. In order to remove some unfortunate
code in CellSignalStrengthCdma that tried to twiddle
the sign on all of the fields during parcel/unparcel
it was necessary (and more than appropriate) to
update RIL to treat the parcel values and ordering
of CellInfoCdma as an implementation detail, instead
calling the respective class constructors and parcel()
methods of the classes.

Bug: 32364031
Test: runtest frameworks-telephony
Change-Id: Id257f8c59476ee083e41dd4161ac0c28759be1e4
IL.java
dfd6dd7c9b95606eeafcc84f42d6f8076fa68b92 28-Feb-2018 Jack Yu <jackyu@google.com> Added indication update mode support

Adde the indication update mode support so that a system
component can control the behavior of indication update. This
will be used by the bluetooth stack when some BT devices such like
carkit is connected, modem will continue update the signal strength
even when the screen is off.

Test: Manual
Bug: 65112388
Change-Id: I725002afd47e14682cf2ffa669f0686167e13802
eviceStateMonitor.java
smCdmaPhone.java
hone.java
dbb01097291b00f908e11df1fc5c92674394ba9e 28-Feb-2018 Brad Ebinger <breadley@google.com> Merge "Assign messageRef to tracker in IMS dispatcher" am: ebbcd26218 am: 3b759a6652
am: 5addc72c8e

Change-Id: I25fa2628bc0aa45587c398c14c6466b9788391ea
5addc72c8ebb8c45cff28a1da4a8c6b7a8c20c19 28-Feb-2018 Brad Ebinger <breadley@google.com> Merge "Assign messageRef to tracker in IMS dispatcher" am: ebbcd26218
am: 3b759a6652

Change-Id: Iec86ef15d7263f7518941d52591eaf513fac4366
ebbcd2621865ebae4b6da718d983d9dd4b0fc4a9 28-Feb-2018 Brad Ebinger <breadley@google.com> Merge "Assign messageRef to tracker in IMS dispatcher"
c380e84e075c493b9d4a0d2a3f2ff9cc8fa35197 27-Feb-2018 Brad Ebinger <breadley@google.com> Merge "Fix IMS SMS calculateLength bug" am: b51a15c461 am: c68d9422f3
am: a86feca89d

Change-Id: I1d5747978c28d560da2bb2594808107dfec3d39b
a86feca89d9c89c7cb4e8df8f920d0c1300ff419 27-Feb-2018 Brad Ebinger <breadley@google.com> Merge "Fix IMS SMS calculateLength bug" am: b51a15c461
am: c68d9422f3

Change-Id: Ic520198980c9a1617c1f9fc4e080bc5f79b5c05f
b51a15c4610da196aec1f0c89e33bf3e19ba46b2 27-Feb-2018 Brad Ebinger <breadley@google.com> Merge "Fix IMS SMS calculateLength bug"
4e53ab357d2d3c55076d1b7a133950e5f658e905 27-Feb-2018 Brad Ebinger <breadley@google.com> Assign messageRef to tracker in IMS dispatcher

The messageRef was not being assigned to sent
SMSs in IMS SMS dispatcher, causing the status
of the messages to never be set to sent.

Test: Manual
Bug: 73838993
Change-Id: Ie34a0ae74995348375cfae05c7766bb147a68916
msSmsDispatcher.java
f091ac9ee64ff250fd2bb20eb9235d4d4f7d7e5c 27-Feb-2018 Qingxi Li <qingxi@google.com> Merge "Start OTA in EuiccCardController" am: b78cce7bfb
am: 187aa2d0a5

Change-Id: I0ff352334528e332f7481f3a53d5204280ae5bbd
b78cce7bfb076ad9a219c14b797b3153a924586c 27-Feb-2018 Qingxi Li <qingxi@google.com> Merge "Start OTA in EuiccCardController"
2595adf2f98977c5f531d7a3c455228336c98054 27-Feb-2018 Mohamed Abdalkader <abdalkader@google.com> Merge "Add more SMS error codes" am: e35e6ed710 am: 9f4a1542c5
am: 8094d5076d

Change-Id: I753d6836804e39c42ddf2ddb90d576c3fc1e8fd5
8094d5076d79dc546bfbafcee76083c790dceea5 27-Feb-2018 Mohamed Abdalkader <abdalkader@google.com> Merge "Add more SMS error codes" am: e35e6ed710
am: 9f4a1542c5

Change-Id: I02e1d210dafc5ef37773ba21478b37f8481b79db
05653db10bec89fdaa39f91bdd1a789e4b4ab97f 27-Feb-2018 Orlowski, Rafal (EXT) <rafal.orlowski@sonymobile.com> Merge "Disable showSpn under no service condition" am: 900cf1ac99 am: d149325f57
am: 687cb8684e

Change-Id: Ia5c3609201a3e51f927331ef854c1d7340a1eebf
687cb8684e5e778b78560ffe312fbc5bdc5cac72 27-Feb-2018 Orlowski, Rafal (EXT) <rafal.orlowski@sonymobile.com> Merge "Disable showSpn under no service condition" am: 900cf1ac99
am: d149325f57

Change-Id: I198a929d03a629c5978e3ab260a37ce835428bac
e35e6ed710603a5acbe99951130eb1051a8766b7 27-Feb-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Add more SMS error codes"
900cf1ac994a975cfb2473e156a9872cce946cce 27-Feb-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Disable showSpn under no service condition"
82f19e45acbc0660c3ab685d2bced37465d19c4c 27-Feb-2018 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Add support for sending message with priority, link control and validity period options" am: 5eb8a9f9cd am: 5c032493e3
am: b357e94eac

Change-Id: I6ee267c18697ffb8ef77ff0214bcd4daea42fd84
b357e94eac02275b8b5d64b6df82e50b2059bd7d 27-Feb-2018 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Add support for sending message with priority, link control and validity period options" am: 5eb8a9f9cd
am: 5c032493e3

Change-Id: I257d352ff42b32a802fea902c1a6ab0658af1280
a5b468911107d2ac0c61631aa7dd9c875bb6e3cf 27-Feb-2018 Brad Ebinger <breadley@google.com> Fix IMS SMS calculateLength bug

Fixed accidental swap of gsm/cdma calculate
length functions for SMS over IMS.

Test: Manual
Change-Id: I59fbfa0ddcc79b564144d3ada96adc8926d625b5
til/SMSDispatcherUtil.java
5eb8a9f9cd43dd6f9392430e5857ff3685ef9c84 26-Feb-2018 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Add support for sending message with priority, link control and validity period options"
73886766c9a9b14230335292f2e2e14351570cbc 03-Feb-2018 Qingxi Li <qingxi@google.com> Start OTA in EuiccCardController

We will try to start OTA when we receive the broadcast of SIM slot
status change, since at this time, radio is on and the slot info. is
ready. We will only try to start OTA if we current is on eSIM slot.

Bug: 72880982
Test: Included
Change-Id: Id2fec7dab328f5ccd8b0f0ee7ff83aa24bc1dda3
Merged-In: Id2fec7dab328f5ccd8b0f0ee7ff83aa24bc1dda3
honeFactory.java
uicc/EuiccCardController.java
f0031283074dc2fef2e79fe61cb40cde984249cb 26-Feb-2018 Brad Ebinger <breadley@google.com> Merge "Refactor IMS to use Helper class for polling" am: bc6cdac422 am: 06d47f429d
am: 6286afc876

Change-Id: I9acf0483d0794ca324cc1652400502756e3a5db3
6286afc876d4ce17947b2ba92f94f558edf8de1a 26-Feb-2018 Brad Ebinger <breadley@google.com> Merge "Refactor IMS to use Helper class for polling" am: bc6cdac422
am: 06d47f429d

Change-Id: If69516657ac3c946dadef702deb3fe0963b16535
bc6cdac4220c8f05076e29c0569c9e490ebbb9c0 26-Feb-2018 Brad Ebinger <breadley@google.com> Merge "Refactor IMS to use Helper class for polling"
486a27a06ebfe40f92f3629a54c58f98fb3b68df 26-Feb-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Start OTA in EuiccCardController"
36706d0cbc43bc79ceeb74ae0062647b93f5c955 26-Feb-2018 Sandeep Gutta <sangutta@codeaurora.org> Merge "Add sanity check to fix NullPointerException" am: 95be6f1a6e am: d094312776
am: b02007fb93

Change-Id: I3d413151f28a090e64aed137623540e8d8a98916
b02007fb93f2e0dfe1c49587f87ce894f5e2de66 26-Feb-2018 Sandeep Gutta <sangutta@codeaurora.org> Merge "Add sanity check to fix NullPointerException" am: 95be6f1a6e
am: d094312776

Change-Id: I1f864c3de7e94eb50f3ffde9913c80e7ccf2a38d
95be6f1a6e08ae976cb10d3b5666844386146101 26-Feb-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Add sanity check to fix NullPointerException"
630d7567b4a78320f52662ad45f0d0726f676474 03-Feb-2018 Qingxi Li <qingxi@google.com> Start OTA in EuiccCardController

We will try to start OTA when we receive the broadcast of SIM slot
status change, since at this time, radio is on and the slot info. is
ready. We will only try to start OTA if we current is on eSIM slot.

Bug: 72880982
Test: Included
Change-Id: Id2fec7dab328f5ccd8b0f0ee7ff83aa24bc1dda3
honeFactory.java
uicc/EuiccCardController.java
903c1ee8f08211a730ea632650af5f2675f945ad 26-Feb-2018 Holly Jiuyu Sun <jiuyu@google.com> Merge "Add device capabilities." am: d8a7436fa5
am: 04214a637b

Change-Id: Icaf3f70df6e490a95b4da2902e3fdbf2ba77c7f2
d8a7436fa5298dd35a1bbc787df8e862b4d0336a 26-Feb-2018 Holly Jiuyu Sun <jiuyu@google.com> Merge "Add device capabilities."
1b4b8dfe45b07e9cb285a6919895fc1a9af77454 24-Feb-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Utilize CARRIER_APP_NAMES to for SIM notification/dialog"
d5222086533bd645fddc5ca4bf2a2bcc84f1a2af 11-Apr-2017 Mengjun Leng <mengju@codeaurora.org> Add support for sending message with priority, link control and validity period options

1. Added support for message priority(indicates the priority of a
SMS to the network in the PDU) in 3gpp2
2. Added support for link control(indicates whether network can
expect more messages or not so it can decide whether to retain
the radio link or not) while sending multiple messages
3. Added support for validity period(indicates how much time the
SMS is valid at the SMSC) support in 3gpp
4. Amended UT test cases for API changes and add UT validity period
test case

Test: Verfied sending short SMS, long SMS, MMS, SMS with emoji on
live network

Bug: 34962629
Change-Id: I04c5794c177a339f782fbb0abf591595afe84dc5
ccSmsInterfaceManager.java
msSmsDispatcher.java
MSDispatcher.java
msDispatchersController.java
iccSmsController.java
dma/CdmaSMSDispatcher.java
sm/GsmSMSDispatcher.java
til/SMSDispatcherUtil.java
c902e4c55f15b39f5113ca4f0e58aff7332f2b01 24-Feb-2018 nharold <nharold@google.com> Merge "NATT Keepalive Unit Test" am: 682fac6c02 am: 278cff40cc
am: 0c915cdb4a

Change-Id: I31662fc87a36d08ab65a1a6b327ba8d837ff5dbc
0c915cdb4a0cd4fc5ae6cf307c299296ffcdd4c9 24-Feb-2018 nharold <nharold@google.com> Merge "NATT Keepalive Unit Test" am: 682fac6c02
am: 278cff40cc

Change-Id: I8a819522496fd3d00f66d318f0c82ae0fff2d416
682fac6c02f98184d74251d0ec2fe3eb2bbdaca2 24-Feb-2018 nharold <nharold@google.com> Merge "NATT Keepalive Unit Test"
ed1756d115d4944c407ab628d41dd2db26c6f214 07-Feb-2018 Holly Jiuyu Sun <jiuyu@google.com> Add device capabilities.

Read the device capability and its value pair from config.xml, and add them
to the Asn1Node used to authenticateServer.

Bug: 72223709
Test: Unit test
Merged-In: I4ea8439c1735970b4190ca1698ac0aeb977ae315
Change-Id: I4ea8439c1735970b4190ca1698ac0aeb977ae315
icc/euicc/EuiccCard.java
b03dbaac0051b2d6c9daee438781c26bf4123fde 22-Feb-2018 Brad Ebinger <breadley@google.com> Refactor IMS to use Helper class for polling

Reduces duplicated logic in the platform by
moving polling code into helper class.

Bug: 72643077
Test: Manual, Telephony unit tests
Change-Id: Id3f20080ceafcd6b9778e9ee5620868b9c171fe7
msSmsDispatcher.java
msphone/ImsPhoneCallTracker.java
2d75c5b4baeaceef006efe888a64777cfc329d48 17-Feb-2018 goneil <goneil@google.com> Utilize CARRIER_APP_NAMES to for SIM notification/dialog

Bug: 70042722
Test: Manual QA
Change-Id: I3f72491e66bb2756df2be585480d7eac5c738fad
icc/InstallCarrierAppTrampolineActivity.java
icc/InstallCarrierAppUtils.java
710d870989fcafce341ea7a05fd06fd0945aef0e 23-Feb-2018 Jeff Davidson <jpd@google.com> Merge "Factor out telephony permission checks into a helper class." am: a8edd92021
am: 7c233dc1a4

Change-Id: I0a7f3c04eb1a2cdc0c2487f9d6ada087330dffe2
76c436b86b836c9b67b71462bdbe757d0f067944 23-Feb-2018 Gil O'Neil <goneil@google.com> Merge "Utilize CARRIER_APP_WHITELIST to check if carrier app is installed"
a8edd92021617c3a56ef63391d470dd67b03dae2 23-Feb-2018 Jeff Davidson <jpd@google.com> Merge "Factor out telephony permission checks into a helper class."
9566fe7f15b78503b9e7ce51e27464b523838e28 11-Jan-2018 goneil <goneil@google.com> Utilize CARRIER_APP_WHITELIST to check if carrier app is installed

Use certificate in favor of package name because some sim cards do not
contain the package name

Bug: 70042722
Test: UiccProfileTest#testParseWhitelistMapFromString
Change-Id: Ie3712a2324063a1adb8ed62c5e0928292a325811
icc/UiccCarrierPrivilegeRules.java
icc/UiccProfile.java
0102671619af42001a2bec31f81659182e7d673f 23-Feb-2018 Amit Mahajan <amitmahajan@google.com> Merge "Avoid logging exception stack trace unnecessarily." am: eef2607f1d am: f28ebd868a
am: 2acc822b42

Change-Id: I601669f8bd2d5c889175c3dc749cc4e51c38555d
2acc822b422356c7a8668a5d97d37ec14fed34d6 23-Feb-2018 Amit Mahajan <amitmahajan@google.com> Merge "Avoid logging exception stack trace unnecessarily." am: eef2607f1d
am: f28ebd868a

Change-Id: I0cc8ea01af2da9172f7585587bf74f80a663394e
eef2607f1d32a5835932bebe2c487e851ac437a2 23-Feb-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Avoid logging exception stack trace unnecessarily."
a1a741e529b5187f8e2ddc21fb6acde17bfc4060 23-Feb-2018 Chen Xu <fionaxu@google.com> Merge "trigger carrier identification on SIM OTA" am: 5ab57320f9 am: e11e5c679b
am: ce6e0309b4

Change-Id: I7251434996c21fdadd17935fce0ee69e92ff4d62
ce6e0309b4595c485c63ca653d43d02a68b0e67d 23-Feb-2018 Chen Xu <fionaxu@google.com> Merge "trigger carrier identification on SIM OTA" am: 5ab57320f9
am: e11e5c679b

Change-Id: Ibc0d9e8ca44a607a0c4c10a6c4f2d204eed36023
5ab57320f993a2eb5cbdc5b522c260c0b02aa2ae 23-Feb-2018 Chen Xu <fionaxu@google.com> Merge "trigger carrier identification on SIM OTA"
1f9a13b16c3f2269b908945c8933fb2e07cebf47 23-Feb-2018 Amit Mahajan <amitmahajan@google.com> Avoid logging exception stack trace unnecessarily.

Test: none
Bug: 72944241
Change-Id: I99e88a8e4fbb68027434d5228d3844709218b8a4
icc/UiccController.java
ba3cd5d9bb09cfb989fd65c00e4f45287aa60df1 23-Feb-2018 fionaxu <fionaxu@google.com> trigger carrier identification on SIM OTA

Bug: 73786449
Test: Manual
Change-Id: Ia0f2836c93deaf014b2aa9a5fffa4a18121fa549
arrierIdentifier.java
3c09fb7eec26ecb5e3b684d7e3f25c9df142775b 09-Feb-2018 Nathan Harold <nharold@google.com> NATT Keepalive Unit Test

-Fix a bug that DC was registering itself
twice for keepalive status notifications.

-Verify that callbacks register/unregister
when entering/exiting DC_ACTIVE state
-Verify that KA sessions are cached by a map
of slotId and sessionHandle.
-Verify that start/stop requests are sent to the
RIL as needed.
-Verify that KA sessions are cleaned up after a
call to stop()
-Verify that a failed keepalive is cleaned up and
the records are either not created or are created
and then deleted depending on the error scenario.

Bug: 72417084
Test: runtest -x DataConnectionTest.java
Change-Id: I113e170fe20b9bdd74c2670109b8271f2114dab1
ataconnection/DataConnection.java
est/SimulatedCommands.java
b418efae712f0e26e81d70809b7505164903451f 22-Feb-2018 Hall Liu <hallliu@google.com> Merge "RTT bugfixes, part 5" am: cc463fe045
am: 5f5c7a5df0

Change-Id: Id3231d2c71278989e94d177f6f6a57147b5ea344
ef3a98e359b92f2bcd92f4569cd19414df4e5dab 22-Feb-2018 Jiuyu Sun <jiuyu@google.com> Merge "Add device capabilities."
cc463fe045945c78b98ef65d2a1ac77e7ab78530 22-Feb-2018 Hall Liu <hallliu@google.com> Merge "RTT bugfixes, part 5"
01d1fd7d4d6dc916924dff09e31c5e8789aa67bf 14-Feb-2018 Jeff Davidson <jpd@google.com> Factor out telephony permission checks into a helper class.

The aim is to cut down on duplicate code (for a particularly high-risk
area) and make it easier to expand READ_PHONE_STATE access to
carrier-privileged apps in a follow-up CL.

No major functional changes are intended, although some logging will
change slightly (different tag / less verbose carrier privilege
logging without DBG flag).

Bug: 70041899
Test: bit FrameworksTelephonyTests:*, nothing visibly broken on boot
Merged-In: I3d45a3b50f6e50fbfc5118579f22b90019bf68c1
Change-Id: I3d45a3b50f6e50fbfc5118579f22b90019bf68c1
honeSubInfoController.java
ubscriptionController.java
icc/UiccCarrierPrivilegeRules.java
icc/UiccProfile.java
266f0afbe2af40613d33d1364fd06a01ea6eee4c 22-Feb-2018 Jeff Davidson <jpd@google.com> Merge "Factor out telephony permission checks into a helper class."
d01a100ad2044133d889d8d534e3322457caf4bc 22-Feb-2018 Sandeep Gutta <sangutta@codeaurora.org> Add sanity check to fix NullPointerException

Test: Verfieid sanity cases with SIM PIN enabled SIM
Change-Id: I04692d7bd36dc2a6d64d6c9ac05260ee68b8577e
ubscriptionInfoUpdater.java
0ad9d69675cf5f8bd32815ceed22121bc1e31f21 22-Feb-2018 Pengquan Meng <mpq@google.com> Merge "Remove timeout event for WaitingState" am: 7ae0ef96c1 am: 0387ddc420
am: 441e8c60a8

Change-Id: I92d84a3540ac6534c7bb2bc44389df6691ae06b0
441e8c60a88f45d474d5207dd030d09018f3e00d 22-Feb-2018 Pengquan Meng <mpq@google.com> Merge "Remove timeout event for WaitingState" am: 7ae0ef96c1
am: 0387ddc420

Change-Id: I7c8798598e3c6b86c3d7f7959693837ef9d5a48b
7ae0ef96c1c396c48a60f4139bbb6d615e18ee33 22-Feb-2018 Pengquan Meng <mpq@google.com> Merge "Remove timeout event for WaitingState"
de28b7cd9d3e31548607a3617532f287003f64fe 22-Feb-2018 Amit Mahajan <amitmahajan@google.com> Merge "Trigger pollState() on carrier config changed for GSM as well." am: 61f96a7e51 am: 2fea71e2d7
am: 141102a4b2

Change-Id: Ifcb5d27c1329c7580cc315d4629c8bb7efccbc2d
b143555739ac2fea04092c0c04207897e0a339d2 22-Feb-2018 Susheel Nyamala <snyamala@codeaurora.org> Merge "Fix IMS PDN deactivate due to single pdn arbitration" am: ddc08749eb am: 9239cb5171
am: e1b7dd886f

Change-Id: I825e925f222129df4dca0c3d8db467f2421b0c49
141102a4b2e300266b6b325ad4951dbe1c31003c 22-Feb-2018 Amit Mahajan <amitmahajan@google.com> Merge "Trigger pollState() on carrier config changed for GSM as well." am: 61f96a7e51
am: 2fea71e2d7

Change-Id: I9f12217e22d051040428cab5f8478a81d968d1dc
e1b7dd886f27496402051cf5d32a18683530b986 22-Feb-2018 Susheel Nyamala <snyamala@codeaurora.org> Merge "Fix IMS PDN deactivate due to single pdn arbitration" am: ddc08749eb
am: 9239cb5171

Change-Id: Iaf74ac7ffe76d5b727a80bae04459c0e1fc6b2fa
3ac411dbb254453ab2b25edcfcd0b37d2109a9b0 10-Feb-2018 Hall Liu <hallliu@google.com> RTT bugfixes, part 5

* Add support for properly setting the ImsStreamMediaProfile's RTT flag
when answering an incoming call
* Add logging

Bug: 72648661
Bug: 72762206
Test: manual, with telecom testapp dialer over the network
Change-Id: I93dfa217b9bf004e95919c3dded8a59cbb14b57e
Merged-In: I93dfa217b9bf004e95919c3dded8a59cbb14b57e
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
msphone/ImsRttTextHandler.java
61f96a7e515e96547f2c3a6ea690031e2d36f152 22-Feb-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Trigger pollState() on carrier config changed for GSM as well."
07340242740f57c165d19000e89f91b32721841b 22-Feb-2018 Hall Liu <hallliu@google.com> Merge "Update method calls to avoid security errors" am: 5e62a7b51d am: 88d882158b
am: fa617808a7

Change-Id: Ic5b8462885b6643c4b7b3653dd9377ecf5120592
ddc08749ebe8ad39a304edb6ecdf87d710d4a42a 22-Feb-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fix IMS PDN deactivate due to single pdn arbitration"
fa617808a7c25ed091e5878aa1e175682edfd09f 22-Feb-2018 Hall Liu <hallliu@google.com> Merge "Update method calls to avoid security errors" am: 5e62a7b51d
am: 88d882158b

Change-Id: I8493f22db8e83d76d42dcc1cbd831bb9f444e7b4
2abae4a71bd26d5de8635494513169fc9f07b9d7 07-Feb-2018 Holly Jiuyu Sun <jiuyu@google.com> Add device capabilities.

Read the device capability and its value pair from config.xml, and add them
to the Asn1Node used to authenticateServer.

Bug: 72223709
Test: Unit test
Change-Id: I4ea8439c1735970b4190ca1698ac0aeb977ae315
icc/euicc/EuiccCard.java
5e62a7b51d075a1e1781e1479a001de7f07fb008 21-Feb-2018 Hall Liu <hallliu@google.com> Merge "Update method calls to avoid security errors"
2061ceba319413bed4d146459c517ca35a4caf8c 03-Dec-2015 Susheel Nyamala <snyamala@codeaurora.org> Fix IMS PDN deactivate due to single pdn arbitration

Add exception for IMS PDN for clean up due to single PDN arbitration.
Add support for IMS PDN to co-exist with other on non IMS PDN's in
single PDN case.

Do not tear down IMS PDN during data stall recovery.
If telephony tears down IMS PDN without release request from
Connectivity, IMS media component will not be able to send/receive
video packets.

Test: manual - Checked that IMS PDN is not torn down when connect to
higher priority APN.

Bug: 37493042
Change-Id: I3979dffd0aaf46523d7cbc002248f33ae6894e0f
Depends-On: I3c22abf0c1a90900936a0ac190cadc699c2eca69
ataconnection/DcTracker.java
7ba70a3b623cc8e6f648267b5beaeac059d8b613 21-Feb-2018 Pengquan Meng <mpq@google.com> Merge "Fixed MMI callback issue" am: 73522c5e9a
am: 49a631132c

Change-Id: I3d71e027a6c957421aebadf9ad5e147f6c52d24f
af480a7133ff8653d0e97fcbb11683766dddcef1 21-Feb-2018 Pengquan Meng <mpq@google.com> Remove timeout event for WaitingState

This remove the timeout event for WaitingState in InboundSmsHandler.
This mean InboundSmsHandler will not broadcast the new incoming SMSs
until the previous broadcast is completed.

Test: current unit test
Bug: 70631177
Change-Id: I7166bbba61ddf7cf397b2ada8de7dc33c4a77cbd
nboundSmsHandler.java
e058dbf4b5b9e76cb70c10630f3d834821d751d1 21-Feb-2018 Amit Mahajan <amitmahajan@google.com> Trigger pollState() on carrier config changed for GSM as well.

Test: Basic telephony sanity, unit tests
Bug: 72145681
Change-Id: Ic88c5e4e48e8500d3deaa38d445f789973f98c2a
smCdmaPhone.java
c15b0242a6dc4f48719545b5a8e8dd449d52d6ff 07-Feb-2018 Pengquan Meng <mpq@google.com> Fixed MMI callback issue

TelephonyManager.sendUssdRequest API does not invoke UssdResponseCallback when request fails.
This happen when the MMI code is invalid.

Bug: 66355133
Test: existing telephony test

Merged-In: Id074d1cd010c3998218621a6338ba3155b215101
Change-Id: Id074d1cd010c3998218621a6338ba3155b215101
sm/GsmMmiCode.java
8f332a7ac42f70f096ca469ee12a2abcbf273c9d 24-Jan-2018 Eric Schwarzenbach <easchwar@google.com> Plumb PhysicalChannelConfig all the way up.

Updates the bottom layer to propagate PhysicalChannelConfig unsols up
through to the PhoneNotifier.

Bug: 72117533
Test: runtest frameworks-telephony

Change-Id: I68143281e4331c8a659ebb33cb1a4d7aacfd75d8
aseCommands.java
ommandsInterface.java
efaultPhoneNotifier.java
hone.java
honeNotifier.java
adioIndication.java
erviceStateTracker.java
est/SimulatedCommandsVerifier.java
23dcf06212488613f9008131425caaad94c631e2 21-Feb-2018 Jordan Liu <jminjie@google.com> Merge "Log phone id for debugging multi SIM devices" am: 97ca162df3 am: ee389b5a66
am: b2070558c2

Change-Id: Idac432303e94ffb872a7e6e11d31481efabc9ff9
b2070558c2c139de1cf81b15f4af69b62dfed220 21-Feb-2018 Jordan Liu <jminjie@google.com> Merge "Log phone id for debugging multi SIM devices" am: 97ca162df3
am: ee389b5a66

Change-Id: Ie8c670fdbdb2502c5f1f6be064247a18edc5b5ee
b8b04e64ba9554fb03a3379ef9ffc415edb2708f 21-Feb-2018 Pengquan Meng <mpq@google.com> Merge "MSIM: Fix flex map related issues" am: b58557f8fe am: 872ba3b9cd
am: e8fdb23bcd

Change-Id: I55a55d604157ccc20875d66047ee8968795a46fe
d74cbbe2c8c94fef4dc5e684928b604d71a5d64c 21-Feb-2018 Brad Ebinger <breadley@google.com> Merge "IMS: Notify call failed for unobtainable number" am: d462e2d69a am: 2cc3680099
am: 9e28a996f4

Change-Id: Ib9a70f81b0fcaba5c1db65b2cddbceb8721a26d4
e8fdb23bcd246b933b5ba0b3abaa454c7a0c24fd 21-Feb-2018 Pengquan Meng <mpq@google.com> Merge "MSIM: Fix flex map related issues" am: b58557f8fe
am: 872ba3b9cd

Change-Id: I1a84f3b1893ee0f39f5067fa74cf2a64c7f82b98
9e28a996f47c3507fc1134f16baf40b820859c57 21-Feb-2018 Brad Ebinger <breadley@google.com> Merge "IMS: Notify call failed for unobtainable number" am: d462e2d69a
am: 2cc3680099

Change-Id: Id06bac36bbb89555964ef6da036267390297d457
97ca162df368be166dfb8c37de51ccc8ef3bce26 21-Feb-2018 Jordan Liu <jminjie@google.com> Merge "Log phone id for debugging multi SIM devices"
b58557f8fee336e36193f1bcb77bba70181525b4 20-Feb-2018 Pengquan Meng <mpq@google.com> Merge "MSIM: Fix flex map related issues"
828a763161a8e9312052de1864f2f1954dd468c5 14-Feb-2018 Jeff Davidson <jpd@google.com> Factor out telephony permission checks into a helper class.

The aim is to cut down on duplicate code (for a particularly high-risk
area) and make it easier to expand READ_PHONE_STATE access to
carrier-privileged apps in a follow-up CL.

No major functional changes are intended, although some logging will
change slightly (different tag / less verbose carrier privilege
logging without DBG flag).

Bug: 70041899
Test: bit FrameworksTelephonyTests:*, nothing visibly broken on boot
Change-Id: I3d45a3b50f6e50fbfc5118579f22b90019bf68c1
honeSubInfoController.java
ubscriptionController.java
icc/UiccCarrierPrivilegeRules.java
icc/UiccProfile.java
d462e2d69a45302a08423232a5f3ee75b61132e5 20-Feb-2018 Brad Ebinger <breadley@google.com> Merge "IMS: Notify call failed for unobtainable number"
91cd56797bd9d0aeb5b1616bd9acd545b7eddd16 12-Feb-2018 Brad Ebinger <breadley@google.com> Integrates ImsService shouldProcessCall API

When placing a call, we now call MmTelFeature#shouldProcessCall
API to allow the ImsService to evaluate whether or not the number
should be placed over IMS or CSFB.

Test: Manual, Telephony unit tests
Bug: 72642113
Change-Id: I3fe174f5a4b6417f17ce16e3c7b98a70bd3e176d
ms/ImsResolver.java
ms/ImsServiceController.java
msphone/ImsPhoneCallTracker.java
5bd4e9a78a4c87146dbcfa33e1886372129fa5b3 15-Jun-2017 Qiongcheng Luo <qiongcheng.luo@sonymobile.com> Log phone id for debugging multi SIM devices

Some telephony classes like GsmCdmaPhone, ImsPhone, etc. are created
per slot in multi SIM devices. It is better to output phone id for
debugging multi SIM devices.

Test: manual - Verified that some logs are output with phone id, run
telephony unit tests
Bug: 69657265
Change-Id: I174e1bc67e436e131a2a7a0abc0585c7d69598a3
smCdmaCallTracker.java
smCdmaPhone.java
erviceStateTracker.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
88a60a9390342c6524b7aa199ab4424c8146439d 17-Feb-2018 Pengquan Meng <mpq@google.com> Merge "Break the for loop searching after removing the item" am: 2597aac799 am: 9e286a9176
am: 7ef1e4e3ff

Change-Id: I95b179ea77524dee936476677a5b2561999e6e7c
7ef1e4e3ffda26df9c5fe9d679d69570edbeafd5 17-Feb-2018 Pengquan Meng <mpq@google.com> Merge "Break the for loop searching after removing the item" am: 2597aac799
am: 9e286a9176

Change-Id: If446ca49e779263a4f485ed13d9e30ac2671a038
2597aac799c2ca0436bd0bf3f48c45c86f87c003 16-Feb-2018 Pengquan Meng <mpq@google.com> Merge "Break the for loop searching after removing the item"
b0caf5b48952ea046c95f882189e01aca7f402ab 16-Feb-2018 Mohamed Abdalkader <abdalkader@google.com> Add more SMS error codes

Bug: 73487630
Change-Id: I3b8113b7f798bf6e0fd92974edce23a731ff5007
msSmsDispatcher.java
dc3912098d5d6de0bf2e86b5b175454a5f4d66f0 13-Jan-2018 Orlowski, Rafal (EXT) <rafal.orlowski@sonymobile.com> Disable showSpn under no service condition

"No Service" with SPN text is displayed on lock screen under no service
condition. But most of the operators require not to display SPN text on
that condition since showing "No Service + SPN" confuses user. By
disabling showSpn, SPN text is not displayed on lock screen.

Test: Verified by manual
Bug: 31952303
Change-Id: Ieea7172271ab0f8c179b6963201faee7c2c7882d
erviceStateTracker.java
3b5aeaa6d077ef8c13491a12cf76cb909776b16b 16-Feb-2018 Amit Mahajan <amitmahajan@google.com> Merge "Determine apps READY/LOADED only based on SIM/USIM/CSIM/RUIM apps." am: d3b21e2b2e am: 513033e575
am: 85fe22c4d4

Change-Id: If355e9e2dd5a04f9f28aa51141295b62ed2b73ff
85fe22c4d4ba048b0e90c0673c8575bc9d817db8 16-Feb-2018 Amit Mahajan <amitmahajan@google.com> Merge "Determine apps READY/LOADED only based on SIM/USIM/CSIM/RUIM apps." am: d3b21e2b2e
am: 513033e575

Change-Id: I6baa869e18bff8b1e2c0f26e79089a24233ef176
f4b3274701c6fd4dec9b95f95e4fc744f259e1f8 16-Feb-2018 Hall Liu <hallliu@google.com> resolve merge conflicts of 450994a84b7b8deaffa4b86cea6625f1c820ca3a to oc-mr1-dev-plus-aosp

Change-Id: I44a842b7c40c299cd3f537feb636bef198a759a3
006c213cdb2aed16923323b3fa3a5e38ca6de0db 09-Feb-2018 Brad Ebinger <breadley@google.com> Expose MMTEL IMS registration technology to TelephonyManager

Pipes IMS registration querying method through telephony.

Bug: 35128252
Test: Telephony unit tests
Merged-In: If8c72ba63ad504b91931afc2e203645e2d6d303e
Change-Id: If8c72ba63ad504b91931afc2e203645e2d6d303e
hone.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
1568ddae9632c775a676bf8e39b0e09e94d2616e 16-Feb-2018 nharold <nharold@google.com> Merge "Add WCDMA Signal Strength to SignalStrength" am: f3117ca388 am: bed23497d1
am: 4d1d003d47

Change-Id: I27f3c1a5a4abd8a69f9f571f2d6f29b65df44743
f01619707960fb1d1d518b0992c092c27fe58aff 16-Feb-2018 Xiangyu/Malcolm Chen <refuhoo@google.com> Merge "Add NetworkRegistrationState into SS's list." am: 619ff7ecc5 am: f800390eb7
am: c7efcf3dc4

Change-Id: Icb4d1f05f497edcbe497113f52e8bbc6ec2ef0a0
32b6ffc55c47937fd649e64fdb9599cfcf899dea 16-Feb-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Expose MMTEL IMS registration technology to TelephonyManager" into oc-mr1-dev-plus-aosp
4d1d003d47a136ef4be3d2af66efa3c1084e5f97 16-Feb-2018 nharold <nharold@google.com> Merge "Add WCDMA Signal Strength to SignalStrength" am: f3117ca388
am: bed23497d1

Change-Id: I2670a8011643973e97299d18a9ddd713f1d3c520
c7efcf3dc4e207b8ea897b4e6092f4b1208525cb 16-Feb-2018 Xiangyu/Malcolm Chen <refuhoo@google.com> Merge "Add NetworkRegistrationState into SS's list." am: 619ff7ecc5
am: f800390eb7

Change-Id: Ie01e820387704a1dfdc9b5197eb39b1772ad2265
41f0c46a0ac132b9e4d931896babc712591ca7a3 16-Feb-2018 Hall Liu <hallliu@google.com> Merge "RTT bugfixes, part 5"
d3b21e2b2e586058f83a4364ec390937e5e05b76 15-Feb-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Determine apps READY/LOADED only based on SIM/USIM/CSIM/RUIM apps."
9a31e54fcc2ef7287fc1a968d2b644544afa50b3 15-Feb-2018 Hall Liu <hallliu@google.com> Merge "RTT outgoing initialization"
f3117ca388465789d7a81fb5299c24a69e5dadaa 15-Feb-2018 nharold <nharold@google.com> Merge "Add WCDMA Signal Strength to SignalStrength"
619ff7ecc5567f50a5b2093667facca6fa37be3a 15-Feb-2018 Xiangyu/Malcolm Chen <refuhoo@google.com> Merge "Add NetworkRegistrationState into SS's list."
162a08ce25a4a53241f42d33dd3c65edfe7a3d6a 15-Feb-2018 Gil O'Neil <goneil@google.com> Merge "Move from an alert dialog to a full screen dialog for SIM app install"
794af81014ba7d6d75d1e9cd11058addb3368dab 23-Jan-2018 Hall Liu <hallliu@google.com> RTT outgoing initialization

Add support for dialing an outgoing call with RTT enabled from the start
(refactors the dial methods to use DialArgs)
Add plumbing code to bubble up RTT initiation/termination events from
the IMS stack up to Telecom

Bug: 72156722
Bug: 71873552
Test: existing unit tests

Change-Id: I084f75d860ebc9837cf6156c1ebaaf4532343de1
Merged-In: I084f75d860ebc9837cf6156c1ebaaf4532343de1
allManager.java
onnection.java
smCdmaPhone.java
hone.java
honeInternalInterface.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
ip/SipPhone.java
ip/SipPhoneBase.java
e57eb897090ae939777c814dd0405d450615f271 14-Feb-2018 Amit Mahajan <amitmahajan@google.com> Determine apps READY/LOADED only based on SIM/USIM/CSIM/RUIM apps.

Test: Basic telephony sanity
Bug: 72959715
Change-Id: I9465b619d7e3fad2ca3adeb7ef644a0c49321b89
icc/UiccProfile.java
f4853a0829e16c21bb1e2266fc3f9f4562d307b8 15-Feb-2018 Brad Ebinger <breadley@google.com> Merge "Expose MMTEL IMS registration technology to TelephonyManager"
e6702220aa471f98579102516afa8aa268820856 13-Dec-2017 Wei Huang <wei.x.huang@sony.com> Add WCDMA Signal Strength to SignalStrength

Integrate a HAL change to support SignalStrengthWcdma
in the SignalStrength IRadioIndication and
IRadioResponse interfaces.

Bug: 71329173
Test: runtest frameworks-telephony
Change-Id: I5cbc0df0c9cf22c4acaa6e1b12785679f69a7ea3
IL.java
adioIndication.java
adioResponse.java
3d28f89927137ce03128a0244a698ca5162e8165 10-Feb-2018 Hall Liu <hallliu@google.com> RTT bugfixes, part 5

* Add support for properly setting the ImsStreamMediaProfile's RTT flag
when answering an incoming call
* Add logging

Bug: 72648661
Bug: 72762206
Test: manual, with telecom testapp dialer over the network
Change-Id: I93dfa217b9bf004e95919c3dded8a59cbb14b57e
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
msphone/ImsRttTextHandler.java
d06d599321a587f0c697bda4c791a5f3618479d1 14-Feb-2018 Malcolm Chen <refuhoo@google.com> Add NetworkRegistrationState into SS's list.

When SST received new NetworkRegistrationState, we add it into
SS's list.

Bug: 73305596
Test: regression-test

Change-Id: I9bacd738b87556f3127e09a4ef760a152ce78a6f
erviceStateTracker.java
60bc8a39e9c5c444c5ac69390b7da7e7823be84e 14-Feb-2018 Malcolm Chen <refuhoo@google.com> Merge "Don't hold mDataEnabledSettings lock if not needed." am: 32e1e2bc49
am: ca651a65fb

Change-Id: I072533fa1c68744aff62d7ef5eb988a0341ee417
50f46994157b93eead4dbe11ec0f09e76906b567 14-Feb-2018 Chen Xu <fionaxu@google.com> Merge "update carrierIdProvider with current active subs" am: dde1944643
am: ceb09e7781

Change-Id: I04e6ce43d98f443911cf83c8e3dbd4429c7a5db9
32e1e2bc49b312225afa24d1431a02a43142fe7d 14-Feb-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Don't hold mDataEnabledSettings lock if not needed."
12161f13cb8fc7443c86b26753c078b33b762077 10-Feb-2018 Malcolm Chen <refuhoo@google.com> Don't hold mDataEnabledSettings lock if not needed.

Since most public APIs in mDataEnabledSettings are synchronized
methods, we don't need to lock mDataEnabledSettings explicitly.
We also shouldn't lock it when no longer needed, which could lead
to deadlock.

Bug: 71517029
Test: regression test
Change-Id: I0f3f51af94e48b4d31f703f444102f53fd466758
Merged-In: I0f3f51af94e48b4d31f703f444102f53fd466758
ataconnection/DcTracker.java
d6be49cecd859d118d0781d32bd55a207eb11284 09-Feb-2018 Brad Ebinger <breadley@google.com> Expose MMTEL IMS registration technology to TelephonyManager

Pipes IMS registration querying method through telephony.

Bug: 35128252
Test: Telephony unit tests
Merged-In: If8c72ba63ad504b91931afc2e203645e2d6d303e
Change-Id: If8c72ba63ad504b91931afc2e203645e2d6d303e
hone.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
09f5b9723639968e85e2452f328b2517ffbc749c 09-Feb-2018 Brad Ebinger <breadley@google.com> Expose MMTEL IMS registration technology to TelephonyManager

Pipes IMS registration querying method through telephony.

Bug: 35128252
Test: Telephony unit tests
Change-Id: If8c72ba63ad504b91931afc2e203645e2d6d303e
hone.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
63d0d7aa4fc9f35434345a1f89b93017e564d2cf 29-Jan-2018 fionaxu <fionaxu@google.com> update carrierIdProvider with current active subs

Test: runtest --path CarrierIdProviderTest
Test: Manual
Bug: 72571475
Change-Id: Id0da627ef5bcda7c8e4ec9f4e490d17f3029bee9
(cherry picked from commit a0a8091a01d43eae665bd10b0e5fea1ef2237b6f)
Merged-in: Id0da627ef5bcda7c8e4ec9f4e490d17f3029bee9
arrierIdentifier.java
6e3606301659292818bbc97ae853ff580c4394f0 14-Feb-2018 Holly Jiuyu Sun <jiuyu@google.com> Merge "Revert "Revert "Public EuiccManager APIs.""" am: 06bf7483fe
am: bde27c7783

Change-Id: Ib64ac689462bd0b1404482742bd8aea1bda7a31e
cc94118f978146761cfb697091da5401cbec6a1b 24-Jan-2018 goneil <goneil@google.com> Move from an alert dialog to a full screen dialog for SIM app install

Bug: 70906683
Test: Local install and tests
Change-Id: Ib7d4b539207d58dd0617b48151a415959a483480
icc/CarrierAppInstallReceiver.java
icc/InstallCarrierAppTrampolineActivity.java
icc/InstallCarrierAppUtils.java
icc/ShowInstallAppNotificationReceiver.java
icc/UiccProfile.java
til/NotificationChannelController.java
06bf7483fe1e610068a05209e07b1e91247ee5a0 13-Feb-2018 Holly Jiuyu Sun <jiuyu@google.com> Merge "Revert "Revert "Public EuiccManager APIs."""
47d8e31f0934b73d3170441972a1167943fd59f0 13-Feb-2018 Sandeep Gutta <sangutta@codeaurora.org> Merge "MSIM: Consider phone count value while creating UiccSlot objects" am: b169eec903 am: c2e2074f24
am: 6815ea0be7

Change-Id: I1892302b85285f78420f63e895d26de1aa99d1fe
6815ea0be780e913d9e01b06a2420af6b24c9b22 13-Feb-2018 Sandeep Gutta <sangutta@codeaurora.org> Merge "MSIM: Consider phone count value while creating UiccSlot objects" am: b169eec903
am: c2e2074f24

Change-Id: Ic674d5731c511595f8bb6b275dfea2d593e115a7
44e649c94cb3e83a75c7cd99f915364ac88e84b1 13-Feb-2018 Qingxi Li <qingxi@google.com> Merge "Add interface to get phoneID from UiccSlot" am: 46e48754cc
am: 3c71098b5e

Change-Id: I0aac5c2a7e1234616c3757e7c292c0b41b60409c
b169eec903e289cf9abe83383ea211bbbee24f00 13-Feb-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "MSIM: Consider phone count value while creating UiccSlot objects"
50294a747a85bb233ffc0dd8cc412a4ba526d277 08-Feb-2018 Jiuyu Sun <jiuyu@google.com> Revert "Revert "Public EuiccManager APIs.""

This reverts commit e79f45616235fedf152658ce5998cd0586d240e8.

Reason for revert: bug fixed

Test: test on phone
Change-Id: Idfcf31ff6af2ac2f61105bbe206a07b344e06d9b
Merged-In: Idfcf31ff6af2ac2f61105bbe206a07b344e06d9b
ubscriptionInfoUpdater.java
uicc/EuiccController.java
uicc/EuiccOperation.java
icc/euicc/EuiccCard.java
46e48754cc47ef78b0c39b34b0c342aaa0f163bb 13-Feb-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Add interface to get phoneID from UiccSlot"
f2eacf4d09d32af59d53c54f28fdd3ce67888f51 13-Feb-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Don't hold mDataEnabledSettings lock if not needed."
a24888b78e506f2e3aa9191817c5bf27b0227619 12-Feb-2018 Qingxi Li <qingxi@google.com> Merge "Revert "Revert "Public EuiccManager APIs."""
84bcbf4c8e3688989772d9e2a615f939bbeb66a9 12-Feb-2018 Jordan Liu <jminjie@google.com> Merge "Do not set "gsm.operator.idpstring" per phoneId" am: 1abe9a858d am: 93a79fa37a
am: 6e47e0ccf6

Change-Id: Icbb3a4249434fe9fe1512cc86dbbdd2fef9ebb0a
6e47e0ccf6cbe3e85fdc667fbc2e4b90a1b04557 12-Feb-2018 Jordan Liu <jminjie@google.com> Merge "Do not set "gsm.operator.idpstring" per phoneId" am: 1abe9a858d
am: 93a79fa37a

Change-Id: I06a3787b3c9c4a6c0d06bc09c96295c71beff336
1abe9a858d1b7ae2937dfc71d5c48dc60dfb9cbe 12-Feb-2018 Jordan Liu <jminjie@google.com> Merge "Do not set "gsm.operator.idpstring" per phoneId"
d828468595f5483da81732d7e321c8204b0fa2b7 08-Feb-2018 Jiuyu Sun <jiuyu@google.com> Revert "Revert "Public EuiccManager APIs.""

This reverts commit e79f45616235fedf152658ce5998cd0586d240e8.

Reason for revert: bug fixed

Test: test on phone
Change-Id: Idfcf31ff6af2ac2f61105bbe206a07b344e06d9b
ubscriptionInfoUpdater.java
uicc/EuiccController.java
uicc/EuiccOperation.java
icc/euicc/EuiccCard.java
99e19978cae47c5a31c28240d2fc899857bc0ff0 31-Jan-2018 Sandeep Gutta <sangutta@codeaurora.org> MSIM: Consider phone count value while creating UiccSlot objects

Test: Manual - DSDS and Single SIM boot-up scenarios
Change-Id: I4899777db5bd8165c033f9d24adfc89545bf0b09
icc/UiccController.java
22f1314170548dd4ab38b3046403d3ef5f78e292 10-Feb-2018 Chen Xu <fionaxu@google.com> Merge "update carrierIdProvider with current active subs"
a0a8091a01d43eae665bd10b0e5fea1ef2237b6f 29-Jan-2018 fionaxu <fionaxu@google.com> update carrierIdProvider with current active subs

Test: runtest --path CarrierIdProviderTest
Test: Manual
Bug: 72571475
Change-Id: Id0da627ef5bcda7c8e4ec9f4e490d17f3029bee9
arrierIdentifier.java
6d8e9268e997fbcc3dd4ab62118604b72fcc0dd0 10-Feb-2018 Malcolm Chen <refuhoo@google.com> Don't hold mDataEnabledSettings lock if not needed.

Since most public APIs in mDataEnabledSettings are synchronized
methods, we don't need to lock mDataEnabledSettings explicitly.
We also shouldn't lock it when no longer needed, which could lead
to deadlock.

Bug: 71517029
Test: regression test
Change-Id: I0f3f51af94e48b4d31f703f444102f53fd466758
ataconnection/DcTracker.java
59cef1189cc373cc7127950bea7e5a10597234fa 05-Feb-2018 Jordan Liu <jminjie@google.com> Do not set "gsm.operator.idpstring" per phoneId

Do not set "gsm.operator.idpstring" per phoneId, otherwise
PhoneNumberUtils does not get the right value.

Test: ServiceStateTrackerTest.java and some manual tests
Fixes: 62048110
Change-Id: I540846d9208f84ff48b6830d45c66abfb16a8a54
smCdmaPhone.java
hone.java
erviceStateTracker.java
a6abfa9126e4e376b59dec3fbdaac505b4a2b5fc 10-Feb-2018 Tyler Gunn <tgunn@google.com> Merge "Add support for CALL_WAITING supp service notification." am: 660aba4aed am: f8ef27f370
am: 6663eead6c

Change-Id: I7c4f656b7e636ca245fb5812954865b57f1a81cc
6663eead6c7ac9f61f2af9fb60bcf5ca2146da97 10-Feb-2018 Tyler Gunn <tgunn@google.com> Merge "Add support for CALL_WAITING supp service notification." am: 660aba4aed
am: f8ef27f370

Change-Id: Iad8e1fbefce5a8300b3e9e810699fb0380114f50
c78f99c554056e5afcd80a5a3a92814bb552828a 21-Dec-2017 Tyler Gunn <tgunn@google.com> Add support for CALL_WAITING supp service notification.

Also cleanup supp service notifications to distinguish between the MO
and MT classes of notifications.

Test: Manual, added new unit tests
Bug: 66173973
Bug: 65534165
Change-Id: I032e1fbf6b3d9db3585093c639e26ee7e9741046
onnection.java
elephonyTester.java
sm/SuppServiceNotification.java
msphone/ImsPhoneCallTracker.java
5e1aad847a93b3028f52e7cd6348050b6bd1ccb0 08-Feb-2018 Jiuyu Sun <jiuyu@google.com> Merge "Revert "Public EuiccManager APIs.""
e79f45616235fedf152658ce5998cd0586d240e8 08-Feb-2018 Jiuyu Sun <jiuyu@google.com> Revert "Public EuiccManager APIs."

This reverts commit 4d59805cd9a6ad9e0f5a5dc87c1fd2a619150b36.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I18af805c5678c14af9926010b5cd7f3e100cad97
ubscriptionInfoUpdater.java
uicc/EuiccController.java
uicc/EuiccOperation.java
icc/euicc/EuiccCard.java
64bd356c99555352eeafad39d0d76a71cc6f79bd 08-Feb-2018 Pooja Jain <poojain@codeaurora.org> Merge "IMS: Add support for call deflection feature" am: c1144f4f79 am: ca3665d611
am: 35792b9fd2

Change-Id: Ia7bd78a433907fbb29186493ebc03f87a2a8601d
35792b9fd22a714e2c5905623c1d084243bec62d 08-Feb-2018 Pooja Jain <poojain@codeaurora.org> Merge "IMS: Add support for call deflection feature" am: c1144f4f79
am: ca3665d611

Change-Id: Ic49196996446733c426bbe7abd57b960246cb5e3
41a4356344950c4845785f25d2a95f3704796885 08-Feb-2018 Pengquan Meng <mpq@google.com> Merge "Fixed MMI callback issue"
92192b56492fbb78195aca4165eaf3adae90ae01 08-Feb-2018 Jiuyu Sun <jiuyu@google.com> Merge "Public EuiccManager APIs."
960c3eb22d7e3b27ff36df4ef21ff4de6b88f860 31-Jan-2018 Qingxi Li <qingxi@google.com> Add interface to get phoneID from UiccSlot

Bug: 72753162
Test: bit FrameworksTelephonyTests:*
Merged-In: Ie236c47f290fcd4dff15eae1bb274e4cbd285f56
Change-Id: Ie236c47f290fcd4dff15eae1bb274e4cbd285f56
icc/UiccSlot.java
184357ae34f91869f31c259af5b53a852c03f8a6 31-Jan-2018 Qingxi Li <qingxi@google.com> Add interface to get phoneID from UiccSlot

Bug: 72753162
Test: bit FrameworksTelephonyTests:*
Change-Id: Ie236c47f290fcd4dff15eae1bb274e4cbd285f56
icc/UiccSlot.java
0be6d7741b921726de0a284e87d2546227178225 07-Feb-2018 yinxu <yinxu@google.com> Merge "Parse ATR in the UiccSlot" am: 8285290c64 am: 03931c62f7
am: 2dfec96c8b

Change-Id: Ie57b14224933684e7bf9294880afae09f39ed6c5
16c547115ef6fb135709915c99f3f4b23bd2ec08 07-Feb-2018 Malcolm Chen <refuhoo@google.com> Merge "Resolve possible race condition in CellularNetworkService" am: 6f3f4d4243 am: 59404be73a
am: 89c13761bc

Change-Id: I54aa4749f48873e98e117b84be8813efba4b041c
4611e65ec532915b3a6968459d68e5a2dc3a08c8 28-Dec-2017 Pooja Jain <poojain@codeaurora.org> IMS: Add support for call deflection feature

Call deflection feature is useful to deflect MT call to another
number.

Test: Manual

Bug: 62170348
Change-Id: Ie31421b21dea6bf5514f1f137cf5a6c315fc1149
onnection.java
smCdmaConnection.java
msphone/ImsExternalConnection.java
msphone/ImsPhoneConnection.java
ip/SipPhone.java
6d6712cb4bba2e31266df9ac5f3809d71b2971ee 07-Feb-2018 Holly Jiuyu Sun <jiuyu@google.com> Merge "Create EuiccCard instance." am: 8a9b82206c am: b1634ad8d3
am: af69c50526

Change-Id: I72fd336364c3f49445859eba9a6125e8b7436cab
2dfec96c8b94f9312131207f86c26aeb24880921 07-Feb-2018 yinxu <yinxu@google.com> Merge "Parse ATR in the UiccSlot" am: 8285290c64
am: 03931c62f7

Change-Id: I495ec37dd3e2c768f9e13477b0392f47e8b094d3
89c13761bc5fc59b6427c5a937073fbb4071fa31 07-Feb-2018 Malcolm Chen <refuhoo@google.com> Merge "Resolve possible race condition in CellularNetworkService" am: 6f3f4d4243
am: 59404be73a

Change-Id: Ib715e8dd35d44912829fbd3de4d2a4081d655150
4c00077f7988aeeddb2004d47eecba7ac500aa85 07-Feb-2018 Hall Liu <hallliu@google.com> Merge "Revert "Update method calls to avoid security errors"" am: 9636416703 am: 69f6354dcd
am: 71a8d84572

Change-Id: Ia28c631a7a4077fcb324cd165f56f4efe4d871c9
8285290c64164781e5658c406cbe8454112015eb 07-Feb-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Parse ATR in the UiccSlot"
af69c50526d8d7aabc0dc09ee0ec950c390e406d 07-Feb-2018 Holly Jiuyu Sun <jiuyu@google.com> Merge "Create EuiccCard instance." am: 8a9b82206c
am: b1634ad8d3

Change-Id: I62ea11bd3af3b0a70498557f5e977e6f42189dd2
6f3f4d42433c54a08b4e98f6dac6260aa1de4bf6 07-Feb-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Resolve possible race condition in CellularNetworkService"
8a9b82206cd2243f4f9fee62569a96013219c420 07-Feb-2018 Holly Jiuyu Sun <jiuyu@google.com> Merge "Create EuiccCard instance."
5769d0032d7e86d2b2e4705f31db6398e15500b0 07-Feb-2018 Pengquan Meng <mpq@google.com> Fixed MMI callback issue

TelephonyManager.sendUssdRequest API does not invoke UssdResponseCallback when request fails.
This happen when the MMI code is invalid.

Bug: 66355133
Test: existing telephony test

Change-Id: Id074d1cd010c3998218621a6338ba3155b215101
sm/GsmMmiCode.java
2d11c9c9d19b9e2c198f63ad9a3ec4cdf2fbda86 07-Feb-2018 Xiangyu/Malcolm Chen <refuhoo@google.com> Merge "Connect to CellularNetworkService in SST." am: e44a72855a
am: 94758f0e48

Change-Id: Ia1bf83a4316ff339713da93b1ef00eb163859853
71a8d84572b428b76bfb3f94476741bf0d1e506a 07-Feb-2018 Hall Liu <hallliu@google.com> Merge "Revert "Update method calls to avoid security errors"" am: 9636416703
am: 69f6354dcd

Change-Id: I4e28c7a7f7784e91cb284775c26466c2a826760a
28dcffcfdf04b4f5fa16f78219278987febc68e3 06-Feb-2018 yinxu <yinxu@google.com> Parse ATR in the UiccSlot

Bug:72526416
Test: Unit Test
Change-Id: I2a9827d6fdd0c9956f2e684fd5d8885e49fef0c1
nswerToReset.java
icc/AnswerToReset.java
icc/UiccSlot.java
de39b267d9fbc909509bb9ec60ee039ed83c42f1 07-Feb-2018 Malcolm Chen <refuhoo@google.com> Merge "Add NetworkRegistrationManager." am: 051e5ee1e1
am: 1a68ac2a04

Change-Id: Ifab420540f904b3b311b3f013bc40a45a0ecc302
2e7e5ab2b4a80d3df4df40157b1cfd5c72e6e4b8 25-Jan-2018 Holly Jiuyu Sun <jiuyu@google.com> Create EuiccCard instance.

Create EuiccCard instance in UiccSlot. After that, read eid and notify
registrants for EID_READY event broadcast.
For eSIM, any sim state broadcast is only sent after EID is ready.

Bug: 38206971
Test: Unit test
Change-Id: I80ee434aa18a972ea87c326b1ce126527349f7a6
icc/UiccProfile.java
icc/UiccSlot.java
icc/euicc/EuiccCard.java
269ee0aa10b0cc586eef68d55f153b1bdbc2085c 06-Feb-2018 Malcolm Chen <refuhoo@google.com> Resolve possible race condition in CellularNetworkService

There might be a race condition that before callback is stored
in mCallbackMap, complete message is back from mCi. Thus callback
is not retrived correctly when handling that message. This change
fixes that bug.

Bug: 73006796
Test: unit-test
Change-Id: I378928938f47b9ed9f9a6228db9931cc0a039171
ellularNetworkService.java
dfe03ae02975c71aba045b826b36f5d2815ba6d5 19-Dec-2017 Hall Liu <hallliu@google.com> Update method calls to avoid security errors

Package name is now used for non-debug reason when registering a
subscription changed listener, so use appropriate values instead of
debug strings.

Bug: 70681555
Test: manual
Change-Id: I5fba616fc3e96bee408fb8ad6196f9b4c56df504
honeSwitcher.java
ubscriptionMonitor.java
d50b1e692d2dda2c40fb9699b88eb2350d3a0a32 30-Jan-2018 Malcolm Chen <refuhoo@google.com> Connect to CellularNetworkService in SST.

Re-route SST to get cellular registration states from
CellularNetworkService instead of calling CommandsInterface
directly

Bug: 64132030
Test: unittest
Change-Id: I50a9cf548a142a147eb027659f72b83c68b9b8e1
Merged-In: I50a9cf548a142a147eb027659f72b83c68b9b8e1
ellularNetworkService.java
erviceStateTracker.java
elephonyTester.java
est/SimulatedCommands.java
9636416703beb362ab56c008fb3a894e653a70d9 06-Feb-2018 Hall Liu <hallliu@google.com> Merge "Revert "Update method calls to avoid security errors""
35941b066b6d454ae1f5105fa3daa4a9ad21e439 30-Jan-2018 Malcolm Chen <refuhoo@google.com> Add NetworkRegistrationManager.

Add NetworkRegistrationManager which will connect to network
services and help ServiceStateTracker to get registration state
updates.

Bug: 64132030
Test: regression tests
Change-Id: I1db9b3544f64f3aedf0bba5bb13ade18eda92ed9
Merged-In: I1db9b3544f64f3aedf0bba5bb13ade18eda92ed9
ellularNetworkService.java
etworkRegistrationManager.java
bfcfb258dccd196102e39d5bdb3be953d9b9a7ed 06-Feb-2018 Ying Xu <yinxu@google.com> Merge "Add new class AnswerToReset for ATR parsing" am: b4a9738e77 am: c9d880f807
am: d5804e61a2

Change-Id: I05ff49f2fb1f5312c5d61fafa4f98b2798df203e
d5804e61a23c6e3a7cebbea3156281c8033b2320 06-Feb-2018 Ying Xu <yinxu@google.com> Merge "Add new class AnswerToReset for ATR parsing" am: b4a9738e77
am: c9d880f807

Change-Id: Id1fad26b4ac47f5312a2cf0a692499de5aa23243
245ae34e71b14527db359d74abca920ce3e854b5 06-Feb-2018 Hall Liu <hallliu@google.com> Revert "Update method calls to avoid security errors"

This reverts commit a984c97ee6533a84a2d9f2951f42ba0ec78bc77f.

Reason for revert: b/72967560

Change-Id: Ie7c160dd63cf952e272022bf5f7670940ba3e83b
honeSwitcher.java
ubscriptionMonitor.java
b4a9738e771e87bfab3bb18677da6a422a4d7e16 06-Feb-2018 Ying Xu <yinxu@google.com> Merge "Add new class AnswerToReset for ATR parsing"
d28d99c573c1053b9f34a91431d003237353291e 31-Jan-2018 yinxu <yinxu@google.com> Add new class AnswerToReset for ATR parsing

Bug:72526416
Test: Unit Test
Change-Id: I89c92d73c05d9f934cff46d7cf1d76ccdcd6c469
nswerToReset.java
129ef2a7961e9a49dcb2aa3ec96f36584cc4d686 06-Feb-2018 Amit Mahajan <amitmahajan@google.com> Merge "Remove delay before getService() call for IRadio service." am: 0db505eee5 am: d5ef1ce053
am: 2c4bc732dc

Change-Id: Iedb85e2708b1917bc55cb78bc462caeb1bcf900d
475d933f13ff83d12abac41ca213d3f834f1c4a8 06-Feb-2018 Jeff Davidson <jpd@google.com> Merge "Reduce logspam in carrier privilege status check." am: 98a42cff3d am: 6f7e12f8d3
am: d42c7243db

Change-Id: I4a45b20d9b96891810581b240d82f9d414bacce2
2c4bc732dc791ac0d8ce5609418cc546f5794ae0 06-Feb-2018 Amit Mahajan <amitmahajan@google.com> Merge "Remove delay before getService() call for IRadio service." am: 0db505eee5
am: d5ef1ce053

Change-Id: I683328e99499e6532afc2804021447903874e725
3d56b2730c7a269406f014c0804fa9b0411da0df 06-Feb-2018 Jack Yu <jackyu@google.com> Merge "Connected with data service manager" am: f3c8d0fa74
am: 7ce3c8fcc7

Change-Id: I1c00d9abac76066ed4c08dfac7079ae246638054
56709f866621fb707b6a3f5e17c0eddeaa847d0e 06-Feb-2018 Malcolm Chen <refuhoo@google.com> Merge "Remove ImsManager.setDataEnabled." am: 585ac8389f
am: ebe5e8f67a

Change-Id: I95182ed7f30eceeae1195b88ca67d459bc532fb2
d42c7243db3664036e7ce222105da51694d2dab5 06-Feb-2018 Jeff Davidson <jpd@google.com> Merge "Reduce logspam in carrier privilege status check." am: 98a42cff3d
am: 6f7e12f8d3

Change-Id: Ibf38b7806306f4052f5fa34c9e13c16d5970cf9b
e1241d899eb8695258437e52178e739132c2276d 06-Feb-2018 Brad Ebinger <breadley@google.com> Merge changes from topics "IMS provisioned value refactor", "ims_apis" am: 0693a34062
am: ebaba78634

Change-Id: Ia0f5d68e7c4c70b706d2b7a1614d937c79fd62c0
81bcd248d9a1e17245b646931ec87b06579717e7 06-Feb-2018 Brad Ebinger <breadley@google.com> Adds compat layer for older devices when IMS binding am: 0cd5434570
am: db8fcd414b

Change-Id: If6d04593c94cd800c9d08ece01def4ff36e0c30d
da39b57c61aa8fe0c9cd2a39948f2108314d98a7 06-Feb-2018 Brad Ebinger <breadley@google.com> Create ImsService API compat layer am: 36b23d5f2f
am: 7fb771d582

Change-Id: I87dc3dac81338464b44791d4ab374666eaa93e46
d63469423c1495a156f2dc3d5cbf1ed8f4a9973f 06-Feb-2018 Brad Ebinger <breadley@google.com> Change ImsService API namespaces am: 1846615c7c
am: 74d2587f27

Change-Id: Idb5df866881f6c85693223a63c34bb0651d7c3ad
0db505eee51f3716dcea2907797f2321af45280f 06-Feb-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Remove delay before getService() call for IRadio service."
f3c8d0fa74150f9c43a7bb76238744ceb0c9b95e 06-Feb-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Connected with data service manager"
9781d0cf354ee3d1e39ffeb9d57a372fdf10dc39 06-Feb-2018 Brad Ebinger <breadley@google.com> resolve merge conflicts of 02ccd75370cff3cafc27c78f641aeb47bb1a0986 to oc-mr1-dev-plus-aosp

Test: Manual
Change-Id: I55b0e94fbe4f70c4020f4a0c1c0c786540421e59
db8fcd414b819b18cd2372b1a2180bb35defbbff 06-Feb-2018 Brad Ebinger <breadley@google.com> Adds compat layer for older devices when IMS binding
am: 0cd5434570

Change-Id: If3706814316759a12eb46af15c77fd3e0bed2981
7fb771d58284de14d069d14cdf9967010275ebe4 06-Feb-2018 Brad Ebinger <breadley@google.com> Create ImsService API compat layer
am: 36b23d5f2f

Change-Id: I83a298bd637a8fdd1b1920d58a23a063f559d208
74d2587f27e10de018be3788dc7316e6ac385dfd 06-Feb-2018 Brad Ebinger <breadley@google.com> Change ImsService API namespaces
am: 1846615c7c

Change-Id: I29ab77331509719c5986bf85e6de7cbceea7f906
02ccd75370cff3cafc27c78f641aeb47bb1a0986 06-Feb-2018 Brad Ebinger <breadley@google.com> Integrate new MMTel APIs into the platform
am: 1ae4f53a3a

Change-Id: I658a0a0b20968ba4d724d6456bebbdb67ee09f65
585ac8389f8478218561515c9a502c4c1721c21d 06-Feb-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Remove ImsManager.setDataEnabled."
98a42cff3da6bf66f19995aa1f677ce6c86cdfbe 05-Feb-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Reduce logspam in carrier privilege status check."
4d59805cd9a6ad9e0f5a5dc87c1fd2a619150b36 31-Jan-2018 Holly Jiuyu Sun <jiuyu@google.com> Public EuiccManager APIs.

Public EuiccManager and other related necessary files.
Mark EuiccCardManager and other related necessary files as @SystemApi.
Solve lint errors and warnings.

Bug: 35851809
Test: test on phone
Change-Id: Iba488c23bec4c196445146f42bde25ce10008325
ubscriptionInfoUpdater.java
uicc/EuiccController.java
uicc/EuiccOperation.java
icc/euicc/EuiccCard.java
71f909237a9921f52d91440fb8f9c6fc97465a52 04-Feb-2018 Jack Yu <jackyu@google.com> Connected with data service manager

Routed all data requests and respones through the
new cellular data service and data service manager.

Test: Telephony sanity tests + unit tests
Bug: 64132030
Merged-In: I66adf6492ee1952e20384c38add107c89da0ac41
Change-Id: I66adf6492ee1952e20384c38add107c89da0ac41
(cherry picked from commit 4b2c78c078d59466d18a4f7f926bb3bc0eccff9d)
smCdmaPhone.java
honeInternalInterface.java
IL.java
adioIndication.java
adioResponse.java
elephonyComponentFactory.java
ataconnection/DataConnection.java
ataconnection/DataServiceManager.java
ataconnection/DcController.java
ataconnection/DcTracker.java
msphone/ImsPhoneBase.java
etrics/TelephonyMetrics.java
ip/SipPhoneBase.java
est/SimulatedCommands.java
a242182309a85ed0852227a25b83c2f3158ee17a 20-Dec-2017 Malcolm Chen <refuhoo@google.com> Remove ImsManager.setDataEnabled.

Bug: 67602046
Test: manual and existing unit-tests
Change-Id: Iaa7bc3b7f0ec2e683c7e9ea45e1d2d1ba0563c0a
Merged-In: Iaa7bc3b7f0ec2e683c7e9ea45e1d2d1ba0563c0a
msphone/ImsPhoneCallTracker.java
a6433e9a40f7d1c624d392cab4333e8220de1a50 05-Feb-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Connected with data service manager"
2fb55f3199ad215f03e5e00c39e434a9d7774878 05-Feb-2018 Hall Liu <hallliu@google.com> Merge "RTT outgoing initialization"
4b2c78c078d59466d18a4f7f926bb3bc0eccff9d 04-Feb-2018 Jack Yu <jackyu@google.com> Connected with data service manager

Routed all data requests and respones through the
new cellular data service and data service manager.

Test: Telephony sanity tests + unit tests
Bug: 64132030
Change-Id: I66adf6492ee1952e20384c38add107c89da0ac41
smCdmaPhone.java
honeInternalInterface.java
IL.java
adioIndication.java
adioResponse.java
elephonyComponentFactory.java
ataconnection/DataConnection.java
ataconnection/DataServiceManager.java
ataconnection/DcController.java
ataconnection/DcTracker.java
msphone/ImsPhoneBase.java
etrics/TelephonyMetrics.java
ip/SipPhoneBase.java
est/SimulatedCommands.java
b2a8b88ff6ee032bea26eb69cca72e432a7918f9 03-Feb-2018 Jeff Davidson <jpd@google.com> Reduce logspam in carrier privilege status check.

UiccCarrierPrivilegeRules can be called by non-platform code via
system APIs (TelephonyManager#checkCarrierPrivilegesForPackage), and
thus it is not an error worthy of logging if the given package is not
installed. It is also easy to infer that a package is not
installed from a bugreport (or determine when it was installed, if
it is installed later). Just return NO_ACCESS.

Change-Id: If068fadb34ea6256287d9e92f00cd2dd5b5ddc9b
Fixes: 72764153
Test: TreeHugger (CL is trivial)
icc/UiccCarrierPrivilegeRules.java
0693a340620748ef656d9681beca875322dc9d9c 05-Feb-2018 Brad Ebinger <breadley@google.com> Merge changes from topics "IMS provisioned value refactor", "ims_apis"

* changes:
Adding more ImsManager test.
Adds compat layer for older devices when IMS binding
Create ImsService API compat layer
Change ImsService API namespaces
Integrate new MMTel APIs into the platform
Integrate new ImsCallSessionListener
bb1bb8917bd8254c30a8ba496ff6b01ca1b5ae5b 05-Feb-2018 Neil Fuller <nfuller@google.com> Merge changes from topic "telephony_aosp_cp" am: 87f27d0bda
am: 28566fdaa2

Change-Id: Iba2609aad4dc25e317e3f3df0a4f0e06590dd225
87f27d0bdab4f9723b42cca3847d808519f84a00 05-Feb-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge changes from topic "telephony_aosp_cp"

* changes:
Add a cache of the last CountryTimeZones looked up
TimeServiceHelper changes to assist in next steps
Add result metadata to time zone lookup results
Tidy up clock adjustment code / logging
ca4cfab7c5e33f7f351682638be93f3e5714710c 01-Nov-2017 Malcolm Chen <refuhoo@google.com> Adding more ImsManager test.

Stop receiving ACTION_IMS_CONFIG_CHANGED. Adding ImsManager test
for getting and setting provisioned vlaues.

Bug: 66701374
Test: unittest
Merged-In: Ia4e58d9998dabaf55f79cd6ef253d47af7ce3ea9
Change-Id: Ia4e58d9998dabaf55f79cd6ef253d47af7ce3ea9
hone.java
0cd54345706ddb0e373aaf33edfb225043575e6f 26-Jan-2018 Brad Ebinger <breadley@google.com> Adds compat layer for older devices when IMS binding

Modifies the ImsResolver to support binding to older
IMS implementations that use the ServiceManager
to expose IMS implementation.

Bug: 63987047
Test: Telephony Unit Tests
Merged-In: I4d7ccbad9f4aed310af92f4832e51ec6bbeec27d
Change-Id: I4d7ccbad9f4aed310af92f4832e51ec6bbeec27d
honeFactory.java
ms/ImsResolver.java
ms/ImsServiceController.java
ms/ImsServiceControllerCompat.java
ms/ImsServiceControllerStaticCompat.java
ms/ImsServiceInterfaceAdapter.java
ms/MmTelFeatureCompatAdapter.java
ms/MmTelInterfaceAdapter.java
1d4b69bc6416eee83fdfe7597b7dc0b9048a509d 05-Feb-2018 Xiangyu/Malcolm Chen <refuhoo@google.com> Merge "Connect to CellularNetworkService in SST."
04cd19051b86045af5fb74dbd94ec1f8232f4172 04-Feb-2018 Jack Yu <jackyu@google.com> Merge "Added data service manager" am: 1d02cd10d6 am: bcc5855b53
am: 2b47ff3581

Change-Id: I688f6d78f5bc4d6d7f53d4cebde57813d212351e
c5c0eb63d438dff9f734c95044722787a5b406a6 04-Feb-2018 Jack Yu <jackyu@google.com> Merge "Added cellular data service" am: de35e3b7df am: 79c3584e2a
am: dc04ebc116

Change-Id: I50cee6e39036cf7bf09261f93c5713d85612731a
b7e0cea062701524797f59919b9d72d0755c700c 30-Jan-2018 Malcolm Chen <refuhoo@google.com> Connect to CellularNetworkService in SST.

Re-route SST to get cellular registration states from
CellularNetworkService instead of calling CommandsInterface
directly

Bug: 64132030
Test: unittest
Change-Id: I50a9cf548a142a147eb027659f72b83c68b9b8e1
ellularNetworkService.java
erviceStateTracker.java
elephonyTester.java
est/SimulatedCommands.java
37bb8b556054f18f4aef562455d2301ca976fcc1 04-Feb-2018 Xiangyu/Malcolm Chen <refuhoo@google.com> Merge "Add NetworkRegistrationManager."
2b47ff35813c542c2791acfe593a1acc65f29bba 03-Feb-2018 Jack Yu <jackyu@google.com> Merge "Added data service manager" am: 1d02cd10d6
am: bcc5855b53

Change-Id: I3c008efe37a8fedadc2ab93e748beaceed0f2f31
dc04ebc1168fb15c29fdf0e6f0bdcb0be1a43481 03-Feb-2018 Jack Yu <jackyu@google.com> Merge "Added cellular data service" am: de35e3b7df
am: 79c3584e2a

Change-Id: I8115f2e8365fd2bf9fda42f00b515bdef6d16e73
73225469bc0503fe961b2791fa37c855c8243217 23-Jan-2018 Hall Liu <hallliu@google.com> RTT outgoing initialization

Add support for dialing an outgoing call with RTT enabled from the start
(refactors the dial methods to use DialArgs)
Add plumbing code to bubble up RTT initiation/termination events from
the IMS stack up to Telecom

Bug: 72156722
Bug: 71873552
Test: existing unit tests

Change-Id: I084f75d860ebc9837cf6156c1ebaaf4532343de1
allManager.java
onnection.java
smCdmaPhone.java
hone.java
honeInternalInterface.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
ip/SipPhone.java
ip/SipPhoneBase.java
1d02cd10d6017c1331f14e4e888075ab3c4e14f7 03-Feb-2018 Jack Yu <jackyu@google.com> Merge "Added data service manager"
de35e3b7df33cbabb49cf2d7f189510b7dbc9f42 03-Feb-2018 Jack Yu <jackyu@google.com> Merge "Added cellular data service"
0ec0081c132a1fb19df192cfd98517134d458bdc 03-Feb-2018 Ying Xu <yinxu@google.com> Merge "Send NOT_READY when there is no apps or no supported apps" am: 58c06dd643 am: e9374b5784
am: 7886eec6a7

Change-Id: I0713e0c4838b6686248695889b543e949e6713f4
7886eec6a78bc4945a550fbf2609c03d1960279d 03-Feb-2018 Ying Xu <yinxu@google.com> Merge "Send NOT_READY when there is no apps or no supported apps" am: 58c06dd643
am: e9374b5784

Change-Id: I6c4a858bbe1f1f29769cd50fd61c851c479936c8
58c06dd64319705d9a7ddb6fee5f1d63b9c50f9e 03-Feb-2018 Ying Xu <yinxu@google.com> Merge "Send NOT_READY when there is no apps or no supported apps"
b0c5f98d744727ad94073063556444ee3f8b4681 01-Feb-2018 Jack Yu <jackyu@google.com> Added data service manager

Data service manager manages handling data requests and responses
on data services (e.g.Cellular data service, IWLAN data service).

Test: Telephony sanity tests
Bug: 64132030
Change-Id: I5435578cf7c68bff586d29cc5f0061ecebc22e45
ataconnection/DataServiceManager.java
53a37b4e32d538b13a17338db08e70b33c35c5f8 30-Jan-2018 Malcolm Chen <refuhoo@google.com> Add NetworkRegistrationManager.

Add NetworkRegistrationManager which will connect to network
services and help ServiceStateTracker to get registration state
updates.

Bug: 64132030
Test: regression tests
Change-Id: I1db9b3544f64f3aedf0bba5bb13ade18eda92ed9
ellularNetworkService.java
etworkRegistrationManager.java
ae5359734f96026b94e8c9cf9473b576d415bb0a 29-Jan-2018 yinxu <yinxu@google.com> Send NOT_READY when there is no apps or no supported apps

Bug: 72463137
Test: Basic telephony sanity
Change-Id: Ib8a01b1a76cce712e09f4d20d79491b438bf977e
icc/UiccProfile.java
55caac516174c927bef97075c1fa3a684b312b91 02-Feb-2018 Amit Mahajan <amitmahajan@google.com> Merge "Fix GsmCdmaPhone.getIccCard() to never return null." am: c3cd225098 am: ce77746802
am: bbabf98f34

Change-Id: I098bd8e3ef2f39f24c58c0ecd70f8f53c4d5167e
7330a5581f13a7a56c781201e70686437f5e2c3a 27-Jan-2018 Jack Yu <jackyu@google.com> Added cellular data service

Added cellular data service that handles handles telephony data
requests and response from the cellular modem.

Test: Manual
Bug: 64132030
Change-Id: Idd67f5e591b4a1788403e7c2758c5dfe7e4ca389
ataconnection/CellularDataService.java
bbabf98f3443369a45a30c6d2cfb06bbc2543c17 02-Feb-2018 Amit Mahajan <amitmahajan@google.com> Merge "Fix GsmCdmaPhone.getIccCard() to never return null." am: c3cd225098
am: ce77746802

Change-Id: I229656682cccf0c154cddca33ccf2fe08ecf21ab
c3cd22509824255e7b13571d5de4182b74776175 02-Feb-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fix GsmCdmaPhone.getIccCard() to never return null."
0af5e133adfa86dc5b11365582a145ac092b2008 02-Feb-2018 Hall Liu <hallliu@google.com> Merge "Update method calls to avoid security errors" am: dbf3f7a5a0 am: 4bf88a6a07
am: e2d9b291dc

Change-Id: I775f52676d27797f7bd12c6e88d12474738fa8eb
e9fa2bceb3e75a98f09fcaa6626c5f3bbb764892 02-Feb-2018 Jordan Liu <jminjie@google.com> Merge "Add API for Call Barring" am: f03ba5684d am: ec9373bbdb
am: 09502d9559

Change-Id: I39359663779abfee1416c92009a491c8181899fc
886c8bec401e699521d90062781c41cc59b5415c 02-Feb-2018 nharold <nharold@google.com> Merge "Remove WiFi Monitoring from DcTracker" am: d613ac1c5e am: e1b06e4267
am: 4c95abddad

Change-Id: I47b0a52d792671a19d399151052912081f4489f6
32286605215acad2ce381b666e8b208f61403d4e 02-Feb-2018 Adrian Muzyka <adrian.muzyka@sonymobile.com> Merge "Displaying HD audio indicator for GSM/CDMA calls" am: baada385c6 am: 502c6c1340
am: 091568f2e5

Change-Id: Iebd246728a95f079c1a19cc67cb6d7788fd00817
e2d9b291dcd05ade0ffe5835f94eb44ebf39808e 02-Feb-2018 Hall Liu <hallliu@google.com> Merge "Update method calls to avoid security errors" am: dbf3f7a5a0
am: 4bf88a6a07

Change-Id: If95a22e550b4922b1b9e8e5f0a4d78cd71b89e02
09502d95594918529f3919f7f08ea123d8711ff2 02-Feb-2018 Jordan Liu <jminjie@google.com> Merge "Add API for Call Barring" am: f03ba5684d
am: ec9373bbdb

Change-Id: I800ce67579e45c8b26b4ff2bc7714995492c51ea
4c95abddad433f11755b6720885a645adccf92c3 02-Feb-2018 nharold <nharold@google.com> Merge "Remove WiFi Monitoring from DcTracker" am: d613ac1c5e
am: e1b06e4267

Change-Id: I04f715ad3e6fb274226bee644853ae6427e09f83
091568f2e5e6ea88056dd45085aaf353d3958ab3 02-Feb-2018 Adrian Muzyka <adrian.muzyka@sonymobile.com> Merge "Displaying HD audio indicator for GSM/CDMA calls" am: baada385c6
am: 502c6c1340

Change-Id: Id10eb745d90e1ca3b7c0ca0b9360aa64d27797d3
d45131c12f021652f1b2734960436c9a5ddc9921 02-Feb-2018 Jack Yu <jackyu@google.com> Merge "Added support for the new 1.2 data setup/deactivate API" am: 9c2b978d2f
am: 0a7d7596e8

Change-Id: Ie728a348c130627aaeffa2e0df6219146833b6d4
74168a86b86c9b543a433daf611b30e69b681820 02-Feb-2018 Brad Ebinger <breadley@google.com> Merge changes from topics "ims_sms_sms_ready", "ims_sms_rm_internal_sms", "ims_sms_reg", "ims_sms_disp" am: e5019ead55
am: 73b7c782b5

Change-Id: I59e9b85cd05ef1709338a5787b04221277ac4b55
44a88428d507f8b64bbbeb06fd092a6f0366b0de 02-Feb-2018 Mohamed Abdalkader <abdalkader@google.com> Fix accidental use of internal version of SMS APIs. am: 5e0a6109f6
am: 599bbfa0f3

Change-Id: Ibb7c24ac8285fab4aaa836602b0cb46ac910db3d
7f6a59515db567e5e4524a4c06a696e74677accb 02-Feb-2018 Mohamed Abdalkader <abdalkader@google.com> Integrate IMS registration with ImsSmsDispatcher. am: 4abb27a031
am: a250fb71a2

Change-Id: Ie68466110f591f4e58d002d1cabd1d51a354b1f8
4436380e3632e94443063103c8f41e82909c8a5b 02-Feb-2018 Mohamed Abdalkader <abdalkader@google.com> Implement ImsSmsDispatcher am: d68e767bd3
am: 23f52ee172

Change-Id: I5d8bfc9fe33133891225bc5ab083511f777a2b7f
ac355d0e1b5c28694f63b90ee4b0439ecbad1645 02-Feb-2018 Mohamed Abdalkader <abdalkader@google.com> Refactor SMSDispatcher and friends. am: 2b533ed532
am: ab8365b21e

Change-Id: I04c2183b80f07a78e7f273a388d55409dee7cd50
599bbfa0f39fa9cdee26645cf97640d82ee8362b 02-Feb-2018 Mohamed Abdalkader <abdalkader@google.com> Fix accidental use of internal version of SMS APIs.
am: 5e0a6109f6

Change-Id: I57b847eb71fd3ffdb820b78a529d30e95bcd243e
a250fb71a2c90c6542b138df8c6650c4a63c1881 02-Feb-2018 Mohamed Abdalkader <abdalkader@google.com> Integrate IMS registration with ImsSmsDispatcher.
am: 4abb27a031

Change-Id: I960a6d423e695e3b19649e6fe4b2d23021e28e3a
36b23d5f2f69db48967d3bfb39742755200ba06e 14-Jan-2018 Brad Ebinger <breadley@google.com> Create ImsService API compat layer

Creates a new ImsService API compat layer,
which translates the "new" API to the
"old" API in the android.telephony.ims.compat
namespace to support older versions of
ImsService Implementation

Bug: 63987047
Test: Manual, Telephony unit tests
Merged-In: I7daafe2ac150c49ba4ad8f08ac175eb7e6044633
Change-Id: I7daafe2ac150c49ba4ad8f08ac175eb7e6044633
ms/ImsConfigCompatAdapter.java
ms/ImsRegistrationCompatAdapter.java
ms/ImsResolver.java
ms/ImsServiceController.java
ms/ImsServiceControllerCompat.java
ms/MmTelFeatureCompatAdapter.java
1846615c7cb3d995efc8788b60aa1f5240de8b8f 23-Jan-2018 Brad Ebinger <breadley@google.com> Change ImsService API namespaces

Changes the ImsService API namespaces
to allow them to be @SystemApi.

Bug: 63987074
Merged-In: I66b564e27d5e0995c4819bd2c6df304e7e04a7eb
Change-Id: I66b564e27d5e0995c4819bd2c6df304e7e04a7eb
Test: Telephony Unit Tests
msSmsDispatcher.java
elephonyTester.java
msphone/ImsExternalCall.java
msphone/ImsExternalCallTracker.java
msphone/ImsExternalConnection.java
msphone/ImsPhone.java
msphone/ImsPhoneCall.java
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
msphone/ImsPhoneMmiCode.java
msphone/ImsPullCall.java
etrics/TelephonyMetrics.java
est/TestConferenceEventPackageParser.java
1ae4f53a3abcdb531a56795486066fffdbcaf289 16-Jan-2018 Brad Ebinger <breadley@google.com> Integrate new MMTel APIs into the platform

Integrates the new ImsService APIs into telephony
and updates the Telephony unit tests to
test the new APIs as well.

Bug: 63987047
Test: Telephony unit tests; Telephony test ImsService
Merged-In: Iaf40fc2a14d2b8e99fb0d08284987c9cf9cd3b2c
Change-Id: Iaf40fc2a14d2b8e99fb0d08284987c9cf9cd3b2c
smCdmaPhone.java
msSmsDispatcher.java
ms/ImsResolver.java
ms/ImsServiceController.java
msphone/ImsPhoneCallTracker.java
etrics/TelephonyMetrics.java
23f52ee1725c5d5558acec0ba6a29b5044ea63b3 02-Feb-2018 Mohamed Abdalkader <abdalkader@google.com> Implement ImsSmsDispatcher
am: d68e767bd3

Change-Id: I8530845966f35a018e3783429709bb66dd5f9929
ab8365b21e70359f68ae5a692de7d5bb971a5a06 02-Feb-2018 Mohamed Abdalkader <abdalkader@google.com> Refactor SMSDispatcher and friends.
am: 2b533ed532

Change-Id: I1e9f58dcb709db67802ec0ad44c7dc437d89f705
dbf3f7a5a06ad6618167285246f8fc4910b04155 02-Feb-2018 Hall Liu <hallliu@google.com> Merge "Update method calls to avoid security errors"
f03ba5684d18a15c52591deb0f34fcc215b8d861 01-Feb-2018 Jordan Liu <jminjie@google.com> Merge "Add API for Call Barring"
d613ac1c5ec7cfba2d09a80b35522fc6eea79c8c 01-Feb-2018 nharold <nharold@google.com> Merge "Remove WiFi Monitoring from DcTracker"
baada385c62af525169dee0ada8978adf48c05c6 01-Feb-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Displaying HD audio indicator for GSM/CDMA calls"
9c2b978d2fd5887d801c4908ee5b16993d6255bc 01-Feb-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Added support for the new 1.2 data setup/deactivate API"
a27d8d3671982cfd1169fd9384d72523b1084391 01-Feb-2018 Nathan Harold <nharold@google.com> Remove WiFi Monitoring from DcTracker

For longer than I can remember, DcTracker has sat
quietly, vigilantly monitoring the state of WiFi.
For too long have we suffered the sight of wifi
status variables. For too long have we seen the
callbacks firing. No more! From this day forth
DcTracker shall confine itself to the monitoring
of the cellular radio state only.

Bug: 5009624
Test: runtest frameworks-telephony
Change-Id: Ifda6c615e456a346b0f2d694771b28fe8dbeac4c
ataconnection/DcTracker.java
e5019ead55635c674ac778ef2b6dc02eb16e8d6d 01-Feb-2018 Brad Ebinger <breadley@google.com> Merge changes from topics "ims_sms_sms_ready", "ims_sms_rm_internal_sms", "ims_sms_reg", "ims_sms_disp"

* changes:
Add and trigger onReady API for SMS over IMS
Fix accidental use of internal version of SMS APIs.
Integrate IMS registration with ImsSmsDispatcher.
Fix ImsSmsDispatcherTest
Implement ImsSmsDispatcher
Refactor SMSDispatcher and friends.
06ed6fceace1df6db89e2e4fa5b98da080a94435 31-Jan-2018 Jack Yu <jackyu@google.com> Added support for the new 1.2 data setup/deactivate API

Added support for the 1.2 IRadio APIs that support IWLAN handover.

Test: Telephony sanity tests
Bug: 64132030

Merged-In: I61840939fa7130b0ef1bc0353dd065486831679c
Change-Id: I61840939fa7130b0ef1bc0353dd065486831679c
(cherry picked from commit d5a7979d5c82f1fd568d80267216402bc9d8d0ba)
ommandsInterface.java
IL.java
ataconnection/DataConnection.java
msphone/ImsPhoneCommandInterface.java
etrics/TelephonyMetrics.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
45f2ac986c6d2ed21fe0b25bb345c669fb9d26da 01-Feb-2018 Jack Yu <jackyu@google.com> Merge "Added support for the new 1.2 data setup/deactivate API"
d5a7979d5c82f1fd568d80267216402bc9d8d0ba 31-Jan-2018 Jack Yu <jackyu@google.com> Added support for the new 1.2 data setup/deactivate API

Added support for the 1.2 IRadio APIs that support IWLAN handover.

Test: Telephony sanity tests
Bug: 64132030

Change-Id: I61840939fa7130b0ef1bc0353dd065486831679c
ommandsInterface.java
IL.java
ataconnection/DataConnection.java
msphone/ImsPhoneCommandInterface.java
etrics/TelephonyMetrics.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
b1dca75bce7b1e843ad452a143b52199558e5de9 01-Feb-2018 Tyler Gunn <tgunn@google.com> Merge "Add onDisconnect callback in root radio connection class." am: d76d0e112f am: 990d69a344
am: 52a4138bee

Change-Id: I07cf3d6161da21a630123649eff393c8baac999f
52a4138bee3e5320be0119628c00b7c28ae9f410 01-Feb-2018 Tyler Gunn <tgunn@google.com> Merge "Add onDisconnect callback in root radio connection class." am: d76d0e112f
am: 990d69a344

Change-Id: I78758ddbec447feffa9b6fcfa4f33bdb350512b1
d76d0e112f8e4ce26ce199f71dbdfa3199b05e2f 01-Feb-2018 Tyler Gunn <tgunn@google.com> Merge "Add onDisconnect callback in root radio connection class."
01504b9e7864dd221a714ae4d9efedde613c72e3 31-Jan-2018 Pengquan Meng <mpq@google.com> Merge "Fixed network mode loaded issue" am: 7abeb535d8
am: b67f53ff5b

Change-Id: I1230339d1f3af322fc210e2512e2da22f47b11a9
8c1fcae0a25b8e7325b8aa7f29df3b6ba818c4a4 23-Jan-2018 Mohamed Abdalkader <abdalkader@google.com> Add and trigger onReady API for SMS over IMS

Test: manual test that normal code path is fine since this code path is
not yet exercisable.
BUG=69846044
Merged-In: I43fbc51f96c04e136c81c77d46077248e598c0be
Change-Id: I43fbc51f96c04e136c81c77d46077248e598c0be
msSmsDispatcher.java
5e0a6109f6d8c4b59fd4e9fc8dacb7b6498a8f47 23-Jan-2018 Mohamed Abdalkader <abdalkader@google.com> Fix accidental use of internal version of SMS APIs.

Test: manual

BUG=69846044
Merged-In: I68802c183509d62f70d5e1c130948fdae097bb57
Change-Id: I68802c183509d62f70d5e1c130948fdae097bb57
msSmsDispatcher.java
10c9cd0a52569558ca360943588304b4287f7902 27-Jan-2018 Pengquan Meng <mpq@google.com> Fixed network mode loaded issue

SubscriptionInfoUpdater.java adds subId during device power-up and if the SIM card
is new to the slot it would set the network mode as Global. Before assigning network mode
as Global, first check if a network mode already available in DB for the current subId.
If network mode available, use the same as current preferred network mode.

Bug: 36850854
Test: manual
Change-Id: I93e9252a8d7f2f31ea212f04525a7a94b479d1fb
Merged-In: I93e9252a8d7f2f31ea212f04525a7a94b479d1fb
ubscriptionInfoUpdater.java
4abb27a031532d4747729eebfc75e22bcc63a677 19-Jan-2018 Mohamed Abdalkader <abdalkader@google.com> Integrate IMS registration with ImsSmsDispatcher.

- Get ImsService
- onImsService available, set sms listener as well as
reg and cap. callbacks.
- Add retry logic.
- return ImsSmsDispatcher.isAvailable() as true only if
ims service is up and registered and sms capable.

P.S. Logic for connecting to ims service and retry is
mostly coming from ImsPhoneCallTracker.

Test: manually testing failure and retry logic only now
as testing success case is not yet feisble.
BUG=69846044
Merged-In: Ibffbaefec9eaac74dbb0cd31cae9584f6a42135a
Change-Id: Ibffbaefec9eaac74dbb0cd31cae9584f6a42135a
msSmsDispatcher.java
MSDispatcher.java
d68e767bd3169ae17c7fbc0a6cdf83cc6cdff48d 10-Jan-2018 Mohamed Abdalkader <abdalkader@google.com> Implement ImsSmsDispatcher

- Implement methods needed to do various sms operations.
- Add Ims Dispatcher to the dispatchers controller and use
if available. (availability impl will come with reg.)
- Astracting out handling result of
injecting sms result out of the injection logic.
- Introduce callback for abstracting out handling result
of handling status report out of dispatchers to share
logic with ImsSmsDispatcher.
- Add unit tests (More to come in a follow-up CL)

Test: manual + added unit tests
BUG=69846044
Merged-In: I7c4d597f68412e86bdd61aeb4c5e50b1256e2f92
Change-Id: I7c4d597f68412e86bdd61aeb4c5e50b1256e2f92
ccSmsInterfaceManager.java
msSmsDispatcher.java
nboundSmsHandler.java
MSDispatcher.java
msDispatchersController.java
dma/CdmaSMSDispatcher.java
sm/GsmSMSDispatcher.java
til/SMSDispatcherUtil.java
5dab6d6e64ae95575dbaafbc1b618917ec3525d3 31-Jan-2018 Amit Mahajan <amitmahajan@google.com> Remove delay before getService() call for IRadio service.

getService() has a blocking version now so the delay is not needed.

Test: basic telephony sanity, manual test
Bug: 68481894
Change-Id: I61fbadf59abd48c4cf237604aa9b05506b024dd0
IL.java
adioConfig.java
2b533ed532c9308ef851fc1d2a0a12d91573c068 05-Jan-2018 Mohamed Abdalkader <abdalkader@google.com> Refactor SMSDispatcher and friends.

Right now ImsSmsDispatcher acts as both a controller that
has pointers to gsm and cdma dispatchers as well as a
dispatcher itself by extending SmsDispatcher, making the
hirarechy convulted.

For example some methods it override but should not invoke
and some methods cdma and gsm dispatchers override but should
not invoke.

Instead this CL converts ImsSmsDispatcher into a proper controller
in preparation for adding a proper ImsSmsDispatcher.

While here also cleaned up a few things like removing duplicate code.

Test: send/receive ims and non-ims manually
Bug: 69846044
Merged-In: Iee97dbaf2284a04eebad28d3a8da627c283cc8a6
Change-Id: Iee97dbaf2284a04eebad28d3a8da627c283cc8a6
ccSmsInterfaceManager.java
msSMSDispatcher.java
msSmsDispatcher.java
MSDispatcher.java
msDispatchersController.java
dma/CdmaSMSDispatcher.java
sm/GsmSMSDispatcher.java
til/SMSDispatcherUtil.java
b9f48188231ddc726363389a501f157b5f743afc 18-Jan-2018 Neil Fuller <nfuller@google.com> Add a cache of the last CountryTimeZones looked up

There should be strong consistency of the country being
looked up so it makes sense to have a cache near to the point
of use. The TimeZoneFinder object currently caches the
last one retrieved, but that's general purpose and may
be invalidated more regularly (and it may be removed).

Test: atest FrameworksTelephonyTests
Bug: 63743683
Merged-In: If0b2aa851c78141bfdb85fd78129d70e94ed8c06
Change-Id: If0b2aa851c78141bfdb85fd78129d70e94ed8c06
(cherry picked from commit c641f4e8d7451c32416079bf50ce790cb5279c16)
imeZoneLookupHelper.java
cd9864a493cce9832ab2e8992d9d47b6de4e85d0 16-Jan-2018 Neil Fuller <nfuller@google.com> TimeServiceHelper changes to assist in next steps

For upcoming changes it makes more sense for the time-related
state to be accessible from TimeServiceHelper rather than
NitzStateMachine.DeviceState so these have moved.

Bug: 63743683
Test: atest FrameworksTelephonyTests
Change-Id: I9580140f730f3bce203069df7db9b390de799af3
Merged-In: I9580140f730f3bce203069df7db9b390de799af3
(cherry picked from commit 7cecf024c258ae234dcaf124cc32ed0e6d0d929e)
itzStateMachine.java
imeServiceHelper.java
672267f5fc89e1665771d9fea5b0e304fb5adf9c 12-Jan-2018 Neil Fuller <nfuller@google.com> Add result metadata to time zone lookup results

This change adds metadata to time zone lookup results which
will enable more sophisticated / better detection logic
in future.

If the device is using multiple sources of time zone
detection then having metadata will enable it to compare
signals and go with the least ambiguous.

The main logic change is that TimeZoneLookupHelper will
return a CountryResult object from lookupByCountry() in
cases when the guessZoneIdByCountry() method that it
replaces returned null. Callers can now check the metadata
for suitability.

android.util.TimeUtils is no longer used for offset lookups,
instead the code goes direct to libcore's TimeZoneFinder
/ CountryTimeZones in all cases.

Included in this commit are some non-functional logging
improvements, comment changes, variable renames and inlining.

Test: atest FrameworksTelephonyTests
Bug: 63743683
Change-Id: I1e67cdb6b564ee8867e4fde361cbb509a3606e6c
Merged-In: I1e67cdb6b564ee8867e4fde361cbb509a3606e6c
(cherry picked from commit 9c27d9c7c78f88afd6ac846a21384b09a0a50ee2)
itzStateMachine.java
elephonyComponentFactory.java
imeZoneLookupHelper.java
5cfa0922f3e5b73d1114deeaca0ad44d637ec3e5 11-Jan-2018 Neil Fuller <nfuller@google.com> Tidy up clock adjustment code / logging

Tidy up some of the clock adjustment code. On a structural
level this removes a few unusual/edge cases that wouldn't
yield particularly useful results:

1) Looking for a UTC-based time zone in a country known not to
use UTC (unlikely to yield a result).
2) Adjusting the system clock when all that is known is the country
(this would previously have set the device to the time zone
the device is using, so probably a no-op).

In the actual adjustment code, rather than adjust the current
device system clock, the time from the NITZ signal is used instead.
The original purpose of this code was apparently to handle NITZ
data where the network is pushing out local time rather than
UTC so it makes sense to base the time off the NITZ data.

This change also makes some non-functional logging changes.

Test: atest FrameworksTelephonyTests
Bug: 63743683
Bug: 37494871
Change-Id: Id0fd20cbe9cf97911ec43eee847aa84b1b32b42f
Merged-In: Id0fd20cbe9cf97911ec43eee847aa84b1b32b42f
(cherry picked from commit 85f8b089d0eaa7665ccc86ddd874b78b2ec767bc)
itzStateMachine.java
imeZoneLookupHelper.java
d42c5dabe2d45faea0f861e70b6902b3e6171b05 31-Jan-2018 nharold <nharold@google.com> Merge "Remove obsolete getIsimChallengeResponse" am: 4ce44fdede am: 60662c9acb
am: 9498fc2fcd

Change-Id: Ia3483bb1d8309b6e3f74064357df1bfbd6e1961d
9498fc2fcdecc6f12ac683608a8cd1c746815055 31-Jan-2018 nharold <nharold@google.com> Merge "Remove obsolete getIsimChallengeResponse" am: 4ce44fdede
am: 60662c9acb

Change-Id: I05cf6687b07284ccabb3af1485b70ba34b07f945
28eb337c9a4d6a9b7b032ff35e0b348ea514bdb7 31-Jan-2018 Amit Mahajan <amitmahajan@google.com> Fix GsmCdmaPhone.getIccCard() to never return null.

Test: Basic telephony sanity
Bug: 72565340
Change-Id: I1e5a5d0c5cbfca9658cb196463dfe0809ca0e89c
icc/IccCardProxy.java
icc/UiccSlot.java
4ce44fdede0fc78cf53c3803085b0bb980d5ff81 31-Jan-2018 nharold <nharold@google.com> Merge "Remove obsolete getIsimChallengeResponse"
60aa07a8df9126d543a4c3b11d754e6b8b9a959d 30-Jan-2018 Pengquan Meng <mpq@google.com> Merge "Fixed network mode loaded issue"
77ba51be604dbfc88edb50117c42fda70ef10638 12-Jan-2011 Karen Zhang <karen1.zhang@sonyericsson.com> Add API for Call Barring

Add Call Barring API in telephony framework so that telephony app can
use to realize Call Barring UI. Since some operator requires the UI,
this feature is needed.

Bug: 30845125
Test: Manual
Change-Id: I5d80508afd8216f04f443c5a9e0dd83d5247788f
smCdmaPhone.java
honeInternalInterface.java
msphone/ImsPhone.java
msphone/ImsPhoneBase.java
ip/SipPhoneBase.java
72e398aea87920e944bf8d190a1a3f33e4e6b06b 30-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Send broadcast for ABSENT/UNKNOWN states." am: 77bd44b5b9 am: 27ff258e77
am: b1153e3310

Change-Id: Ic7631a6bb666e824389887a43ed457b3fa933f01
b8ee7405cbb7ba63f32b31005cf31b5d46e2a474 30-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Determine the state to be broadcast in just one place." am: f0ebe5fc2a am: 1d561da7b8
am: 558a78bacd

Change-Id: I04203d5bba5ebc19db8b0373ca516f83f8b11877
12f844b0f84469c8cd8f094412a7599173aaaac3 29-Jan-2018 Nathan Harold <nharold@google.com> Remove obsolete getIsimChallengeResponse

This method is fully superceded by getIccAuthentication
Any callers should use the new method instead.

Bug: 27954896
Test: compilation
Change-Id: I8fb81a6c6cb1dcb278f4fe9d4ac4d3ae54a342c2
ommandsInterface.java
honeSubInfoController.java
IL.java
adioResponse.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
icc/IsimRecords.java
icc/IsimUiccRecords.java
b1153e331082c19f5446462b9f0a988758797364 30-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Send broadcast for ABSENT/UNKNOWN states." am: 77bd44b5b9
am: 27ff258e77

Change-Id: I599f07a078ac96b1a3ee7c33e4b1d0aa90cfe443
558a78bacd1ec7c573508ef71fa755a1e8459365 30-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Determine the state to be broadcast in just one place." am: f0ebe5fc2a
am: 1d561da7b8

Change-Id: I5d9f3c283eef84321c3c75a187b58ec333e5d496
c1f1c70143fee7818874f32cab5249e90761c07f 30-Jan-2018 nharold <nharold@google.com> Merge "Plumb NattKeepalive from HAL to DataConnection" am: 6a89929a09
am: 28fd023688

Change-Id: I64beeb6b03c2e19f0beb4d31b1ea7ac9aa74a0fd
77bd44b5b922be6ab95c690fbd5f5c6ed0486e49 30-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Send broadcast for ABSENT/UNKNOWN states."
f7f17fb8527db04a9202dc10e77374991a4fd52f 30-Jan-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Telephony power metrics"
47b078c27bfb57477a4ff1ce12abc4e9632c1dd5 30-Jan-2018 Tyler Gunn <tgunn@google.com> Add onDisconnect callback in root radio connection class.

From CDMA/GSM and IMS connections, notify listeners of the disconnects.
This is used as a replacement for the traditional phone.notifyDisconnect
method. This ensures that a more reliable direct path is used to notify
of disconnects in the underlying connections.

Test: Manual
Bug: 70389936
Change-Id: Id1809bc9deb7675e94341664dc08707dc81b304c
onnection.java
smCdmaConnection.java
msphone/ImsPhoneConnection.java
f0ebe5fc2ac2d55b397287ee6dc03d42f0f1b6e3 30-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Determine the state to be broadcast in just one place."
6a89929a09ebdf18b5d5ff71e65f84d7b40876b3 30-Jan-2018 nharold <nharold@google.com> Merge "Plumb NattKeepalive from HAL to DataConnection"
24f2a9548e49ada88f560c0566142d8b920ddff9 30-Jan-2018 Brad Ebinger <breadley@google.com> Merge changes from topic "ims_imsservice_apis"

* changes:
Adds compat layer for older devices when IMS binding
Create ImsService API compat layer
Change ImsService API namespaces
Integrate new MMTel APIs into the platform
Integrate new ImsCallSessionListener
1c2adde4d306003ff968b70668a9bf8f48fdbed5 30-Jan-2018 Malcolm Chen <refuhoo@google.com> Merge "Add TransportManager." am: dacc21b568 am: a6aa197530
am: c1c8be9c5c

Change-Id: I4a34cd2e64bb1e8c3fc50118d1033b4fd709888a
c1c8be9c5c781b24efb0328d359f3c9b4a0c3db6 30-Jan-2018 Malcolm Chen <refuhoo@google.com> Merge "Add TransportManager." am: dacc21b568
am: a6aa197530

Change-Id: I8915a66290b29f8d37b1d33d15f82060a6632393
bbb2f925d4e9f02ba50f5fa78dae9bd53639fe0e 08-May-2017 haoyu li <haoyu2.li@sonyericsson.com> IMS: Notify call failed for unobtainable number

"Server unreachable" is displayed when user makes IMS call with
unobtainable number. But "Invalid Number" is displayed when user makes
CS call with the same number. They are inconsistent. "Invalid Number"
should be displayed in IMS call.

To fix this, add a case that map the fail cause to
DisconnectCause#UNOBTAINABLE_NUMBER.

Test: manual - Checked that "Invalid number" is shown when make the IMS
MO call to unobtainable number.
Bug: 69940434

Change-Id: I7bf653c137ad0ee4aba0ab03ab4f054451410839
msphone/ImsPhoneCallTracker.java
dc652e245b138b700a4199591ed8d9211fde91f3 27-Jan-2018 Amit Mahajan <amitmahajan@google.com> Determine the state to be broadcast in just one place.

Earlier it was done in multiple places leading to corner cases
and unexpected states.

Test: basic telephony sanity
Bug: 72513243
Change-Id: I129a9f69e523db8f11901f40a37164fb7ebf5282
icc/UiccProfile.java
a6a2480692b2c54e9efc8de03ffc21b20279c628 22-Jan-2018 Siddharth Ray <siddharthr@google.com> Telephony power metrics

Modem power metrics is added to Telephony metrics

BUG:72383800

Test: Manual
Change-Id: I951276a41d9b94a740576fe8898f1a74a9088b6d
etrics/ModemPowerMetrics.java
etrics/TelephonyMetrics.java
7556a0379bf2f1d2ac8d0f6c5edb8e44ecd011e6 30-Jan-2018 Malcolm Chen <refuhoo@google.com> Add TransportManager.

Bug: 64132030
Test: regression tests
Change-Id: Iebb2a17923ca0ce3d2c66e7fd520854cfe69001a
ransportManager.java
9ed21a8776f94091ffda14778a9fe52674814a22 26-Jan-2018 Brad Ebinger <breadley@google.com> Adds compat layer for older devices when IMS binding

Modifies the ImsResolver to support binding to older
IMS implementations that use the ServiceManager
to expose IMS implementation.

Bug: 63987047
Test: Telephony Unit Tests
Change-Id: I4d7ccbad9f4aed310af92f4832e51ec6bbeec27d
honeFactory.java
ms/ImsResolver.java
ms/ImsServiceController.java
ms/ImsServiceControllerCompat.java
ms/ImsServiceControllerStaticCompat.java
ms/ImsServiceInterfaceAdapter.java
ms/MmTelFeatureCompatAdapter.java
ms/MmTelInterfaceAdapter.java
0b49b9969d3e8923cc9b6a1add06ced2a8d245b4 14-Jan-2018 Brad Ebinger <breadley@google.com> Create ImsService API compat layer

Creates a new ImsService API compat layer,
which translates the "new" API to the
"old" API in the android.telephony.ims.compat
namespace to support older versions of
ImsService Implementation

Bug: 63987047
Test: Manual, Telephony unit tests
Change-Id: I7daafe2ac150c49ba4ad8f08ac175eb7e6044633
ms/ImsConfigCompatAdapter.java
ms/ImsRegistrationCompatAdapter.java
ms/ImsResolver.java
ms/ImsServiceController.java
ms/ImsServiceControllerCompat.java
ms/MmTelFeatureCompatAdapter.java
04c17b36e012335a8575ae24895fd3f0bea8491f 23-Jan-2018 Brad Ebinger <breadley@google.com> Change ImsService API namespaces

Changes the ImsService API namespaces
to allow them to be @SystemApi.

Bug: 63987074
Change-Id: I66b564e27d5e0995c4819bd2c6df304e7e04a7eb
Test: Telephony Unit Tests
msSmsDispatcher.java
elephonyTester.java
msphone/ImsExternalCall.java
msphone/ImsExternalCallTracker.java
msphone/ImsExternalConnection.java
msphone/ImsPhone.java
msphone/ImsPhoneCall.java
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
msphone/ImsPhoneMmiCode.java
msphone/ImsPullCall.java
etrics/TelephonyMetrics.java
est/TestConferenceEventPackageParser.java
1d0af327f9d60dcdb010314bbdc4ab2492df11df 16-Jan-2018 Brad Ebinger <breadley@google.com> Integrate new MMTel APIs into the platform

Integrates the new ImsService APIs into telephony
and updates the Telephony unit tests to
test the new APIs as well.

Bug: 63987047
Test: Telephony unit tests; Telephony test ImsService
Change-Id: Iaf40fc2a14d2b8e99fb0d08284987c9cf9cd3b2c
smCdmaPhone.java
msSmsDispatcher.java
ms/ImsResolver.java
ms/ImsServiceController.java
msphone/ImsPhoneCallTracker.java
etrics/TelephonyMetrics.java
06c1f46c4f7d32f1a9832121f7e4cfe67f6660bc 27-Jan-2018 Amit Mahajan <amitmahajan@google.com> Send broadcast for ABSENT/UNKNOWN states.

Test: manual test, basic telephony sanity
Bug: 72565340
Change-Id: Ia95182f2f1bda7a02205769faba5d8f8005c1106
icc/UiccProfile.java
icc/UiccSlot.java
7273b329e69c29c80b78fba805553553a559dee7 27-Jan-2018 Pengquan Meng <mpq@google.com> Fixed network mode loaded issue

SubscriptionInfoUpdater.java adds subId during device power-up and if the SIM card
is new to the slot it would set the network mode as Global. Before assigning network mode
as Global, first check if a network mode already available in DB for the current subId.
If network mode available, use the same as current preferred network mode.

Bug: 36850854
Test: manual
Change-Id: I93e9252a8d7f2f31ea212f04525a7a94b479d1fb
ubscriptionInfoUpdater.java
21cb4001dec43dc8a3e031eb4a64c721a03bd6ee 12-Jul-2017 Nathan Harold <nharold@google.com> Plumb NattKeepalive from HAL to DataConnection

Connect NetworkAgent's Packet Keepalive signals
to the telephony HAL via DataConnection and the
CommandsInterface.

Add DcKeepaliveTracker to DcNetworkAgent to track
incoming keepalive indications and handle status
reporting to the NetworkAgent

Bug: 38350389
Test: verified with sl4a, additional tests pending
Merged-In: If436b9240b192ed41f2dd0d05aca1ae36dc5e57f
Change-Id: If436b9240b192ed41f2dd0d05aca1ae36dc5e57f
(cherry picked from commit f9d8835c31c9a0347e5d40f6b0f582bbf09b9e51)
aseCommands.java
ommandException.java
ommandsInterface.java
IL.java
adioIndication.java
adioResponse.java
ataconnection/DataConnection.java
ataconnection/KeepaliveStatus.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
7a8e1efb182d2436b10c1d1f756a9aa52253f51d 29-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Add sanity check to avoid NullPointerException." am: df844ef577 am: 5688d2e983
am: bca1f77980

Change-Id: I5c759c0f623aaf702103631ed3f762a0246f17e1
bca1f779800893c617e173ce3ad93c645e3e85e5 29-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Add sanity check to avoid NullPointerException." am: df844ef577
am: 5688d2e983

Change-Id: I4b1c58e4b59da86c8f539f6bfe549c94b3b07429
df844ef577841e5e7903b867f1b5d0ffc95f91f3 29-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Add sanity check to avoid NullPointerException."
54156928a4df51151e1010acdf6e8ae76f591eec 27-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Fix for properly setting SIM lock state." am: 871bb05cd0
am: 11a931838a

Change-Id: I9befe3028d5008ae37754cce49acd3295c6b55c1
d1d4d43fb06ee22f8b3f7309018e2ac06dd1b013 27-Jan-2018 Amit Mahajan <amitmahajan@google.com> Add sanity check to avoid NullPointerException.

Test: none
Bug: 72463137
Change-Id: I6308d7495048dca751d8ad0d9974b3484fa527ae
ubscriptionInfoUpdater.java
871bb05cd00c31a5927cea52f273d3ac8982ba1a 27-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fix for properly setting SIM lock state."
81ebde64e135db3d4eb7eaf7c7b2b3d436259d5b 26-Jan-2018 Hall Liu <hallliu@google.com> Merge "De-flake ImsRttHandlerTest" am: 7d1f1e5afd am: ed89805bfa
am: f7a5742680

Change-Id: I9eec43136f317c1c8d31257dfb07a3946ef52868
f7a57426802e4254172a2f152b93e5346d45d665 26-Jan-2018 Hall Liu <hallliu@google.com> Merge "De-flake ImsRttHandlerTest" am: 7d1f1e5afd
am: ed89805bfa

Change-Id: I2c7e5cb0778d7602424417784b99ef609acfdc7a
7d1f1e5afd5731ba17b0f5cc7a7c80e995ec1468 26-Jan-2018 Hall Liu <hallliu@google.com> Merge "De-flake ImsRttHandlerTest"
e200adbf2e05c26640fa65e49dd456b732788d90 26-Jan-2018 Amit Mahajan <amitmahajan@google.com> Fix for properly setting SIM lock state.

Test: verified SIM locking/unlocking with a TMo SIM
Bug: 72513243
Merged-in: Ieffa067d2ea0e23c929d71cf4d854f6ea07e124a
Change-Id: Ieffa067d2ea0e23c929d71cf4d854f6ea07e124a
icc/UiccProfile.java
c11ce71fb1263ea71bf5c58fdb70efefbf586492 26-Jan-2018 Amit Mahajan <amitmahajan@google.com> Fix for properly setting SIM lock state.

Test: verified SIM locking/unlocking with a TMo SIM
Bug: 72513243
Change-Id: Ieffa067d2ea0e23c929d71cf4d854f6ea07e124a
icc/UiccProfile.java
6960b9a74a596d4cfe1bd0279f21e37c5ec5e125 26-Jan-2018 Xiangyu/Malcolm Chen <refuhoo@google.com> Merge "Add CellularNetworkService." am: 97742aa693 am: af58e8c6da
am: 979cd2bdcf

Change-Id: I7939aa182fc69ce998a53d7d3939bcef9e9627ff
979cd2bdcfa0ed420cdf8f20f15ea356c7b4afbb 26-Jan-2018 Xiangyu/Malcolm Chen <refuhoo@google.com> Merge "Add CellularNetworkService." am: 97742aa693
am: af58e8c6da

Change-Id: Icc3384158da430ddddf450e76be63d1393ee54fc
97742aa693fb44387d335a1039cb4e29dcc461c1 26-Jan-2018 Xiangyu/Malcolm Chen <refuhoo@google.com> Merge "Add CellularNetworkService."
ea84879a9f1c08ab00905a6aa9d33e30356533c2 26-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Revert "Revert "Client side implementation for IRadioConfig hal.""" am: ee9c362535
am: c505af71b1

Change-Id: Ic2d4c4bc8cd271d455e34ba24b6a44bfd6c99a27
7439663494ac799e018cf155933d9bba21b9ba7c 25-Jan-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Revert "Revert "Client side implementation for IRadioConfig hal."""
3c2db4f18a5d4c8c1935a81a34e9f740ead372a8 25-Jan-2018 Holly Jiuyu Sun <jiuyu@google.com> Merge "Fill in methods in EuiccCardController." am: e2383aef66 am: 9da05304a2
am: 3a99d1ea91

Change-Id: I58dcde20e4291ea704ccc167e9a3c9babf058da5
3a99d1ea9172bfe1cb6e1ad4f92bf7e1604c0842 25-Jan-2018 Holly Jiuyu Sun <jiuyu@google.com> Merge "Fill in methods in EuiccCardController." am: e2383aef66
am: 9da05304a2

Change-Id: I05d26ba3a268cdce2f5bf6d2d8dbac674cfbd208
3c9f8c8cf143d16a68d7767813c471d8ca937b24 12-Jan-2018 Malcolm Chen <refuhoo@google.com> Add CellularNetworkService.

Add CellularNetworkService as a sub class of NetworkService.
It includes instances of CellularNetworkServiceProvider that
handles related requests for each slot.

Bug: 64132030
Test: build
Change-Id: I6d2c98fce4234ab8eacd27338e5e6fb76b537a3d
ellularNetworkService.java
e7b0f40cbd5c0888c8100f4257af5a57d5df8853 24-Jan-2018 Amit Mahajan <amitmahajan@google.com> Revert "Revert "Client side implementation for IRadioConfig hal.""

This reverts commit d1b957a4a1382c0ae1514cfac8899b04717cd2bb.

Reason for revert: Trying to re-land the reverted change.

Test: Basic telephony sanity (new APIs are not exercised yet)
Bug: 64131518
Merged-in: I1f19df6798573c86da105ab512effed80526c092
Change-Id: I1f19df6798573c86da105ab512effed80526c092
adioConfig.java
adioConfigIndication.java
adioConfigResponse.java
icc/UiccController.java
93b812abba166c6b7d18c6dcddb23a8bee0eda4c 24-Jan-2018 Amit Mahajan <amitmahajan@google.com> Revert "Revert "Client side implementation for IRadioConfig hal.""

This reverts commit d1b957a4a1382c0ae1514cfac8899b04717cd2bb.

Reason for revert: Trying to re-land the reverted change.

Test: Basic telephony sanity (new APIs are not exercised yet)
Bug: 64131518
Change-Id: I1f19df6798573c86da105ab512effed80526c092
adioConfig.java
adioConfigIndication.java
adioConfigResponse.java
icc/UiccController.java
e2383aef66f11e26cbd474dd301dcafdb8efbbe0 25-Jan-2018 Holly Jiuyu Sun <jiuyu@google.com> Merge "Fill in methods in EuiccCardController."
7a9454238ca0c112643aee33ccbb5413907a2dfe 25-Jan-2018 Eric Schwarzenbach <easchwar@google.com> Merge "Support new CellInfo fields." am: e49e14b8fc am: 8c895d5cec
am: 135eadaf7c

Change-Id: Id6951d7be94f70c6f2c9e1bb5019539d52e7d5f9
135eadaf7cdb6e2c67f331b66506df113cb11c67 25-Jan-2018 Eric Schwarzenbach <easchwar@google.com> Merge "Support new CellInfo fields." am: e49e14b8fc
am: 8c895d5cec

Change-Id: I618920c2d8e54d088a1aaa2fc34b13a10180dcc7
c2170af2768bedc32652d355f16bb0a64ac18ce4 25-Jan-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Add and trigger onReady API for SMS over IMS"
81b90daac5f0e09da0ea83327b8f31976194aade 10-Jan-2018 Eric Schwarzenbach <easchwar@google.com> Support new CellInfo fields.

Bug: 72117223
Test: runtest frameworks-telephony

Change-Id: I662e097527abbb9c742ef7018010b17fcaebff04
IL.java
0e98b3d726c6c58543fe304d932f5bcb51e43257 25-Jan-2018 Jun Yin <junyin@google.com> Merge "EuiccCard #4 (Other Methods)" am: ebdffd06db am: 1886931b29
am: 251072f169

Change-Id: Ic68b3115fe31e56d5133ab12efdae4105f9c681b
251072f1698de22665d8c7d09c37a5837d34d737 25-Jan-2018 Jun Yin <junyin@google.com> Merge "EuiccCard #4 (Other Methods)" am: ebdffd06db
am: 1886931b29

Change-Id: I2f39bb250dc55d8ba296c2cb97a5c2bc2043c7a4
b8979401638681a0c83e1b75669b2e3fddd03215 25-Jan-2018 Jun Yin <junyin@google.com> Merge "EuiccCard #3 (disableProfile)" am: 22e4774329 am: 941b2dbe51
am: 8598a88245

Change-Id: I66e01e70b0c3fdc9b119c6dbb3a021ac70bdcbb5
8598a88245f52767d2251876e7bc4584066e8501 25-Jan-2018 Jun Yin <junyin@google.com> Merge "EuiccCard #3 (disableProfile)" am: 22e4774329
am: 941b2dbe51

Change-Id: Ia2f1e332ce2b17500f7e24f374938054358d4b69
179b062d4ba3d27323f561772cfebebb004fd901 17-Jan-2018 Jun Yin <junyin@google.com> EuiccCard #4 (Other Methods)

EuiccCard extends UiccCard to provide eUICC functionality defined by
GSMA RSP specifications.

This CL adds the implementation for all remaining methods.

The patch #1 is the existing code and can be compared with the patch #2
to see the actual diff.

Bug: 38206971
Test: unit test
Change-Id: Idf90904cd70f9cc59b77693cae132794c74046c2
icc/euicc/EuiccCard.java
22e47743295adf2cf3b24be1beecb3bb953a86b8 25-Jan-2018 Jun Yin <junyin@google.com> Merge "EuiccCard #3 (disableProfile)"
37a7715422b55bd69659a89db297ac22c46113e3 25-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Disable IccCardProxy and enable new code in UiccProfile." am: 6acff24894 am: 332d26fa1f
am: 08b870bf57

Change-Id: I0e2116ad46c78b312b224e09fa398590412a5e13
08b870bf5796fa129a459e8e5c3aacc830d4125e 25-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Disable IccCardProxy and enable new code in UiccProfile." am: 6acff24894
am: 332d26fa1f

Change-Id: I2e3802e6d2bec6d770e8175ad6089dfd72e82c1e
6acff248942168ae81ddf43fd09c09f7edacd79d 25-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Disable IccCardProxy and enable new code in UiccProfile."
911487df2a7ddad90edff7f61df04c192584c89b 25-Jan-2018 Jun Yin <junyin@google.com> Merge "EuiccCard #2 (getAllProfiles)" am: 5ca8c98619 am: f4410cc909
am: 09bff15d9a

Change-Id: I5a8d5c11055c3fbe9dfbf971b239808d396c2c4b
c8845bcb6daffaf186fb2b36edda545f28db2ed6 17-Jan-2018 Jun Yin <junyin@google.com> EuiccCard #3 (disableProfile)

EuiccCard extends UiccCard to provide eUICC functionality defined by
GSMA RSP specifications.

This CL adds the implementation for disableProfile. Other implementation
of methods are added in following up CLs.

The patch #1 is the existing code and can be compared with the patch #2
to see the actual diff.

Bug: 38206971
Test: unit test
Change-Id: I32419e54733dbba82d412e135efa251a4e1f1d58
icc/euicc/EuiccCard.java
09bff15d9a5e43363fa40123ff7cebe1eb56d441 25-Jan-2018 Jun Yin <junyin@google.com> Merge "EuiccCard #2 (getAllProfiles)" am: 5ca8c98619
am: f4410cc909

Change-Id: I061d7fe8b7e3d9f1e11d3ba11d7fcb4f0b7181ae
5ca8c9861932a8ba41ae411b8811bc56497dfbee 25-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "EuiccCard #2 (getAllProfiles)"
22f8b8a2174e48d55bc59c7bf09360f366e9c4f8 19-Jan-2018 Holly Jiuyu Sun <jiuyu@google.com> Fill in methods in EuiccCardController.

Bug: 38206971
Test: test on phone
Change-Id: I419783698bfd4c6f93551b17537d30dc9dd4d08e
uicc/EuiccCardController.java
b8d6fafa17b6be739a61e6fa90cbb186875d0bb0 24-Jan-2018 Amit Mahajan <amitmahajan@google.com> Disable IccCardProxy and enable new code in UiccProfile.

Test: Basic telephony sanity with TMo, VZW, Fi SIMs; telephony unit tests
Bug: 64131518
Change-Id: I03e523bfebf731ad35018583c8ace12fa48ca397
smCdmaPhone.java
ccCard.java
honeFactory.java
ubscriptionInfoUpdater.java
elephonyComponentFactory.java
icc/IccCardProxy.java
icc/UiccCard.java
icc/UiccController.java
icc/UiccProfile.java
4ec923daed36834dc6948e7487e2e21f301e09f2 25-Jan-2018 Nathan Harold <nharold@google.com> Merge "Plumb NattKeepalive from HAL to DataConnection"
91bbd7af1d94ac20275f3d6950aa39b3e8665675 25-Jan-2018 Holly Jiuyu Sun <jiuyu@google.com> Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""" am: 0b485b9d85 am: 4ace7481e8
am: 38fbdd9312

Change-Id: Ie422d0fa93979acec609c40893ae1bd596f53ca1
38fbdd931287e67973aaf5a998bbe7e15e9b0196 25-Jan-2018 Holly Jiuyu Sun <jiuyu@google.com> Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""" am: 0b485b9d85
am: 4ace7481e8

Change-Id: I088d701b9524e44b2c3efc5d644abd7dcd6b6364
3cffc48ecbc432c93dcb808bfa6938ed4b884a0f 23-Jan-2018 Mohamed Abdalkader <abdalkader@google.com> Add and trigger onReady API for SMS over IMS

Test: manual test that normal code path is fine since this code path is
not yet exercisable.
BUG=69846044
Change-Id: I43fbc51f96c04e136c81c77d46077248e598c0be
msSmsDispatcher.java
5569a0cf2e06b196a41fd28a9cff1d19952e67ce 24-Jan-2018 Tyler Gunn <tgunn@google.com> Merge "Handle SIP 380 code mapped from the modem." am: 08346c7dd5 am: a4d6e2b228
am: d6f1c25857

Change-Id: I575d8ac2e6024f3167315e332dc35c2f0d801abe
a7f3888f0bd0442eccbb19cb0f612b31ee782ca4 24-Jan-2018 Mohamed Abdalkader <abdalkader@google.com> Merge "Fix accidental use of internal version of SMS APIs."
0b485b9d8518bd844510c1e8200c48bac39751d1 24-Jan-2018 Holly Jiuyu Sun <jiuyu@google.com> Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."""
d6f1c258578fbe326dc529b9f636c0ff4f230016 24-Jan-2018 Tyler Gunn <tgunn@google.com> Merge "Handle SIP 380 code mapped from the modem." am: 08346c7dd5
am: a4d6e2b228

Change-Id: I2c2d3a71028fea20caca833ba5525fe116ad2b26
c17ddea719eff14bfa441b78ff7f9264b8f41108 17-Jan-2018 Jun Yin <junyin@google.com> EuiccCard #2 (getAllProfiles)

EuiccCard extends UiccCard to provide eUICC functionality defined by
GSMA RSP specifications.

This CL adds the implementation for getAllProfiles. Other implementation
of methods are added in following up CLs.

The patch #1 is the existing code and can be compared with the patch #2
to see the actual diff.

Bug: 38206971
Test: unit test
Change-Id: I1253bd235103392d4d8105cc9dd2019876f92eb0
ubscriptionInfoUpdater.java
icc/euicc/EuiccCard.java
08346c7dd55d2863aa27856521d7b4dd726266e1 24-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Handle SIP 380 code mapped from the modem."
6aae4851617bdf050e549a850cd2ed27c2d1f9da 24-Jan-2018 Holly Jiuyu Sun <jiuyu@google.com> Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""

This reverts commit 4e044e6669e3d76dcb79342656ccab0d115a3816.

Reason for revert: The original failure was not caused by this CL and this CL does not depend on the broken one.

Test: on phone

Change-Id: Id5b5ca33e5836b6ccb1d38ab7ee5166a95955fbb
icc/UiccController.java
3678efd9b6af49812ba992dfa80ffaabd3c1cd57 24-Jan-2018 Eric Schwarzenbach <easchwar@google.com> Merge changes from topics "radioconfig-indication", "lce-indication" am: 8924a77a7e am: 9fef35c066
am: e6fc44c524

Change-Id: I0665416cd8169f9a5d5d96e383ff12d0bc734a82
b63e7aae0fce0a2f2c3fa0192443d7edaaa82a06 24-Jan-2018 Jun Yin <junyin@google.com> Merge "EuiccCard #1" am: b187119205 am: 245efc02f2
am: c4b1a66af0

Change-Id: I44737e35edd2944b4812287d9a3fc6c3c2443df0
e6fc44c524afb55712de1833f5d207d87d4972c9 24-Jan-2018 Eric Schwarzenbach <easchwar@google.com> Merge changes from topics "radioconfig-indication", "lce-indication" am: 8924a77a7e
am: 9fef35c066

Change-Id: Ib885f98482409c7efbc26599ac04adde4675176a
c4b1a66af0169d4e22fd954ae52a10ad91f0a9ba 24-Jan-2018 Jun Yin <junyin@google.com> Merge "EuiccCard #1" am: b187119205
am: 245efc02f2

Change-Id: Ia9e6e159d4b0938aea5cd38dde42fe70406f9126
ce1ebf48550afce8a52bc16a5df6eede40251701 23-Jan-2018 Mohamed Abdalkader <abdalkader@google.com> Fix accidental use of internal version of SMS APIs.

Test: manual

BUG=69846044
Change-Id: I68802c183509d62f70d5e1c130948fdae097bb57
msSmsDispatcher.java
8924a77a7e42866570fabd51506744440e68ce6a 24-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge changes from topics "radioconfig-indication", "lce-indication"

* changes:
Add skeleton implementation for physical channel config indication.
Add skeleton implementation for new link capacity estimate.
b1871192051ed151656eb9e19941ba67a07888b6 24-Jan-2018 Jun Yin <junyin@google.com> Merge "EuiccCard #1"
2590ea3b5d951e85a0ae06e077628a91d011cf21 24-Jan-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Add a cache of the last CountryTimeZones looked up"
82dd0559bdbce405d386aca78628e6a6e6b5eaf6 24-Jan-2018 Nicolas Geoffray <ngeoffray@google.com> Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."" am: 27818a0882
am: a69cc7320e

Change-Id: I07dc14937c5bc4faf8a4d8fa2fffee577d1d8023
9a1b8310f650db4cfc231f9f90871b50845c5086 24-Jan-2018 Neil Fuller <nfuller@google.com> Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."

AOSP build broken

Bug: 71914112

This reverts commit c8342864cd4abf8fafbf9160a20524977393b08e.
icc/UiccController.java
27818a0882e0eada83579ec4a3fa2b483f15c49d 24-Jan-2018 Nicolas Geoffray <ngeoffray@google.com> Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""
fd49b95ca5f3fd2764a4b0213b38fb61528b7e5d 24-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Revert "Client side implementation for IRadioConfig hal."" am: 922a719067 am: 0a98134de2
am: 87d7690fed

Change-Id: I25f42d6b2a332ff3e0e9c4ac82b0d679a8833c09
8606e9bc671524e8461f017b830c950d7ed2d585 24-Jan-2018 Holly Jiuyu Sun <jiuyu@google.com> Merge "Add getUiccSlots() and switchSlots() in TelephonyManager." am: 8fcb3aa3f8 am: c6d9c6b2d7
am: fa32a75863

Change-Id: I66d88d495d9c82d71165a178c4403ae3e08db7c9
4e044e6669e3d76dcb79342656ccab0d115a3816 24-Jan-2018 Nicolas Geoffray <ngeoffray@google.com> Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."

AOSP build broken

Bug: 71914112

This reverts commit c8342864cd4abf8fafbf9160a20524977393b08e.

Change-Id: I6e6245297861565973b0c181f0072a91fcdf2d5b
icc/UiccController.java
87d7690fed8187584aeed48fc31a882dcc495fa9 24-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Revert "Client side implementation for IRadioConfig hal."" am: 922a719067
am: 0a98134de2

Change-Id: I904f86ac5df8d39a4f35413f3dc3db3d0a179ca7
fa32a758639a4233d3fbc7700e812fe502bb1ccb 24-Jan-2018 Holly Jiuyu Sun <jiuyu@google.com> Merge "Add getUiccSlots() and switchSlots() in TelephonyManager." am: 8fcb3aa3f8
am: c6d9c6b2d7

Change-Id: I685dc67a4c3c8c37c1ff7464e6539f84f31c97d9
922a719067cd0e7b8e85bcb0949546d37ab99487 24-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Revert "Client side implementation for IRadioConfig hal.""
d1b957a4a1382c0ae1514cfac8899b04717cd2bb 24-Jan-2018 Amit Mahajan <amitmahajan@google.com> Revert "Client side implementation for IRadioConfig hal."

This reverts commit 73d3c12c9edc15264e51e862694870fd4984af03.

Reason for revert: TH boot test failures

Bug: 72416825
Change-Id: Ie07731225de5bbaa132da6361e485f4a0e193879
adioConfig.java
adioConfigIndication.java
adioConfigResponse.java
icc/UiccController.java
4e5766109645e58abfb272261f3e6b18d584aab4 28-Nov-2017 Adrian Muzyka <adrian.muzyka@sonymobile.com> Displaying HD audio indicator for GSM/CDMA calls

Acquire audio quality information from RIL and set HD quality to
connection so that HD audio indicator can be displayed in in-call
screen. This feature is necessary to fulfill some carriers
requirement.

Test: manual - Checked that HD audio indicator is displayed on UI in
GSM/CDMA calls.
Bug: 30207043

Change-Id: I988e5f18ebff33a49189e11ae2a20bf4aa8005f4
riverCall.java
smCdmaConnection.java
adioResponse.java
b023d0441bed5c915a1e1995d15d8db5fbe16813 24-Jan-2018 Holly Jiuyu Sun <jiuyu@google.com> Merge "Add cardId in EuiccCardManager API." am: 04b4f027e4 am: 150fb3fc80
am: e8c970f30a

Change-Id: I564cf7efbccc0e216b1649d93cf06dcbc4e5dd5b
e8c970f30acd97ff8df71612e29b4120591884d5 24-Jan-2018 Holly Jiuyu Sun <jiuyu@google.com> Merge "Add cardId in EuiccCardManager API." am: 04b4f027e4
am: 150fb3fc80

Change-Id: Ieb126baf048f683e46e4a485b407f2b16cdc7d90
8fcb3aa3f8b97e1df8ec3e10271e35f570ef059d 24-Jan-2018 Holly Jiuyu Sun <jiuyu@google.com> Merge "Add getUiccSlots() and switchSlots() in TelephonyManager."
f9d8835c31c9a0347e5d40f6b0f582bbf09b9e51 12-Jul-2017 Nathan Harold <nharold@google.com> Plumb NattKeepalive from HAL to DataConnection

Connect NetworkAgent's Packet Keepalive signals
to the telephony HAL via DataConnection and the
CommandsInterface.

Add DcKeepaliveTracker to DcNetworkAgent to track
incoming keepalive indications and handle status
reporting to the NetworkAgent

Bug: 38350389
Test: verified with sl4a, additional tests pending
Change-Id: If436b9240b192ed41f2dd0d05aca1ae36dc5e57f
aseCommands.java
ommandException.java
ommandsInterface.java
IL.java
adioIndication.java
adioResponse.java
ataconnection/DataConnection.java
ataconnection/KeepaliveStatus.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
04b4f027e42f5f5a8ec95310ac99059bc09aad88 24-Jan-2018 Holly Jiuyu Sun <jiuyu@google.com> Merge "Add cardId in EuiccCardManager API."
88580e2dbade08860d1260a9d9b735038ef03176 24-Jan-2018 Sooraj Sasindran <sasindran@google.com> Merge "Telephony: Fix RUIM app mcc/mnc issue" am: dee5f9e27f am: 6e1e7965cd
am: 1382d8626d

Change-Id: I3c6577f037b0a3512c970918fb3cda1a56733f76
1382d8626decc4131ae686b816597b47ab2b62d1 24-Jan-2018 Sooraj Sasindran <sasindran@google.com> Merge "Telephony: Fix RUIM app mcc/mnc issue" am: dee5f9e27f
am: 6e1e7965cd

Change-Id: Ic3c4a50875e013e55f972d284eedca8f62c007b1
cd4d38ca27e315d583d56cd475499796196da671 03-Jan-2018 Eric Schwarzenbach <easchwar@google.com> Add skeleton implementation for physical channel config indication.

Bug: 70638175
Test: n/a
Change-Id: I79985e7aff625941ea750ff05a8cb0239a3bc47f
adioIndication.java
ebb82d1f70b71d7901540134c5de85f82aab82f9 03-Jan-2018 Eric Schwarzenbach <easchwar@google.com> Add skeleton implementation for new link capacity estimate.

Also updates RadioResponse to handle responses for setting reporting
criteria.

Bug: 70638175
Test: n/a
Change-Id: I2fd10240d35d23bd5013845c7dd31c697425a2d9
adioIndication.java
adioResponse.java
52af3109b573f2f6b8d1a7ad45ceedfc7b007ca9 24-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Client side implementation for IRadioConfig hal." am: a66d30a2a6 am: d87b9deac0
am: 72e40642cd

Change-Id: I29841c0b234f12d6f5e760af85da265f02f566c2
dee5f9e27ff065089207450acd37dab074254e9b 24-Jan-2018 Sooraj Sasindran <sasindran@google.com> Merge "Telephony: Fix RUIM app mcc/mnc issue"
c8342864cd4abf8fafbf9160a20524977393b08e 12-Jan-2018 Holly Jiuyu Sun <jiuyu@google.com> Add getUiccSlots() and switchSlots() in TelephonyManager.

Bug: 71914112
Test: test on phone
Change-Id: I5b113ee99fefa65f9eeed70f2e2f04ed7aeaf43b
icc/UiccController.java
72e40642cd16ab964dc6990ebe6d93428515d0d4 24-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Client side implementation for IRadioConfig hal." am: a66d30a2a6
am: d87b9deac0

Change-Id: I0a7d1224763d3591caf477ac4cc06d60375f4dc2
a66d30a2a6cfc364172daa46eaea74c7e3ca6a87 24-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Client side implementation for IRadioConfig hal."
4aea0c138dfa8c69179a754f7133581372ee4768 24-Jan-2018 Holly Jiuyu Sun <jiuyu@google.com> Add cardId in EuiccCardManager API.

Bug: 38206971
Test: test on phone
Change-Id: I9131977c8beb73015450538ced4b08339a295006
uicc/EuiccCardController.java
379a2b4a4614f9521bc603b4f89e91d10f74736a 24-Jan-2018 nharold <nharold@google.com> Merge "Cleanup of SignalStrength Parcel" am: 2bb9e70824 am: 869e98590e
am: 4bfab761c8

Change-Id: I6288cbaba76d07cded6f8ee71d3210d9f46709ca
4bfab761c8081d6629ca313f15973fd081f5f6f2 24-Jan-2018 nharold <nharold@google.com> Merge "Cleanup of SignalStrength Parcel" am: 2bb9e70824
am: 869e98590e

Change-Id: I59baf3e10d30d1b4c76813af2cb64dfded69b60c
73d3c12c9edc15264e51e862694870fd4984af03 19-Jan-2018 Amit Mahajan <amitmahajan@google.com> Client side implementation for IRadioConfig hal.

Test: Basic telephony sanity (new APIs are not exercised yet)
Bug: 64131518
Change-Id: Ia6ba04ca78c570d246b54353123304499b3ccc0b
adioConfig.java
adioConfigIndication.java
adioConfigResponse.java
icc/UiccController.java
d2ac9ea7d93d64c7b4851c1d364adf40b10fd977 23-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Add slot related APIs to UiccController." am: 5d5800c4e6
am: 530b0fdf07

Change-Id: I94282661e7c538689dff2e51b8097f2b16c61e56
ccc3a975130eb652969b7b5f97bb8edec32dbca5 09-Sep-2016 Yashdev Singh <yashdevs@codeaurora.org> Telephony: Fix RUIM app mcc/mnc issue

if mUiccAppType is RUIM:
use RuimRecords for mcc/mnc lookup
else
Use mIccRecords of mUiccAppType for mcc/mnc

Above algorithm mandates that mUiccAppType MUST always be
correct for current configuration. This is controlled by
VOICE_RADIO_TECH and mPrecisePhoneType

For the configuration where simcard has only RuimApp and SimApp.
- In home network, VOICE_RADIO_TECH would indicate 1x.
- This would result in enforcing that phonetype be CDMA.
- MCC/MNC lookup on GsmCdmaPhone would result in using RuimRecords.
- *#0000# would show RuimRecords parameters.
- In roaming GSM networks, VOICE_RADIO_TECH would indicate 3GPP RAT value.
- this would force phone type to change from cdma >> GSM.
- SimRecords would be used in mcc/mnc lookup.
- *#0000# would show SimRecords parameters.

For the configuration where simcard has CsimApp, UsimApp and Isimapp.
- In home/roaming network, VOICE_RADIO_TECH would indicate 3GPP-rats/1x/LTE
- GsmCdmaPhone would use SimRecords irrespective of VOICE_RADIO_TECH value.
- *#0000# would show SimRecords or RuimRecords parameters based on current
phoneType and VOICE_RADIO_TECH.

For the configurations where simcard has Csimapp or just RuimApp.
- RuimRecords would be used in mcc/mnc lookup.
- *#0000# woud show RuimRecords parameters.

Change-Id: Ia82c675dd3e78c3fa16d785c75d29612e9188f20
Bug-Id: 37533579
smCdmaPhone.java
erviceStateTracker.java
fc892559b1718da93c307a8ec4836164e05ac312 19-Jan-2018 Nathan Harold <nharold@google.com> Cleanup of SignalStrength Parcel

Remove extraneous constructors from SignalStrength.
Add tests for SignalStrength to verify parceling.

Bug: 72116430
Test: runtest frameworks-telephony
Change-Id: I542450d825763290b2f9deeab4405465a9944d94
IL.java
est/SimulatedCommands.java
b2f5a5654299f65bd91e7f478c46f629e9416939 17-Jan-2018 Jun Yin <junyin@google.com> EuiccCard #1

EuiccCard extends UiccCard to provide eUICC functionality defined by
GSMA RSP specifications.

This CL is the first CL to migrate the existing EuiccCard code. It
adds the enums, exceptions, empty methods, and the implementation of
getting spec version from the opening logical channel response.
Other implementation of methods are added in following up CLs.

The patch #3 is the existing code and can be compared with the patch #4
to see the actual diff.

Bug: 38206971
Test: unit test
Change-Id: I3b64fd03c35cf8fa154f38423bdb8dad11a309b7
icc/euicc/EuiccCard.java
icc/euicc/EuiccCardErrorException.java
icc/euicc/EuiccCardException.java
icc/euicc/EuiccSpecVersion.java
icc/euicc/Tags.java
5d5800c4e65865feaead44f088d422c0530f4b08 23-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Add slot related APIs to UiccController."
816c53d2b1d9e8c1669a61020d5d3b164728f76f 23-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Add slot related APIs to UiccController."
02b348bccb2c88faf838c8157d2f35d8806a9e48 23-Jan-2018 Neil Fuller <nfuller@google.com> Merge "TimeServiceHelper changes to assist in next steps"
676d4eaac86486aca8076e777f6e7f1b8dd0620e 23-Jan-2018 Ying Xu <yinxu@google.com> Merge "Add radio config java library to build file" am: ae466994bb am: 5621f2918e
am: 9edf40fc8c

Change-Id: I10863cfe3eed7b2d5c5503434c6fc3b39eb57e48
1acc4c72ae6e1b7c38e36b96f65330c52b7fd58e 18-Jan-2018 Amit Mahajan <amitmahajan@google.com> Add slot related APIs to UiccController.

This CL adds broadcast for slot status changes and API to get
UiccSlot based on cardId

Test: Basic telephony sanity
Bug: 64131518
Merged-in: Ibbb9b109935c7c2760b4076bc8b2b583f0fada8d
Change-Id: Ibbb9b109935c7c2760b4076bc8b2b583f0fada8d
ubscriptionInfoUpdater.java
icc/IccSlotStatus.java
icc/UiccController.java
icc/UiccSlot.java
4b9e63e28958f4c3bdaf6990b3910d3d4375341d 23-Jan-2018 Lorenzo Colitti <lorenzo@google.com> Merge "Add the defaultNetwork parameter to the NetworkStats.Entry." am: fd998714bf am: 0366e7390b
am: 7a487fa77a

Change-Id: Ieb7bbe3f58198addaf9d91db3872f5b5b13bfba1
9edf40fc8c93be7f08acb69635843937b9b93cca 23-Jan-2018 Ying Xu <yinxu@google.com> Merge "Add radio config java library to build file" am: ae466994bb
am: 5621f2918e

Change-Id: I56aeaa28d4eac94673c486a424de18757c443541
7a487fa77a0bfc9b60f2ac6c85be19cdac9f7601 23-Jan-2018 Lorenzo Colitti <lorenzo@google.com> Merge "Add the defaultNetwork parameter to the NetworkStats.Entry." am: fd998714bf
am: 0366e7390b

Change-Id: I97990c80a9d8a66ead35da4228c67b9c4cec8d21
ae466994bb39c8785979916b628a00bfb788b071 23-Jan-2018 Ying Xu <yinxu@google.com> Merge "Add radio config java library to build file"
a390832d8693dee00505ef94bbba08384eebb3a1 22-Jan-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Add result metadata to time zone lookup results"
535e7d7e2e3908003f944b6f4ddd92a144b6b967 22-Jan-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Integrate IMS registration with ImsSmsDispatcher."
8b55cbe95ef5c0007cacf1727e239ab21da6cbaf 19-Jan-2018 yinxu <yinxu@google.com> Add radio config java library to build file

Bug: 64131518
Test: Basic telephony sanity
Change-Id: I7aef4ba361a893fbda8d23b30fcfaa8b85fb2e73
IL.java
adioIndication.java
adioResponse.java
93b0e5e1ffcee10da38d84cfa5ba26a0938195a4 19-Jan-2018 Mohamed Abdalkader <abdalkader@google.com> Integrate IMS registration with ImsSmsDispatcher.

- Get ImsService
- onImsService available, set sms listener as well as
reg and cap. callbacks.
- Add retry logic.
- return ImsSmsDispatcher.isAvailable() as true only if
ims service is up and registered and sms capable.

P.S. Logic for connecting to ims service and retry is
mostly coming from ImsPhoneCallTracker.

Test: manually testing failure and retry logic only now
as testing success case is not yet feisble.
BUG=69846044
Change-Id: Ibffbaefec9eaac74dbb0cd31cae9584f6a42135a
msSmsDispatcher.java
MSDispatcher.java
0dd01fcb63aaf7ecd0b6873dd2df15a38044cbb1 18-Jan-2018 Amit Mahajan <amitmahajan@google.com> Add slot related APIs to UiccController.

This CL adds broadcast for slot status changes and API to get
UiccSlot based on cardId

Test: Basic telephony sanity
Bug: 64131518
Change-Id: Ibbb9b109935c7c2760b4076bc8b2b583f0fada8d
ubscriptionInfoUpdater.java
icc/IccSlotStatus.java
icc/UiccController.java
icc/UiccSlot.java
26ac208cff13d9ad0ab31f761a90a858cab15a59 16-Jan-2018 Lorenzo Colitti <lorenzo@google.com> Add the defaultNetwork parameter to the NetworkStats.Entry.

This allows us to remove a NetworkStats.Entry constructor that is
used only by this code. DEFAULT_NETWORK_YES is used because VT
traffic uses the network specified by the carrier.

While I'm at it, also change "1" to NetworkStats.METERED_YES, so
the code is clearer about what it's doing.

Bug: 35142602
Test: builds, boots
Change-Id: I88a288ed03437c0945b221871919ea0f78a16ebe
msphone/ImsPhoneCallTracker.java
3355068596b9360f9f86a70205b3c4e606517bd5 20-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Broadcast new SIM state related intents." am: 6cb4e5ab3a am: ab9bf1669f
am: 02d594025a

Change-Id: I969c62f6cd140f9d3be83584e062873035241834
02d594025a15ef204db67d38034019701589dadd 20-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Broadcast new SIM state related intents." am: 6cb4e5ab3a
am: ab9bf1669f

Change-Id: I782a7cdecaac8ea06b9e7b057b6007ad6d445472
6cb4e5ab3ab86b0eb44ffd23347168f191e0339c 20-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Broadcast new SIM state related intents."
960cba728e02dbe7790b2cfb25797e4fab533216 20-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Make LOADED an external sim state." am: 87405c38a4 am: afc662dc6f
am: 82421e7ea5

Change-Id: I6de68ed774538dbd305c43de3fa0a85348fdaf18
e6717608b8baac4131bb1093d592d75fc8102bcc 20-Jan-2018 yinxu <yinxu@google.com> Merge "Add CARD_ID in SubscriptionInfo database" am: 29fe86bd1e am: 8e35d1bb3e
am: 6f9e68ea43

Change-Id: If8bead436109445fc9a2ec9dd99e3abe2fd77a3a
82421e7ea58618609d633e013a11b370c4ab7315 20-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Make LOADED an external sim state." am: 87405c38a4
am: afc662dc6f

Change-Id: Icf4158e8a28f791a553db5e71c3f24ac8abb2d62
6f9e68ea4362576950b1c4e9f9e384dee29620fb 20-Jan-2018 yinxu <yinxu@google.com> Merge "Add CARD_ID in SubscriptionInfo database" am: 29fe86bd1e
am: 8e35d1bb3e

Change-Id: I13ffe8a2434b79b578efa2e306094e758b7481b3
87405c38a484f094368190ac132c3ee738405429 20-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Make LOADED an external sim state."
29fe86bd1e95941ea0587764fd3e303806bc1579 20-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Add CARD_ID in SubscriptionInfo database"
720a8503cae3e2b74bd42df5ffbc00fb41175189 20-Jan-2018 Jack Yu <jackyu@google.com> Merge "Handled IPv4 without prefix length correctly" am: cfe4f30c19
am: eec8b360ce

Change-Id: Iad6307bce822267ab45f0a3940fbda05d727d019
00ed9996a174af7a815c57060393cd162258fd68 19-Jan-2018 Jack Yu <jackyu@google.com> Handled IPv4 without prefix length correctly

LinkAddress always takes address with prefix length. We should
add a prefix length to those IPv4 addresses. This is a regression
from aosp/586706. Also fixed the incorrect regex used to split the
addresses from the modem.

Test: Telephony sanity tests
bug: 72039489
Merged-In: I31fa1a343036370b28ce44fd895802804342dadd
Change-Id: I31fa1a343036370b28ce44fd895802804342dadd
(cherry picked from commit bf307ac11797b1a843e687a3f5e6170e20df244c)
IL.java
ataconnection/DataConnection.java
bf307ac11797b1a843e687a3f5e6170e20df244c 19-Jan-2018 Jack Yu <jackyu@google.com> Handled IPv4 without prefix length correctly

LinkAddress always takes address with prefix length. We should
add a prefix length to those IPv4 addresses. This is a regression
from aosp/586706. Also fixed the incorrect regex used to split the
addresses from the modem.

Test: Telephony sanity tests
bug: 72039489
Change-Id: I31fa1a343036370b28ce44fd895802804342dadd
IL.java
ataconnection/DataConnection.java
ac392f8357dcc6aa2a5d71bb070b5ee31d09c3d4 19-Jan-2018 Jordan Liu <jminjie@google.com> Merge "Make LTE signal bar thresholds customizable with carrier configuration" am: 0facf3c05f
am: cbc8dbee45

Change-Id: I77937997e4200fa1af533811031700a416c207cb
0facf3c05fc07d69270b41d804dc956366766e1f 19-Jan-2018 Jordan Liu <jminjie@google.com> Merge "Make LTE signal bar thresholds customizable with carrier configuration"
c641f4e8d7451c32416079bf50ce790cb5279c16 18-Jan-2018 Neil Fuller <nfuller@google.com> Add a cache of the last CountryTimeZones looked up

There should be strong consistency of the country being
looked up so it makes sense to have a cache near to the point
of use. The TimeZoneFinder object currently caches the
last one retrieved, but that's general purpose and may
be invalidated more regularly (and it may be removed).

Test: atest FrameworksTelephonyTests
Bug: 63743683
Change-Id: If0b2aa851c78141bfdb85fd78129d70e94ed8c06
imeZoneLookupHelper.java
7cecf024c258ae234dcaf124cc32ed0e6d0d929e 16-Jan-2018 Neil Fuller <nfuller@google.com> TimeServiceHelper changes to assist in next steps

For upcoming changes it makes more sense for the time-related
state to be accessible from TimeServiceHelper rather than
NitzStateMachine.DeviceState so these have moved.

Bug: 63743683
Test: atest FrameworksTelephonyTests
Change-Id: I9580140f730f3bce203069df7db9b390de799af3
itzStateMachine.java
imeServiceHelper.java
9c27d9c7c78f88afd6ac846a21384b09a0a50ee2 12-Jan-2018 Neil Fuller <nfuller@google.com> Add result metadata to time zone lookup results

This change adds metadata to time zone lookup results which
will enable more sophisticated / better detection logic
in future.

If the device is using multiple sources of time zone
detection then having metadata will enable it to compare
signals and go with the least ambiguous.

The main logic change is that TimeZoneLookupHelper will
return a CountryResult object from lookupByCountry() in
cases when the guessZoneIdByCountry() method that it
replaces returned null. Callers can now check the metadata
for suitability.

android.util.TimeUtils is no longer used for offset lookups,
instead the code goes direct to libcore's TimeZoneFinder
/ CountryTimeZones in all cases.

Included in this commit are some non-functional logging
improvements, comment changes, variable renames and inlining.

Test: atest FrameworksTelephonyTests
Bug: 63743683
Change-Id: I1e67cdb6b564ee8867e4fde361cbb509a3606e6c
itzStateMachine.java
elephonyComponentFactory.java
imeZoneLookupHelper.java
699a50a82642c198f4176671c8f050d5713ed95f 17-Jan-2018 Amit Mahajan <amitmahajan@google.com> Broadcast new SIM state related intents.

Test: Basic telephony sanity
Bug: 64131518
Change-Id: I3b82a6d1545a0a22b61d41d161c3fa992d45962e
ubscriptionInfoUpdater.java
3ff1f2150f175b1b81c209459df4d1b111da93a4 16-Jan-2018 Amit Mahajan <amitmahajan@google.com> Make LOADED an external sim state.

Test: Basic telephony sanity
Bug: 64131518
Change-Id: Ie651e903f462f97fa37d9f8c53a956988042b13c
icc/IccCardProxy.java
icc/UiccProfile.java
bc787f466f21d792253bb6a2742a11224af662cb 19-Jan-2018 Jeff Sharkey <jsharkey@android.com> Merge "Add ability to override subscriber capabilities." am: 626f24c798 am: be9c5861e2
am: 4313d91e11

Change-Id: Iac6854e371eae0865fae70d6487e48d0479e4f2b
4313d91e11502dc7dffcfeadbf9affbbfdd709bd 19-Jan-2018 Jeff Sharkey <jsharkey@android.com> Merge "Add ability to override subscriber capabilities." am: 626f24c798
am: be9c5861e2

Change-Id: I3d16043fbfd84ec2f2e6b2338dd63c2500805e65
49a78d91113d469dfd026d719874b084f5e18f75 18-Jan-2018 Mohamed Abdalkader <abdalkader@google.com> Merge "Implement ImsSmsDispatcher"
99e1eab9e37ba86b8a1c8f8c82264ccf73c1dcfe 18-Jan-2018 Jeff Sharkey <jsharkey@android.com> Add ability to override subscriber capabilities.

In a future set of CLs, NPMS will offer to override a handful of
capabilities on a per-subId basis. Respond to these overrides
in the telephony code.

Add basic locking around collections that were unprotected
against cross-thread interactions.

Test: bit FrameworksNetTests:android.net.,com.android.server.net.
Test: bit FrameworksTelephonyTests:com.android.internal.telephony.dataconnection.DataConnectionTest
Bug: 64133169
Change-Id: Ia66bc5f420c3678bd940bc02c2adaefc7b9ecf90
(cherry picked from commit 92c66f10cbdb5f50c462c7be24c120b6edb04584)
ataconnection/DataConnection.java
ataconnection/DcController.java
6c39c7fc7d7006ac636c15475b7768596d2d65b9 18-Jan-2018 Holly Jiuyu Sun <jiuyu@google.com> Merge "Add APIs to EuiccCardController." am: a077c6535b am: f0ec94228e
am: 79f22b4577

Change-Id: I8ac161ff0171877d90298345ca049a88ad572401
45bb7bd8318aa926fe29b9fe98454f99759f6a01 18-Jan-2018 Jeff Sharkey <jsharkey@android.com> Merge "Add "not congested" network capability." am: a69b5f5ae4 am: 990f305335
am: b642db482a

Change-Id: I3ffa235c6cb8096fa784e542cc6dcbbf86f317b1
8232eda374ce7dfa4c4cad5fc0b9b6e8c751f030 18-Jan-2018 sqian <shuoq@google.com> Merge "Carrier Id matching metrics dump" am: 0464627fef
am: ba7ef11f5c

Change-Id: I47daac8db436878ea36b0b32bb8ae51664fbdab1
79f22b4577c5cf3028494ece88f00b752f26e73b 18-Jan-2018 Holly Jiuyu Sun <jiuyu@google.com> Merge "Add APIs to EuiccCardController." am: a077c6535b
am: f0ec94228e

Change-Id: Iba8c4892342ca4ac36df3a2ced81b162dcaf9ed1
b642db482ad8e9a46b4b4c9aab74be9867fd6648 18-Jan-2018 Jeff Sharkey <jsharkey@android.com> Merge "Add "not congested" network capability." am: a69b5f5ae4
am: 990f305335

Change-Id: I97ca602c4d82d79acf205c32f5747aa90ea84b93
0464627feff2faabb4c24493362d4ece850a1d65 18-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Carrier Id matching metrics dump"
a077c6535b498ed7c259fa6a8cef6b5746fac858 18-Jan-2018 Holly Jiuyu Sun <jiuyu@google.com> Merge "Add APIs to EuiccCardController."
a69b5f5ae49d1d9974898cea697249863b7ad28f 18-Jan-2018 Jeff Sharkey <jsharkey@android.com> Merge "Add "not congested" network capability."
e2db420fc2d3820e096c0a41d2290b277d0f97b9 10-Jan-2018 Mohamed Abdalkader <abdalkader@google.com> Implement ImsSmsDispatcher

- Implement methods needed to do various sms operations.
- Add Ims Dispatcher to the dispatchers controller and use
if available. (availability impl will come with reg.)
- Astracting out handling result of
injecting sms result out of the injection logic.
- Introduce callback for abstracting out handling result
of handling status report out of dispatchers to share
logic with ImsSmsDispatcher.
- Add unit tests (More to come in a follow-up CL)

Test: manual + added unit tests
BUG=69846044
Change-Id: I7c4d597f68412e86bdd61aeb4c5e50b1256e2f92
ccSmsInterfaceManager.java
msSmsDispatcher.java
nboundSmsHandler.java
MSDispatcher.java
msDispatchersController.java
dma/CdmaSMSDispatcher.java
sm/GsmSMSDispatcher.java
til/SMSDispatcherUtil.java
dc7beba65c0d99f8ef49765ad3f98b9aa8506ffd 05-Jan-2018 sqian <shuoq@google.com> Carrier Id matching metrics dump

Test: Manual
Bug: 64131637
Change-Id: I8d87d9bea19642fe67c3f2078c458f7dcc3b538b
Merged-In: I8d87d9bea19642fe67c3f2078c458f7dcc3b538b
(cherry picked from commit 17943fccffd277477c627046df0c944ec86c4bf6)
etrics/TelephonyMetrics.java
7c715665410610518feb885bcb6fff557f349b33 18-Jan-2018 Chen Xu <fionaxu@google.com> Merge "add version to carrier identification metrics" am: ddde95c216
am: fab7839ac4

Change-Id: Ie33e33deed88c58a96499919cabba7f6cc654e04
ecd1d6928fde428a6edc3eb8fe8db6b4454290f9 18-Jan-2018 Tyler Gunn <tgunn@google.com> Merge "Shows "no answer" when phone dials a non-answering number." am: bbc4ad22be am: 6f5c4c7c83
am: 0e168a17fb

Change-Id: I5e1a0e382523ea4e56f6c81d9c5b0dc3556c0c3e
2fa223a93f27d2ea8b11214f29f1f4fdee8de4c0 22-Dec-2017 Holly Jiuyu Sun <jiuyu@google.com> Add APIs to EuiccCardController.

getEid() is sync. The other APIs are async.

Bug: 38206971
Test: test on phone
Change-Id: Ic40ccb4294db7422a79e3c26512845030f4611e9
uicc/EuiccCardController.java
0ebdda8b6519902868c5a5457afa10d23491cf25 18-Jan-2018 sqian <shuoq@google.com> Merge "Add Metrics for unknown Carrier Id" am: 2b10f902ab
am: b4bc8f5419

Change-Id: Ib757ea91eaf7baa4e55d1a3b7c0a196a940d227f
0e168a17fbf0766978dd10149573601b4c0d5d20 18-Jan-2018 Tyler Gunn <tgunn@google.com> Merge "Shows "no answer" when phone dials a non-answering number." am: bbc4ad22be
am: 6f5c4c7c83

Change-Id: I90f6c88310fc19a8cb25368b8e9b9f2303e333a0
6e1cc0dbffc66cfc8dcdc30068d02bdf0d009110 18-Jan-2018 Holly Jiuyu Sun <jiuyu@google.com> Merge "Add APIs to EuiccCardManager and EuiccCardController." am: 110cb405e2 am: 8bdd434529
am: b712dac009

Change-Id: I99a7b86af06a7cc465d6fde8a2f5d9e23ad7ded6
efedf3cb47c26dbdb4e8fbe7e16edb8189e9c58b 18-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Change to broadcast SIM_STATE_CHANGED only from SubscriptionInfoUpdater." am: 52a415304e am: a50652f2b0
am: 96251284ac

Change-Id: I6106c2ceb67e36d3a215d9a7a7734bbac08f0c9c
3d66e817e8258915ca81ff594d688489247873a7 14-Jan-2018 fionaxu <fionaxu@google.com> add version to carrier identification metrics

Bug: 64131637
Test: Maunal
Change-Id: If18b8be55b189913b7141a8acd34f48cd1016fbf
(cherry picked from commit c9dc12e0a3766fd5a0d16dd9ee0844dbe8f291b6)
Merged-in: If18b8be55b189913b7141a8acd34f48cd1016fbf
arrierIdentifier.java
etrics/TelephonyMetrics.java
b712dac00957e59959eac745be1d52b523179f23 18-Jan-2018 Holly Jiuyu Sun <jiuyu@google.com> Merge "Add APIs to EuiccCardManager and EuiccCardController." am: 110cb405e2
am: 8bdd434529

Change-Id: I48b527e056f8a5c7b1073bb1f0d04ce2e2994660
96251284ac40c8fe34045c767dc1278d01a9fbcc 18-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Change to broadcast SIM_STATE_CHANGED only from SubscriptionInfoUpdater." am: 52a415304e
am: a50652f2b0

Change-Id: Iecbb1640edbf7bbe38e3c2f8150ab50a176b5a26
403ae7e408ac1ed0b059d0edac5f3c6c78c54fee 18-Jan-2018 sqian <shuoq@google.com> Merge "Add Iccid_prefix in Carrier Idenfitication" am: ae3988d71a
am: d5dfdc9d01

Change-Id: Ie5cdcdeb9a0b2b1436204d2ead7e6529d6e9ac0d
daff8c504c576e41ff1788855c2f33d07aa1bada 18-Jan-2018 Brad Ebinger <breadley@google.com> Merge "Integrate Registration APIs" am: f728c0c026
am: 6d7ef63f0d

Change-Id: Ifdf256d00b4dd15f8d4d4131889aa33a691e906c
2b10f902ab4fcef03be098ae51dfc3971ae17399 18-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Add Metrics for unknown Carrier Id"
bbc4ad22bee55454ee9971b300d93e600f79b63a 17-Jan-2018 Tyler Gunn <tgunn@google.com> Merge "Shows "no answer" when phone dials a non-answering number."
e8b6e7887154aa5aa5f4548acf53eeb61cb1c918 05-Jan-2018 yinxu <yinxu@google.com> Add CARD_ID in SubscriptionInfo database

Test: Basic telephony sanity
Bug: 64131518
Change-Id: I5771ab704830d060141e8346f698c6aa532083a8
ubscriptionController.java
icc/UiccCard.java
110cb405e28cf16e4b8d2687b5561272f72f6bb5 17-Jan-2018 Holly Jiuyu Sun <jiuyu@google.com> Merge "Add APIs to EuiccCardManager and EuiccCardController."
554f31ad6510337143a3c36b52bba5244a0f94e0 17-Jan-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Tidy up clock adjustment code / logging"
52a415304e4c96c1d98dba37e7f12154fa8d816c 17-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Change to broadcast SIM_STATE_CHANGED only from SubscriptionInfoUpdater."
af714fa63d622ecf98a7ce10e27ba36a67f52fe0 17-Jan-2018 Chen Xu <fionaxu@google.com> Merge "apply new carrier id APIs" am: f26792b38e
am: 9ba4a27b96

Change-Id: I5756aa27d2d9633a685cba0133448b7787097d88
ae3988d71a10d61d9193342980a3eba1473af85b 17-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Add Iccid_prefix in Carrier Idenfitication"
f728c0c026cdfa113035f56baf7bb8105812e468 17-Jan-2018 Brad Ebinger <breadley@google.com> Merge "Integrate Registration APIs"
a984c97ee6533a84a2d9f2951f42ba0ec78bc77f 19-Dec-2017 Hall Liu <hallliu@google.com> Update method calls to avoid security errors

Package name is now used for non-debug reason when registering a
subscription changed listener, so use appropriate values instead of
debug strings.

Bug: 70681555
Test: manual
Change-Id: I8dea457dca33b73ca1f9958f33a77abb133fffd7
honeSwitcher.java
ubscriptionMonitor.java
95719cadc5d606bec05b02902f6dc0a8c45f5d58 15-Dec-2017 sqian <shuoq@google.com> Add Metrics for unknown Carrier Id

Add metrics field for carrier_id_table_version, score, gid1,
and carrier_id.

After carrier identification match score is calculated,
write metrics for any of below situations:
0) success matching
1) unknown mccmnc - the Carrier Id provider contains no rule
that matches the read mccmnc.
2) unknown gid1 - the Carrier Id provider contains some rule(s)
that match the read mccmnc, but the read gid1
is not matched within the highest-scored rule.

The design:
https://docs.google.com/document/d/1DHK8HH5KZu9sgmZFOmmTzxxGlD2zo1Eg5HfR0YcjS7c/edit

Test: atest FrameworksTestTelephony
Bug: 64131637
Change-Id: Ia3062882923974d4b459727df4fb27e6b3b5fd2c
Merged-In: Ia3062882923974d4b459727df4fb27e6b3b5fd2c
(cherry picked from commit 512e3c703f450c9a3067e97c52129365ca54811c)
arrierIdentifier.java
etrics/TelephonyEventBuilder.java
etrics/TelephonyMetrics.java
769ab7354530a88cb1b46fdb1bed1e97ec0db4b2 17-Jan-2018 sqian <shuoq@google.com> Add Iccid_prefix in Carrier Idenfitication

Bug: 64131637
Test: Manual
Change-Id: Ic7cbb8ed9b6357fafd1bf164876a25f52515b299
Merged-In: Ic7cbb8ed9b6357fafd1bf164876a25f52515b299
(cherry picked from commit cf7ff3fc0bd693404c4edfd5071af6ce64b36e83)
arrierIdentifier.java
icc/CarrierTestOverride.java
icc/IccRecords.java
icc/SIMRecords.java
f26792b38e8c3905378aec1c81ccc68a2d8c531e 17-Jan-2018 Chen Xu <fionaxu@google.com> Merge "apply new carrier id APIs"
d60e61445f0664aeba134a6635fce1bfd93744d4 16-Jan-2018 Amit Mahajan <amitmahajan@google.com> Change to broadcast SIM_STATE_CHANGED only from SubscriptionInfoUpdater.

There should be no change in behavior with this CL.

Test: Basic telephony sanity
Bug: 64131518
Change-Id: I7cf1c184fdc346619c2b0449a8233ebf942884af
ubscriptionInfoUpdater.java
icc/IccCardProxy.java
icc/UiccProfile.java
4431e1cf9215cf525f221edcbd7559d00b8a0fdf 28-Nov-2017 fionaxu <fionaxu@google.com> apply new carrier id APIs

1. apply new unknown_carrier_id API
2. send carrier_subscription_identity_changed broadcast

Bug: 64131637
Test: Build
Change-Id: I73c83071c9f16a75d809f5f51b397b23da27edb3
(cherry picked from commit 079e1e0f4f58e6d893aedee2947d0a60f99d1240)
Merged-in: I73c83071c9f16a75d809f5f51b397b23da27edb3
arrierIdentifier.java
hone.java
7c39347b6a658f99f05c5f32116813b10f76fa28 17-Jan-2018 Neil Fuller <nfuller@google.com> Merge changes from topic "telephony_aosp_cp" am: 64f7d20ea0
am: e0d10db02c

Change-Id: I50b54cee0ac9e37d478bbf7c3d8321f8b9632d11
d9e6f059920c2e5d7988c31d81e4f7afbbff002a 17-Jan-2018 Jun Yin <junyin@google.com> Merge changes from topic "apdu-sender" am: 7d2466bce6 am: ceb4788019
am: 270af1d75e

Change-Id: I2d0ab6913a81c1b69878f05de694d9e5f43a008c
64f7d20ea0a1af271888e496df0070b1510d341f 17-Jan-2018 Neil Fuller <nfuller@google.com> Merge changes from topic "telephony_aosp_cp"

* changes:
Make state transitions clearer in NitzStateMachine
Move time zone lookup logic
85f8b089d0eaa7665ccc86ddd874b78b2ec767bc 11-Jan-2018 Neil Fuller <nfuller@google.com> Tidy up clock adjustment code / logging

Tidy up some of the clock adjustment code. On a structural
level this removes a few unusual/edge cases that wouldn't
yield particularly useful results:

1) Looking for a UTC-based time zone in a country known not to
use UTC (unlikely to yield a result).
2) Adjusting the system clock when all that is known is the country
(this would previously have set the device to the time zone
the device is using, so probably a no-op).

In the actual adjustment code, rather than adjust the current
device system clock, the time from the NITZ signal is used instead.
The original purpose of this code was apparently to handle NITZ
data where the network is pushing out local time rather than
UTC so it makes sense to base the time off the NITZ data.

This change also makes some non-functional logging changes.

Test: atest FrameworksTelephonyTests
Bug: 63743683
Bug: 37494871
Change-Id: Id0fd20cbe9cf97911ec43eee847aa84b1b32b42f
itzStateMachine.java
imeZoneLookupHelper.java
270af1d75e9ec601df0283ef1dc7317603b6dfa5 17-Jan-2018 Jun Yin <junyin@google.com> Merge changes from topic "apdu-sender" am: 7d2466bce6
am: ceb4788019

Change-Id: I1c296ccc71b6451313bd4ba23df30f760b7f7a3a
3832f4da5cc7927fa1072b05b3455ac8b3f56d16 17-Jan-2018 Jeff Sharkey <jsharkey@android.com> Add "not congested" network capability.

Can be used by a network to indicate when it's congested, meaning that
apps should defer network traffic that could be done at a later time.

Test: bit FrameworksNetTests:android.net.,com.android.server.net.,com.android.server.connectivity.VpnTest,com.android.server.ConnectivityServiceTest
Bug: 64133169
Change-Id: Icfaff89c6ba15ccb6108ac95a52b3744c3c8a4b0
ataconnection/DataConnection.java
bdc36857ea6a798aa82e4cdba4bbd93675fb0c73 22-Dec-2017 Holly Jiuyu Sun <jiuyu@google.com> Add APIs to EuiccCardManager and EuiccCardController.

Bug: 38206971
Test: test on phone
Change-Id: Iada31d594fa1c4747e28567c736710658e4f9258
uicc/EuiccCardController.java
5d189431096e8e339507cff6414cf403116b9cc6 25-May-2016 Honggang <honggang.x.luo@sonymobile.com> Shows "no answer" when phone dials a non-answering number.

When call is failed with cause code 19, map it to
DisconnectCause.TIMED_OUT.

Test: manual
Bug: 32007762
Change-Id: Ib03b652293926a977599c449d8807771d7790165
smCdmaConnection.java
388fa40468c01b8959ae4bac688241b6d362820f 09-Jan-2018 Jun Yin <junyin@google.com> ApduSender

ApduSender sends a list of APDU commands to an AID on a UICC. A
logical channel will be will be opened before sending and closed
after all APDU commands are sent.

Bug: 38206971
Test: unit test
Change-Id: I59796b82cf3f1aed1132c5f0ad83cd6fa5f3f006
icc/euicc/apdu/ApduException.java
icc/euicc/apdu/ApduSender.java
6d5e9e59f5c2fb0709de90b36477e2d7d9353c83 09-Jan-2018 Jun Yin <junyin@google.com> RequestBuilder for ApduSender

RequestBuilder helps build a list of APDU commands that are sent by
ApduSender. ApduSender accepts a RequestProvider instance to get all
APDU commands after a logical channel is opened. The caller to an
ApduSender can generate different APDU commands based on the select
response of the opened logical channel. This is used by EuiccCard to
provide the implementations for different GSMA RSP specifications.

Bug: 38206971
Test: unit test on the ApduSender CL of the same topic
Change-Id: Icab30ca17a19576a6272a7cb8cc7b8d2cc666003
icc/euicc/apdu/RequestBuilder.java
icc/euicc/apdu/RequestProvider.java
67d903ab56951a47bd9f6a7c3763bf9ec30e1ff8 09-Jan-2018 Jun Yin <junyin@google.com> AsyncMessageInvocation and implementations

AsyncMessageInvocation wraps an invocation to an asynchronous method
using Message to be working with AsyncResultCallback. This CL adds
three implementations for opening logical channel, transmitting APDU
via logical channel, and closing logical channel on the async methods of
CommandsInterface.

Bug: 38206971
Test: unit test on the ApduSender CL of the same topic
Change-Id: I0621a0e8b1f4d5e1eb6409427ec814d0dee09de9
icc/euicc/apdu/ApduCommand.java
icc/euicc/apdu/CloseLogicalChannelInvocation.java
icc/euicc/apdu/OpenLogicalChannelInvocation.java
icc/euicc/apdu/TransmitApduLogicalChannelInvocation.java
icc/euicc/async/AsyncMessageInvocation.java
1a3b3d7282440ad115a0916d196989d6c364a6f3 17-Jan-2018 Chen Xu <fionaxu@google.com> Merge "add version to carrier identification metrics"
6488cddea0949edebf4712b36a10e25d4839b3a8 16-Jan-2018 Pankaj Kanwar <pkanwar@google.com> Merge "Address IMSI privacy issues."
3b2136dbf4a8d00086c4df10858ffd4709a04a9d 16-Jan-2018 Brad Ebinger <breadley@google.com> Merge "IMS: De-registration happens when modem comes up from low power mode." am: ce0d687bb7 am: a30d5d4e76
am: eb601a3a35

Change-Id: Ib0e82df4ff6814f7f2bbc847bb1e128d277bde55
eb601a3a35f7ce945bab79c8100980fdaf1477ba 16-Jan-2018 Brad Ebinger <breadley@google.com> Merge "IMS: De-registration happens when modem comes up from low power mode." am: ce0d687bb7
am: a30d5d4e76

Change-Id: I7e15230e9052767b62b2f149e757a2a2c046e797
c9dc12e0a3766fd5a0d16dd9ee0844dbe8f291b6 14-Jan-2018 fionaxu <fionaxu@google.com> add version to carrier identification metrics

Bug: 64131637
Test: Maunal
Change-Id: If18b8be55b189913b7141a8acd34f48cd1016fbf
arrierIdentifier.java
etrics/TelephonyMetrics.java
ce0d687bb704dfb2a13c1151afe80cc1cafa5e6e 16-Jan-2018 Brad Ebinger <breadley@google.com> Merge "IMS: De-registration happens when modem comes up from low power mode."
103fc28eb88f01d5d14da1954cee2132913365a2 16-Jan-2018 Ying Xu <yinxu@google.com> Merge "Modify the SIM state "Ready" and "Loaded"" am: da79e5d5b5 am: 7440ed35ef
am: bc1ffbedae

Change-Id: If84c13d4e9179eb3b35e2df70b273f88b4eeaaeb
bc1ffbedae6e9ce26ccd51387ad316167d4c41f7 16-Jan-2018 Ying Xu <yinxu@google.com> Merge "Modify the SIM state "Ready" and "Loaded"" am: da79e5d5b5
am: 7440ed35ef

Change-Id: I26c4d9ebab702c190a2e0236ded0588b3e68c7fd
da79e5d5b5fea477c80de49ffd1c3ed5409d76a4 16-Jan-2018 Ying Xu <yinxu@google.com> Merge "Modify the SIM state "Ready" and "Loaded""
ed16f2086bc68036453ddd077afd5cf550ac4d0f 14-Dec-2017 Brad Ebinger <breadley@google.com> Integrate Registration APIs

1) Pipe ImsRegistration interface through ImsResolver
so that ImsManager can access the ImsService's
Registration APIs.

2) Tear down ImsManager when the ImsService becomes
unavailable and recreate it with the new ImsService.

3) Update namespaces.

Bug: 63987047
Test: Manual, Telephony unit tests
Merged-In: I1e07e15bc8effc06a4687183f0e67f4e253656ab
Change-Id: I1e07e15bc8effc06a4687183f0e67f4e253656ab
ms/ImsResolver.java
ms/ImsServiceController.java
msphone/ImsPhoneCallTracker.java
b13dd1cb26a23117f1e3958612b8f56dfde4bc39 16-Jan-2018 Brad Ebinger <breadley@google.com> Merge "Integrate Registration APIs"
65e348e11a3fbe1e9ce2c582ab4c01cf2f604486 16-Jan-2018 Pengquan Meng <mpq@google.com> Merge "Fixed phone crash issue on no-sim device" am: 457db48e0f am: 53d20e7da4
am: 1e19b5a765

Change-Id: I4ed54b5bf4856422f869981859a79c2be3e96f08
1e19b5a7656ef186f7f524dfd5888ccfa20f89a9 16-Jan-2018 Pengquan Meng <mpq@google.com> Merge "Fixed phone crash issue on no-sim device" am: 457db48e0f
am: 53d20e7da4

Change-Id: I4dd68b5f0bd8cd2a3b056a5644c3683691715ba2
457db48e0f840617fd84f572f7161b273e798431 16-Jan-2018 Pengquan Meng <mpq@google.com> Merge "Fixed phone crash issue on no-sim device"
6c3b2891674897c472dba463a2788203fce140c6 14-Dec-2017 Brad Ebinger <breadley@google.com> Integrate Registration APIs

1) Pipe ImsRegistration interface through ImsResolver
so that ImsManager can access the ImsService's
Registration APIs.

2) Tear down ImsManager when the ImsService becomes
unavailable and recreate it with the new ImsService.

3) Update namespaces.

Bug: 63987047
Test: Manual, Telephony unit tests
Change-Id: I1e07e15bc8effc06a4687183f0e67f4e253656ab
ms/ImsResolver.java
ms/ImsServiceController.java
msphone/ImsPhoneCallTracker.java
9407e359fecae71d261bf901b096a6d4eae32ab5 15-Jan-2018 Yuan Ye <yuan.ye@sony.com> Merge "Reset carrier actions when APN change" am: 3860bcb2da am: d344f6f125
am: 309a82f265

Change-Id: I71ae7ef97bb63692d91ca68084fb67f5471d2716
309a82f265594b1bf9eaf5215b44731a09474479 15-Jan-2018 Yuan Ye <yuan.ye@sony.com> Merge "Reset carrier actions when APN change" am: 3860bcb2da
am: d344f6f125

Change-Id: Ic375bdfb9b23325d57b8451c1b4df395e51922eb
3860bcb2da032b4462c452fdbe2929d021403f08 15-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Reset carrier actions when APN change"
34d6bf935f8a5441d423c0faa7c8ae531f74bb10 18-Nov-2017 pkanwar <pkanwar@google.com> Address IMSI privacy issues.

Added method resetCarrierKeysForImsiEncryption
to allow for keys to be reset.

Bug: 35606429
Test: manual
Change-Id: I2c1958d78984dfb1c3904575440ce5053b7323bc
arrierInfoManager.java
arrierKeyDownloadManager.java
smCdmaPhone.java
hone.java
honeInternalInterface.java
honeSubInfoController.java
d11c42730d50404b50e876bff4a299d9f45b3c46 19-Dec-2017 Neil Fuller <nfuller@google.com> Make state transitions clearer in NitzStateMachine

All state transitions are triggered in "handleXyz"
methods and ServiceStateTracker calls them at obvious
places.

Some of the logic when the MCC becomes known has been
pulled together into a single method from several
separate calls. This change may introduce some
functional changes as a result of these changes.
A field has been renamed to try to make the logic
still clearer now the state is not inspected by
ServiceStateTracker.

An additional call has been added to
handleNetworkUnavailable() in a place where it seems
appropriate.

The interface between ServiceStateTracker and
NitzStateMachine should be stable at this point,
allowing for NitzStateMachine to become an abstract
or interface class and enable an alternative
implementation to be swapped in.

Test: atest FrameworksTelephonyTests
Bug: 63743683
Change-Id: I2e03f9bbce06e2a03b32e467deb2a0a269adecb8
Merged-In: I2e03f9bbce06e2a03b32e467deb2a0a269adecb8
(cherry picked from commit bb8be93846561a7dcff8882e0b2a8a824ba6a47f)
itzStateMachine.java
erviceStateTracker.java
758a3446fb252a7678553d73489da2db0a1e4ee6 17-Dec-2017 Neil Fuller <nfuller@google.com> Move time zone lookup logic

Move time zone lookup logic into a separate TimeZoneLookupHelper which
can be independently tested and improved. Tests for all methods there
have been added / migrated & improved.

This also allows the lookup behavior to be mocked for NitzStateMachineTest
which has been adjusted accordingly. An additional test has been added
to demonstrate.

TimeStampedValue has been moved to a top-level class under util so
it can be used more widely and from tests.

Test: atest FrameworksTelephonyTests
Bug: 63743683
Change-Id: I2ff15b1355d5ba690198c5943bcb0faed17d8210
Merged-In: I2ff15b1355d5ba690198c5943bcb0faed17d8210
(cherry picked from commit a0f09cee0f6328ea104b9ef965a387b4a4652e8a)
itzData.java
itzStateMachine.java
erviceStateTracker.java
imeZoneLookupHelper.java
til/TimeStampedValue.java
c8d912f6e6cd54c2b52fa42df0400e728c480855 13-Jan-2018 zxuan <zxuan@google.com> Merge "Notify the listener when user change the mobile data status toggle." am: 64c6af7e1f am: 95e913309d
am: 0a71a18050

Change-Id: I3682d35b2598d6a33ae1d29773c40c128ddc323f
0a71a180505710e7cd1f03961ec7db894d7eb409 13-Jan-2018 zxuan <zxuan@google.com> Merge "Notify the listener when user change the mobile data status toggle." am: 64c6af7e1f
am: 95e913309d

Change-Id: Ibb2dfb5134c71020c82f360574538606ec142ffb
64c6af7e1fee01c66cda22c72cadca6b9299db88 13-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Notify the listener when user change the mobile data status toggle."
865116e1846a0e2985feafaedab54449d7d17307 13-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Fixing values for LOCKED_REASON constants in IccRecords." am: 7280eb4b0a am: 674be59d51
am: 7c5e6b4a5d

Change-Id: I78b85c1046ec7b84fe099010f05ea696cb39d5bf
7c5e6b4a5d719d7e0ee756f2084e10f5a4671dd5 13-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Fixing values for LOCKED_REASON constants in IccRecords." am: 7280eb4b0a
am: 674be59d51

Change-Id: I7ee2aaa0079cdf71f7e3dc2549ff6ad0c4b68240
9571ce9ea32bbceada34b5b344303a55232d8699 13-Jan-2018 Jack Yu <jackyu@google.com> Merge "Used LinkAddress insteaad of InterfaceAddress" am: c5ad2f0f29
am: bbc51b3794

Change-Id: I51fb5c4ca713d39cf82604c35928e80606a9086d
7280eb4b0a300bceb8e9268a902c8488930b1771 13-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fixing values for LOCKED_REASON constants in IccRecords."
c5ad2f0f296544343d610557b4d34d6ddd41d469 13-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Used LinkAddress insteaad of InterfaceAddress"
4420729e6ecca7211169a30b6db0fb70bf68e4d9 13-Jan-2018 Malcolm Chen <refuhoo@google.com> Merge "Replace ImsManager static methods with proper ones." am: 11f6ad9c72
am: caa2e92067

Change-Id: I84b61d727d21be230565c44c8e1a1f4945513b64
72f2ccce2531c3e30084040655036a7f7b2072dc 13-Jan-2018 Pengquan Meng <mpq@google.com> Fixed phone crash issue on no-sim device

Bug: 71803372
Test: manual
Change-Id: I6a374f619672aa32d0b4f6362b3937c05e2fa144
arrierServiceBindHelper.java
ea3a4caa4fe516faceeaf47da08fad349df7eb5a 21-Dec-2017 yinxu <yinxu@google.com> Modify the SIM state "Ready" and "Loaded"

In old implementation, "Ready" and "Loaded" are only related to the
current UiccCardApplication. In this CL, those two states are modified
to represent all the available UiccCardApplication of the profile.

Bug: 64131518
Test: Basic telephony sanity

Change-Id: I8e901fd9549859ea4489e645c60ffffaa4c6e78d
adioResponse.java
icc/IccRecords.java
icc/IsimUiccRecords.java
icc/RuimRecords.java
icc/SIMRecords.java
icc/UiccCardApplication.java
icc/UiccProfile.java
06e7286b5b3cc0fdbf09985adb553c7698e4f2c9 11-Jan-2018 Jack Yu <jackyu@google.com> Used LinkAddress insteaad of InterfaceAddress

Also removed InterfaceAddress which was added
in aosp/561351 since LinkAddress is exactly same
as InterfaceAddress.

Test: Telephony sanity tests
bug: 64132030
Merged-In: Iefc12dd025edb4f67cf0e9080da1ad8d6cfb63b5
Change-Id: Iefc12dd025edb4f67cf0e9080da1ad8d6cfb63b5
(cherry picked from commit 129675838ba8258b6c9ddba93c31fe15f17346a4)
IL.java
ataconnection/DataConnection.java
est/SimulatedCommands.java
15005fed3327bbc9b4fb6ad536d69596340438b9 13-Jan-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Used LinkAddress insteaad of InterfaceAddress"
860ee3d98a33eb386a490dea04c1ace5f1d17916 13-Jan-2018 Amit Mahajan <amitmahajan@google.com> Fixing values for LOCKED_REASON constants in IccRecords.

Test: Basic telephony sanity
Bug: 64131518
Change-Id: I23840d09a4ba699f2a85ef2745d7fdb1e89a7186
icc/IccRecords.java
11f6ad9c72a4c0d2a676aac07b1a4ca4a2c4b0af 13-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Replace ImsManager static methods with proper ones."
ba19cf14ae39f88f1082069be643960df9e4b819 13-Jan-2018 Jun Yin <junyin@google.com> Merge "EuiccSpecVersion" am: 064f8206fd am: bf0353d827
am: 4d6cadeb9b

Change-Id: Ic7133f321ffaeef04795e9c3182738b2c9ae38cd
3e349c141550ca2cc0f732628de5a17ebde37453 13-Jan-2018 Mohamed Abdalkader <abdalkader@google.com> Merge "Refactor SMSDispatcher and friends."
4d6cadeb9b440b786f91ab44c014e92deeb5ab04 13-Jan-2018 Jun Yin <junyin@google.com> Merge "EuiccSpecVersion" am: 064f8206fd
am: bf0353d827

Change-Id: I8450ab0daba824239c8d9cf61606013b09c791bf
064f8206fdca5a6c9ad5b64afab3332f8ada4b7d 12-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "EuiccSpecVersion"
75329293e3c0e298deeb310811f70e5d01691772 13-Dec-2017 Malcolm Chen <refuhoo@google.com> Replace ImsManager static methods with proper ones.

ImsManager static methods are deprecated since it doesn't support
MSIM devices. It will now always call getInstance with phoneId and
then call corresponding non-static methods.

Bug: 67602046
Test: regression tests
Change-Id: I1253249a414cc9be45d5fbbab182911144a30c32
Merged-In: I1253249a414cc9be45d5fbbab182911144a30c32
smCdmaPhone.java
hone.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
29a58aea664014e9d4e0e1ed4b6914e032fca7dc 05-Jan-2018 Mohamed Abdalkader <abdalkader@google.com> Refactor SMSDispatcher and friends.

Right now ImsSmsDispatcher acts as both a controller that
has pointers to gsm and cdma dispatchers as well as a
dispatcher itself by extending SmsDispatcher, making the
hirarechy convulted.

For example some methods it override but should not invoke
and some methods cdma and gsm dispatchers override but should
not invoke.

Instead this CL converts ImsSmsDispatcher into a proper controller
in preparation for adding a proper ImsSmsDispatcher.

While here also cleaned up a few things like removing duplicate code.

Test: send/receive ims and non-ims manually
Bug: 69846044
Change-Id: Iee97dbaf2284a04eebad28d3a8da627c283cc8a6
ccSmsInterfaceManager.java
msSMSDispatcher.java
msSmsDispatcher.java
MSDispatcher.java
msDispatchersController.java
dma/CdmaSMSDispatcher.java
sm/GsmSMSDispatcher.java
til/SMSDispatcherUtil.java
a0f8de027b4dc2e9bcaa995297157a0d6ea444db 12-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Read ICCID before broadcasting intent for network locked SIM." am: ceadaa5d30 am: 076e8f5e0e
am: 68b5c6f6aa

Change-Id: I9f182a0c25b89a7ccf798329096ca24aa31d0c5c
68b5c6f6aafaba6f6634dfb6c1bb863eb528d2b3 12-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Read ICCID before broadcasting intent for network locked SIM." am: ceadaa5d30
am: 076e8f5e0e

Change-Id: Ic73f4131986ac86c3d665b89a0f727566b3c3db5
129675838ba8258b6c9ddba93c31fe15f17346a4 11-Jan-2018 Jack Yu <jackyu@google.com> Used LinkAddress insteaad of InterfaceAddress

Also removed InterfaceAddress which was added
in aosp/561351 since LinkAddress is exactly same
as InterfaceAddress.

Test: Telephony sanity tests
bug: 64132030
Change-Id: Iefc12dd025edb4f67cf0e9080da1ad8d6cfb63b5
IL.java
ataconnection/DataConnection.java
est/SimulatedCommands.java
beb158d3889cb00ed173db55f02f35c99c6653c9 12-Jan-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Add target package to VisualVoicemailFilterSettings."
d767b44c4bdd43ef09d98637eb1ab69552dff24f 10-Jan-2018 Amit Mahajan <amitmahajan@google.com> Read ICCID before broadcasting intent for network locked SIM.

Test: Basic telephony sanity
Bug: 64131518
Change-Id: I4cf20e96c598c7709a63a55f0addab758768744a
icc/IccCardProxy.java
icc/IccRecords.java
icc/IsimUiccRecords.java
icc/RuimRecords.java
icc/SIMRecords.java
icc/UiccCardApplication.java
icc/UiccProfile.java
f9f95ea47133739f74dcbf65c0cb45695d43d33a 09-Jan-2018 Jun Yin <junyin@google.com> EuiccSpecVersion

EuiccSpecVersion represents a GSMA RSP specification version for parsing
and comparison.

Bug: 38206971
Test: unit test
Change-Id: I3fe6d85d5fcb0dcd8f008cae0d863438556a2cfa
icc/euicc/EuiccSpecVersion.java
21b95cb2e85544e9cd8bf18a1acac2f15b14dc77 01-Dec-2017 Kitta Koutarou <koutarou.x.kitta@sonymobile.com> Make LTE signal bar thresholds customizable with carrier configuration

Set the threshold of LTE signal bar to SignalStrength.

Test: manual - Checked that the LTE signal bar thresholds can be
controlled by carrier config.
Test: auto - Confirmed that run
ServiceStateTrackerTest#testSignalStrength and it has no problem.
Bug: 70698348
Change-Id: I65ac32944903193b2a93d3850a02d588624ee9fb
Merged-In: I65ac32944903193b2a93d3850a02d588624ee9fb
erviceStateTracker.java
0a0260f37a6f24ec1ff0aea6654583343a972434 12-Jan-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Make LTE signal bar thresholds customizable with carrier configuration"
f2575cd456dc544f2dd688cc92fd65655a0c6781 12-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Change to use new slot related RIL APIs." am: c10a3e2f53
am: 0b45062428

Change-Id: I9f496af16b1a5262615575771f91ae5b9f0b37cf
2646c38b6c6527991d007641e021086e7cdb2022 12-Jan-2018 Holly Jiuyu Sun <jiuyu@google.com> Merge "Add EuiccCardManager and EuiccCardController." am: 74f2b39b59
am: b172b2ddac

Change-Id: I451d447d6560d8efc12ec17df596771fa2e0aa2f
c10a3e2f53a0e7ede21f6dd2a7e5d43231c05eea 11-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Change to use new slot related RIL APIs."
c74159c919a20eac3819a61a297e3d7c3effa87c 11-Jan-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Change to use new slot related RIL APIs."
74f2b39b59de6069c2db8a43d5b22873a9448273 11-Jan-2018 Holly Jiuyu Sun <jiuyu@google.com> Merge "Add EuiccCardManager and EuiccCardController."
b37050e095f60f6db0b3b5cd7d98af78835006ea 11-Jan-2018 Tyler Gunn <tgunn@google.com> Add support for notification of midcall video call radio handovers. am: 02761d2406
am: 956462b45b

Change-Id: I3c6a59e9802bb11efec2f3cec6dab34f4e74154b
956462b45b4b8d3c45261827f756a84b1b829d5d 11-Jan-2018 Tyler Gunn <tgunn@google.com> Add support for notification of midcall video call radio handovers.
am: 02761d2406

Change-Id: Icf6889eb3b69203216feb07a7c793cf334619976
ce32bfe78ca1e8e30f30c04457ce8c700086f769 06-Jan-2018 Amit Mahajan <amitmahajan@google.com> Change to use new slot related RIL APIs.

Test: Basic telephony sanity
Bug: 64131518
Merged-in: Iaa40e400eb99c9582995d64d9e53969e208c5395
Change-Id: Iaa40e400eb99c9582995d64d9e53969e208c5395
adioIndication.java
est/SimulatedCommands.java
icc/IccCardStatus.java
icc/UiccController.java
icc/UiccSlot.java
icc/UiccStateChangedLauncher.java
7aac0858ed9535dbb56baa34f00879bc6b9e960b 06-Jan-2018 Amit Mahajan <amitmahajan@google.com> Change to use new slot related RIL APIs.

Test: Basic telephony sanity
Bug: 64131518
Change-Id: Iaa40e400eb99c9582995d64d9e53969e208c5395
adioIndication.java
est/SimulatedCommands.java
icc/IccCardStatus.java
icc/UiccController.java
icc/UiccSlot.java
icc/UiccStateChangedLauncher.java
9e2da25abcd17f5a12642c5a3370e73885eef5b6 11-Jan-2018 yinxu <yinxu@google.com> Merge "Use correct UID for network setting menu" am: 2915575fc8 am: c2e8af4664
am: 321ac08a11

Change-Id: I3be9dcf54dd077aed18fb6ace55595fc112f829d
321ac08a1127268f1a9d696c083016aa90b68a02 11-Jan-2018 yinxu <yinxu@google.com> Merge "Use correct UID for network setting menu" am: 2915575fc8
am: c2e8af4664

Change-Id: Ie21a5e618ef459850b97b7eb9b65e3d18edb941e
2915575fc846c539b6e74e0eb17f6cda87a4ef2d 11-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Use correct UID for network setting menu"
da70560d7b8cebfd3c5d3b58a343c6b2159a6d49 15-Dec-2017 Tyler Gunn <tgunn@google.com> Handle SIP 380 code mapped from the modem.

The modem will remap SIP 380 to ImsReasonInfo.CODE_SIP_ALTERNATE_EMERGENCY_CALL.
Adding support to remap this to the "turn off airplane mode to make a call"
error code.

Test: Manually tested (hardcode error code), added mapping unit test.
Bug: 69024173
Change-Id: I79eddc1852e2e7cdb428de44d6211ea7958a58a4
msphone/ImsPhoneCallTracker.java
1f0fdbc2b2f3cb69016fff078bb8944379b89bf3 01-Dec-2017 Kitta Koutarou <koutarou.x.kitta@sonymobile.com> Make LTE signal bar thresholds customizable with carrier configuration

Set the threshold of LTE signal bar to SignalStrength.

Test: manual - Checked that the LTE signal bar thresholds can be
controlled by carrier config.
Test: auto - Confirmed that run
ServiceStateTrackerTest#testSignalStrength and it has no problem.
Bug: 70698348
Change-Id: I65ac32944903193b2a93d3850a02d588624ee9fb
erviceStateTracker.java
f57225cc89b6dbc5d29126ef5b2d2f6227888509 22-Dec-2017 Holly Jiuyu Sun <jiuyu@google.com> Add EuiccCardManager and EuiccCardController.

EuiccCardManager is in the same path with EuiccManager.
EuiccCardController is in the same path with EuiccController.
Use getAllProfiles() as an example interface.
The implementation of EuiccCard and its content will be added in a
follow up CL.

Bug: 38206971
Test: test on phone
Change-Id: I9f09da5305cb2d3c9444692e96c308f291b6ae26
Merged-In: I9f09da5305cb2d3c9444692e96c308f291b6ae26
honeFactory.java
uicc/EuiccCardController.java
5eb2d6142e7f427557ff9e6b85bbc3a7c2b4f8ea 11-Jan-2018 Jiuyu Sun <jiuyu@google.com> Merge "Add EuiccCardManager and EuiccCardController."
378b2f69dee002ae237d11c5add7bb26c8e77a6f 11-Jan-2018 Cassie Han <xih@google.com> Merge "Add cellInfoList_1_2 in IRadioIndication.java." am: f06ecc797f am: 659ca24b06
am: 29d554c346

Change-Id: I93962766710dca37cf78a2b8a68284ac120df345
29d554c3466e49e86ff348092aa1145adc74339e 11-Jan-2018 Cassie Han <xih@google.com> Merge "Add cellInfoList_1_2 in IRadioIndication.java." am: f06ecc797f
am: 659ca24b06

Change-Id: I2261b160d0884d6e0b7e595d7e1340ebc2df319f
f06ecc797fc5e86ef8dde203d40ed1b4de38db0e 11-Jan-2018 Cassie Han <xih@google.com> Merge "Add cellInfoList_1_2 in IRadioIndication.java."
7dd437b55dae4748f59cb4fcedb88db315783e05 11-Jan-2018 youhei yamahata <youhei.yamahata@sony.com> Merge "The re-try flag is not set to true when re-sending SMS at second time" am: d28dd923c1 am: 3619f08192
am: fc8a19e5a8

Change-Id: I2e894912e1a1d233401ed192a956ae781ea0e346
fc8a19e5a8cc393e2cfba78aa647529ecec79480 11-Jan-2018 youhei yamahata <youhei.yamahata@sony.com> Merge "The re-try flag is not set to true when re-sending SMS at second time" am: d28dd923c1
am: 3619f08192

Change-Id: Ic5c80732a17d80f9c691aeb4970bf1bd3d494004
d28dd923c1e6134814f49d4f2a06296caa0480b6 11-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "The re-try flag is not set to true when re-sending SMS at second time"
8f8f52d5c0f6bd6bea6e0b846105faa5b4d05ce8 22-Dec-2017 Holly Jiuyu Sun <jiuyu@google.com> Add EuiccCardManager and EuiccCardController.

EuiccCardManager is in the same path with EuiccManager.
EuiccCardController is in the same path with EuiccController.
Use getAllProfiles() as an example interface.
The implementation of EuiccCard and its content will be added in a
follow up CL.

Bug: 38206971
Test: test on phone
Change-Id: I9f09da5305cb2d3c9444692e96c308f291b6ae26
honeFactory.java
uicc/EuiccCardController.java
35e7223960fbce2e0e615be1a873edd2a44e5d1e 10-Jan-2018 Qingxi Li <qingxi@google.com> Merge "Add API EuiccController#startOtaUpdatingIfNecessary" am: 8a86293baa
am: 32f9230879

Change-Id: Ie805859c4b412e22d15dd4238e3d30d2c702d4d6
ba9b9eb7bc7850e198290371dc3d780ea84203bf 10-Jan-2018 Neil Fuller <nfuller@google.com> Merge "Make state transitions clearer in NitzStateMachine"
b4db55a186bc26337475fbad6c79083ef2d42663 10-Jan-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Move time zone lookup logic"
8a86293baa6d2fb7fb8024abfc5cc89c11a64d79 10-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Add API EuiccController#startOtaUpdatingIfNecessary"
33d94ef1234a57cf85fca078df8da1290fdab06c 10-Jan-2018 Jack Yu <jackyu@google.com> Merge "Added Cell identity for TD-SCDMA and a base class CellIdentity" am: 60d720f2e8 am: 7dfdf2ca79
am: 147052c32e

Change-Id: I15a55681fb50a1bfcf08eadaf6aaf816511e42f3
147052c32eeaca39346f97edf731ecda3e026ae1 10-Jan-2018 Jack Yu <jackyu@google.com> Merge "Added Cell identity for TD-SCDMA and a base class CellIdentity" am: 60d720f2e8
am: 7dfdf2ca79

Change-Id: I8a61f0eb66819f0c07e96950ea6a21d96465edd1
0a2c99b130f4c0a15cbb56749570d5a780f254a2 15-Dec-2017 Qingxi Li <qingxi@google.com> Add API EuiccController#startOtaUpdatingIfNecessary

This function requests calling app has WRITE_EMBEDDED_SUBSCRIPTIONS
permission. It will check whether the OTA update needed to be done
first. If current eUICC OS isn't latest one and OTA needed to be
performed, it will update eUICC OS. When the OS update is started or
finished, a broadcast will be sent.

Bug: 37279356
Test: Included
Merged-In: I68f88dd01f23259859f6069046a96fa23b880c24
Change-Id: I68f88dd01f23259859f6069046a96fa23b880c24
uicc/EuiccConnector.java
uicc/EuiccController.java
1c0f41d254d597623f43c0e073d3f9f3431c8cdb 10-Jan-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Carrier Id matching metrics dump"
30aa266b6d45242169193860b2029a2fdf73bcc7 04-Jan-2018 yinxu <yinxu@google.com> Use correct UID for network setting menu

Bug: 67748005
Test: Basic telephony sanity
Change-Id: Id3e6498c52b0f26a19bad66f3c775bae4490c921
etworkScanRequestTracker.java
60d720f2e820c1175258d7354d0073c1bb702830 10-Jan-2018 Jack Yu <jackyu@google.com> Merge "Added Cell identity for TD-SCDMA and a base class CellIdentity"
481ea68786a6ec20f01391233b1ed78ffa16a3fc 10-Jan-2018 Jordan Liu <jminjie@google.com> Merge "Extend CallFailCause to distinguish more precise code" am: 4c5c451076 am: a0c716068c
am: d3a5baf4cb

Change-Id: I39e53d4f27767cddbfadeb6d62aff2e99b1cc28b
d3a5baf4cbc941df2838e8f0127c83f2948be326 10-Jan-2018 Jordan Liu <jminjie@google.com> Merge "Extend CallFailCause to distinguish more precise code" am: 4c5c451076
am: a0c716068c

Change-Id: I408c8c47a70d37abec41c2c19abdb95858f01c05
4c5c4510767222dca84da9525f1ef3214f97bc8a 10-Jan-2018 Jordan Liu <jminjie@google.com> Merge "Extend CallFailCause to distinguish more precise code"
bb8be93846561a7dcff8882e0b2a8a824ba6a47f 19-Dec-2017 Neil Fuller <nfuller@google.com> Make state transitions clearer in NitzStateMachine

All state transitions are triggered in "handleXyz"
methods and ServiceStateTracker calls them at obvious
places.

Some of the logic when the MCC becomes known has been
pulled together into a single method from several
separate calls. This change may introduce some
functional changes as a result of these changes.
A field has been renamed to try to make the logic
still clearer now the state is not inspected by
ServiceStateTracker.

An additional call has been added to
handleNetworkUnavailable() in a place where it seems
appropriate.

The interface between ServiceStateTracker and
NitzStateMachine should be stable at this point,
allowing for NitzStateMachine to become an abstract
or interface class and enable an alternative
implementation to be swapped in.

Test: atest FrameworksTelephonyTests
Bug: 63743683
Change-Id: I2e03f9bbce06e2a03b32e467deb2a0a269adecb8
itzStateMachine.java
erviceStateTracker.java
663bd9a35f7826c91357c32453fd94c54797ad8d 21-Nov-2017 youhei yamahata <youhei.yamahata@sony.com> The re-try flag is not set to true when re-sending SMS at second time

Retry flag for sending SMS message is set when send IMS SMS.
If this flag is true, the device re-sends SMS over SGs and if false,
the device re-sends SMS over IMS.
The problem is that the flag is set to true only first time.
So, if second retry fail occurs, the device re-sends SMS over IMS.
But it should send SMS over SGs.

To solve this issue, always set ImsSmsMessage#retry to true
if the number of retransmissions is 1 or more.

Test: auto - Confirmed that run RILTest and it has no problem.
Bug: 69871520
Change-Id: I395a670af6f69eb830b0c2ed7c92b8469012997b
IL.java
7aa0254d5d8f08163b3702a2a1c9602366f568d8 31-Dec-2017 Jack Yu <jackyu@google.com> Added Cell identity for TD-SCDMA and a base class CellIdentity

Added CellIdentityTdscdma for TDS-CDMA cell identity. Also added
a base class for existing CellIdentityXxx so that the network
service can return specific RAT cell identity through the
network service callback API which takes generic cell identity
as the parameter.

This is the preliminary change for IWLAN refactoring since cell
identity is part of the CS/PS network registration.

bug: 64132030
Test: Unit tests
Change-Id: Ieea70a9e4d05ff2710c9d11de2f0984996817f73
IL.java
e8d83a417fca36dec9bae43d800129735e6cbb95 04-Oct-2017 Yuan Ye <yuan.ye@sony.com> Reset carrier actions when APN change

If network has rejected with Cause#33 due to incorrect APN,
CarrierDefaultApp disables metered APN as default.
Afterwards, the metered APN remains disabled even if it is reset to
default APN(correct APN). Device fails to avail data services.
To avoid this, reset carrier actions when APN change.

Test: manual - Confirmed that carrier data restriction was reset when
APN changed.
Test: auto - Confirmed that run CarrierActionAgentTest and it has no
problem.
Bug: 67988743
Change-Id: Ib08664f8bb8abbf1c28af1e57a851165b9d80215
arrierActionAgent.java
40428f65855803fa0d38a7c18ab20ded2f79a789 10-Jan-2018 Yueming Wang <yuemingw@google.com> Merge "Change DcTracker to use URL_FILTERED." am: 9f623f16cd am: be96050299
am: f5e2e41093

Change-Id: I97c4e2f06e729aa7e390dab451d00ed6da6f4dbc
f5e2e41093488937cbcef28a603b20c46617d1c8 10-Jan-2018 Yueming Wang <yuemingw@google.com> Merge "Change DcTracker to use URL_FILTERED." am: 9f623f16cd
am: be96050299

Change-Id: Ie4fb3b752c8ae861d50dfe65d52e4cea278898f7
9f623f16cd45842936d0ee9831aa26dc1564c053 10-Jan-2018 Yueming Wang <yuemingw@google.com> Merge "Change DcTracker to use URL_FILTERED."
1950659d7016fda344f2133d6d97f0c44804a5eb 10-Jan-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Add API EuiccController#startOtaUpdatingIfNecessary"
17943fccffd277477c627046df0c944ec86c4bf6 05-Jan-2018 sqian <shuoq@google.com> Carrier Id matching metrics dump

Test: Manual
Bug: 3367987
Change-Id: I8d87d9bea19642fe67c3f2078c458f7dcc3b538b
etrics/TelephonyMetrics.java
eec9c88e85717dea39a96e22ecaae44e6ee58217 10-Jan-2018 Cassie Han <xih@google.com> Merge "Expose a new public column network_type_bitmask and deprecate bearer_bitmask gradually." am: 89587ddc18 am: 7f067cc7e6
am: d91303729e

Change-Id: I953907ba5729016f33674e1647533f29b203b1be
d91303729eca90fd6e6b1d8dd416d09fa65d1068 10-Jan-2018 Cassie Han <xih@google.com> Merge "Expose a new public column network_type_bitmask and deprecate bearer_bitmask gradually." am: 89587ddc18
am: 7f067cc7e6

Change-Id: Ia5a17bfebd394314f1c9026f4439c06769de3ac1
89587ddc18dbbbf6c40a922072bb0ec2862a0d50 10-Jan-2018 Cassie Han <xih@google.com> Merge "Expose a new public column network_type_bitmask and deprecate bearer_bitmask gradually."
eb88223778ed148084fd761d54cc0e5a674a426d 10-Jan-2018 Malcolm Chen <refuhoo@google.com> Merge "Rename isDataEnabled and getDataEnabled in DcTracker." am: 7f02f4a21f
am: 987e7966b0

Change-Id: I04261920564fd8f1a655e208140fb68559c28672
33bb558aee2c5add707b33032f577d26fad443d3 05-Jan-2018 Cassie <xih@google.com> Add cellInfoList_1_2 in IRadioIndication.java.

As part of the new NetworkScan API project, we need to add V1_2
cellInfoList in RadioIndication to support the V1_2 CellInfo as well.

Bug: 63984327, 69058403, 71697391
Test: Basic telephony sanity
Change-Id: Ia942be465bca76e1b3f42a5086d4a8c719b6d7ae
adioIndication.java
7f02f4a21f77f3f94f073a9820f4d8cd5048f4ef 10-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Rename isDataEnabled and getDataEnabled in DcTracker."
7815e7a0cb12df7ae071a49134a3d4bea2b4b448 09-Jan-2018 Neil Fuller <nfuller@google.com> Merge changes from topic "telephony_aosp_cp" am: d42459dc48
am: 9015b7fd50

Change-Id: Ice95f7752d7ef9feb2bd3812fa3c209b849bc4ad
a0f09cee0f6328ea104b9ef965a387b4a4652e8a 17-Dec-2017 Neil Fuller <nfuller@google.com> Move time zone lookup logic

Move time zone lookup logic into a separate TimeZoneLookupHelper which
can be independently tested and improved. Tests for all methods there
have been added / migrated & improved.

This also allows the lookup behavior to be mocked for NitzStateMachineTest
which has been adjusted accordingly. An additional test has been added
to demonstrate.

TimeStampedValue has been moved to a top-level class under util so
it can be used more widely and from tests.

Test: atest FrameworksTelephonyTests
Bug: 63743683
Change-Id: I2ff15b1355d5ba690198c5943bcb0faed17d8210
itzData.java
itzStateMachine.java
erviceStateTracker.java
imeZoneLookupHelper.java
til/TimeStampedValue.java
d42459dc486bfda814c9c2901d5ab63d2b17053c 09-Jan-2018 Neil Fuller <nfuller@google.com> Merge changes from topic "telephony_aosp_cp"

* changes:
Time Detection improvements
Fix broken telephony tests
96d4dfe105bae38079c1ad834e5840365f2b9cc6 15-Dec-2017 Qingxi Li <qingxi@google.com> Add API EuiccController#startOtaUpdatingIfNecessary

This function requests calling app has WRITE_EMBEDDED_SUBSCRIPTIONS
permission. It will check whether the OTA update needed to be done
first. If current eUICC OS isn't latest one and OTA needed to be
performed, it will update eUICC OS. When the OS update is started or
finished, a broadcast will be sent.

Bug: 37279356
Test: Included
Change-Id: I68f88dd01f23259859f6069046a96fa23b880c24
uicc/EuiccConnector.java
uicc/EuiccController.java
fcd5efef57e734966ed373ab7a4ce419d0034cec 04-Jan-2018 zxuan <zxuan@google.com> Notify the listener when user change the mobile data
status toggle.

Bug: 65290481
Test: builds
Change-Id: I6e715e99a54360f3bf794bfd17ca1780d7b4fc0a
efaultPhoneNotifier.java
hone.java
honeNotifier.java
ataconnection/DcTracker.java
0ee200a8507ce5c0e29e3b1c0a75cb1598bcc546 09-Jan-2018 Malcolm Chen <refuhoo@google.com> Merge "Rename RadioNetworkConstants to NetworkConstants." am: eb1d279cd5 am: e818b2c90a
am: 237a04842f

Change-Id: Iec8bf5d58eb94ffb599cdb4f53d3eca7e79da6d6
237a04842fe554a04a3b7479ce86403f53bea88a 09-Jan-2018 Malcolm Chen <refuhoo@google.com> Merge "Rename RadioNetworkConstants to NetworkConstants." am: eb1d279cd5
am: e818b2c90a

Change-Id: I60cc13f1c2a5e7e7ef6f8b3336cf98674f39ee53
75d0c86d48c1697633d4ceb57cb68bdcfd84c90f 16-Dec-2017 Neil Fuller <nfuller@google.com> Time Detection improvements

This change mostly modifies time detection logic to be
clearer, safer around wake locks. It adds / de-dupes
logging for improved debugging.

It also modifies mNitzUpdatedTime:

mNitzUpdatedTime was added to GsmServiceStateTracker in
commit a27421a306c49fbe9b3823b30f7ab1cd58b28854
and is used to track whether NITZ has been used. The original
purpose was to determine whether it was appropriate to try
to set the time zone using the network MCC (it's not if NITZ
has been received). The logic around this seems generally
bogus and the flag state was not maintained historically in
various paths (e.g. fixTimeZone()). This change renames
the field to reflect actual usage and moves it to be with
the Time Zone detection code. Later changes will improve the
time zone detection logic.

Bug: 63743683
Test: atest FrameworksTelephonyTests
Change-Id: Ic0925b1096eb20e35fb284100b54e82fc980839f
Merged-In: Ic0925b1096eb20e35fb284100b54e82fc980839f
(cherry picked from commit 25b55a71977e73a6d4e99fb970481949c1ebbe63)
itzStateMachine.java
erviceStateTracker.java
d7f8632ad50006dac80523dc1b791552628010c8 09-Jan-2018 Pankaj Kanwar <pkanwar@google.com> Merge "Address IMSI privacy issues."
542b971655043038567441b14554106d29127d3f 09-Jan-2018 Narayan Kamath <narayan@google.com> Merge "RIL: Add support for WorkSources with chained attribution."
030fdfb7ccdf5dce9a6b48ca07918082627200f4 05-Jan-2018 yuemingw <yuemingw@google.com> Change DcTracker to use URL_FILTERED.

Fix: 68208263
Test: runtest -x frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java

Design doc: https://docs.google.com/document/d/1UEYjhRGSEwwccPLs_FzFD-IeOsVq63gxmAHNtDfnzAY/edit?ts=5a0526aa&pli=1#

Change-Id: I116c2285c05b55ace52b7b5212dbc59d5b002a63
ataconnection/DcTracker.java
eb1d279cd5e70f634421e7d537525ba943a9fc3d 09-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Rename RadioNetworkConstants to NetworkConstants."
a64092befe003884c4c8951438ab311ce8f92824 29-Nov-2017 Malcolm Chen <refuhoo@google.com> Rename isDataEnabled and getDataEnabled in DcTracker.

Rename isDataEnabled and getDataEnabled to isDataEnabled
and isUserDataEnabled to better clarify their functionality.

Bug: 69814555
Test: build
Change-Id: I8b05f02103e017c746850afd2ddfc366e1ce6a64
Merged-In: I8b05f02103e017c746850afd2ddfc366e1ce6a64
arrierActionAgent.java
smCdmaPhone.java
honeInternalInterface.java
ataconnection/DcTracker.java
msphone/ImsPhoneBase.java
ip/SipPhoneBase.java
b13f68bed6f0ff69679dac0faff1cff3561d5b6d 08-Jan-2018 Cassie Han <xih@google.com> Merge "Migrate flag config_telephony_use_own_number_for_voicemail to Carrier Config." am: 1fcb3a0c49
am: 0e04348995

Change-Id: I74fc40546b999b0d6251af90dc29a9cce902346a
02761d2406c0197cebd255b575f161f5145efbb3 14-Dec-2017 Tyler Gunn <tgunn@google.com> Add support for notification of midcall video call radio handovers.

Adding support for video calls to:
- Notification of successful LTE to WIFI handover
- Notification of failure to handover from LTE to WIFI.

If there is a handover from WIFI to LTE (or the initial handover from
lte to WIFI fails at the start of a call), we enable a
connectivity listener to track when a new WIFI network becomes available.
If a new wifi network becomes available and there is no handover to WIFI
before a 1 min time expires, we warn the user (existing connection event)
that we couldn't handover to wifi.
If the handover to WIFI is successful, we send a connection event which
dialer will use to show a toast for the handover.

Test: Manual, added unit tests.
Bug: 65490850
Change-Id: I7fa16003e7309d40df0654c2992c823ed4d12e28
msphone/ImsPhoneCallTracker.java
1fcb3a0c49f1e751fe816521392a81f927110b07 08-Jan-2018 Cassie Han <xih@google.com> Merge "Migrate flag config_telephony_use_own_number_for_voicemail to Carrier Config."
f07403c2d923b3542b59087e3a226881a45dde80 25-Nov-2017 pkanwar <pkanwar@google.com> Address IMSI privacy issues.

Add method to calculate certificate metrics.

Bug: 35606429
Test: manual
Change-Id: I23df943dd16e2e67c64f27decf4c5fe41c22d6c9
arrierInfoManager.java
smCdmaPhone.java
etrics/TelephonyEventBuilder.java
etrics/TelephonyMetrics.java
07701d7a4846c2a7ad43ae08ad619d2c352421fb 07-Jan-2018 Neil Fuller <nfuller@google.com> Merge "Time Detection improvements"
c2d4cafae266d7d71d02c935a4015645c50566d4 23-Dec-2017 Hall Liu <hallliu@google.com> De-flake ImsRttHandlerTest

Add some better threading control to testSendEnoughChars to prevent a
race condition

Test: run unit test 200 times
Change-Id: Ic4610dfa919a78441c929b0c2ebc0847782575c2
msphone/ImsRttTextHandler.java
17605c455662954aee7c807f0bc5418904e5cd08 05-Jan-2018 yinxu <yinxu@google.com> Merge "Make UiccProfile#getOperatorBrandOverride work as before" am: f5fa7002b9 am: 6d10a0d336
am: 4d11d0d28d

Change-Id: I92082d2f6b888823342cf014d6d83a3df4c01018
4d11d0d28df9a4af647926d27ad8af9f1be9e4d4 05-Jan-2018 yinxu <yinxu@google.com> Merge "Make UiccProfile#getOperatorBrandOverride work as before" am: f5fa7002b9
am: 6d10a0d336

Change-Id: I59c4b3b3d073f9046999b528f0dff8fd19e53ea4
f5fa7002b961e4dbcbfc74e0a318fe12666a4b6f 05-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Make UiccProfile#getOperatorBrandOverride work as before"
5f77a4b63d18c63f66af2df60a02f60468c07431 05-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Change to match unregister calls with register ones." am: cc38c1a6ff am: e5fbcdff3f
am: ef94e1c490

Change-Id: I07010eed90cf22cf88177beb547c4356fbca8f33
ef94e1c490d587bcd0609c26a1f89402ebaeef84 05-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Change to match unregister calls with register ones." am: cc38c1a6ff
am: e5fbcdff3f

Change-Id: I7603c78abc47e239a7f84f8546f9f1eb3a49476b
cc38c1a6ffd8ff27cb6b566180b79f6348f694c3 04-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Change to match unregister calls with register ones."
6b7a6f9a2d29edea862ecc30e44d1c178efdcd93 04-Jan-2018 Shuo Qian <shuoq@google.com> Merge "Add Metrics for unknown Carrier Id"
a771b7bfdc26d904c1d6a7a69c63211602154403 04-Jan-2018 Neil Fuller <nfuller@google.com> Merge changes from topic "telephony_aosp_cp" am: 75f994c73a
am: c1728cae3e

Change-Id: I6d0232a274cdc3f22026e931941b5e57bc8e9ef7
dcd601414bfc682697978c4a79b9edd90d723236 04-Jan-2018 yinxu <yinxu@google.com> Make UiccProfile#getOperatorBrandOverride work as before

UiccProfile#getOperatorBrandOverride should work exactly the same as the
old UiccCard#getOperatorBrandOverride

Test: Basic telephony sanity
Bug: 64131518
Change-Id: I7a297ea25a4327eb26c0652ee8f0f62c29e03057
icc/UiccProfile.java
d6bae3555019d52c4039141b78279575546b145f 04-Jan-2018 Amit Mahajan <amitmahajan@google.com> Change to match unregister calls with register ones.

Test: Basic telephony sanity
Bug: 64131518
Change-Id: I7f333fdc3a0dc692aa88f6ae92b2d21d38bab068
icc/IccCardProxy.java
icc/UiccProfile.java
ad7647e78288747bd50ff5a8ad33dd39ddc2c9a4 10-Oct-2017 Cassie <xih@google.com> Migrate flag config_telephony_use_own_number_for_voicemail to Carrier Config.

Bug: 65683508
Test: Basic telephony sanity
Change-Id: Ia69f72eac147e2d2eeeea4cf042943996033f9b1
Merged-In: Ia69f72eac147e2d2eeeea4cf042943996033f9b1
smCdmaPhone.java
569dbed9853fbf291a22d73dc137262fc7fa5ff7 17-Dec-2017 Neil Fuller <nfuller@google.com> Remove unused system property setting code

Remove unused "gsm.nitz.time" system property setting code. This
system property dates from < 2008.

This system property is set as a side effect from NitzStateMachine
when NITZ data is received and not throttled.

The property is set even when the NITZ time signal is not used
to set the device system clock and no other information from NITZ
is recorded in this way.

No usages of this system property can be found in code. It appears
as though it was once used from radio stress tests and bugs suggest
it has occasionally been referenced but it is not very useful on its
own: there's more useful information in the (volatile) dumpsys /
bugreport logs.

Bug: 63743683
Test: atest FrameworksTelephonyTests
(cherry picked from commit 23923c3406479165068f87c3a88e1cfa16fd6d59)
Merged-In: Ib077421d9a7c7f542176815c1f1fe1ce4e9f6113
Change-Id: Ib077421d9a7c7f542176815c1f1fe1ce4e9f6113
itzStateMachine.java
d2520e28daddb2e1f827acf1763afa814cd70cc5 16-Dec-2017 Neil Fuller <nfuller@google.com> Deflake ServiceStateTracker test and others

Switching MccTable over to using TelephonyComponentFactory
in commit 42e5c2ccbf2d6a6a7319cd5003a938207e049020
appears to have made an existing flakiness problem worse:
Evidence from Treehugger suggests that
MccTable.updateMccMncConfiguration() (which started using
TelephonyComponentFactory to obtain a TimeServiceHelper) is
called in various places while a test may be running.
TelephonyTest's replacement of the static
TelephonyComponentFactory instance used by MccTable is probably
leading to spurious NullPointerExceptions.

This change allows logic to be shared while side-stepping
the test infrastructure issue implied.

This change also moves the replacement of static instances
of various fundamental telephony classes until after they have
been baseline configured: it's not a solution but reduces the
time window where there may be unconfigured mocks replacing
real instances.

Bug: 63743683
Test: atest FrameworksTelephonyTests
Test: Treehugger

(cherry picked from commit eff964878d590a8a74837c48bbb0e4ff4ff8f28f)
Merged-In: Ib93a87ab87464af93f8092434e971f09326973a4
Change-Id: Ib93a87ab87464af93f8092434e971f09326973a4
ccTable.java
imeServiceHelper.java
689d9eb7c8b0fab4a305046fabd76f8a01a0d2c6 14-Dec-2017 Neil Fuller <nfuller@google.com> Remove mysterious test logic

Remove mysterious test logic that probably
isn't used.

It was added in frameworks/base commit
a27421a306c49fbe9b3823b30f7ab1cd58b28854 to
GsmServiceStateTracker.

The logic can be removed because the
system property is used for testing, and
even if it were, controlling behavior based
on whether the realtime clock value is odd
or even is strange.

Test:
atest FrameworksTelephonyTests:com.android.internal.telephony.NitzStateMachineTest

Test: build / boot / see above
Bug: 63743683
(cherry picked from commit c344eb872873337f8d47b9db07be83c24ac29967)
Merged-In: I51de9a81eaaa49974dcc94dffcd22c1f417728fa
Change-Id: I51de9a81eaaa49974dcc94dffcd22c1f417728fa
itzStateMachine.java
9e0a2cd0de646f9455c0d6ab34632b89b418235c 04-Jan-2018 Narayan Kamath <narayan@google.com> RIL: Add support for WorkSources with chained attribution.

Ensure that the code that constructs Client IDs can handle WorkSource
objects that contain WorkChains.

Test: RILTest
Bug: 62390666
Change-Id: Id4972fa386b20245dc1ce60456eccca031cbbb4b
IL.java
ILRequest.java
6fe496082c989a8a0b7e9120ba34c4eb7e4bf003 04-Jan-2018 Qingxi Li <qingxi@google.com> Merge "Add API to get eUICC's OTA status" am: e01e32e14c
am: 00729997e3

Change-Id: I7f5a1801ff800662e9c249f79f85f9a6e0493e7f
e01e32e14c898d3358f49d8e827103629166786f 04-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Add API to get eUICC's OTA status"
176f28521fd45bb739709d309e7970b1558c9f61 05-Dec-2017 Cassie <xih@google.com> Expose a new public column network_type_bitmask and deprecate
bearer_bitmask gradually.

Add a new attribute networkTypeBitmask in ApnSetting, and it will be set as 0 if
networkTypeBitmask is not provided in the constructor.
ApnSetting.networkTypeBitmask will be mapped to DataProfile.bearerBitmap in
DcTracker.createDataProfile if existed.

Bug: 21276001
Test: Basic telephony sanity
Change-Id: I58964aab074ca3402066e31c28102401f239a083
ataconnection/ApnSetting.java
ataconnection/DcTracker.java
01e8b1e70fe5ee7d522fe8ba57630a55e633bcbb 03-Jan-2018 Malcolm Chen <refuhoo@google.com> Rename RadioNetworkConstants to NetworkConstants.

Rename RadioNetworkConstants to NetworkConstants and some classes
inside it.
Added IWLAN as one RadioAccessNetwork type.

Bug: 64132030
Test: build
Change-Id: I02cfe1e4cc6a49842140d952a59f285b4c3a90ea
etworkScanRequestTracker.java
IL.java
512e3c703f450c9a3067e97c52129365ca54811c 15-Dec-2017 sqian <shuoq@google.com> Add Metrics for unknown Carrier Id

Add metrics field for carrier_id_table_version, score, gid1,
and carrier_id.

After carrier identification match score is calculated,
write metrics for any of below situations:
0) success matching
1) unknown mccmnc - the Carrier Id provider contains no rule
that matches the read mccmnc.
2) unknown gid1 - the Carrier Id provider contains some rule(s)
that match the read mccmnc, but the read gid1
is not matched within the highest-scored rule.

The design:
https://docs.google.com/document/d/1DHK8HH5KZu9sgmZFOmmTzxxGlD2zo1Eg5HfR0YcjS7c/edit

Test: atest FrameworksTestTelephony
Bug: 64131637
Change-Id: Ia3062882923974d4b459727df4fb27e6b3b5fd2c
arrierIdentifier.java
etrics/TelephonyEventBuilder.java
etrics/TelephonyMetrics.java
832e0e5e0851f5b267f21529f406c1d1c8f1048c 03-Jan-2018 Ying Xu <yinxu@google.com> Merge "Add the UiccProfile into UiccCard" am: 1076d8a77d am: 8bc89a1f20
am: 906d905baf

Change-Id: I76df77960c89b5cfa49d789b35b410df0553c988
906d905bafcd072dd0fef45e845ef63c177b4262 03-Jan-2018 Ying Xu <yinxu@google.com> Merge "Add the UiccProfile into UiccCard" am: 1076d8a77d
am: 8bc89a1f20

Change-Id: I4c33e131591879622b5941dbea7b0d240af1e0fe
1076d8a77d3790e80a3d753d074810848b128169 03-Jan-2018 Ying Xu <yinxu@google.com> Merge "Add the UiccProfile into UiccCard"
b16c28b5640ddf239ce630abd7d6a36d715f6d15 14-Dec-2017 Qingxi Li <qingxi@google.com> Add API to get eUICC's OTA status

The function will return current eUICC's OTA status and requests calling
app has WRITE_EMBEDDED_SUBSCRIPTIONS.

Test: Included
Bug: 37279356
Change-Id: Ibffd8b9ac9fb7d17e75c477c029e33b971191866
uicc/EuiccConnector.java
uicc/EuiccController.java
d92c54f4aeb5477c1c486d39f2ffde11487f3801 03-Jan-2018 Sandeep Gutta <sangutta@codeaurora.org> Merge "Clean up Icc Refresh handling" am: 33f8fe37e2 am: f3d58e57c9
am: 9fe51a4fa4

Change-Id: Iadf8c0d71321fb8eb1bc582ce200bb944c1381fb
9fe51a4fa4d4c742c140a78d40a214d7341e527f 03-Jan-2018 Sandeep Gutta <sangutta@codeaurora.org> Merge "Clean up Icc Refresh handling" am: 33f8fe37e2
am: f3d58e57c9

Change-Id: Ie61146181790d621edff28ac4858a7bd57a61f22
55244ccda38af20d37c47ef0767bcd25d11136a9 03-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Copy over logic from IccCardProxy to UiccProfile." am: 9643513034 am: 96edf5f478
am: 330d3e52eb

Change-Id: I4b11d6c9a5b8951ddcb18a41392781868cfb1c61
33f8fe37e2928753860ae4281f3d260b1fce061b 03-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Clean up Icc Refresh handling"
330d3e52eb76e9afbc2ef06c5e5c3901bfb6afce 03-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Copy over logic from IccCardProxy to UiccProfile." am: 9643513034
am: 96edf5f478

Change-Id: Ie073390f9b3aff699f5975e181b025efeb99bc55
5b07a62f59800c985a89045fbdb7b91f80b6fb18 12-Dec-2017 Amit Mahajan <amitmahajan@google.com> Add the UiccProfile into UiccCard

Test: Basic telephony sanity
Test: runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/uicc
Bug: 64131518
Change-Id: I76a5e672ef08d2f9acc3a51dce5a7c7cec1e8192
at/CatService.java
icc/IccRecords.java
icc/RuimRecords.java
icc/SIMRecords.java
icc/UiccCard.java
icc/UiccCardApplication.java
icc/UiccCarrierPrivilegeRules.java
icc/UiccPkcs15.java
icc/UiccProfile.java
e5c26ce878f10b9a8e6dcd3152d05703c3ebc0c7 03-Jan-2018 Malcolm Chen <refuhoo@google.com> Merge "Adding IMS settings into Subscription db." am: f768bb9cbc
am: 2031d4776f

Change-Id: I4ef456b021e9f5a24909c51cd835a9a4a06fa48d
96435130342a1eeb194c79de9a7243cd6e41d04e 03-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Copy over logic from IccCardProxy to UiccProfile."
f768bb9cbc519000398c8ac588fc1b90e9e907fe 03-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Adding IMS settings into Subscription db."
f965bc9f0965984782a6fef947dba17a4c51f0ff 12-Apr-2017 Sandeep Gutta <sangutta@codeaurora.org> Clean up Icc Refresh handling

1. When a SIM refresh is received of type INIT,
don't immediately start re-fetching the records, because
the app might not be ready. In this case, we could end up
broadcasting that all records are loaded pre-maturely.

On a refresh of the above type, the app will move out of the
ready state and back into the PIN state, if PIN is enabled.
Start reading the records only after the PIN has been verified
and the app has moved to the READY state.

2. When UiccController receives refresh of type INIT, it will
propagate it to the Card. The card will dispose the apps if required.
UiccController will also request card status on receiving
refresh to get the latest state.

This avoids having to make assumptions on the ordering of the
Unsols for Sim Refresh and card state changes. This also
ensures that after a refresh, the app state will move to ready
when it is truly ready.

3. Moved common implementation for refresh into IccRecords
for better code reuse.

Test: runtest -path frameworks/opt/telephony/tests/telephonytests/
Test: Manual SIM refresh related cases
Bug: 35919855
Change-Id: Ib4149c94adc7845bfe8d07dacec6ff78a6b64c1e
est/SimulatedCommands.java
icc/IccRecords.java
icc/IsimUiccRecords.java
icc/RuimRecords.java
icc/SIMRecords.java
icc/UiccController.java
4a7b0a1de1c07c26eefda1fe5d2609cd54c2ecbd 20-Dec-2017 Amit Mahajan <amitmahajan@google.com> Copy over logic from IccCardProxy to UiccProfile.

Test: Basic telephony sanity
Bug: 64131518
Change-Id: Ib647ddabbded5bf8ac45f948271e232c6bd08ff9
icc/IccCardProxy.java
icc/UiccProfile.java
icc/UiccSlot.java
a2ccf2ff133f147f78acf3ea94e4d3b6aaf6c9f0 03-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Add UiccCard to UiccSlot, and UiccSlot to UiccController." am: 19a3b32b3f am: ed7b061851
am: 5d5d9259d5

Change-Id: Ib3e4efe46003fba424d485d9b7704508339947c3
5d5d9259d5d201cc577194eb61a9684bf7718077 03-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Add UiccCard to UiccSlot, and UiccSlot to UiccController." am: 19a3b32b3f
am: ed7b061851

Change-Id: I0db2f93dceb6eb2b717bea4449f3bf9f66d12ed2
19a3b32b3f08afc95c60fbf626758dcc6baa078f 03-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Add UiccCard to UiccSlot, and UiccSlot to UiccController."
e1fd1a128fbc5206af22919e6a86229bdc13df4d 03-Jan-2018 Qingxi Li <qingxi@google.com> Merge "Add API to get eUICC's OTA status"
c3eae59f9b41e0edfcc70c1571a35ad4f41d343b 03-Jan-2018 Jordan Liu <jminjie@google.com> Merge "SST only cancels its own notifications" am: bebf18a047 am: 45226eec8c
am: 502fbfcde4

Change-Id: If5e774aac40f022b901e32a5ee2c56297e453384
502fbfcde48a394dc16b9483621ba6618edfc57f 03-Jan-2018 Jordan Liu <jminjie@google.com> Merge "SST only cancels its own notifications" am: bebf18a047
am: 45226eec8c

Change-Id: Idada1d507612e87e727194dffc5d4017d3b81777
bebf18a047308e648adc984e3029f43ecab8db59 03-Jan-2018 Jordan Liu <jminjie@google.com> Merge "SST only cancels its own notifications"
dd9f4b04dedb05318ac3c31de24a3a932f5be55e 02-Jan-2018 yinxu <yinxu@google.com> Merge "Add platform changes to support new RIL APIs." am: bc6ea1213a am: b8088b402c
am: d19c2c1ac5

Change-Id: Ife0175157d29b6efa7222e7b6b6651c40fa8b115
d19c2c1ac56e87ed710ef4e1654a98e34d2efef9 02-Jan-2018 yinxu <yinxu@google.com> Merge "Add platform changes to support new RIL APIs." am: bc6ea1213a
am: b8088b402c

Change-Id: Ib60200710ebb7ca3ed652539df11e6066d9a1ebf
bc6ea1213ac50c74b9913ae498478190ff884a5e 02-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Add platform changes to support new RIL APIs."
d837b9911fa0bb4095a43e59eab6ba8cf19b2b15 02-Oct-2017 Malcolm Chen <refuhoo@google.com> Adding IMS settings into Subscription db.

Since we are making IMS setting per subId, it's more appropriate
to live in Subscription db. Here we are adding support from
SubscriptionController side

Bug: 66699661
Test: Manual

Change-Id: I71f540192285262461c3c03a88fbb80de60fddf5
Merged-In: I71f540192285262461c3c03a88fbb80de60fddf5
ubscriptionController.java
430164512a39a6f5849b94333bb6fe4d96e80275 27-Dec-2017 Malcolm Chen <refuhoo@google.com> Merge "Make sure MOBILE_DATA value is updated in onSetUserDataEnabled." am: 018bc544ad
am: af36fafde9

Change-Id: Ib01833a5a37ac1644df623327d6dba178156e1be
985c1bee3c77000298a0ba01f1b69f46a564e3d3 21-Jul-2017 Malcolm Chen <refuhoo@google.com> Make sure MOBILE_DATA value is updated in onSetUserDataEnabled.

In onSetUserDataEnabled, we used to call getDataEnabled to check
against "enable". Since getDataEnabled always returns true when
provisioning, onSetUserDataEnabled(true) never writes "true"
into Settings.Global.MOBILE_DATA. Now we are making sure
Settings.Global.MOBILE_DATA is updated in onSetUserDataEnabled.

Bug: 34351475
Test: Build
Change-Id: Iec2245f6ee1c087e488829344ff7c352acdbf602
Merged-In: Iec2245f6ee1c087e488829344ff7c352acdbf602
ataconnection/DataEnabledSettings.java
ataconnection/DcTracker.java
4e10a61602bd065cdf71d0335493ac3444d5055a 21-Nov-2017 yinxu <yinxu@google.com> Add platform changes to support new RIL APIs.

Bug: 68998818
Test: Basic telephony sanity
Change-Id: I36be4c29cb575e7210da1b7e69772ba20e77404d
aseCommands.java
ommandsInterface.java
IL.java
adioIndication.java
adioResponse.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
icc/IccCardStatus.java
icc/IccSlotStatus.java
25b55a71977e73a6d4e99fb970481949c1ebbe63 16-Dec-2017 Neil Fuller <nfuller@google.com> Time Detection improvements

This change mostly modifies time detection logic to be
clearer, safer around wake locks. It adds / de-dupes
logging for improved debugging.

It also modifies mNitzUpdatedTime:

mNitzUpdatedTime was added to GsmServiceStateTracker in
commit a27421a306c49fbe9b3823b30f7ab1cd58b28854
and is used to track whether NITZ has been used. The original
purpose was to determine whether it was appropriate to try
to set the time zone using the network MCC (it's not if NITZ
has been received). The logic around this seems generally
bogus and the flag state was not maintained historically in
various paths (e.g. fixTimeZone()). This change renames
the field to reflect actual usage and moves it to be with
the Time Zone detection code. Later changes will improve the
time zone detection logic.

Bug: 63743683
Test: atest FrameworksTelephonyTests
Change-Id: Ic0925b1096eb20e35fb284100b54e82fc980839f
itzStateMachine.java
erviceStateTracker.java
6eb8b3cb411a7522517303d3290459d32f368b91 22-Dec-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Remove unused system property setting code"
a7b7cb23e1741f96b5b2c01073a83cc931fe2d63 01-Apr-2016 Ping Sun <ping.x.sun@sonymobile.com> Extend CallFailCause to distinguish more precise code

Bug: 31504039
Test: Manual
Change-Id: I9be15d935c79bd5d3cac2181ec9db63a32a58e3d
allFailCause.java
3caa000d2f0643c50bf74d85a3e6672e484e25e1 12-Dec-2017 Amit Mahajan <amitmahajan@google.com> Add UiccCard to UiccSlot, and UiccSlot to UiccController.

Test: Basic telephony sanity
Test: runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/uicc
Bug: 64131518
Change-Id: I58cedd165e37a86a688f105aa7cb1fa724cfc5ff
icc/IccCardProxy.java
icc/UiccCard.java
icc/UiccController.java
icc/UiccSlot.java
icc/UiccStateChangedLauncher.java
d40c95036d92ba462467281f552f4279c9cb5a61 22-Dec-2017 Ying Xu <yinxu@google.com> Merge "Use getters to access private fields" am: c5da70ff66 am: b5e55f6f3e
am: aa4aeeafca

Change-Id: I99daee0c6046412f2294f03a77cd6f7901068c99
aa4aeeafca242dda93a91fcebf12b36ddb850328 22-Dec-2017 Ying Xu <yinxu@google.com> Merge "Use getters to access private fields" am: c5da70ff66
am: b5e55f6f3e

Change-Id: Ie950efa3d0c1a42470bdc30192f261004cfae53c
c5da70ff665f1df53ed515899750121c2a7f63dd 22-Dec-2017 Ying Xu <yinxu@google.com> Merge "Use getters to access private fields"
2cb9baf6cc715fd1cee1f8e72966e7591cf60e6b 22-Dec-2017 Brad Ebinger <breadley@google.com> Merge "Fix issue that a calling name appeared in adb log" am: 64e9ba84d4 am: 1cc1536935
am: 96ddcb694a

Change-Id: I04a50e9f33044367095392aa424a7ae9765d2c4d
0216da2540a40e4569915004729b666350ddcba3 22-Dec-2017 Brad Ebinger <breadley@google.com> Merge "Convert the fail cause to DisconnectCause.CALL_BARRED" am: 039b9bb65c am: 7336423c6f
am: caf74399da

Change-Id: I8eda3971cbd8d097c3d3e111a3f268f7c8e22c4f
96ddcb694a9cbf9d1277da431321d927a03a4567 22-Dec-2017 Brad Ebinger <breadley@google.com> Merge "Fix issue that a calling name appeared in adb log" am: 64e9ba84d4
am: 1cc1536935

Change-Id: Idccdb1f97b3fcebb81a9455d7f5b12f0efd3b8da
caf74399da408974699c038a76cbfa0ead76932a 22-Dec-2017 Brad Ebinger <breadley@google.com> Merge "Convert the fail cause to DisconnectCause.CALL_BARRED" am: 039b9bb65c
am: 7336423c6f

Change-Id: Ia6a262977796c3b1292605e4594f88e4b72bc471
64e9ba84d42769243fdf1fd31ab77e735fde6490 22-Dec-2017 Brad Ebinger <breadley@google.com> Merge "Fix issue that a calling name appeared in adb log"
039b9bb65c706d12d9bcd38206e1b701c024fabf 22-Dec-2017 Brad Ebinger <breadley@google.com> Merge "Convert the fail cause to DisconnectCause.CALL_BARRED"
6fe1611fccdec519696931095ad5a0bcc0355408 21-Dec-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Deflake ServiceStateTracker test and others"
23923c3406479165068f87c3a88e1cfa16fd6d59 17-Dec-2017 Neil Fuller <nfuller@google.com> Remove unused system property setting code

Remove unused "gsm.nitz.time" system property setting code. This
system property dates from < 2008.

This system property is set as a side effect from NitzStateMachine
when NITZ data is received and not throttled.

The property is set even when the NITZ time signal is not used
to set the device system clock and no other information from NITZ
is recorded in this way.

No usages of this system property can be found in code. It appears
as though it was once used from radio stress tests and bugs suggest
it has occasionally been referenced but it is not very useful on its
own: there's more useful information in the (volatile) dumpsys /
bugreport logs.

Bug: 63743683
Test: atest FrameworksTelephonyTests
Change-Id: Ib077421d9a7c7f542176815c1f1fe1ce4e9f6113
itzStateMachine.java
a4fd7bbd4141a66ff1465c2e4f65aca2c65ec728 08-Dec-2017 yinxu <yinxu@google.com> Use getters to access private fields

Bug: 67748005
Test: Basic telephony sanity
Change-Id: I595336602ef2e64c6b65e6db23a11e60c83b6f1c
etworkScanRequestTracker.java
IL.java
f4c0f278a8cf1e83a9fd8a355be1f37b31a649a3 21-Dec-2017 Holly Jiuyu Sun <jiuyu@google.com> Merge "Move AsyncResultCallback from Euicc to platform." am: c33e6442b8 am: 74a76f6e3d
am: 14bda3aff8

Change-Id: If06e7176b0ba0110087090de08a24ac3d48af5d1
f03af89a58a84c3103af01a3119d116c8a8b7bcb 21-Dec-2017 yinxu <yinxu@google.com> Merge "Check whether the NetworkScanRequest is null" am: c866efc6e2 am: c2f22c1404
am: 848a9cbdf9

Change-Id: I087ae9a7e95a260fd43125b2c379acf2e82e8958
14bda3aff86f152d8b9ba77e7045107645f4f4d0 21-Dec-2017 Holly Jiuyu Sun <jiuyu@google.com> Merge "Move AsyncResultCallback from Euicc to platform." am: c33e6442b8
am: 74a76f6e3d

Change-Id: I350ea0a082fa004619dd4702cef0152728d3249b
c33e6442b872e432a11cee451c26f9ecbbbe9efb 21-Dec-2017 Holly Jiuyu Sun <jiuyu@google.com> Merge "Move AsyncResultCallback from Euicc to platform."
848a9cbdf9b8a39ea68d1c10a704f74585434282 21-Dec-2017 yinxu <yinxu@google.com> Merge "Check whether the NetworkScanRequest is null" am: c866efc6e2
am: c2f22c1404

Change-Id: If8d2b6237881e5e51135bc7c1fdf53a0d40db480
054443bb4174c250ebd38f7d72fe68953521ae18 21-Dec-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Remove ImsManager.setDataEnabled."
c866efc6e26b91485e615f3a8d6ec3513f179ded 21-Dec-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Check whether the NetworkScanRequest is null"
973bdbcb053d35f046f81c15c938201328ba7499 20-Dec-2017 Malcolm Chen <refuhoo@google.com> Remove ImsManager.setDataEnabled.

Bug: 67602046
Test: manual and existing unit-tests
Change-Id: Iaa7bc3b7f0ec2e683c7e9ea45e1d2d1ba0563c0a
msphone/ImsPhoneCallTracker.java
7c9bc21b6e96d4641fe8220154512b0a4c5ac654 20-Dec-2017 yinxu <yinxu@google.com> Check whether the NetworkScanRequest is null

Bug: 70887471
Test: Basic telephony sanity
Change-Id: Icfe475446eff9ae1ad436747c028b68dcd326180
etworkScanRequestTracker.java
5e25dd2beb61692775441d6b94aca97cedb2a163 20-Dec-2017 Jordan Liu <jminjie@google.com> SST only cancels its own notifications

cancelAll cancels all notifications posted by anyone. We avoid
cancelling all notifications by specifying any possible notification ids
we may have posted. Note that this behavior is still not correct for
multi-sim devices.

Bug: 69928579
Test: manual
Change-Id: If166af886290aa856cb1bd324c01dd658cfef412
erviceStateTracker.java
8cf45a2007290c2d34645025b377a98a3f861050 20-Dec-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Replace ImsManager static methods with proper ones."
58bd1ca1d1e4d3b168093f3a3281d40c736719f9 13-Dec-2017 Malcolm Chen <refuhoo@google.com> Replace ImsManager static methods with proper ones.

ImsManager static methods are deprecated since it doesn't support
MSIM devices. It will now always call getInstance with phoneId and
then call corresponding non-static methods.

Bug: 67602046
Test: regression tests
Change-Id: I1253249a414cc9be45d5fbbab182911144a30c32
smCdmaPhone.java
hone.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
ac824b0c7ab2fa466ad31ba821029e994db598b8 19-Dec-2017 Sooraj Sasindran <sasindran@google.com> Merge "Avoid ratcheting the radio tech for OOS" am: 21de0496f8 am: 9522536012
am: 37b9251498

Change-Id: I13bdf59e44becf8b7de388253ab8fd14348b7e0b
37b92514988b9868a39e7c35f930d7bd1ab9ae6d 19-Dec-2017 Sooraj Sasindran <sasindran@google.com> Merge "Avoid ratcheting the radio tech for OOS" am: 21de0496f8
am: 9522536012

Change-Id: Ifbc242f50a0074acfe4a74a8c66d73a605fdba49
c080fad6127ba7b15a76ce0e1d4568c893830878 19-Dec-2017 Neil Fuller <nfuller@google.com> Merge changes from topic "telephony_aosp_cp" am: a1db4bd073
am: 6bc4701ee2

Change-Id: I58774baa73cddb6be64753f56af17775e17e26bf
21de0496f8128788bd2922e36218184412736125 19-Dec-2017 Sooraj Sasindran <sasindran@google.com> Merge "Avoid ratcheting the radio tech for OOS"
eff964878d590a8a74837c48bbb0e4ff4ff8f28f 16-Dec-2017 Neil Fuller <nfuller@google.com> Deflake ServiceStateTracker test and others

Switching MccTable over to using TelephonyComponentFactory
in commit 42e5c2ccbf2d6a6a7319cd5003a938207e049020
appears to have made an existing flakiness problem worse:
Evidence from Treehugger suggests that
MccTable.updateMccMncConfiguration() (which started using
TelephonyComponentFactory to obtain a TimeServiceHelper) is
called in various places while a test may be running.
TelephonyTest's replacement of the static
TelephonyComponentFactory instance used by MccTable is probably
leading to spurious NullPointerExceptions.

This change allows logic to be shared while side-stepping
the test infrastructure issue implied.

This change also moves the replacement of static instances
of various fundamental telephony classes until after they have
been baseline configured: it's not a solution but reduces the
time window where there may be unconfigured mocks replacing
real instances.

Bug: 63743683
Test: atest FrameworksTelephonyTests
Test: Treehugger

Change-Id: Ib93a87ab87464af93f8092434e971f09326973a4
ccTable.java
imeServiceHelper.java
467c5502ae200ffb62ce6fc5cadcd790a1af9593 19-Dec-2017 Neil Fuller <nfuller@google.com> Merge "Remove mysterious test logic"
ebbbe7bdbf2c6226913480bbd83a88cd0460a86a 14-Dec-2017 Qingxi Li <qingxi@google.com> Add API to get eUICC's OTA status

The function will return current eUICC's OTA status and requests calling
app has WRITE_EMBEDDED_SUBSCRIPTIONS.

Test: Included
Bug: 37279356
Change-Id: Ibffd8b9ac9fb7d17e75c477c029e33b971191866
uicc/EuiccConnector.java
uicc/EuiccController.java
569c6ba3779e4c74d5c5a2135ccace8fdcd1d23e 09-Aug-2017 Wileen Chiu <wileenc@codeaurora.org> Avoid ratcheting the radio tech for OOS

- Avoid ratcheting the radio tech when
the device is moving from or into
out of service

Bug: 35455414
Change-Id: I96c95a327f066516a36acce440e3f292883ce299
erviceStateTracker.java
4371cd52c47a0e0f30b9d9080007de262ecdab5b 18-Dec-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Rename isDataEnabled and getDataEnabled in DcTracker."
c3a0750c282348ddd0f5fc1661fecf35e46fc894 18-Dec-2017 Ta-wei Yen <twyen@google.com> Add target package to VisualVoicemailFilterSettings.

When a VVM SMS is received, opt/telephony send a broadcast to
TelephonyService which will then bind to the remote package handling
VVM. The remote package might change when the broadcast is in flight
and caused the new package to receive SMS filtered by the old package.
This caused flakiness in CTS tests.

In this CL, the filter will also receive the package which set the
filter settings, and will instruct TelephonyService to bind to the
package that set the settings.

Change-Id: I1d8dcce64a5a9a39df864fd414bbc4cde1def6c0
Fixes: 70675403
Test: CtsTelephonyTestCases
isualVoicemailSmsFilter.java
2d9066c0cf43db97c5c42347be2df608eef05409 15-Dec-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Improved Cell Broadcast debug messages."
276a67e1d06f7eb9275f1d6a35595cc34196e37a 14-Dec-2017 Neil Fuller <nfuller@google.com> Remove phone type-specific time detection logic

Remove more time detection logic that appears
to treat NITZ updates differently on non-GSM
devices but only if auto-time is disabled.

The logic only runs if NITZ has been received
so it is assumed unnecessary for device types
that don't support NITZ.

The check was added in commit ec2e4a8f12e5b6
when Cdma/CdmaLte/Gsm ServiceStateTracker classes
were combined.

Removing the check left a redundant auto-time
check, which has also been removed.

Bug: 63743683
Test: build / boot / see above
(cherry picked from commit 96ccee367104e326a975c78d48346724518ecaec)
Merged-In: I46f81275b3c4103b62527475a957437aa9881824
Change-Id: I46f81275b3c4103b62527475a957437aa9881824
itzStateMachine.java
d85f1192292c2729afb62784d8ee90d6c0abfe22 14-Dec-2017 Neil Fuller <nfuller@google.com> Remove throttling difference for GSM

Removing a difference between GSM and other
devices.

Throttling was added to CDMA in commit:
https://android.googlesource.com/platform/frameworks/base/+/aeff5fd8eb17bc0f611918d6482139c1921e7b60
(bug 2251845).

The bug justification was that CDMA was receiving NITZ
updates too regularly, which was impacting device
performance.

If GSM receives updates at a slower rate the throttling
should be a no-op so there’s no reason to have separate paths.

atest FrameworksTelephonyTests:NitzStateMachineTest \
FrameworksTelephonyTests:ServiceStateTrackerTest

Bug: 63743683
Test: build / test / see above
(cherry picked from commit 1e9ac7dae3c2d014cb763cd8eebba4dc2472efc3)
Merged-In: I36d580436e3bbb8c47d453a80eb81686c57809b3
Change-Id: I36d580436e3bbb8c47d453a80eb81686c57809b3
itzStateMachine.java
31f9f5a808530b18a9e5e562db94f34a75af0cc6 12-Dec-2017 Neil Fuller <nfuller@google.com> Add more tests around time / time zone detection

Add more tests to demonstrate NitzStateMachine behavior
when auto time / time zone detection are disabled.

Some non-functional refactoring of NitzStateMachine.

Bug: 63743683
Test: atest FrameworksTelephonyTests
(cherry picked from commit 37df60b0b1b7266657bf9ddeef83705793121341)
Merged-In: I5c79825e6a04fa3b9f38594e94675596e4a3b695
Change-Id: I5c79825e6a04fa3b9f38594e94675596e4a3b695
itzStateMachine.java
c344eb872873337f8d47b9db07be83c24ac29967 14-Dec-2017 Neil Fuller <nfuller@google.com> Remove mysterious test logic

Remove mysterious test logic that probably
isn't used.

It was added in frameworks/base commit
a27421a306c49fbe9b3823b30f7ab1cd58b28854 to
GsmServiceStateTracker.

The logic can be removed because the
system property is used for testing, and
even if it were, controlling behavior based
on whether the realtime clock value is odd
or even is strange.

Test:
atest FrameworksTelephonyTests:com.android.internal.telephony.NitzStateMachineTest

Test: build / boot / see above
Bug: 63743683
Change-Id: I51de9a81eaaa49974dcc94dffcd22c1f417728fa
itzStateMachine.java
d30e90cf3c1f7d085f64ad88092618c8a361c1f4 15-Dec-2017 Neil Fuller <nfuller@google.com> Merge changes from topic "telephony_aosp_cp" am: a91a4aa087
am: da1ddbf2c0

Change-Id: Ic3c8be6681e59048faa6943e36f56097bca75c5e
a91a4aa08768ec8c5934353222d2fa4aaaf25e9c 15-Dec-2017 Neil Fuller <nfuller@google.com> Merge changes from topic "telephony_aosp_cp"

* changes:
Switch MccTable over to using TimeServiceHelper
Make NitzStateMachine testable
Pull out NITZ-related logic into a separate class
Clarify bogus NITZ correction logic / correction
Extract low level NITZ parsing logic
Remove unnecessary overriding capability
Use Android data for MCC-based time zone lookup
2775a2b0555bdd0c6fdef7d2831405bc40666795 15-Dec-2017 Neil Fuller <nfuller@google.com> Merge changes I46f81275,I36d58043

* changes:
Remove phone type-specific time detection logic
Remove throttling difference for GSM
c9698787af1225b489d7fe3d86f54fc76422bd3d 15-Dec-2017 Neil Fuller <nfuller@google.com> Merge "Add more tests around time / time zone detection"
66aa18684c8d73641cd5469c7f8b12b172a74161 14-Dec-2017 Holly Jiuyu Sun <jiuyu@google.com> Merge "Confirmation code second try." am: e9d1f75968
am: 7801c5f649

Change-Id: Ice9ed912fc1112552e5b3d85faf1d8e09b79f655
e9d1f75968da688fd17011b45cef1c386c93b600 14-Dec-2017 Holly Jiuyu Sun <jiuyu@google.com> Merge "Confirmation code second try."
96ccee367104e326a975c78d48346724518ecaec 14-Dec-2017 Neil Fuller <nfuller@google.com> Remove phone type-specific time detection logic

Remove more time detection logic that appears
to treat NITZ updates differently on non-GSM
devices but only if auto-time is disabled.

The logic only runs if NITZ has been received
so it is assumed unnecessary for device types
that don't support NITZ.

The check was added in commit ec2e4a8f12e5b6
when Cdma/CdmaLte/Gsm ServiceStateTracker classes
were combined.

Removing the check left a redundant auto-time
check, which has also been removed.

Bug: 63743683
Test: build / boot / see above
Change-Id: I46f81275b3c4103b62527475a957437aa9881824
itzStateMachine.java
1e9ac7dae3c2d014cb763cd8eebba4dc2472efc3 14-Dec-2017 Neil Fuller <nfuller@google.com> Remove throttling difference for GSM

Removing a difference between GSM and other
devices.

Throttling was added to CDMA in commit:
https://android.googlesource.com/platform/frameworks/base/+/aeff5fd8eb17bc0f611918d6482139c1921e7b60
(bug 2251845).

The bug justification was that CDMA was receiving NITZ
updates too regularly, which was impacting device
performance.

If GSM receives updates at a slower rate the throttling
should be a no-op so there’s no reason to have separate paths.

atest FrameworksTelephonyTests:NitzStateMachineTest \
FrameworksTelephonyTests:ServiceStateTrackerTest

Bug: 63743683
Test: build / test / see above
Change-Id: I36d580436e3bbb8c47d453a80eb81686c57809b3
itzStateMachine.java
42e5c2ccbf2d6a6a7319cd5003a938207e049020 23-Nov-2017 Neil Fuller <nfuller@google.com> Switch MccTable over to using TimeServiceHelper

Switch MccTable over to using TimeServiceHelper; there's
some logic that should be shared or identical for detecting
if the device automatically defaulted the time zone to GMT
on boot. This will slightly alter ServiceStateTracker
behavior (the other user of TimeServiceHelper), which
previously did not check for GMT. This new
behavior looks more correct given bug 64056758.

This commit also switches MccTable over to using
TimeServiceHelper to set the device time zone.

This alters behavior of MccTable and means there will be
an extra broadcast of ACTION_NETWORK_SET_TIMEZONE if MccTable
sets the time zone (which only happens if the device has
no time zone set). Although this MccTable path is not strictly
an NITZ update it's still a "telephony" update so broadly
qualifies as a "network time zone update".

MccTable should probably also call
TimeServiceHelper.isTimeZoneDetectionEnabled() before setting
the device time zone but that change is not being made as
part of this commit.

Test: atest FrameworksTelephonyTests
Bug: 64056758
Bug: 63743683
(cherry picked from commit 92a32ccfd8f20d8cf3dee618e730fa73315331e4)
Merged-In: I1c17dab0c93b5827f33eb34d472453d048880bb7
Change-Id: I1c17dab0c93b5827f33eb34d472453d048880bb7
ccTable.java
imeServiceHelper.java
6f0f602bcb26fc40776fac346b33c62276b80852 22-Nov-2017 Neil Fuller <nfuller@google.com> Make NitzStateMachine testable

This commit does not modify behavior of NitzStateMachine.
It is a refactoring that separates NitzStateMachine from
various device concerns that would otherwise make unit
testing difficult.

There are three main categories of interaction from
NitzStateManager with other components:

1) External actions / querying of the NITZ state triggered
by ServiceStateTracker.

2) NitzStateManager interacting with the device's
time / time zone state and associated user settings. This
is now handled by TimeServiceHelper. In future this will
mostly be replaced by calls to a proposed TimeDetectionService
as part of the work to improve support for devices that have
multiple ways of detecting time / time zone. Time / time zone
detection being enabled will dependent on which component is
asking.

3) NitzStateManager interacting with global / shared device
state. i.e. reading and writing SystemProperties and reading
unmodifiable clocks. Abstracting these has clear
advantages for unit testing since it allows simulation of
various device states and avoids modification of the system
properties (which is not permitted, anyway).

This commit contains a single new test in NitzStateMachineTest
to demonstrate the purpose of this change and prove that
there is nothing preventing more extensive time / time zone
detection tests being written in future commits.

The only test in ServiceStateTrackerTest that touched on NITZ
logic has been modified to reflect the fact it delegates to a
(test stubbed) NitzStateMachine and no longer handles the NITZ
logic itself.

Testing:

To run individual tests:

atest FrameworksTelephonyTests:com.android.internal.telephony.NitzStateMachineTest \
FrameworksTelephonyTests:com.android.internal.telephony.ServiceStateTrackerTest

To run all telephony tests:

atest FrameworksTelephonyTests

Bug: 63743683
Test: See above

(cherry picked from commit f9e4314c7258d07ee1b995d625d20887d36c94da)
Merged-In: Ie0be1bc4a2d6baf4860ed93902c697f3edfa4d44
Change-Id: Ie0be1bc4a2d6baf4860ed93902c697f3edfa4d44
ccTable.java
itzData.java
itzStateMachine.java
erviceStateTracker.java
elephonyComponentFactory.java
imeServiceHelper.java
c516d5f0838d1ec3c2baa791acf53e3aaa82b577 09-Nov-2017 Neil Fuller <nfuller@google.com> Pull out NITZ-related logic into a separate class

This commit extracts several hundred lines of NITZ-related
logic from ServiceStateTracker into a separate class. No
behavior changes are intended: this is a pure refactoring
to move the logic into a separate, (ultimately) more
testable form. This is the first commit of several.

Bug: 63743683
Test: Build / Boot
(cherry picked from commit 10bdf3ddfce9baedc25891f43b1abbff980219e0)
Merged-In: Ic19ce01167892d7cfbd03d34fea37181bb43cc7c
Change-Id: Ic19ce01167892d7cfbd03d34fea37181bb43cc7c
ccTable.java
itzStateMachine.java
erviceStateTracker.java
c2fd460e297b43d15a64a844d26fb162094c868f 21-Nov-2017 Neil Fuller <nfuller@google.com> Clarify bogus NITZ correction logic / correction

This change clarifies some logic used to correct for bogus
NITZ signals.

From looking at a frameworks/base commit
(df7bbfd7c28549742443bbf91200871c09e89299) from 2012
it is possible to better understand the original intent
of some NITZ correction logic due to a (since deleted)
comment.

The comments from the commit mentioned above has
been expanded on to reflect the latest code and reintroduced.

The original comment was:

// "(mZoneOffset == 0) && (mZoneDst == false) &&
// (Arrays.binarySearch(GMT_COUNTRY_CODES, iso) < 0)"
// means that we received a NITZ string telling
// it is in GMT+0 w/ DST time zone
// BUT iso tells is NOT, e.g, a wrong NITZ reporting
// local time w/ 0 offset.

Since the recent commit d8ce837499725b, it has been possible
to tell the difference between "no NITZ data received" and
"offset from UTC is zero". The null case (i.e. when NITZ has
not been received) has been retained with the existing behavior
to avoid modifying the behavior at this time but it looks
(historically, but previously undetectably) incorrect and has
been commented.

There have been some small code-style improvements (addition
of braces and improved logging) made as part of changes to
the affected method.

Bug: 63743683
Bug: 69593701
Test: Boot device
(cherry picked from commit ffeba90625790a34e0c49dfaaed4eeabaa83fdca)
Merged-In: I859c809ba004ff9f1996792e2f813ea081acb9f3
Change-Id: I859c809ba004ff9f1996792e2f813ea081acb9f3
erviceStateTracker.java
2b6601e3cf8a82e2f29c71fbd274ecfc745dfbad 10-Nov-2017 Neil Fuller <nfuller@google.com> Extract low level NITZ parsing logic

This change shrinks ServiceStateTracker by a
couple of hundred lines and improves
documentation and variable/field/method naming.

This change is a side-effect of work done to
understand the time / time zone detection logic
with a view to splitting it out from the rest of
the spralling ServiceStateTracker class.

It is likely possible to isolate time / time
zone logic but it will certainly involve
behavior changes. This is useful first step
to reduce the amount of code involved
without altering behavior.

NITZ parsing has been extracted into the static
NitzData.parse() method. NitzData is a state-holding
class that replaces three primitive fields on
ServiceStateTracker that store NITZ-derived data
and are always set together.

This change is a pure refactoring. No functional
changes are intended. The refactoring exposed
various unusual (probably unintended) cases that
were a consequence of using three, potentially
uninitialized, primitive fields to store saved
NITZ state rather than a reference type. Now that
the code can detect that NITZ data is not available
they become more obvious and expose cases that would
(for example) try to do time zone detection
with an offset == 0 and time == 0 and dst = false
(resulting in Africa/Abidjan being detected if it
ever runs).

Now the parsing / time zone lookup code is
separate it can be tested so tests have been
included here.

Tested with:
make google-tradefed-all FrameworksTelephonyTests
tradefed.sh run template/local_min --template:map test=FrameworksTelephonyTests

...and also, more quickly, with...

vogar --no-multidex --classpath \
out/target/product/marlin/data/app/FrameworksTelephonyTests/FrameworksTelephonyTests.apk \
com.android.internal.telephony.NitzDataTest

Bug: 63743683
Test: See above
Test: Booted device
(cherry picked from commit d8ce837499725b7eac7c5405d8fbf6c7cc27b774)
Merged-In: Ie7004a7e67dff50b8271bdfe6d01111d7091dbe4
Change-Id: Ie7004a7e67dff50b8271bdfe6d01111d7091dbe4
itzData.java
erviceStateTracker.java
4f0e6a13b45e77f3e3f91041c116da3f2a25d3f0 14-Nov-2017 Neil Fuller <nfuller@google.com> Remove unnecessary overriding capability

This change modifies the signature of several internal
methods of ServiceStateTracker to remove the possibility
of subclasses overriding them. Where possible the methods
have been made private (thus implicitly final) and where
not possible the methods have been left protected but
made final. Only shared logging and time/time zone related
methods have been changed to limit the scope.

The use of protected is apparently a legacy of earlier
Android releases where there were several subclasses of
ServiceStateTracker.

None of these methods are referenced in tests using mocking
frameworks which might require the methods remain virtual
and non-final.

The use of protected for the log methods appears to be to
increase visiblity to subclasses but not to allow
overriding / redirection of logging to alternative log
destinations. One subclass still existings in the codebase
that relies on log() and loge().

The goal of this change is to reduce the possibility of
unintended side effects from later time / time zone detection
refactoring.

Bug: 63743683
Test: make droid
(cherry picked from commit da3ce17515b6030216bed0ad70e97a75ae052b16)
Merged-In: I57c9dd8d45fc4cfac8996c1879b93d3886be82a5
Change-Id: I57c9dd8d45fc4cfac8996c1879b93d3886be82a5
erviceStateTracker.java
ad53dc8f3b1bb230fe42f7334fb88c51b794d500 25-Oct-2017 Neil Fuller <nfuller@google.com> Use Android data for MCC-based time zone lookup

Instead of using IANA's time zone ordering from zone.tab,
use Android data for MCC-based time zone lookup.

This allows us to remove a code hack for Australia (
which was forcing the use of Australia/Sydney over the
Australia/Lord_Howe given in the IANA data) and
improves a few others. It also means that the selection
is controlled in files mastered by Android and not files
taken directly from IANA.

With 2017b rules data it means the following
differences from prior behavior:

[ISO code]: Old answer, New answer.

[fm]: Old: Pacific/Chuuk, New: Pacific/Pohnpei
[ru]: Old: Europe/Kaliningrad, New: Europe/Moscow
[um]: Old: Pacific/Midway, New: Pacific/Wake
[uz]: Old: Asia/Samarkand, New: Asia/Tashkent

In all cases these are the zone IDs understood to cover the
region's capital.

This change only affects time zone lookups when only
the MCC is known (i.e. in the absence of NITZ).

Bug: 36971201
Bug: 62418027
Test: All known country ISO codes (and some unknown) tried
(cherry picked from commit 36bc1ea8cc7522e141ad4b4dec6a70898d61592c)
Merged-In: I7ee2d133802d2d91f36b247b05974c77abb957dc
Change-Id: I7ee2d133802d2d91f36b247b05974c77abb957dc
ccTable.java
fb690b90c4852afdcb3554b0264030976bf51e0d 14-Dec-2017 Neil Fuller <nfuller@google.com> Merge "Switch MccTable over to using TimeServiceHelper"
80ea23aed48a35b5807e47143551530f6edd76b3 14-Dec-2017 Jack Yu <jackyu@google.com> Improved Cell Broadcast debug messages.

bug: 70126218
Test: Manual
Change-Id: I39353c7a21b7219c8ac1ece68706bb506de79bb8
sm/GsmCellBroadcastHandler.java
aa435f63d46022d7259f502eb4ae162e63b342fd 10-Nov-2017 Holly Jiuyu Sun <jiuyu@google.com> Confirmation code second try.

Add an extra bundle to resolution intent which can be passed to LUI.

Bug: 69050703
Test: test on phone
Merged-In: I4c3c17b999a26ae4643178d6302cda9c9c7781c0
Change-Id: I4c3c17b999a26ae4643178d6302cda9c9c7781c0
uicc/EuiccController.java
cf7ff3fc0bd693404c4edfd5071af6ce64b36e83 13-Dec-2017 sqian <shuoq@google.com> Add Iccid_prefix in Carrier Idenfitication

Bug: 64131637
Test: Manual
Change-Id: Ic7cbb8ed9b6357fafd1bf164876a25f52515b299
arrierIdentifier.java
icc/CarrierTestOverride.java
icc/IccRecords.java
icc/SIMRecords.java
7ff30d52b4fcb9db87ec61feb2905983ae9ddc63 14-Dec-2017 Chen Xu <fionaxu@google.com> Merge "apply new carrier id APIs"
ef4ec8604ae76985798deb89ae70ea602136636a 13-Dec-2017 Jack Yu <jackyu@google.com> Merge "Fixed empty dns not properly handled issue" am: 100de66a0e
am: 91ff91fba6

Change-Id: I8adf73f45100d2dce13a9e6f4c19f01b3a4b3284
f894832e415f506b83eba61ea65bc6e683aacd58 12-Dec-2017 Jack Yu <jackyu@google.com> Fixed empty dns not properly handled issue

1. The original code was not moved correctly when moved
from data call response into data connection in ag/3296869.
2. Removed the unnecessary stack trace print.
3. Added a new unit test to cover empty dns case.

Test: Unit tests + Telephony sanity tests.
bug: 70506433
Merged-In: Id95304705d3fd0560c0104621c407ad9f8f1148c
Change-Id: Id95304705d3fd0560c0104621c407ad9f8f1148c
(cherry picked from commit 5a9a6b847f268adf37e41f74a755c8c8f8661cc2)
ataconnection/DataConnection.java
9e7ead7b01b26357e6ff3ec3f4489398c8fb6930 06-Dec-2017 Holly Jiuyu Sun <jiuyu@google.com> Move AsyncResultCallback from Euicc to platform.

AsyncResultCallback is a callback parameter for APIs in EuiccCard to
return return or exception.

Note: In Patchset 1, all the files are copied from LPA without any
changes. The diff can be shown against Patchset 1.

Bug: 38206971
Test: unit test
Change-Id: I26d1f0a7b7977a56413720e678109266f04771b6
icc/euicc/async/AsyncResultCallback.java
icc/euicc/async/AsyncResultHelper.java
cd57056834f3c2d463a7d178312454ff7a1d3317 12-Dec-2017 Jack Yu <jackyu@google.com> Merge "Moved data connection response into system api." am: 822d1fd029
am: 42f363a7d1

Change-Id: Ia1a7ea70e092dd590a838e4446216185cf4ec160
822d1fd0296a6aaf9e5fd3b5420db4779723130e 12-Dec-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Moved data connection response into system api."
37df60b0b1b7266657bf9ddeef83705793121341 12-Dec-2017 Neil Fuller <nfuller@google.com> Add more tests around time / time zone detection

Add more tests to demonstrate NitzStateMachine behavior
when auto time / time zone detection are disabled.

Some non-functional refactoring of NitzStateMachine.

Bug: 63743683
Test: atest FrameworksTelephonyTests
Change-Id: I5c79825e6a04fa3b9f38594e94675596e4a3b695
itzStateMachine.java
a036f405808f5aecf02876bff789f6144a37e27a 12-Dec-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Make NitzStateMachine testable"
92a32ccfd8f20d8cf3dee618e730fa73315331e4 23-Nov-2017 Neil Fuller <nfuller@google.com> Switch MccTable over to using TimeServiceHelper

Switch MccTable over to using TimeServiceHelper; there's
some logic that should be shared or identical for detecting
if the device automatically defaulted the time zone to GMT
on boot. This will slightly alter ServiceStateTracker
behavior (the other user of TimeServiceHelper), which
previously did not check for GMT. This new
behavior looks more correct given bug 64056758.

This commit also switches MccTable over to using
TimeServiceHelper to set the device time zone.

This alters behavior of MccTable and means there will be
an extra broadcast of ACTION_NETWORK_SET_TIMEZONE if MccTable
sets the time zone (which only happens if the device has
no time zone set). Although this MccTable path is not strictly
an NITZ update it's still a "telephony" update so broadly
qualifies as a "network time zone update".

MccTable should probably also call
TimeServiceHelper.isTimeZoneDetectionEnabled() before setting
the device time zone but that change is not being made as
part of this commit.

Test: atest FrameworksTelephonyTests
Bug: 64056758
Bug: 63743683
Change-Id: I1c17dab0c93b5827f33eb34d472453d048880bb7
ccTable.java
imeServiceHelper.java
5afbd368c942d7b3fc42586ac50fa9012bb3f530 12-Dec-2017 Neil Fuller <nfuller@google.com> Merge "Pull out NITZ-related logic into a separate class"
9ff280ebe11cdf107ef90d2a32ab7eb68f43b4e8 12-Dec-2017 Amit Mahajan <amitmahajan@google.com> Merge "Revert "Add support for send Message with messaging options."" am: 73595a47a7 am: dbda5ebb51
am: f2894d0001

Change-Id: I75530f7428b6517136ac870d4d6cda047d92826c
8e23ad8ce3c364969a56fa4a22b4f944162584c9 12-Dec-2017 Tyler Gunn <tgunn@google.com> Merge "Always play remote hold tone if carrier config indicates it should be." am: 02267f80e5 am: 2871a504c1
am: a2a9d3e16a

Change-Id: I38242e04bbe21f04c042facd78054e460c99510e
f2894d00019c06110089e2ad338ad72d491cf25b 12-Dec-2017 Amit Mahajan <amitmahajan@google.com> Merge "Revert "Add support for send Message with messaging options."" am: 73595a47a7
am: dbda5ebb51

Change-Id: Ib51e5b20845de62e294074ffaa767b8159713031
47fade6692232c0c754dea61e9d9455063a4bc24 12-Dec-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fixed empty dns not properly handled issue"
a2a9d3e16a1603b7ecafb732a371c9f8a7172bf2 12-Dec-2017 Tyler Gunn <tgunn@google.com> Merge "Always play remote hold tone if carrier config indicates it should be." am: 02267f80e5
am: 2871a504c1

Change-Id: Ib5f7a51f8facd9e9ca9cd4290bc51a174d1adbb9
73595a47a736c4dee2f53fd09a6256db2153c1ed 12-Dec-2017 Amit Mahajan <amitmahajan@google.com> Merge "Revert "Add support for send Message with messaging options.""
02267f80e58d0d8a14c987b6a2fe5deb3fd662ee 12-Dec-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Always play remote hold tone if carrier config indicates it should be."
a65b940c49ca314abcc6c102a84b5e95682491c9 12-Dec-2017 Holly Jiuyu Sun <jiuyu@google.com> Merge "Carrier confirmation code." am: e59c2cf32f
am: a1ba9726b4

Change-Id: I660c60c4c88cea3bbf52520b464c5a387d10ed80
5a9a6b847f268adf37e41f74a755c8c8f8661cc2 12-Dec-2017 Jack Yu <jackyu@google.com> Fixed empty dns not properly handled issue

1. The original code was not moved correctly when moved
from data call response into data connection in ag/3296869.
2. Removed the unnecessary stack trace print.
3. Added a new unit test to cover empty dns case.

Test: Unit tests + Telephony sanity tests.
bug: 70506433
Change-Id: Id95304705d3fd0560c0104621c407ad9f8f1148c
ataconnection/DataConnection.java
c57b35c870225730456b93e66bb825b2a170a8ef 12-Dec-2017 Amit Mahajan <amitmahajan@google.com> Revert "Add support for send Message with messaging options."

This reverts commit 9eb99b2daaf46917e8e565005e03d53b33936fb6.

Reason for revert: Causing long sms failure

Bug: 68762942
Change-Id: Ie202241b8c377ba20129bbd74979eef34fcedd6e
ccSmsInterfaceManager.java
msSMSDispatcher.java
MSDispatcher.java
iccSmsController.java
dma/CdmaSMSDispatcher.java
sm/GsmSMSDispatcher.java
e59c2cf32fdb01b7e54c32571510baaa4e572d3b 12-Dec-2017 Holly Jiuyu Sun <jiuyu@google.com> Merge "Carrier confirmation code."
f9e4314c7258d07ee1b995d625d20887d36c94da 22-Nov-2017 Neil Fuller <nfuller@google.com> Make NitzStateMachine testable

This commit does not modify behavior of NitzStateMachine.
It is a refactoring that separates NitzStateMachine from
various device concerns that would otherwise make unit
testing difficult.

There are three main categories of interaction from
NitzStateManager with other components:

1) External actions / querying of the NITZ state triggered
by ServiceStateTracker.

2) NitzStateManager interacting with the device's
time / time zone state and associated user settings. This
is now handled by TimeServiceHelper. In future this will
mostly be replaced by calls to a proposed TimeDetectionService
as part of the work to improve support for devices that have
multiple ways of detecting time / time zone. Time / time zone
detection being enabled will dependent on which component is
asking.

3) NitzStateManager interacting with global / shared device
state. i.e. reading and writing SystemProperties and reading
unmodifiable clocks. Abstracting these has clear
advantages for unit testing since it allows simulation of
various device states and avoids modification of the system
properties (which is not permitted, anyway).

This commit contains a single new test in NitzStateMachineTest
to demonstrate the purpose of this change and prove that
there is nothing preventing more extensive time / time zone
detection tests being written in future commits.

The only test in ServiceStateTrackerTest that touched on NITZ
logic has been modified to reflect the fact it delegates to a
(test stubbed) NitzStateMachine and no longer handles the NITZ
logic itself.

Testing:

To run individual tests:

atest FrameworksTelephonyTests:com.android.internal.telephony.NitzStateMachineTest \
FrameworksTelephonyTests:com.android.internal.telephony.ServiceStateTrackerTest

To run all telephony tests:

atest FrameworksTelephonyTests

Bug: 63743683
Test: See above

Change-Id: Ie0be1bc4a2d6baf4860ed93902c697f3edfa4d44
ccTable.java
itzData.java
itzStateMachine.java
erviceStateTracker.java
elephonyComponentFactory.java
imeServiceHelper.java
10bdf3ddfce9baedc25891f43b1abbff980219e0 09-Nov-2017 Neil Fuller <nfuller@google.com> Pull out NITZ-related logic into a separate class

This commit extracts several hundred lines of NITZ-related
logic from ServiceStateTracker into a separate class. No
behavior changes are intended: this is a pure refactoring
to move the logic into a separate, (ultimately) more
testable form. This is the first commit of several.

Bug: 63743683
Test: Build / Boot
Change-Id: Ic19ce01167892d7cfbd03d34fea37181bb43cc7c
ccTable.java
itzStateMachine.java
erviceStateTracker.java
16583a9801424b0af65eebfb52dc7e68790227e8 11-Dec-2017 Neil Fuller <nfuller@google.com> Merge "Clarify bogus NITZ correction logic / correction"
f203ed03c8ca7495ac069163ddac6a0817956979 17-Nov-2017 Holly Jiuyu Sun <jiuyu@google.com> Carrier confirmation code.

If confirmation code is null and required during downloading a profile,
returns a resovable error, and show ConfirmationCodeActivity. After we
get the confirmation code from the user, continue the operation.

Add the confirmationCode as a member in DownloadableSubscription.

Merged-In: Id649e0623f582ce3fc2f2eb8db01e4502f72ff5b
Test: unit test, e2e on phone
Bug: 36730837
Change-Id: Id7308b900b5fb3b35624ae3a2d6a5088d72cda32
uicc/EuiccController.java
uicc/EuiccOperation.java
65dabed427f0e3423f17ebc66e25627881a6673e 09-Dec-2017 Xiangyu/Malcolm Chen <refuhoo@google.com> Merge "Adding more ImsManager test."
c0a3ed8c70021d47cd55bbc1406a9cf63bd6afe2 30-Nov-2017 Jack Yu <jackyu@google.com> Moved data connection response into system api.

This is a preliminary step for IWLAN refactoring, where data response
will be one of the parameter in data service callback.

Test: Telephony sanity tests
bug: 64132030
Merged-In: Ie3cfc59c98bdd362a89207dc517f92619fa2278a
Change-Id: Ie3cfc59c98bdd362a89207dc517f92619fa2278a
(cherry picked from commit 3f8bd3dd2c7bceeab44854231411e9517417b944)
IL.java
adioIndication.java
adioResponse.java
ataconnection/DataCallResponse.java
ataconnection/DataConnection.java
ataconnection/DcController.java
ataconnection/DcTracker.java
etrics/TelephonyMetrics.java
est/SimulatedCommands.java
7862a030b39eb245871e0df1eee64b91c0fbc379 08-Dec-2017 Jack Yu <jackyu@google.com> Merge "Moved DataProfile from telephony internal hidden API to System API" am: 67c734994b
am: fdde8900e4

Change-Id: I58c3da0e0b6e7222a78362e7994e36d5c53765d0
886183cde1263ea524cdf08524442724e246ed42 20-Nov-2017 Jack Yu <jackyu@google.com> Moved DataProfile from telephony internal hidden API to System API

This is the preliminary change in order to make the new data call
setup API for IWLAN refactoring.

Test: Telephony sanity tests + unit tests
bug: 64132030

Merged-In: I5aa50001ef6374b080c10eb29e59363c21008639
Change-Id: I34b9a40b587092f28ffe5d5c96a4e3636f52ed53
(cherry picked from commit b02e63a76e4c3d5e364b0d0017e1a0f57916959d)
ommandsInterface.java
IL.java
ataconnection/DataConnection.java
ataconnection/DataProfile.java
ataconnection/DcTracker.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
1fa6c4bd307fbd6ff974dd213231e76ddf38129a 17-Mar-2011 Yuling Liu <yuling.liu@sonyericsson.com> Convert the fail cause to DisconnectCause.CALL_BARRED

DisconnectCause.CALL_BARRED is notified to TeleService when CS call
fails due to call barring. But it isn't notified in case of IMS call.

To fix this, add a case that converts the fail cause to
DisconnectCause.CALL_BARRED.

Test: manual - Checked that DisconnectCause.CALL_BARRED is notified
when call is barred.
Bug: 70369741

Change-Id: I78d59e320d39a47c2c4f778583121c98650e2f2f
msphone/ImsPhoneCallTracker.java
534bf3e070fa569a67ed449e6c6d7329cca1fa02 08-Dec-2017 Jordan Liu <jminjie@google.com> Merge "IMS: Add support for STK CC feature" am: b7fd3bd5db am: 562943505d
am: 0670e5160c

Change-Id: I644d5bb1c8b0ac4ab2666944c67db48ecf44e294
a57a71d65e9d8bb15c14c9ab82af7887ee9d932e 01-Nov-2017 Malcolm Chen <refuhoo@google.com> Adding more ImsManager test.

Stop receiving ACTION_IMS_CONFIG_CHANGED. Adding ImsManager test
for getting and setting provisioned vlaues.

Bug: 66701374
Test: unittest
Change-Id: Ia4e58d9998dabaf55f79cd6ef253d47af7ce3ea9
hone.java
0670e5160c3f5c5e24448426bd221f1c027876f0 08-Dec-2017 Jordan Liu <jminjie@google.com> Merge "IMS: Add support for STK CC feature" am: b7fd3bd5db
am: 562943505d

Change-Id: I0fecfb27917fe5b011465e649e52909adff39157
76b9a0784083bf34ba8bab1003f00935e7b040f1 07-Dec-2017 Jack Yu <jackyu@google.com> Merge "Moved data connection response into system api."
97d2609e31917538360d1632c9bdd0cc901eace4 29-Jul-2017 Suresh Koleti <skoleti@codeaurora.org> IMS: Add support for STK CC feature

-- Create ImsUt which will set the ImsUtListenerProxy which is used
to get the STK CC supplementary service indication.
-- Parse STK CC supplementary service indication and
show appropriate dialog to user.
-- Using OEM_ERROR_1 to show error dialog for USSD modified
to Video Dial

Test: Manual
Bug: 64685331
Change-Id: Ic540616e383107595905fdee01e3eb5e39f6f3d0
ommandException.java
smCdmaPhone.java
sm/GsmMmiCode.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneMmiCode.java
3f8bd3dd2c7bceeab44854231411e9517417b944 30-Nov-2017 Jack Yu <jackyu@google.com> Moved data connection response into system api.

This is a preliminary step for IWLAN refactoring, where data response
will be one of the parameter in data service callback.

Test: Telephony sanity tests
bug: 64132030
Change-Id: Ie3cfc59c98bdd362a89207dc517f92619fa2278a
IL.java
adioIndication.java
adioResponse.java
ataconnection/DataCallResponse.java
ataconnection/DataConnection.java
ataconnection/DcController.java
ataconnection/DcTracker.java
etrics/TelephonyMetrics.java
est/SimulatedCommands.java
c58281f18e760c39c2fedba61453eae7bfdda349 01-Aug-2017 Xinying.Deng <xinying.deng@sony.com> Fix issue that a calling name appeared in adb log

A calling name is displayed in VoLTE/ViLTE MT call on adb log
even if user variant.
Privacy information should not be displayed in adb log.

Test: manual - Check that a calling name of the adb log is masked.
Bug: 70307005
Change-Id: I4014676130f44c213700c1aebbead87f26f49a6a
msphone/ImsPhoneConnection.java
5e46f7b762e6ca254b4b6ee7ccd57563ee3be314 06-Dec-2017 Amit Mahajan <amitmahajan@google.com> Merge "Get rid of code related to QuietMode." am: b9da5f0eba am: 737f913032
am: 2e15a3eb29

Change-Id: I080a887f30fcc0654fa1a6483d4eea5883bc58e2
2e15a3eb2992e6f5ee129b26c5caa370d3983011 06-Dec-2017 Amit Mahajan <amitmahajan@google.com> Merge "Get rid of code related to QuietMode." am: b9da5f0eba
am: 737f913032

Change-Id: Ieb459286822ad1cb780de91be4327b4fd4f3d905
737f9130321eecaaab00fb6d1530537a0e9b537d 06-Dec-2017 Amit Mahajan <amitmahajan@google.com> Merge "Get rid of code related to QuietMode."
am: b9da5f0eba

Change-Id: I2d50edfc522f4b8bf2b2f99046f904e9cb6e78bd
b9da5f0eba0a03aa89521bcfc4cec15b453f24ee 06-Dec-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Get rid of code related to QuietMode."
eaa953acf2ce00a4a615c36fd4fbc79e8c4c3cbf 05-Dec-2017 Amit Mahajan <amitmahajan@google.com> Merge "Initial implementation for UiccSlot." am: 6516d3d571 am: de7253c40c
am: 6ceea0ab3f

Change-Id: I8fce4843bdc5ef357d7f225db6071adaed415407
6ceea0ab3fdb38509e514b3c7a14aab14cadae13 05-Dec-2017 Amit Mahajan <amitmahajan@google.com> Merge "Initial implementation for UiccSlot." am: 6516d3d571
am: de7253c40c

Change-Id: I66d5b30d53d8bf5f584df918a2ae4d714b3d60ab
de7253c40c116f4cb832a6a7d4d9c1183350ca93 05-Dec-2017 Amit Mahajan <amitmahajan@google.com> Merge "Initial implementation for UiccSlot."
am: 6516d3d571

Change-Id: Ie6e736d84c630f14665ac8326a565ff85d2a80f7
6516d3d57115ee286498545e748927f5e7e70a5c 05-Dec-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Initial implementation for UiccSlot."
f235d8472a0dac603c5d3a684121cc1b38fb5b79 06-Nov-2017 Amit Mahajan <amitmahajan@google.com> Get rid of code related to QuietMode.

Test: Basic telephony sanity
Bug: 64131518
Change-Id: I393143662486d5d131d3211fb8caad27b869efb2
icc/IccCardProxy.java
26cb20acc2b906c438728953d1d70600bc21edd1 05-Dec-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Do not notify of WIFI to LTE handover for disconnected call." into oc-mr1-dev
25a2dd35d64e41b692801be78a18a446ecf938f4 05-Dec-2017 Amit Mahajan <amitmahajan@google.com> Merge "Read ICCID before broadcasting state LOCKED." am: 8c05f23c18 am: 1d87e78d69
am: 7c6a3caeb6

Change-Id: I246661ce0b2ae6d37741a66b887166cc8da4e6ec
7c6a3caeb6f1be1256291aeefeca958f2d73f98e 05-Dec-2017 Amit Mahajan <amitmahajan@google.com> Merge "Read ICCID before broadcasting state LOCKED." am: 8c05f23c18
am: 1d87e78d69

Change-Id: Ia01b142c3a97f4a61985c3c3a7fdb28b36630c2e
1d87e78d6912dbff4ac73bcfdd228f45f47dce6a 05-Dec-2017 Amit Mahajan <amitmahajan@google.com> Merge "Read ICCID before broadcasting state LOCKED."
am: 8c05f23c18

Change-Id: I1d21f506bfaa2f28c8f0cad84246cc86eb4c3a52
8c05f23c18c44cc94d08f8a61c08e20ef7d7783f 05-Dec-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Read ICCID before broadcasting state LOCKED."
4de8effafa19167eb55efb666fa275fe419cc615 19-Nov-2017 Amit Mahajan <amitmahajan@google.com> Initial implementation for UiccSlot.

Test: Basic telephony sanity
Bug: 64131518
Change-Id: I2408d5a0268f8a293db7f98f702fdc552e86adfd
icc/UiccSlot.java
a8a3d652155b5d25f8d26931d102bb4ac91770e8 04-Nov-2017 Amit Mahajan <amitmahajan@google.com> Read ICCID before broadcasting state LOCKED.

Test: Basic telephony sanity
Bug: 64131518
Change-Id: Id22fa01d87383d6746b9a264dda47f55d1bb9e67
ubscriptionInfoUpdater.java
icc/IccCardProxy.java
icc/IccRecords.java
icc/IsimUiccRecords.java
icc/RuimRecords.java
icc/SIMRecords.java
44c60ce8ba90bd88ce6cfdfdae9c6ae5b2f623cb 05-Dec-2017 Amit Mahajan <amitmahajan@google.com> Merge "Increase waiting state timeout from 30s to 5min." into oc-mr1-dev
39fc48694b1b54e2901b87f7841ba594edd7a796 05-Dec-2017 Amit Mahajan <amitmahajan@google.com> Merge "Remove unused code." am: c6f628cbfe am: d97352728e
am: 555f7678ad

Change-Id: I3b9ff500c41375027648b2f0d20c44a9f7005948
555f7678ad92ce8febbee73cd22bfbf36e20b7f7 05-Dec-2017 Amit Mahajan <amitmahajan@google.com> Merge "Remove unused code." am: c6f628cbfe
am: d97352728e

Change-Id: I789a0127c6c43658c669588cf1fd0053a3bdfe9e
d97352728e8ce809e7fa1febd671a09ff11b3753 05-Dec-2017 Amit Mahajan <amitmahajan@google.com> Merge "Remove unused code."
am: c6f628cbfe

Change-Id: I1b631fdbffcab03075b28ad946f0e022e93d0cfa
c6f628cbfeb2100aa117033644ecced06593894e 05-Dec-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Remove unused code."
8907a6dcd82e140f8fe47c02fda8ffd15964aba6 31-Oct-2017 Amit Mahajan <amitmahajan@google.com> Increase waiting state timeout from 30s to 5min.

Test: runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/
internal/telephony/gsm/GsmInboundSmsHandlerTest.java
Bug: 68704659
Bug: 69475609

Change-Id: I79bded1ca345978075836bf247fccb53bc55caa5
nboundSmsHandler.java
49470fb09d68948c358b8e3cbb99916465da765b 20-Nov-2017 Amit Mahajan <amitmahajan@google.com> Remove unused code.

Test: none
Bug: 64131518
Change-Id: I06663e6aa415cb15e35399596433e1d9d5ba7c3f
ccCard.java
icc/IccCardProxy.java
079e1e0f4f58e6d893aedee2947d0a60f99d1240 28-Nov-2017 fionaxu <fionaxu@google.com> apply new carrier id APIs

1. apply new unknown_carrier_id API
2. send carrier_subscription_identity_changed broadcast

Bug: 64131637
Test: Build
Change-Id: I73c83071c9f16a75d809f5f51b397b23da27edb3
arrierIdentifier.java
hone.java
3e227d75e46ad8fa928ebfccbc3a90db65429968 01-Dec-2017 Tyler Gunn <tgunn@google.com> Do not notify of WIFI to LTE handover for disconnected call.

It is possible for the onCallHandover callback to indicate that a
call in the process of disconnecting or which has been disconnected already
has handed over from WIFI to LTE. We suppress the connection event if this
is the case.

Test: Reproduced bug, and then confirmed fix corrects the issue.
Bug: 65490850
Merged-In: Ibaff84dc7e4c3b628d4f9f5b2fdd819220a9d185
Change-Id: I460db6c122188d9bd9a4db4e93cee44bf9c63905
msphone/ImsPhoneCallTracker.java
90f7ae0270d1ca8e2b89654da0d286486dce9571 01-Dec-2017 Jordan Liu <jminjie@google.com> Merge "Add old APIs as overloaded methods" am: 542e4e6b3c am: f53296a935
am: cf04c2fd8a

Change-Id: I414ef9d9e54cb4c3c9ed4f57da48938178c8893e
cf04c2fd8a3ec5b3c3b163fa77775fc45643c3fe 01-Dec-2017 Jordan Liu <jminjie@google.com> Merge "Add old APIs as overloaded methods" am: 542e4e6b3c
am: f53296a935

Change-Id: I3c5bdc83d9b2f2c66a79e9c9d4945895cb1b8f63
f53296a9353319143225c6eaa4572f585fc4d344 01-Dec-2017 Jordan Liu <jminjie@google.com> Merge "Add old APIs as overloaded methods"
am: 542e4e6b3c

Change-Id: Ifb50ba9de7ab8aa2ce24ae35215d60c6a0461ee4
bcfc54aca38044b7020a870768c3cb7071b274e4 29-Nov-2017 Malcolm Chen <refuhoo@google.com> Rename isDataEnabled and getDataEnabled in DcTracker.

Rename isDataEnabled and getDataEnabled to isDataEnabled
and isUserDataEnabled to better clarify their functionality.

Bug: 69814555
Test: build
Change-Id: I8b05f02103e017c746850afd2ddfc366e1ce6a64
arrierActionAgent.java
smCdmaPhone.java
honeInternalInterface.java
ataconnection/DcTracker.java
msphone/ImsPhoneBase.java
ip/SipPhoneBase.java
81357ffc6a5a19c6ee1f846797cf06fedc0c7b5e 01-Dec-2017 Jordan Liu <jminjie@google.com> Add old APIs as overloaded methods

Bug: 37559543
Test: manual
Change-Id: Ic7f55559b3a10c4be3159ce43e2f0ffd10fe75be
msphone/ImsPhone.java
ccdb9f2868e711562fa2dca81b4763a51a18823c 01-Dec-2017 Olivier Gaillard <gaillard@google.com> Merge "Update RIL wakelock tag to follow the naming convention and be more verbose."
59802436c17561c5403fab3795daad882daa0fde 01-Dec-2017 Tyler Gunn <tgunn@google.com> Merge "Do not notify of WIFI to LTE handover for disconnected call." am: cbe33053ac am: 74250c9c98
am: ec0c2c9cf0

Change-Id: Ifbb67e8b2515f33628c03e04ee669a216824567e
ec0c2c9cf083d008b3bac1cfcd38db926f0001d8 01-Dec-2017 Tyler Gunn <tgunn@google.com> Merge "Do not notify of WIFI to LTE handover for disconnected call." am: cbe33053ac
am: 74250c9c98

Change-Id: Ibaff84dc7e4c3b628d4f9f5b2fdd819220a9d185
74250c9c98f9bb7be7be419861b40ff06184817b 01-Dec-2017 Tyler Gunn <tgunn@google.com> Merge "Do not notify of WIFI to LTE handover for disconnected call."
am: cbe33053ac

Change-Id: I66ae1304a320e7762191382c5bbd609e727742f6
cbe33053acc41a52ce0d3db6692243b0322e4449 01-Dec-2017 Tyler Gunn <tgunn@google.com> Merge "Do not notify of WIFI to LTE handover for disconnected call."
04ed5d01a9f80a41a09b8cb455d27614598caae4 20-Nov-2017 Olivier Gaillard <gaillard@google.com> Update RIL wakelock tag to follow the naming convention and be more
verbose.

Tags of Wakelocks with a WorkSource should use the naming convention
*tag*. This will help app developers to understand which wakelocks come
from the platform.

Test: not tested

Change-Id: Ic06a7fb0844cd5dc106923199783e89f32bba8ec
IL.java
9b56821fdde86b3597e5f77c53fee2669376673e 01-Dec-2017 Jordan Liu <jminjie@google.com> Merge "IMS: Add service class for call barring operations" am: d24ca5c90f am: db6273ac19
am: a2565023de

Change-Id: I49b2a823597e557fa37482ed6bccc47015374cac
a2565023de58efc2699bc29e9ce06238c4f06d05 01-Dec-2017 Jordan Liu <jminjie@google.com> Merge "IMS: Add service class for call barring operations" am: d24ca5c90f
am: db6273ac19

Change-Id: I382282796fc22b3e6f53e88854222c69da4b20da
db6273ac193639255de80de7facb736aa552ca2d 01-Dec-2017 Jordan Liu <jminjie@google.com> Merge "IMS: Add service class for call barring operations"
am: d24ca5c90f

Change-Id: Ibe86d4daf230f31eec40bce9c7d63355e06588cf
d24ca5c90f5adc3804263f4eefbbd8173a664661 01-Dec-2017 Jordan Liu <jminjie@google.com> Merge "IMS: Add service class for call barring operations"
624390540661cf9f43abd48ffd234669a4b55afd 30-Nov-2017 Jordan Liu <jminjie@google.com> Merge "GET INPUT command can contain the duration information" am: 1c73863cf1 am: 8f27eadfa7
am: d1145ec12f

Change-Id: Ia0fd8e5af40f1872fd69800335451a262e50f040
d1145ec12f4d6b8188e513ce98c258a5f65e23e3 30-Nov-2017 Jordan Liu <jminjie@google.com> Merge "GET INPUT command can contain the duration information" am: 1c73863cf1
am: 8f27eadfa7

Change-Id: I8f9956dde8542a094ccf4d718d70a786c10ab183
8f27eadfa7b8525a0fed10718731c3d9e1edf9ab 30-Nov-2017 Jordan Liu <jminjie@google.com> Merge "GET INPUT command can contain the duration information"
am: 1c73863cf1

Change-Id: I578e4b44275d570bfc7fc21d619d3e811329d038
1c73863cf194d315ae12483a7cabf41cb98f525e 30-Nov-2017 Jordan Liu <jminjie@google.com> Merge "GET INPUT command can contain the duration information"
82ca8ecbc314ca6ddec6c8dfc3fa9c6fbdbf9abc 30-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Fix the roaming searching text display in standby screen" am: 7bd5a19b57 am: c025d013cb
am: 8914c2df35

Change-Id: I0d3379d1fbe4a352703afa98f2e43bd115506592
8914c2df359ac79ea478a879830c2408f04ffcf6 30-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Fix the roaming searching text display in standby screen" am: 7bd5a19b57
am: c025d013cb

Change-Id: I35131c4c75fb68e9e0ce9f3d52ba19e268fe81a1
c025d013cbc4cc9a12b5bf693e8ec8376aca3526 30-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Fix the roaming searching text display in standby screen"
am: 7bd5a19b57

Change-Id: Iaeb8f0ce43a057a72fb4cbc663d80ee10d1f5422
7bd5a19b5763aa97c32e1f33d0af452629b711bc 30-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Fix the roaming searching text display in standby screen"
f4d1b3a28ea5f1fdbd4db1d1508596ae29fe10ae 02-Nov-2016 Benergy Meenan Ravuri <bravuri@codeaurora.org> IMS: Add service class for call barring operations

Add service class for call barring operations

Test: Manual
Bug: 37559543
Change-Id: I41dfb7439b15a03e7a21970e32cc65dd044dff2c
msphone/ImsPhone.java
msphone/ImsPhoneMmiCode.java
ceafe87887c0e45ea1092e89f58199438bcc29f6 30-Nov-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Revert "Merge "Revert "Moved DataProfile from telephony internal hidden API to System API"" am: ff4c852798 am: 58c2654141 am: 9fc7a5386d""
c2d0cec6cc786470359383a5fa179586bdde3858 30-Nov-2017 Jack Yu <jackyu@google.com> Revert "Merge "Revert "Moved DataProfile from telephony internal hidden API to System API"" am: ff4c852798 am: 58c2654141 am: 9fc7a5386d"

This reverts commit 71df921a8aa13ed6d6a4cc3e6ed277ea3ff382b5.

Change-Id: I5aa50001ef6374b080c10eb29e59363c21008639
ommandsInterface.java
IL.java
ataconnection/DataConnection.java
ataconnection/DataProfile.java
ataconnection/DcTracker.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
a223c7cbe909807950359cdef46c7170715a7632 30-Nov-2017 Jiuyu Sun <jiuyu@google.com> Merge "Confirmation code second try."
fb4330692d332ee8ee4614a9500ae39efbe138d8 27-Nov-2017 Tyler Gunn <tgunn@google.com> Always play remote hold tone if carrier config indicates it should be.

Remote hold tones are normally only played when the audio stream goes
inactive and the call is remotely held.
Adding support for carriers which do not make the audio stream go inactive
when the call is remotely held.

Test: Added unit test coverage for hold tones, manually tested with TMO.
Bug: 64099717
Change-Id: Ib001cbc7613551302d87c1a9a5f5e6412f1cbc57
msphone/ImsPhoneBase.java
msphone/ImsPhoneCall.java
msphone/ImsPhoneCallTracker.java
c8b6ccc39593e162d0ea6262cd2b68e4401d2f47 29-Nov-2017 Nathan Harold <nharold@google.com> Merge "Remove spn-conf.xml Support for SPN Override" am: 6e2094e357 am: 2c7f0f9d2f
am: 023296f960

Change-Id: I0ed85e2277822180ac3230d55644b2b7eeccfb55
023296f96047eaa8c2f66e909bcef285723124d4 29-Nov-2017 Nathan Harold <nharold@google.com> Merge "Remove spn-conf.xml Support for SPN Override" am: 6e2094e357
am: 2c7f0f9d2f

Change-Id: Ibb382ec0230f0e8499a1bb6309d4e5433b3162cc
2c7f0f9d2fd461fdc97b1f25fdd1ee18dde24edc 29-Nov-2017 Nathan Harold <nharold@google.com> Merge "Remove spn-conf.xml Support for SPN Override"
am: 6e2094e357

Change-Id: Ie460a897cdbdc1fdd1d0da7a7f60dad15433b922
6e2094e35745cc34545fe68b8d48dc1d4b37d794 29-Nov-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Remove spn-conf.xml Support for SPN Override"
9cb108826a4544d99dfe811af866e43862c0a8ef 29-Nov-2017 Jack Yu <jackyu@google.com> Merge "Combined setLinkProperties in DataConnection and DataResponse" am: 462b114734
am: 1deef79497

Change-Id: Ief3b7b69550c46591300471bc23599800acba743
1deef79497a77ee936242ee56750cca989fbd95f 29-Nov-2017 Jack Yu <jackyu@google.com> Merge "Combined setLinkProperties in DataConnection and DataResponse"
am: 462b114734

Change-Id: I779cae44e62f737d3627fd58a0789508a889f55d
a21232c2c1956555bad5832d78f0526d7962b197 29-Nov-2017 Jack Yu <jackyu@google.com> Combined setLinkProperties in DataConnection and DataResponse

1. Merged the method setLinkProperties from DataCallResponse into
the same method in DataConnection.
2. Made gateways field in DataCallResponse final.
3. Moved SetupResult into DataConnection.

This is the preliminary step of moving DataResponse to system API
so it can be part of the data service API, which is required by
IWLAN refactoring.

Test: Telephony sanity tests
bug: 64132030
Merged-In: I434c4f1553954fdda0c58c2eada888d7d6087af4
Change-Id: I434c4f1553954fdda0c58c2eada888d7d6087af4
(cherry picked from commit 86632debcc5a94a8a1a2f9995eb407e26ca2869a)
ataconnection/DataCallResponse.java
ataconnection/DataConnection.java
8a6f9c110015f294de9cdc6240bea3b00ae97a7c 29-Nov-2017 Jack Yu <jackyu@google.com> Merge "Combined setLinkProperties in DataConnection and DataResponse"
2d1845b3572e3bc4e6dd629953865de419e47157 29-Nov-2017 fionaxu <fionaxu@google.com> Merge "carrier identification" am: 0e17949536
am: ed9bf0c373

Change-Id: Ib841f871a6d637c2d4933a8767358de2c1cfe915
ed9bf0c37364a7954606d1d3eeb2e1e5450ab5d1 29-Nov-2017 fionaxu <fionaxu@google.com> Merge "carrier identification"
am: 0e17949536

Change-Id: I472cd4e1d50e228710c489ad5e6fa4c68735efc3
2db47c1626b17a8f2c1f7f7030931a790c38c25f 30-Oct-2017 fionaxu <fionaxu@google.com> carrier identification

CarrierIdentifier identifies the subscription carrier and returns a
canonical carrier Id and a user friendly carrier name.
CarrierIdentifier reads subscription info and check against all carrier
matching rules stored in CarrierIdProvider

Test: runtest --path CarrierIdentifierTest.java
Bug: 64131637
(cherry picked from commit b5c356fee2ce1be13fee506d1cc65927079d7b88)

Change-Id: I6906d8b573ea6d12ce8bcf3e3acf8e007fbc2b08
Merged-in: I3f1a1ddd124037e85d702f22d076d75223cb5276
arrierIdentifier.java
smCdmaPhone.java
hone.java
elephonyComponentFactory.java
86632debcc5a94a8a1a2f9995eb407e26ca2869a 29-Nov-2017 Jack Yu <jackyu@google.com> Combined setLinkProperties in DataConnection and DataResponse

1. Merged the method setLinkProperties from DataCallResponse into
the same method in DataConnection.
2. Made gateways field in DataCallResponse final.
3. Moved SetupResult into DataConnection.

This is the preliminary step of moving DataResponse to system API
so it can be part of the data service API, which is required by
IWLAN refactoring.

Test: Telephony sanity tests
bug: 64132030
Change-Id: I434c4f1553954fdda0c58c2eada888d7d6087af4
ataconnection/DataCallResponse.java
ataconnection/DataConnection.java
1c57fc96a99529429d3467fbc47604f68cb99ee1 28-Nov-2017 Jack Yu <jackyu@google.com> Merge "Moved DataProfile from telephony internal hidden API to System API"
4caa11d8e1d6790b2813d48a91924492a60b5156 20-Nov-2017 Jack Yu <jackyu@google.com> Moved DataProfile from telephony internal hidden API to System API

This is the preliminary change in order to make the new data call
setup API for IWLAN refactoring.

Test: Telephony sanity tests + unit tests
bug: 64132030

Merged-In: I320632be0d50b03c948b02fa664640ecfb401357
Change-Id: I21aa0ac07d251804716dd88846e7b4913673cdc9
(cherry picked from commit b02e63a76e4c3d5e364b0d0017e1a0f57916959d)
ommandsInterface.java
IL.java
ataconnection/DataConnection.java
ataconnection/DataProfile.java
ataconnection/DcTracker.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
71df921a8aa13ed6d6a4cc3e6ed277ea3ff382b5 28-Nov-2017 Jack Yu <jackyu@google.com> Merge "Revert "Moved DataProfile from telephony internal hidden API to System API"" am: ff4c852798 am: 58c2654141
am: 9fc7a5386d

Change-Id: I5f7f6cb23a26994cea9961127d1a9935fbbd362b
9fc7a5386dc5422c1a7940e446c998f19255c5dd 28-Nov-2017 Jack Yu <jackyu@google.com> Merge "Revert "Moved DataProfile from telephony internal hidden API to System API"" am: ff4c852798
am: 58c2654141

Change-Id: Ie3ac87d6998ba793a4d3f4ee8a02b34b7157c5fa
fa204958afc0e69ff371492830ccfaf261748679 28-Nov-2017 Jack Yu <jackyu@google.com> Merge "Moved DataProfile from telephony internal hidden API to System API" am: 3fd8b3ecfd
am: 3a953e80c4

Change-Id: Id12b258f0f41ad39f98d27672387de6de9a99aec
58c265414152e6dc948d491c58cf3fd17f28d14f 28-Nov-2017 Jack Yu <jackyu@google.com> Merge "Revert "Moved DataProfile from telephony internal hidden API to System API""
am: ff4c852798

Change-Id: I55a242e3d23f94358c78ce9aeaff2055f26a17f9
3a953e80c4f83c153fcebc71a9814b77f320bc19 28-Nov-2017 Jack Yu <jackyu@google.com> Merge "Moved DataProfile from telephony internal hidden API to System API"
am: 3fd8b3ecfd

Change-Id: I031c600f0d2a8cac02a24eed7fb58e9a4fa87146
ff4c852798171c6027734041f35d6f1b34e53c77 28-Nov-2017 Jack Yu <jackyu@google.com> Merge "Revert "Moved DataProfile from telephony internal hidden API to System API""
4bb301ce081b348fbb8b6b7a990e0c6e65b9e039 28-Nov-2017 Jack Yu <jackyu@google.com> Revert "Moved DataProfile from telephony internal hidden API to System API"

This reverts commit c36b42eb847959f451900d1eac4e32be180a0b99.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I7fd9fbb181fcc74de585e3224ed230e029db1049
ommandsInterface.java
IL.java
ataconnection/DataConnection.java
ataconnection/DataProfile.java
ataconnection/DcTracker.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
3fd8b3ecfd8607473e49608b5bea03e75769e5d9 28-Nov-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Moved DataProfile from telephony internal hidden API to System API"
15961beb0dfe88458c16bfbc9ea175ce45ddbe8a 27-Sep-2017 Takanori Nakano <takanori.nakano@sony.com> GET INPUT command can contain the duration information

GET INPUT command can contain the duration information as an optional
parameter and it should be handled in the same manner as GET INKEY
command from ETSI TS 102 223 v14.0.0 onward.

Bug: 66984843
Test: Confirmed that the duration of GET INPUT is treated as expected

Change-Id: I4aab2804419d9b2c87a8d864fdbf31a66a47580a
at/CatService.java
at/CommandParamsFactory.java
2ef948d0087729c91bcc06af3df0af67d17cae70 28-Nov-2017 Tyler Gunn <tgunn@google.com> Do not notify of WIFI to LTE handover for disconnected call.

It is possible for the onCallHandover callback to indicate that a
call in the process of disconnecting or which has been disconnected already
has handed over from WIFI to LTE. We suppress the connection event if this
is the case.

Test: Reproduced bug, and then confirmed fix corrects the issue.
Bug: 65490850
Change-Id: I460db6c122188d9bd9a4db4e93cee44bf9c63905
msphone/ImsPhoneCallTracker.java
c36b42eb847959f451900d1eac4e32be180a0b99 20-Nov-2017 Jack Yu <jackyu@google.com> Moved DataProfile from telephony internal hidden API to System API

This is the preliminary change in order to make the new data call
setup API for IWLAN refactoring.

Test: Telephony sanity tests + unit tests
bug: 64132030

Merged-In: I320632be0d50b03c948b02fa664640ecfb401357
Change-Id: I320632be0d50b03c948b02fa664640ecfb401357
(cherry picked from commit b02e63a76e4c3d5e364b0d0017e1a0f57916959d)
ommandsInterface.java
IL.java
ataconnection/DataConnection.java
ataconnection/DataProfile.java
ataconnection/DcTracker.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
315fc070982e984a64da5831f3268ff9b57c3d95 27-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Avoid logging text string TLV objects in TERMINAL RESPONSE" am: 391676308d am: b4072f8751
am: 0f8ef8eff3

Change-Id: I9232754b7e48710231ab99fa267e15d5df85eeb7
0f8ef8eff36adfaa6ebc9e3b382eef96836f91d5 27-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Avoid logging text string TLV objects in TERMINAL RESPONSE" am: 391676308d
am: b4072f8751

Change-Id: If6495b074a6623053ece3a664eea470a05760318
b4072f8751e36368cd910260b873433fe4ba26fb 27-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Avoid logging text string TLV objects in TERMINAL RESPONSE"
am: 391676308d

Change-Id: I84b9d724c371e49c2c2c4147a8309dba738fb4b7
391676308dbf0130a3e90105752686bc410d2109 27-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Avoid logging text string TLV objects in TERMINAL RESPONSE"
b4742bb2de8f20c0f81fa679bc5653f04f9eeaef 27-Nov-2017 Jack Yu <jackyu@google.com> Merge "Moved DataProfile from telephony internal hidden API to System API"
8ae0edb9dd3a30f69dc4e12c38d669ab1576fac6 23-Nov-2017 Chen Xu <fionaxu@google.com> Merge "carrier identification"
b5c356fee2ce1be13fee506d1cc65927079d7b88 30-Oct-2017 fionaxu <fionaxu@google.com> carrier identification

CarrierIdentifier identifies the subscription carrier and returns a
canonical carrier Id and a user friendly carrier name.
CarrierIdentifier reads subscription info and check against all carrier
matching rules stored in CarrierIdProvider

Test: runtest --path CarrierIdentifierTest.java
Bug: 64131637
Change-Id: I3f1a1ddd124037e85d702f22d076d75223cb5276
arrierIdentifier.java
smCdmaPhone.java
hone.java
elephonyComponentFactory.java
f68174905a32b1faa246d54b247ad16786452235 22-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Remove APDU or AID exchanged in communication with applet in SE" am: 9e6db01070 am: b658ceaa99
am: 2976beb004

Change-Id: I6ca7190d1816c24d9cfd5610be1c63b1bc2c569f
2f55018bf3eca2e425347799a4bdaccce38453c1 22-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Add iccid support for mvno data" am: d495238d9b am: d09bb47dd5
am: aae762de15

Change-Id: I60804018b29c37286adbd2a8d25d1b71d4a8924d
2976beb004ee99755170fc1ca07636ac3bdb7f3f 22-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Remove APDU or AID exchanged in communication with applet in SE" am: 9e6db01070
am: b658ceaa99

Change-Id: I5a7f272a14c9a8adf40a2cef72ffb0812b0954c3
aae762de1564478e98af51590398f31cf2e61896 22-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Add iccid support for mvno data" am: d495238d9b
am: d09bb47dd5

Change-Id: I2f71d35ad8a1829c57f78f37a375849e2520af9b
b658ceaa992f0d3136c268d445e0bcb27635cfd9 22-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Remove APDU or AID exchanged in communication with applet in SE"
am: 9e6db01070

Change-Id: If78ab52d5f7bd3f829f174676cf1590f997e2516
d09bb47dd586ce0113467aaa29452db74fd1e7b8 22-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Add iccid support for mvno data"
am: d495238d9b

Change-Id: Id6993cb8fbea0a4c1ae2e1165f19961432e53127
ffeba90625790a34e0c49dfaaed4eeabaa83fdca 21-Nov-2017 Neil Fuller <nfuller@google.com> Clarify bogus NITZ correction logic / correction

This change clarifies some logic used to correct for bogus
NITZ signals.

From looking at a frameworks/base commit
(df7bbfd7c28549742443bbf91200871c09e89299) from 2012
it is possible to better understand the original intent
of some NITZ correction logic due to a (since deleted)
comment.

The comments from the commit mentioned above has
been expanded on to reflect the latest code and reintroduced.

The original comment was:

// "(mZoneOffset == 0) && (mZoneDst == false) &&
// (Arrays.binarySearch(GMT_COUNTRY_CODES, iso) < 0)"
// means that we received a NITZ string telling
// it is in GMT+0 w/ DST time zone
// BUT iso tells is NOT, e.g, a wrong NITZ reporting
// local time w/ 0 offset.

Since the recent commit d8ce837499725b, it has been possible
to tell the difference between "no NITZ data received" and
"offset from UTC is zero". The null case (i.e. when NITZ has
not been received) has been retained with the existing behavior
to avoid modifying the behavior at this time but it looks
(historically, but previously undetectably) incorrect and has
been commented.

There have been some small code-style improvements (addition
of braces and improved logging) made as part of changes to
the affected method.

Bug: 63743683
Bug: 69593701
Test: Boot device
Change-Id: I859c809ba004ff9f1996792e2f813ea081acb9f3
erviceStateTracker.java
9e6db010703d9c19278bfe09903f01d50333a007 22-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Remove APDU or AID exchanged in communication with applet in SE"
d495238d9b433436a0713008d9b97709fd76f473 22-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Add iccid support for mvno data"
a3e776f0d4a9d3b224e7e965d4b714b09cd9d628 22-Nov-2017 Cassie Han <xih@google.com> Merge "Added OperatorInfo in Scan Result." am: cfb8dba761 am: d0b15fad06
am: 39f570060c

Change-Id: I61f7a2fa8e17eb6ffd7934e9ece284523a5e05b9
39f570060cd345886b12544902eaf23b26c0ed96 22-Nov-2017 Cassie Han <xih@google.com> Merge "Added OperatorInfo in Scan Result." am: cfb8dba761
am: d0b15fad06

Change-Id: I58ba60707bf1f0bf514f304b1e026010268e2095
d0b15fad06f65b18c2ff56d49181654e06a332d7 22-Nov-2017 Cassie Han <xih@google.com> Merge "Added OperatorInfo in Scan Result."
am: cfb8dba761

Change-Id: Id1055a2d619e375703cfce16689bf6aec95ba11c
cfb8dba761d6398bf04ef21d7cd30da798341d51 22-Nov-2017 Cassie Han <xih@google.com> Merge "Added OperatorInfo in Scan Result."
478ebe10c101e8c75df4a67d72efce9cb6b0f31b 22-Nov-2017 Brad Ebinger <breadley@google.com> Merge "Refactor ImsService structure" am: b089d7c04f am: b2a658741b
am: 5b21f1d272

Change-Id: Ic588df634a913cbd4b951b515982dc2c109ae840
5b21f1d272c95d200d8e1713ee0934672bf0701c 22-Nov-2017 Brad Ebinger <breadley@google.com> Merge "Refactor ImsService structure" am: b089d7c04f
am: b2a658741b

Change-Id: I7a45d07763d54fab615c9813fd7ca711f89c4113
b2a658741bdfa56071b478ee1007a9b566f3f933 22-Nov-2017 Brad Ebinger <breadley@google.com> Merge "Refactor ImsService structure"
am: b089d7c04f

Change-Id: Ib24e4959cb2c9ed34e0b9ef7d798350c80b49cbb
b089d7c04f7b0379894ceb4d2c7f9bbcbcb10888 22-Nov-2017 Brad Ebinger <breadley@google.com> Merge "Refactor ImsService structure"
3fd2f3abe4db925d6f8b2a1db4316c71c30af493 24-Nov-2015 Susheel Nyamala <snyamala@codeaurora.org> Add iccid support for mvno data

To support multimode cards, add iccid as a type for mvno data

Bug: 37537212
Change-Id: I51115da1b39b839aaccd12d3efe71c1c3f1322b2
ataconnection/ApnSetting.java
e9c396cfd047b045c6df08a32ef546600f921bfa 14-Nov-2017 Cassie <xih@google.com> Added OperatorInfo in Scan Result.

The following changes were made becuase we added the new CellIdentity
Structures in the types.hal. And those new CellIdentity structures are
used
in the function networkScanResult in RadioIndication.java, in the
function
getCellInfoListResponse in RadioResponse.java and in the function
convertHalCellInfoList in RIL.java.

Bug: 63984327
Test: Basic telephony sanity
Change-Id: I88faa6dcad0f6ec3f8cd01552d6a4719482b55a0
IL.java
adioIndication.java
adioResponse.java
b02e63a76e4c3d5e364b0d0017e1a0f57916959d 20-Nov-2017 Jack Yu <jackyu@google.com> Moved DataProfile from telephony internal hidden API to System API

This is the preliminary change in order to make the new data call
setup API for IWLAN refactoring.

Test: Telephony sanity tests + unit tests
bug: 64132030

Change-Id: I320632be0d50b03c948b02fa664640ecfb401357
ommandsInterface.java
IL.java
ataconnection/DataConnection.java
ataconnection/DataProfile.java
ataconnection/DcTracker.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
9c2f83fb889781ff2c0cd284fa5e8387bee39592 19-Sep-2017 Denis Hsu <denis.hsu@mediatek.com> Break the for loop searching after removing the item

When inserting a new HardwareConfig item, we will search the list to
find if it exists. If yes, remove it first then insert the new one.
The problem is that after removing it, we should break the for loop
searching else the size value is incorrect and cause
IndexOutOfBoundsException.

Test: manual, ran the test 30 times and it passed 30 times
Change-Id: I870eaa9be410e8e8b6c24ff748fb6c84c292c289
elephonyDevController.java
7c78687b6df9c0c7fe422f6b5abc86a99fb37bcb 19-Nov-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Building IMSI support for encryption."
07aa22694e8a4cb934594053669e8340958dd5bd 18-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Strip the 'F' padding at the end of the full iccid" am: 82e0087063 am: 457b2b9e24
am: aef3bddb2e

Change-Id: Ib6c16ff3cc6d6915c924c474fea4b9bbf028b9d7
aef3bddb2eb489d952495372fafcb98fb23c909d 18-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Strip the 'F' padding at the end of the full iccid" am: 82e0087063
am: 457b2b9e24

Change-Id: I14ad6f7e48ec3494a6d10dab49c61d2f3293fb1b
457b2b9e24913ffdef54a31a73783119f1a17f27 18-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Strip the 'F' padding at the end of the full iccid"
am: 82e0087063

Change-Id: Ib6ff12b083c1f7b915c9caea2c522a0c5dfc51ba
82e008706394a1f412cfaf77fb1a18b580e1a6e2 18-Nov-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Strip the 'F' padding at the end of the full iccid"
0b36207a128ae8b447a98b8d18d90ad3e2e96133 18-Nov-2017 Jack Yu <jackyu@google.com> Merge "Fixed that call forwarding icon not shown issue" am: 0d5b34f9d6
am: 36b23af2d4

Change-Id: I406a3e55e5db98e5229d4d5db7d751cf616d596f
36b23af2d415bd3b47be3d12f68a086dcc87ed48 18-Nov-2017 Jack Yu <jackyu@google.com> Merge "Fixed that call forwarding icon not shown issue"
am: 0d5b34f9d6

Change-Id: Ib02f58979336a9dac5472678f0b122ee7a26a119
0d5b34f9d6adc39dae3400dc46f904d2ec58e8ae 18-Nov-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fixed that call forwarding icon not shown issue"
a897bda27d3fc171180225f9d6aa592d06cb86c6 17-Nov-2017 Jordan Liu <jminjie@google.com> Strip the 'F' padding at the end of the full iccid

Bug: 62245439
Test: testHexIccIdSuffix (fails without change, succeeds with change)
Change-Id: I9173729e037c732eef99e4b0ed5e72345318320a
ubscriptionInfoUpdater.java
504efb8bb7ecb120ee0ea38d60b0ad4dafd40cab 27-Sep-2017 Masatoshi Akasaka <masatoshi.akasaka@sony.com> Remove APDU or AID exchanged in communication with applet in SE

The device must avoid to log any sensitive information such as APDU or
AID exchanged in communication with applet located in the secure
element. Refer to TS26_NFC_REQ_163 described in TS.26 - NFC Handset
Requirements.

Bug: 66980442
Test: Confirmed that GSMA TS.27 TC 15.9.3.2.1 does not fail.

Change-Id: I938833b7f94f597adcfb44d94c8791a929541b0d
IL.java
5f37e9b859203f06cb1ab14f3bb5632bd793a2ed 17-Nov-2017 Jack Yu <jackyu@google.com> Fixed that call forwarding icon not shown issue

Fixed that call forwarding icon not shown when enabling
all call forwarding (i.e. unconditional + all conditional) when
using UT interface. Used the same logic from circuit switch SS.

Test: manual
bug: 69427654
Merged-In: I5e43f006bfb4752ca1119e3e226746923a10f4a3
Change-Id: I5e43f006bfb4752ca1119e3e226746923a10f4a3
(cherry picked from commit aea49bb09780de60c3a0fc91574bc8d0628e25da)
sm/GsmMmiCode.java
msphone/ImsPhone.java
08710de04710654a2202be6ebe796b2b9622f960 17-Nov-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fixed that call forwarding icon not shown issue"
57befa76042fa5e5f845ca19e75cbec37d67bb0a 20-Jul-2017 pkanwar <pkanwar@google.com> Building IMSI support for encryption.

Provide ability to delete keys from the database. Will be used when
network is reset.
BUG: 35606429
Test: manual

Change-Id: Ia8492f0ad4795a552176f37757a192d02ee7d718
(cherry picked from commit 0d75cf8e79f605582f8785e4efd927847a415a76)
arrierInfoManager.java
7cd2f4575ab50897e3e80ee8422f857f4ce9c816 17-Nov-2017 Cassie Han <xih@google.com> Merge "Adjust the logic of constructing the Parcel in convertHalCellInfoList." am: 90a154fff3 am: 2010b74528
am: 6026b87779

Change-Id: Ib66adf3a92921b611552e075ccabfb2d890df2c0
aea49bb09780de60c3a0fc91574bc8d0628e25da 17-Nov-2017 Jack Yu <jackyu@google.com> Fixed that call forwarding icon not shown issue

Fixed that call forwarding icon not shown when enabling
all call forwarding (i.e. unconditional + all conditional) when
using UT interface. Used the same logic from circuit switch SS.

Test: manual
bug: 69427654
Change-Id: I5e43f006bfb4752ca1119e3e226746923a10f4a3
sm/GsmMmiCode.java
msphone/ImsPhone.java
6026b877797b98a83dc4279562c818d0184fa82d 17-Nov-2017 Cassie Han <xih@google.com> Merge "Adjust the logic of constructing the Parcel in convertHalCellInfoList." am: 90a154fff3
am: 2010b74528

Change-Id: I2bca2147119e37d60ef6e5e1880ca804f3c63a4e
2010b7452800f6f6db21f3b34e33a0d6bc0333b1 17-Nov-2017 Cassie Han <xih@google.com> Merge "Adjust the logic of constructing the Parcel in convertHalCellInfoList."
am: 90a154fff3

Change-Id: Ied860dcbc18b561986c8decc11fe44a2e509c1a3
90a154fff3029a82530d13bfe6ad120202200cfd 17-Nov-2017 Cassie Han <xih@google.com> Merge "Adjust the logic of constructing the Parcel in convertHalCellInfoList."
35c7837f87896a7dcf6d2b3fc3363129ad5a4a96 16-Nov-2017 Pengquan Meng <mpq@google.com> Merge "Send shutdown command to modem" am: 7f2bf36ff8 am: b22d4c3cfa
am: a4a81a52d2

Change-Id: Ie14d6108fcadd58206cb7876194e32a01501ed4d
a4a81a52d22f804afad0a1f2d8f807b9780fab03 16-Nov-2017 Pengquan Meng <mpq@google.com> Merge "Send shutdown command to modem" am: 7f2bf36ff8
am: b22d4c3cfa

Change-Id: Ia78ed87a3b048de1295808585797daef1faa651c
b22d4c3cfa8d2765b91b4b77075c662795a8f11c 16-Nov-2017 Pengquan Meng <mpq@google.com> Merge "Send shutdown command to modem"
am: 7f2bf36ff8

Change-Id: I9bd69afdee9b01a80f6fd2e85f85a1f27895447b
7f2bf36ff8c02d9b0976e102b59268264150a037 16-Nov-2017 Pengquan Meng <mpq@google.com> Merge "Send shutdown command to modem"
e2be13c62d7f340a6560c61e2e925d8608f1024c 16-Nov-2017 Cassie <xih@google.com> Adjust the logic of constructing the Parcel in convertHalCellInfoList.

Due to the changes in the constructing CellIdentity from Parcel, we need
to adjust the sequence when write into Parcel in the function
convertHalCellInfoList. Added Unit test for the changes as well.

Bug: 63984327
Test: Basic telephony sanity
Change-Id: I3c58b2e478fb2070039db8278656f90bb7776cd4
IL.java
54080689b6082f48c7148a3426315775a0354a44 16-Nov-2017 Cassie Han <xih@google.com> Merge "Revert "Adjust the logic of constructing the Parcel in convertHalCellInfoList."" am: 2f587f0125 am: 9b112d7794
am: 016119e973

Change-Id: I18681ce01dc683cecd026b54e267679bd37999d2
016119e9736c4909347fc78f3c82e116750e254d 16-Nov-2017 Cassie Han <xih@google.com> Merge "Revert "Adjust the logic of constructing the Parcel in convertHalCellInfoList."" am: 2f587f0125
am: 9b112d7794

Change-Id: I52a59e68c37699ac0775aeb1e163f81ee0bf7fbb
4d04d02f2efafd20c1447e4ee067b077beef39ed 16-Nov-2017 Ningyuan Wang <nywang@google.com> Merge "telephony: Remove persist argument for setting wifi country code"
9b112d779484f33d8d46927f2fe08730929d54af 16-Nov-2017 Cassie Han <xih@google.com> Merge "Revert "Adjust the logic of constructing the Parcel in convertHalCellInfoList.""
am: 2f587f0125

Change-Id: I96d768147111a3ee25794dedf10f4af07cf58f91
2f587f0125357d03786deac32b30a273b59d97f6 16-Nov-2017 Cassie Han <xih@google.com> Merge "Revert "Adjust the logic of constructing the Parcel in convertHalCellInfoList.""
325a03213d7c9c0284551199432fabbd1d3a16e9 15-Nov-2017 Brad Ebinger <breadley@google.com> Merge "Add exponential backoff to ImsServiceController" am: b6e40b98d9
am: 0b5bfbfef2

Change-Id: Iab30d8b475a2845ec20766a7fef3f31e789095e2
0b5bfbfef2e68d1621d68a1edaa6d65826da3a60 15-Nov-2017 Brad Ebinger <breadley@google.com> Merge "Add exponential backoff to ImsServiceController"
am: b6e40b98d9

Change-Id: I2182b0b750425961f3b3cf4959ca6dffb590f501
f2e6e134218a3302a8889ceef73d0f7ccfbddb56 10-Nov-2017 Holly Jiuyu Sun <jiuyu@google.com> Confirmation code second try.

Add an extra bundle to resolution intent which can be passed to LUI.

Bug: 69050703
Test: test on phone
Change-Id: I4c3c17b999a26ae4643178d6302cda9c9c7781c0
uicc/EuiccController.java
uicc/EuiccOperation.java
81011e81d1f0dcf15f9271379294d0a55d074403 09-Nov-2017 Brad Ebinger <breadley@google.com> Refactor ImsService structure

Refactors the ImsService feature handling
in Telephony to use the AIDL backed
features instead of the ImsService proxy
methods.

Test: Manual, Telephony IMS Unit Tests
Change-Id: I70598e5302f998c775c9a5a6eee78461cfbd8858
ms/ImsResolver.java
ms/ImsServiceController.java
18223cddc6ca8b82fbe9e06e6edc68ebe2699ae9 12-Jul-2017 Pengquan Meng <mpq@google.com> Add exponential backoff to ImsServiceController

This add exponential backoff with jitter applied to
ImsServiceController to replace the constant time retry mechanism.

Test: "JUnit tests"
Bug:34635764

Merged-In: I3069c0144ff76429315768fc8d1f6e232e3aaa3c
Change-Id: I3069c0144ff76429315768fc8d1f6e232e3aaa3c
xponentialBackoff.java
ms/ImsServiceController.java
abbf305669d446b2e7a3fbeaf91d17e475a7e390 15-Nov-2017 Cassie Han <xih@google.com> Revert "Adjust the logic of constructing the Parcel in convertHalCellInfoList."

Bug: 69349963
Bug: 69096589
Bug: 63984327

This reverts commit c10564eaf097cf7942c8d9476918f86f54d15403.

Change-Id: I193b7bacfa68694380df81bc4424876b2fec6bb2
IL.java
b0f45ffdc1c4b656b24c318c505200b3686b46f3 15-Nov-2017 Neil Fuller <nfuller@google.com> Merge "Extract low level NITZ parsing logic"
c2a920bf4ba7abff7fd413f1bbd5a8f43dfe8265 14-Nov-2017 Xin Li <delphij@google.com> Merge commit 'a07cb60cacf82c040c0536e5331fb12c1c6bea65' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.

Change-Id: I9298b2b32e25a13e2369856fe4a1d96e7d087125
c89eddd7b33ae030276c24eca127546bc75b1794 14-Nov-2017 Neil Fuller <nfuller@google.com> Merge "Remove unnecessary overriding capability"
5b62259acdbf02391cdfb80741cce2116ae9f77d 14-Nov-2017 Ying Xu <yinxu@google.com> Merge changes from topic "uiccprofile_test" am: 1ad8b167eb am: 93644cd4d7
am: 5261a0506d

Change-Id: Ife6839c963be1077d8f50039195edf334f956170
5261a0506d990c758a4c534f69cf1244d7e08f5d 14-Nov-2017 Ying Xu <yinxu@google.com> Merge changes from topic "uiccprofile_test" am: 1ad8b167eb
am: 93644cd4d7

Change-Id: I5aff53c5991348efde03b8b123b764d434af8eca
93644cd4d734dca519354ee297f353b3738c3d4f 14-Nov-2017 Ying Xu <yinxu@google.com> Merge changes from topic "uiccprofile_test"
am: 1ad8b167eb

Change-Id: I7b023eee1ac4e70a20481891a9236d38359b5e2c
1ad8b167ebd502903c19df96fac9d2900ee6e267 14-Nov-2017 Ying Xu <yinxu@google.com> Merge changes from topic "uiccprofile_test"

* changes:
Expose the update() and dispose() methods of UiccProfile
Add unit test for UiccProfile
802ffaf902e65d35d4706e2a19cbbb073b01342a 14-Nov-2017 Cassie <xih@google.com> Merge "Adjust the logic of constructing the Parcel in convertHalCellInfoList." am: 251f21db86 am: bb2fdf1ce9
am: 18cae1762e

Change-Id: Ica5fa76c6319cb9105016e9dcce4a72ee9d2cde5
18cae1762eb418a58e6a94e279c23653e97c5459 14-Nov-2017 Cassie <xih@google.com> Merge "Adjust the logic of constructing the Parcel in convertHalCellInfoList." am: 251f21db86
am: bb2fdf1ce9

Change-Id: Ie70db71b59c76e93d28b86d0aae3e552c22d68df
bb2fdf1ce9fcbb4c178e73d50d815f60a10a6a05 14-Nov-2017 Cassie <xih@google.com> Merge "Adjust the logic of constructing the Parcel in convertHalCellInfoList."
am: 251f21db86

Change-Id: Id5a5543f0a704f34445cff49d7576f191aab63d2
d8ce837499725b7eac7c5405d8fbf6c7cc27b774 10-Nov-2017 Neil Fuller <nfuller@google.com> Extract low level NITZ parsing logic

This change shrinks ServiceStateTracker by a
couple of hundred lines and improves
documentation and variable/field/method naming.

This change is a side-effect of work done to
understand the time / time zone detection logic
with a view to splitting it out from the rest of
the spralling ServiceStateTracker class.

It is likely possible to isolate time / time
zone logic but it will certainly involve
behavior changes. This is useful first step
to reduce the amount of code involved
without altering behavior.

NITZ parsing has been extracted into the static
NitzData.parse() method. NitzData is a state-holding
class that replaces three primitive fields on
ServiceStateTracker that store NITZ-derived data
and are always set together.

This change is a pure refactoring. No functional
changes are intended. The refactoring exposed
various unusual (probably unintended) cases that
were a consequence of using three, potentially
uninitialized, primitive fields to store saved
NITZ state rather than a reference type. Now that
the code can detect that NITZ data is not available
they become more obvious and expose cases that would
(for example) try to do time zone detection
with an offset == 0 and time == 0 and dst = false
(resulting in Africa/Abidjan being detected if it
ever runs).

Now the parsing / time zone lookup code is
separate it can be tested so tests have been
included here.

Tested with:
make google-tradefed-all FrameworksTelephonyTests
tradefed.sh run template/local_min --template:map test=FrameworksTelephonyTests

...and also, more quickly, with...

vogar --no-multidex --classpath \
out/target/product/marlin/data/app/FrameworksTelephonyTests/FrameworksTelephonyTests.apk \
com.android.internal.telephony.NitzDataTest

Bug: 63743683
Test: See above
Test: Booted device
Change-Id: Ie7004a7e67dff50b8271bdfe6d01111d7091dbe4
itzData.java
erviceStateTracker.java
da3ce17515b6030216bed0ad70e97a75ae052b16 14-Nov-2017 Neil Fuller <nfuller@google.com> Remove unnecessary overriding capability

This change modifies the signature of several internal
methods of ServiceStateTracker to remove the possibility
of subclasses overriding them. Where possible the methods
have been made private (thus implicitly final) and where
not possible the methods have been left protected but
made final. Only shared logging and time/time zone related
methods have been changed to limit the scope.

The use of protected is apparently a legacy of earlier
Android releases where there were several subclasses of
ServiceStateTracker.

None of these methods are referenced in tests using mocking
frameworks which might require the methods remain virtual
and non-final.

The use of protected for the log methods appears to be to
increase visiblity to subclasses but not to allow
overriding / redirection of logging to alternative log
destinations. One subclass still existings in the codebase
that relies on log() and loge().

The goal of this change is to reduce the possibility of
unintended side effects from later time / time zone detection
refactoring.

Bug: 63743683
Test: make droid
Change-Id: I57c9dd8d45fc4cfac8996c1879b93d3886be82a5
erviceStateTracker.java
bef0d604907f3254ec3c768e140c053ee13dd8e5 14-Nov-2017 Xiangyu/Malcolm Chen <refuhoo@google.com> Merge "Adding IMS settings into Subscription db."
2ffd14a164263f7482cb53e638e963f1633a0f45 13-Nov-2017 yinxu <yinxu@google.com> Expose the update() and dispose() methods of UiccProfile

Bug: 64131518
Test: Basic telephony sanity
Change-Id: Iabc3dfa31ff3ade870c968f0a07545eb1fafc58a
icc/UiccProfile.java
008dd343e2799636600ffc0db37e72cd8c78f8e2 26-Sep-2017 Wileen Chiu <wileenc@codeaurora.org> Send shutdown command to modem

- The shutdown command is not sent to
the modem for a graceful shutdown when
the modem is in offline state in which,
the RADIO_POWER off request is rejected
- Send the shutdown command as soon as
the device has been given a chance to
power down the radio

Test: manual - Checked that shutdown command is sent
even if modem is in offline state.
Bug: 38397402

Change-Id: I2fc2eae04918f3927e93924f6ae7b3e19f920de2
erviceStateTracker.java
est/SimulatedCommands.java
6fa6be6b4edaab1725c654c0cdbecf5cdab86217 25-Oct-2017 Nathan Harold <nharold@google.com> Remove spn-conf.xml Support for SPN Override

Migrate all of the SPN override support to use CarrierConfig.
With this patch, there is now a 3 step process to
determining the displayed carrier name.
1) Check the carrier config to see if the
CARRIER_NAME_OVERRIDE is set to true. If so, use it.
2) If there is already a non-empty SPN, use that.
3) If the SPN is empty and there is a valid
CARRIER_NAME_STRING, use it as the fallback.

Bug: 68049890
Test: builds+boots Fi and TMO SIMs
Change-Id: I9938a5a8428368848b1616a4b59fbb72ed178c1c
icc/SIMRecords.java
icc/SpnOverride.java
c10564eaf097cf7942c8d9476918f86f54d15403 09-Nov-2017 Cassie <xih@google.com> Adjust the logic of constructing the Parcel in convertHalCellInfoList.

Due to the changes in the constructing CellIdentity from Parcel, we need
to adjust the sequence when write into Parcel in the function
convertHalCellInfoList. Added Unit test for the changes as well.

Bug: 69096589
Bug: 63984327
Test: Basic telephony sanity
Change-Id: I76a5bed59c6da429048fc03c9fa5415aa4c0a855
IL.java
75040309317d43b2882be239de174722d8a932b7 10-Nov-2017 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Remove the OEM hook implementation and usage" am: 4a2a751662
am: a39988fae7

Change-Id: I48069ed8c01d6dd9b7471e75a7995dea0b01f6ba
a39988fae7f828269039fc6bbea32dfaa523df48 10-Nov-2017 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Remove the OEM hook implementation and usage"
am: 4a2a751662

Change-Id: I1aa0a900251b11cc4e71703f3f89c2d82e202dbf
4a2a7516629180a4e1b433c9f352679a9d975159 10-Nov-2017 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Remove the OEM hook implementation and usage"
6993a3eef4eed1a2f31a967d330bdd97e76fe1c5 25-Oct-2017 Jayachandran C <jayachandranc@google.com> Remove the OEM hook implementation and usage

Vendors and OEMs shall use HIDL extension going forward
to send OEM specific message

Test: Basic Telephony Sanity

Bug: 34344851

Change-Id: I3432501978a08753f791fb90df77ee9ef1b6d642
aseCommands.java
ommandsInterface.java
efaultPhoneNotifier.java
emHookIndication.java
emHookResponse.java
hone.java
honeNotifier.java
IL.java
adioResponse.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
22cf123d53b3274a61031f9beba90b8b13ad94f7 09-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Do not inform user when the alpha identifier is a null data" am: db8686710c am: d9793d5c76
am: e5ae43098b

Change-Id: I8a7c1fdd5399b1aca69129f084c0d2f0497fdf04
e411085af17b045bfb3b4c2dcbccd7ba4ad2fb73 31-Oct-2017 Yoshiaki Naka <yoshiaki.naka@sony.com> Avoid logging text string TLV objects in TERMINAL RESPONSE

The text string TLV object shall be hidden in the log as it might
contain personal information like password input by user.

Bug: 68786549
Test: Confirmed that the text string is not output in the radio log.
Change-Id: I6cbf4827db4094e535b5188e522eac9b2f22f988
IL.java
at/ComprehensionTlv.java
e5ae43098b356ed166774a408f16f60833403d9a 09-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Do not inform user when the alpha identifier is a null data" am: db8686710c
am: d9793d5c76

Change-Id: Ie8133ac253853c176c7f79e9f387f7970130e47e
d9793d5c7639e7cd29b4be0636fbac6d77e99960 09-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Do not inform user when the alpha identifier is a null data"
am: db8686710c

Change-Id: I43c145924f9d73b77b6c7a0467dcd35fdd0425ac
db8686710cce8f05a0a0dd52240724d9dc98979e 09-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Do not inform user when the alpha identifier is a null data"
a148c614cfe31f521d759cbde9e51d8de398ebbe 09-Nov-2017 Jiuyu Sun <jiuyu@google.com> Merge "Carrier confirmation code."
56264bff6cf1db9ec20ebeac16e980487e6fc9fc 09-Nov-2017 Cassie Han <xih@google.com> Merge "Revert "Added OperatorInfo in Scan Result."" am: b65da2fb76 am: 1e3411d719
am: 84a7d97e2a

Change-Id: I7b2686ab54176abb6139c24c92c618fd85f35290
2594f6695f4bafb0641b4f7662bb78b838f3fe67 09-Nov-2017 Jordan Liu <jminjie@google.com> Merge "SPN/PLMN display rule should consider the carrier configuration" am: 2200831f18 am: 2930109ee1
am: 8bee637a77

Change-Id: I2dbacc660818f7311e0e00b9b2188567a914d981
84a7d97e2aa8bade0716c3a9eca1fd6cba2f3491 09-Nov-2017 Cassie Han <xih@google.com> Merge "Revert "Added OperatorInfo in Scan Result."" am: b65da2fb76
am: 1e3411d719

Change-Id: I9ded069f7dd1efc3f678ea716ae7b8e8f2d02336
1e3411d7190b0be85bcf11a6ee2f7155dd9afcd3 09-Nov-2017 Cassie Han <xih@google.com> Merge "Revert "Added OperatorInfo in Scan Result.""
am: b65da2fb76

Change-Id: I1ba5ba53930ace302c7743433b882ea4d7aaf225
8bee637a77d1f36dc0e8c1c83fb499f38f4d0320 09-Nov-2017 Jordan Liu <jminjie@google.com> Merge "SPN/PLMN display rule should consider the carrier configuration" am: 2200831f18
am: 2930109ee1

Change-Id: I696dd3c125b8a3a5c676419c842bc1403b8af67a
b65da2fb76afa415cbf637a6452628abe0de1e28 09-Nov-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Revert "Added OperatorInfo in Scan Result.""
2930109ee1e5e688c2cf24673b6fae6b1fcb16b4 09-Nov-2017 Jordan Liu <jminjie@google.com> Merge "SPN/PLMN display rule should consider the carrier configuration"
am: 2200831f18

Change-Id: Idd790fb50eee844a43750f9dabeffee43f863133
04b4a766ee1f79a6b01d64b770f0676e921aa1a1 09-Nov-2017 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Remove the OEM hook implementation and usage"
5aea38d64bd4ec2d4dae74c36b225268ff3294bc 09-Nov-2017 Cassie Han <xih@google.com> Revert "Added OperatorInfo in Scan Result."

This reverts commit c9c9c57014a98ae5fa46636d86f8f5b0be9c08de.

Bug: 69096589
Bug: 63984327
Change-Id: I0a316be1da2860d4f2218be0a73029000218084c
IL.java
adioIndication.java
adioResponse.java
003923cdb761c51a1d572f18760494504fcb5739 06-Jul-2016 Guobing Xiong <guobing.x.xiong@sonymobile.com> SPN/PLMN display rule should consider the carrier configuration

Some carrier configuration are used to whether the device is currently
roaming on this network. However, SPN/PLMN display rule is not
controlled by these configuration. SPN/PLMN display rule should be
decided in consideration of these configuration.

Test: manual - Verified that PLMN/SPN which the carrier configuration
was considered is displayed.
Bug: 67835339

Change-Id: Idfd7f5ee430eb7b9892cf62037f8ca09c8de0d69
erviceStateTracker.java
icc/IccRecords.java
icc/IsimUiccRecords.java
icc/RuimRecords.java
icc/SIMRecords.java
05478e360aaaf49de44f9d45f17ebdba8fc6540d 09-Nov-2017 yinxu <yinxu@google.com> Merge "Add new class UiccProfile" am: 0dab91b3b0 am: 51f73c21a6
am: 9bfb3fe221

Change-Id: Ibf3afb7a51934bd7b0b4fb02d283b5c4fb90f0ab
9bfb3fe2213ab3f217c80f57d601bc529f27707b 09-Nov-2017 yinxu <yinxu@google.com> Merge "Add new class UiccProfile" am: 0dab91b3b0
am: 51f73c21a6

Change-Id: I5aaef86b7f6592661a6531029460676d4f58e768
51f73c21a648e59cca291e56406981c76b27540c 09-Nov-2017 yinxu <yinxu@google.com> Merge "Add new class UiccProfile"
am: 0dab91b3b0

Change-Id: I3e60ffd485f18c47b57a6eed413d9c6190b5b44b
0dab91b3b0cd7f1d0be0b318ab23728f51dcdede 09-Nov-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Add new class UiccProfile"
80fc6417014d6a884b009557fd7d19861a1087ab 18-Oct-2017 Holly Jiuyu Sun <jiuyu@google.com> Carrier confirmation code.

If confirmation code is null and required during downloading a profile,
returns a resovable error, and show ConfirmationCodeActivity. After we
get the confirmation code from the user, continue the operation.

Add the confirmationCode as a member in DownloadableSubscription.

Test: unit test, e2e on phone
Bug: 36730837
Change-Id: Id649e0623f582ce3fc2f2eb8db01e4502f72ff5b
uicc/EuiccController.java
uicc/EuiccOperation.java
4352c3f35a4ea84dad8e8684011852f34e43aae5 07-Nov-2017 yinxu <yinxu@google.com> Add new class UiccProfile

Bug: 64131518
Test: Basic telephony sanity
Change-Id: I501f14ba309e047d415e1f9faa59d36b3d9672ee
icc/UiccProfile.java
4eb59fe8c6d9922d14dc898df06efb32fbdb9317 08-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Use CarrierConfigManager as fallback to override brand" am: d6e73967a5 am: 3ab622c966
am: 2fd300b3a8

Change-Id: If6a79ce0bddfd1eef29f0a8b47f2850a4d6099a1
2fd300b3a83f0eb7d48cbb64f78e8f5509b9f034 08-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Use CarrierConfigManager as fallback to override brand" am: d6e73967a5
am: 3ab622c966

Change-Id: I6ce86b5b79eeba7809a78d1a0abeda4a01954171
3ab622c966714348bfdb0f499123c16e035f5005 08-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Use CarrierConfigManager as fallback to override brand"
am: d6e73967a5

Change-Id: Iad165fbdee56156b20d983ee71616d2e35404c11
d6e73967a59d48a75d3d394511b73bc3656f50ed 08-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Use CarrierConfigManager as fallback to override brand"
b8c6a9b03eb8c62941ce7c7b662c8aca1407edae 08-Nov-2017 Jordan Liu <jminjie@google.com> Do not inform user when the alpha identifier is a null data

Add a condition to distinguish between alpha identifier with
null data and no alpha identifier.

Ref spec: 3GPP TS 11.14, 6.4.5. Play Tone.

Bug: 22980070
Test: manual
Change-Id: Ibfe211653c34206e4326d4b4f234c9dd1e9778f2
at/CommandParamsFactory.java
19de84b984ff8dc893e63a613dcebc1e01cf69ec 08-Nov-2017 Cassie Han <xih@google.com> Merge "Added OperatorInfo in Scan Result." am: 35a37d2042 am: 191ddc67ca
am: d5ca0a16c6

Change-Id: Ie58ce7a9814ed391dba69f0910a5cafe4b0fb1a4
d5ca0a16c647174b6aa9a7e03e86bc5dddbc54fc 08-Nov-2017 Cassie Han <xih@google.com> Merge "Added OperatorInfo in Scan Result." am: 35a37d2042
am: 191ddc67ca

Change-Id: I169b684c8b0dcacb6a03c5af9ec12531937b5918
191ddc67ca263e3391cf7ff2774385c5a16b9f9f 08-Nov-2017 Cassie Han <xih@google.com> Merge "Added OperatorInfo in Scan Result."
am: 35a37d2042

Change-Id: I9fd2c1122dc2b6d9021276eaf51634c734fbe279
35a37d2042d5f750c3616b5435adf14e90b182b8 08-Nov-2017 Cassie Han <xih@google.com> Merge "Added OperatorInfo in Scan Result."
892e55ab32f1ad35591052a736e0498fb3c7de0d 08-Nov-2017 Brad Ebinger <breadley@google.com> Merge "Change ImsServiceProxy namespace" am: 37f4d636e4 am: 90bb231380
am: 9387be0dbe

Change-Id: Ie67022b430888a1e02d05b71bdf0545a069ed3f0
9387be0dbe5ac45a68aa01fba5c7a57f15230d87 08-Nov-2017 Brad Ebinger <breadley@google.com> Merge "Change ImsServiceProxy namespace" am: 37f4d636e4
am: 90bb231380

Change-Id: Ie763cb6f5f8a377c0c5b603065538d372a813fbe
90bb231380857ab8d455c3c51620d3fe301f2f00 08-Nov-2017 Brad Ebinger <breadley@google.com> Merge "Change ImsServiceProxy namespace"
am: 37f4d636e4

Change-Id: Ib936733e49210b268e2963ff222ca43de0f098ca
11f75dab7b47e7b3d459ccca5c6856018231862f 25-Oct-2017 Jayachandran C <jayachandranc@google.com> Remove the OEM hook implementation and usage

Vendors and OEMs shall use HIDL extension going forward
to send OEM specific message

Test: Basic Telephony Sanity

Bug: 34344851

Change-Id: I3432501978a08753f791fb90df77ee9ef1b6d642
aseCommands.java
ommandsInterface.java
efaultPhoneNotifier.java
emHookIndication.java
emHookResponse.java
hone.java
honeNotifier.java
IL.java
adioResponse.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
c9c9c57014a98ae5fa46636d86f8f5b0be9c08de 30-Oct-2017 Cassie <xih@google.com> Added OperatorInfo in Scan Result.

The following changes were made becuase we added the new CellIdentity
Structures in the types.hal. And those new CellIdentity structures are used
in the function networkScanResult in RadioIndication.java, in the function
getCellInfoListResponse in RadioResponse.java and in the function
convertHalCellInfoList in RIL.java.

Bug: 63984327
Test: Basic telephony sanity
Change-Id: I33e3169d2e90db3c32f59977917e02350c18a26d
IL.java
adioIndication.java
adioResponse.java
4ced648ae9f61fa4c9e2d7575d031f635b9797b5 18-Sep-2017 Mattias Nilsson <mattias.nilsson@sonymobile.com> Use CarrierConfigManager as fallback to override brand

MVNOs want their own brand name in sim settings, not
the network owner's.

Test: Added an entry in vendor.xml
Bug: 31784938
Change-Id: I6a6f7ab3769b73f55e43e4b5d8ea82779a64cc3f
icc/UiccCard.java
8bdce0412ded7e7afba435594fe3136d4756ac1b 07-Nov-2017 Brad Ebinger <breadley@google.com> Change ImsServiceProxy namespace

Changes ImsServiceProxy namespace to correspond
with move

Test: Manual
Change-Id: I04a163436e51b5af551e8c4b7114c652252f13a8
msphone/ImsPhoneCallTracker.java
d8a7576527052b4515faffc5890116ef43a4d26c 07-Nov-2017 Jordan Liu <jminjie@google.com> Merge "IMS: Use proper phone to route emergency calls" am: 67d26fc180 am: eabe08fbfc
am: ee4a1d4fe5

Change-Id: Ib466712eacc883e471501739b6540fe3d60dfbfb
ee4a1d4fe579a07561155944e31dbfe612b274f8 07-Nov-2017 Jordan Liu <jminjie@google.com> Merge "IMS: Use proper phone to route emergency calls" am: 67d26fc180
am: eabe08fbfc

Change-Id: I1e9bc81e3c85773cd0f3c55f3d9957b49acd08e4
eabe08fbfc270d98cdfc2a1921a118ea5fe50e2b 07-Nov-2017 Jordan Liu <jminjie@google.com> Merge "IMS: Use proper phone to route emergency calls"
am: 67d26fc180

Change-Id: I6eb8d5ee745eb8906aa125404aaf8d17f871c409
67d26fc180eca6a0dc31d7fd13c6cb63378f6c4a 07-Nov-2017 Jordan Liu <jminjie@google.com> Merge "IMS: Use proper phone to route emergency calls"
b4416b59c4fe60837975bc2ea29fab0cf55c7375 06-Nov-2017 Amit Mahajan <amitmahajan@google.com> Merge "Increase waiting state timeout from 30s to 5min." am: 2553549000
am: abe310da3f

Change-Id: I47a55e258cf8f03909e6ae0dfd62be10d5614a61
abe310da3fc16295c49cf5c86fe6396fa0779dc8 06-Nov-2017 Amit Mahajan <amitmahajan@google.com> Merge "Increase waiting state timeout from 30s to 5min."
am: 2553549000

Change-Id: Ie6cbdf10e112afe298c1de15764870e55c08fbbf
2553549000ad6411d2e8d94a38b6e29583f89580 06-Nov-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Increase waiting state timeout from 30s to 5min."
6e89dc089b7f2646c9138a554aa7cff4b36516d2 31-Oct-2017 Amit Mahajan <amitmahajan@google.com> Increase waiting state timeout from 30s to 5min.

Test: runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/
internal/telephony/gsm/GsmInboundSmsHandlerTest.java
Bug: 68704659

Merged in: I79bded1ca345978075836bf247fccb53bc55caa5
Change-Id: I79bded1ca345978075836bf247fccb53bc55caa5
nboundSmsHandler.java
67b8415f8cfa7a164fa75966ef17e2570ef90c3c 04-Nov-2017 Pengquan Meng <mpq@google.com> Merge "Add tests for RIL" am: f981d5d11a
am: f1cc4869b1

Change-Id: Ib353debcce723d12ebefaa94e76c5059e8200190
f1cc4869b1cd49e5c152f174806f361f277ced27 04-Nov-2017 Pengquan Meng <mpq@google.com> Merge "Add tests for RIL"
am: f981d5d11a

Change-Id: I25e4be06d028108401a96eff23c84f4e32bf170a
f981d5d11a4cb48ac367be6370acddb908140aff 04-Nov-2017 Pengquan Meng <mpq@google.com> Merge "Add tests for RIL"
a99916387c01b47023604637afe16c12b9915f6c 04-Nov-2017 Jeff Sharkey <jsharkey@android.com> Merge "Define NOT_ROAMING network capability." am: c8733de511 am: 6a585c0cf0
am: abf8394d2c

Change-Id: I15890da1847a105cc019060fbf6b561df0f13364
abf8394d2c4b2bc498f7ce377c7a66027b8eba48 04-Nov-2017 Jeff Sharkey <jsharkey@android.com> Merge "Define NOT_ROAMING network capability." am: c8733de511
am: 6a585c0cf0

Change-Id: Ic4fdd8a4027f84d86083a6f11a4bbe96b31939d4
6a585c0cf02ce8d09b36b02f15d0bb775c06921d 03-Nov-2017 Jeff Sharkey <jsharkey@android.com> Merge "Define NOT_ROAMING network capability."
am: c8733de511

Change-Id: Ifaaea03af0ad16397c121cc6ea134e602916d6cc
c8733de511837f1d3533e3c003aa2a4470de221b 03-Nov-2017 Jeff Sharkey <jsharkey@android.com> Merge "Define NOT_ROAMING network capability."
99686b9ef259ddbf7c93ef41522342746ce5c953 29-Jun-2017 Pengquan Meng <mpq@google.com> Add tests for RIL

Add some unit tests for RIL.java.

Test: "runTest -x RILTest.java" under the test directory
Bug: 38511400
Change-Id: Idded1dd46053f51dbd5b5ef26d3361def2285851
Merged-In: Idded1dd46053f51dbd5b5ef26d3361def2285851
IL.java
ILRequest.java
309cebc979ae0c180bd5a8ed6461f60e9bbe8bd2 03-Nov-2017 Chen Xu <fionaxu@google.com> Merge "new IccRecord APIs to get plmn and registerForSpnUpdate" am: 964fa68759
am: 373f57e745

Change-Id: Ief182a44d4e1bcd915ce3592c90a57fe8be0ee7a
373f57e74560b14a2306f9b09cdf812f1875e285 03-Nov-2017 Chen Xu <fionaxu@google.com> Merge "new IccRecord APIs to get plmn and registerForSpnUpdate"
am: 964fa68759

Change-Id: I701fd1d7deca5812bd375cedb030f379220dbded
964fa68759ed3bbfeead77215e3791065b0c60de 03-Nov-2017 Chen Xu <fionaxu@google.com> Merge "new IccRecord APIs to get plmn and registerForSpnUpdate"
0e71246c952c2e3b5c29dd4ce2a654f1dee07c5c 20-Jul-2017 Suresh Koleti <skoleti@codeaurora.org> IMS: Use proper phone to route emergency calls

-- By default emergency calls will be dialed using ImsPhone.
For multi-sim use cases if tried to dial emergency calls
using ImsPhone where feature state is NOT_READY then will
end up in not sending DIAL request to lower layers as
ImsServiceProxy will not allow creating call profile if
feature state is NOT_READY.
-- Check feature state before routing emergency calls to ImsPhone.

Test: Manual
Bug: 63920021
Change-Id: Ie74a4a368b860d9ad284cef6b90a2cc7eff19609
msphone/ImsPhoneCallTracker.java
b4f68c4860d3ab0bf9089a2621d2ff647a19d996 03-Nov-2017 Chen Xu <fionaxu@google.com> Merge "check empty EF_CFIS when validate call forward" am: 60f9bd6f64
am: a065f90548

Change-Id: I0447e022f4eb2cce26ebb6163991a2c1fc81d024
a065f9054873894022bee8b5b4a0058673cf7134 03-Nov-2017 Chen Xu <fionaxu@google.com> Merge "check empty EF_CFIS when validate call forward"
am: 60f9bd6f64

Change-Id: I65657f086c80df0fdb4146c03ba2ca41c3c9d86a
60f9bd6f6428bafb9ddce068704b373821101148 03-Nov-2017 Chen Xu <fionaxu@google.com> Merge "check empty EF_CFIS when validate call forward"
ee602d6daea9923c3e45fa5f9f7bef4a13796f79 02-Nov-2017 fionaxu <fionaxu@google.com> check empty EF_CFIS when validate call forward

Bug: 68679121
Test: Manual test
Change-Id: Ib4088bfd56f6b081177f548f93e9862707551a7f
icc/SIMRecords.java
41916b2445a32211aa7ffec842e4aba491894e5d 27-Oct-2017 fionaxu <fionaxu@google.com> new IccRecord APIs to get plmn and registerForSpnUpdate

those are preliminary works required for carrier identification which
requires plmn and spn for resolution.
1. new API to get PLMN from UICC.
2. new API to register SPN change. SPN is read from UICC initially
but could be override by carrier config and API setOperatorBrandOverride
we need a mechnism to notify registrants that SPN is being updated.

Bug: 64131637
Test: Manual
Change-Id: I7f1b59cf520d95aec14dd02487c48a187b6f55a9
icc/CarrierTestOverride.java
icc/IccRecords.java
icc/SIMRecords.java
f9fb243d86e786b9d81a8cb1bf664014a513db4c 03-Nov-2017 Chen Xu <fionaxu@google.com> Merge "check empty EF_CFIS when validate call forward"
375eaf5410da839b1b3144f32c6a51e52dcf140f 02-Oct-2017 Malcolm Chen <refuhoo@google.com> Adding IMS settings into Subscription db.

Since we are making IMS setting per subId, it's more appropriate
to live in Subscription db. Here we are adding support from
SubscriptionController side

Bug: 66699661
Test: Manual

Change-Id: I71f540192285262461c3c03a88fbb80de60fddf5
ubscriptionController.java
d4861d41e50f849e5663447962ec72102e3a47c5 02-Nov-2017 fionaxu <fionaxu@google.com> check empty EF_CFIS when validate call forward

Bug: 68679121
Test: Manual test
Change-Id: Ib4088bfd56f6b081177f548f93e9862707551a7f
icc/SIMRecords.java
52a4cc0ada5fa3d18ebe4c06b67683dece339991 02-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Support to read hex characters from ICCID in card." am: c89d0c91e6 am: 9b2016dfe4
am: f834e5c454

Change-Id: Idb926b759a1eeb17f2c56575fdf9a6fb11979513
f834e5c454daffe2aa9f7bca0aafe235c74842aa 02-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Support to read hex characters from ICCID in card." am: c89d0c91e6
am: 9b2016dfe4

Change-Id: I7c4861c82ad19768701272ff0d2ae1950ca96d98
5438ba1be80c9b222f88b2a2c3e892d00e062440 02-Nov-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Use SubscriptionController api to set display name"
9b2016dfe498684e47c4f4a080c8afb7bc7a3599 02-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Support to read hex characters from ICCID in card."
am: c89d0c91e6

Change-Id: I76581ec845e4be5f8cced29680c3ffeb0b66e1cc
c89d0c91e6f118721058d6277e1278e6dd7c053e 02-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Support to read hex characters from ICCID in card."
ba64b9650b60768255a96a54226cb0d137060521 01-Nov-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "DO NOT MERGE Use SubscriptionController api to set display name"
5f8e6f0c15ce8535b7e8f342b433edf749691f50 01-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Sets a flag whether to use only RSRP for LTE signal bar" am: 4ce4976800 am: f87cb1df15
am: b4b2b8fed7

Change-Id: I6ca226919a421ebf073989ec3cc57042273a926c
a46bbe62a10bf3117cc948cd1a70fa2934993ce7 03-Apr-2017 Sandeep Gutta <sangutta@codeaurora.org> DO NOT MERGE Use SubscriptionController api to set display name

To broadcast onSubscriptionChange notification when display name
and display number are updated use SubscriptionController apis
to update display name and number.

Test: manual test with different carrier SIM cards
Bug: 36850457
Change-Id: Ib5fa90385a991b24a884aa34c7dda809ac53e743
ubscriptionInfoUpdater.java
b4b2b8fed785255a041159597af09400cdc3b1c9 01-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Sets a flag whether to use only RSRP for LTE signal bar" am: 4ce4976800
am: f87cb1df15

Change-Id: If4ffb5ffa2f66c1a92a9b4a2c9b5e82dada287ac
1d084659a4cff22a786e22539432cf19ab136a43 09-May-2017 Yujing Gu <guy@codeaurora.org> Support to read hex characters from ICCID in card.

The ICCID in some commercial cards included hex characters.
Instead of reading decimal digit, support to read hex characters
from ICCID in card.

Fixes: 62245439
Test: SubscriptionInfoUpdaterTest#testHexIccId
Change-Id: Ib79840c4b318e9310d98c6cc5ace0999146995d5
ubscriptionController.java
ubscriptionInfoUpdater.java
e394ecae6d9df7fab535ab99794b225706017ad3 03-Apr-2017 Sandeep Gutta <sangutta@codeaurora.org> Use SubscriptionController api to set display name

To broadcast onSubscriptionChange notification when display name
and display number are updated use SubscriptionController apis
to update display name and number.

Test: manual test with different carrier SIM cards
Bug: 36850457
Change-Id: Ib5fa90385a991b24a884aa34c7dda809ac53e743
ubscriptionInfoUpdater.java
8b8f2d0eef46bc73e5b3853d6a52707d8d07a8b7 31-Oct-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Update references to moved CDMA_ROAMING_MODE_ constants."
138279a7dee1c541869acb970f0e3014feff2544 31-Oct-2017 Amit Mahajan <amitmahajan@google.com> Increase waiting state timeout from 30s to 5min.

Test: runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/
internal/telephony/gsm/GsmInboundSmsHandlerTest.java
Bug: 68704659

Change-Id: I79bded1ca345978075836bf247fccb53bc55caa5
nboundSmsHandler.java
40222ee76e264fe08da75f41e72e6bd03a0f30f1 31-Oct-2017 Jeff Davidson <jpd@google.com> Update references to moved CDMA_ROAMING_MODE_ constants.

Bug: 29163993
Change-Id: I7959192f2b085393a55fbfa01b1f62cc5c82c1a0
Test: TreeHugger only (no functional changes)
smCdmaPhone.java
honeInternalInterface.java
d31963e95653ec0f9976b1da3c893b8406f2fd77 18-Oct-2017 Wenting Xiong <wenting.xa.xiong@sony.com> Sets a flag whether to use only RSRP for LTE signal bar

Some carriers require to use only RSRP for LTE signal bar.
Set the flag to SignalStrength according to a carrier config.

Test: manual - Checked that the number of LTE signal bars display
which base on RSRP only can be controlled by carrier config.
Bug: 67831028

Change-Id: I7948fa17bddb0e1fc2544a73711349f1a713d204
erviceStateTracker.java
c30a024e7be8ec7b05187a4e66791ee808adc6c5 31-Oct-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Use Android data for MCC-based time zone lookup"
d23be77e0a2302ebdfd068a0ef59ca624009abe7 31-Oct-2017 Jack Yu <jackyu@google.com> Merge "Logged historical APN state" am: 80fa35e7c0
am: 2073f5ac6d

Change-Id: I46099488e9b932549fd265863f32beb948b610a2
80fa35e7c06cdbca7a07b0fde239e5b18df12f30 31-Oct-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Logged historical APN state"
9dd8de1a78a5ed427bbaf1b7fb0e1bc2af922d42 28-Oct-2017 Jack Yu <jackyu@google.com> Logged historical APN state

Added historical APN state into local log for debugging
purposes.

Test: Manual
Merged-In: I2a3c32dfc8fb750fd369d48fc77b9630d84f4c94
Change-Id: I2a3c32dfc8fb750fd369d48fc77b9630d84f4c94
(cherry picked from commit 58b0c0142b2763968b8fa75a2da4cab3629d739f)
ataconnection/ApnContext.java
ataconnection/DataConnection.java
d33ea2aa5491dec833b2921ac80ad36b42040b81 30-Oct-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Logged historical APN state"
f24c35890afdf666a3ab5dd564f72c494c22f197 30-Oct-2017 Chen Xu <fionaxu@google.com> Merge "new IccRecord APIs to get plmn and registerForSpnUpdate"
58b0c0142b2763968b8fa75a2da4cab3629d739f 28-Oct-2017 Jack Yu <jackyu@google.com> Logged historical APN state

Added historical APN state into local log for debugging
purposes.

Test: Manual
Change-Id: I2a3c32dfc8fb750fd369d48fc77b9630d84f4c94
ataconnection/ApnContext.java
ataconnection/DataConnection.java
da3b8be8f1acf834c17e00fb3c5c15fc24e9efec 28-Oct-2017 Jeff Sharkey <jsharkey@android.com> Define NOT_ROAMING network capability.

The "roaming" state of a network really belongs on NetworkCapabilities
instead of being published through NetworkInfo.isRoaming(). One major
reason is to support developers creating NetworkRequests for a
non-roaming network.

This change unifies NetworkInfo updates into a single method, since
there were lurking bugs where it could end up partially updated. Also
always send updated info and capabilities whenever they change.

Test: bit FrameworksNetTests:android.net.,com.android.server.net.
Bug: 68397798, 16207332
Change-Id: I1652e7bea37e1d3f64ef829a9cbc1411b64e286c
ataconnection/DataConnection.java
72204daaab03717021a3f0983e90016c373457bf 30-Oct-2017 Xi Han <xih@google.com> Merge "Migrate flag config_telephony_use_own_number_for_voicemail to Carrier Config."
8cc7f5b3e4d6c82b0fadca3fd4fc41d682c1a253 29-Oct-2017 Mengjun Leng <mengju@codeaurora.org> Merge "Add support for send Message with messaging options." am: 5bb6bdb54c am: 2b95be2149
am: 184be992bc

Change-Id: I614306193caa948f2e497463c63117004b5a862c
184be992bc77c744c9e451cb5545a5446038799d 29-Oct-2017 Mengjun Leng <mengju@codeaurora.org> Merge "Add support for send Message with messaging options." am: 5bb6bdb54c
am: 2b95be2149

Change-Id: Idc8f7f259bd6e8c1454b3c078f4dbcf527aa97dd
5bb6bdb54c60b40157b4c8824966986fe44b9cdb 29-Oct-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Add support for send Message with messaging options."
73a879e848c6cc35e9748a47bbcadc4358d2d718 27-Oct-2017 fionaxu <fionaxu@google.com> new IccRecord APIs to get plmn and registerForSpnUpdate

those are preliminary works required for carrier identification which
requires plmn and spn for resolution.
1. new API to get PLMN from UICC.
2. new API to register SPN change. SPN is read from UICC initially
but could be override by carrier config and API setOperatorBrandOverride
we need a mechnism to notify registrants that SPN is being updated.

Bug: 64131637
Test: Manual
Change-Id: I7f1b59cf520d95aec14dd02487c48a187b6f55a9
icc/CarrierTestOverride.java
icc/IccRecords.java
icc/SIMRecords.java
09ac2aaad8429058f08e440cfa19eca76cadd82c 27-Oct-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Expand call forwarding logging."
fab11d29e252ceed83065e146bba7ccc4318a126 27-Oct-2017 Sandeep Gutta <sangutta@codeaurora.org> Merge "MSIM: Fix to update display name in subinfo record" am: fec5f08b2e am: 65d1b64deb
am: 99a18fbe70

Change-Id: I867542a6769c5acb50f22afb0e2180fe6c481ac1
99a18fbe70ec54c959524f810147b57faea1732f 27-Oct-2017 Sandeep Gutta <sangutta@codeaurora.org> Merge "MSIM: Fix to update display name in subinfo record" am: fec5f08b2e
am: 65d1b64deb

Change-Id: Id051c9f8fdf3bb859d8209e4a6b7e8086999f128
7d97ddc2a1d84bccf6dbd422211556ce7314c915 19-Sep-2017 Tyler Gunn <tgunn@google.com> Expand call forwarding logging.

Cleaned up logging code surrounding call forwarding indication changes.
Diagnosing failures to update the CFI indicator was not possible due
to missing logging.

Test: Manually togged CFI to confirm log messages.
Bug: 65760595
Merged-In: I4d06c842c3d21304e1df719a6d37085781f22e21
Change-Id: I94d546486a08547d0b1958708884b5e1725e322d
allForwardInfo.java
efaultPhoneNotifier.java
smCdmaPhone.java
hone.java
fec5f08b2ec3428077ca7556e4950259cfd0794a 27-Oct-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "MSIM: Fix to update display name in subinfo record"
b7a5be0d35bda36d896842972ee9529cd71b5206 27-Oct-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Ensure call forwarding and barring MMI codes can work over IMS."
81f2d9fe51e2d0c12e7c5e4cdd6c7fe497935e2d 09-Aug-2017 Tyler Gunn <tgunn@google.com> Ensure call forwarding and barring MMI codes can work over IMS.

The code included a mDialingNumber != null check which would prevent
call forwarding and call barring codes from ever being handled over IMS.
E.g. *30#6505551212 should be handled because it is a valid SC_CLIP
request, but the 6505551212 dialing number would prevent this from going
over IMS.

Test: Dialed MMI code and verified it goes over IMS.
Merged-In: I0aa5ccbf020c6f9606d193ef944d4458c6f6c355
Change-Id: I4bc93085a9c012d80fcce67c65b851995cfe8996
Fixes: 38439766
msphone/ImsPhoneMmiCode.java
c75caec8ddf3776ea5b978575d5eef8a7a4259dc 10-Oct-2017 Cassie <xih@google.com> Migrate flag config_telephony_use_own_number_for_voicemail to Carrier Config.

Bug: 65683508
Test: Basic telephony sanity
Change-Id: Ia69f72eac147e2d2eeeea4cf042943996033f9b1
smCdmaPhone.java
484ac6109b1850721eea964c3ee7bf98feaf5f36 27-Oct-2017 Tyler Gunn <tgunn@google.com> Remove empty override of saveClirSetting in ImsPhoneBase. am: 26d7e38ef3
am: 7e9f789681

Change-Id: Ie5e4c1297e92b253ac5b4765c7ee9ba4e8d48b6f
7e9f78968185fadf387826fbf2a4413693d1506f 27-Oct-2017 Tyler Gunn <tgunn@google.com> Remove empty override of saveClirSetting in ImsPhoneBase.
am: 26d7e38ef3

Change-Id: I5a9e10db935611c9396d1c0fb6cbc2478b764d21
9eb99b2daaf46917e8e565005e03d53b33936fb6 11-Apr-2017 Mengjun Leng <mengju@codeaurora.org> Add support for send Message with messaging options.

Add support for following messaging options.

1.Add support for message priority in 3gpp2.

2.Add link control support while sending multiple messages.

3.Add validity period support in 3gpp.

Change-Id: Iaee8b93ef373e34ddcc5b7d65365852e470467d4

Pass correct arguments to sendText api

Pass correct arguments to sendText api

Change-Id: I3b07c7c359af12fe6d63636408d4d6237acff8cd

MSIM(Telephony):Add changes to SMS APIs as per new SmsManager design

Changed SMS Msim APIs as per new SmsManager design.

Added SMS Msim APIs for new SmsManager relevant to adding support for
sending Message with messaging options.

Ammend UT test cases for API changes and add UT validity period test
case.

Change-Id: I53bb027531959f71285e5f79896768a591129536
ccSmsInterfaceManager.java
msSMSDispatcher.java
MSDispatcher.java
iccSmsController.java
dma/CdmaSMSDispatcher.java
sm/GsmSMSDispatcher.java
d66dcae0f167d27b99b847070c1e64fbe140858f 27-Oct-2017 Jack Yu <jackyu@google.com> Merge "Fixed the network capabilities log" am: 12efa86029
am: a2e8a173ef

Change-Id: Id8a6534b4369a8867f0632a35e4812c6d618dc3d
731e4a8f8747622f44372d18e9510f30a783df5e 27-Oct-2017 Jack Yu <jackyu@google.com> Merge "Added service state override testing tool" am: 36381bc74b
am: c0b47d7194

Change-Id: Ie89549a81565a2a860db70540c03fc14c5e90955
02321638d3290148acbd42a77932ece971216268 27-Oct-2017 Jack Yu <jackyu@google.com> Merge "Added capabilities changed history into local log" am: 4c7bdf68b0
am: 573f2a9b32

Change-Id: I4596c318525c06b89a936062ffa30b4f521722dd
12efa86029fd1bc752a24842d73d6c93dee9ba4a 26-Oct-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fixed the network capabilities log"
36381bc74bb919f2d28ca77ca18e85f6a0f24d74 26-Oct-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Added service state override testing tool"
60c9dad26912093a7f95546d71909fce14039480 26-Oct-2017 Jack Yu <jackyu@google.com> Added service state override testing tool

Expand Telephony tester to support service state
override to simulate hard-to-repro issues.

Test: Manual
Merged-In: I1525c18322dd8282c1ee2c7f9b5f030b0a9c9543
Change-Id: I1525c18322dd8282c1ee2c7f9b5f030b0a9c9543
hone.java
erviceStateTracker.java
elephonyTester.java
f1be527d20eb3d191a3b4fc194bb5da61a93fb0d 26-Oct-2017 Jack Yu <jackyu@google.com> Fixed the network capabilities log

Fixed the network capabilities log

Test: Manual
bug: 67979821
Merged-In: If446d64a41948a72b128db0c8391febff452fa19
Change-Id: If446d64a41948a72b128db0c8391febff452fa19
ataconnection/DataConnection.java
2337e6f1b497bc79438430bee3edbeb583a0cd5c 24-Oct-2017 Jack Yu <jackyu@google.com> Added capabilities changed history into local log

Added capabilities changed history into local log.

Test: Manual
bug: 67979821
Merged-In: I5e0fc9d95d4ae5ecc5ac4c2e7912ddb77633ce65
Change-Id: I5e0fc9d95d4ae5ecc5ac4c2e7912ddb77633ce65
ataconnection/DataConnection.java
1838468b41bac845de2beacd161fd2bdfdaba9c2 26-Oct-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Added service state override testing tool"
171318cdecb5107a262f4d451cb91bf79ebbe9ea 26-Oct-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fixed the network capabilities log"
8d4c4e71edddbfe462f4cda9f23d5d82db654f16 26-Oct-2017 Jack Yu <jackyu@google.com> Added service state override testing tool

Expand Telephony tester to support service state
override to simulate hard-to-repro issues.

Test: Manual
Change-Id: I1525c18322dd8282c1ee2c7f9b5f030b0a9c9543
hone.java
erviceStateTracker.java
elephonyTester.java
7f31b3f8fedf3647791f1299f18e61e938891b98 26-Oct-2017 Jack Yu <jackyu@google.com> Fixed the network capabilities log

Fixed the network capabilities log

Test: Manual
bug: 67979821
Change-Id: If446d64a41948a72b128db0c8391febff452fa19
ataconnection/DataConnection.java
dfab23533b71dc5de6bb1960707ffa53faef325f 26-Oct-2017 nharold <nharold@google.com> Merge "Trim Empty PLMNs from the list of parsed PLMNs" am: 5f84fc9311 am: 654f7ec62b
am: 7e8eb60cad

Change-Id: I712b587892a5b7145cbe7d0423e9132e692abfd5
7e8eb60cadf0c2587f6dfef1db885aa781bd5d15 26-Oct-2017 nharold <nharold@google.com> Merge "Trim Empty PLMNs from the list of parsed PLMNs" am: 5f84fc9311
am: 654f7ec62b

Change-Id: I17352a97e0f513d0c48ae4a0031ddcedda139406
5f84fc9311a64d369b57a78ccb0d823703c25367 26-Oct-2017 nharold <nharold@google.com> Merge "Trim Empty PLMNs from the list of parsed PLMNs"
03f0c3a89f071518251dc99bdb47d7c94dd96472 26-Oct-2017 Pengquan Meng <mpq@google.com> Merge "Fix to notify ECBM exit to registrants" am: b01a527803 am: 9aca3cb263
am: 3ebb441c07

Change-Id: I1ff88296d3a271b776a093346198d5a370fc2fd6
3ebb441c0731f70c41b2373aa0f76ecadbc15bdb 26-Oct-2017 Pengquan Meng <mpq@google.com> Merge "Fix to notify ECBM exit to registrants" am: b01a527803
am: 9aca3cb263

Change-Id: Ia12eeaaf6cf8f6458c0d467ef57f159858793734
b01a5278037c573f47759c6219de6df3ac61a302 26-Oct-2017 Pengquan Meng <mpq@google.com> Merge "Fix to notify ECBM exit to registrants"
cca928e42dfd1800903374c22f2aacdbfee79a19 25-Oct-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Added capabilities changed history into local log"
0090a28cd82470123abd7cfb31321d4dda16b604 25-Oct-2017 Brad Ebinger <breadley@google.com> Merge "Fix dial emergency call redial issue by China Unicom." am: 0491b77344 am: 7c22bb739f
am: 60dbc7f3cc

Change-Id: I535477dbb947b7747624bd2b5337a332e3f646e4
60dbc7f3ccaf7757653ba3927622097ddec7209e 25-Oct-2017 Brad Ebinger <breadley@google.com> Merge "Fix dial emergency call redial issue by China Unicom." am: 0491b77344
am: 7c22bb739f

Change-Id: Ia0cbce29d4048839191b43cefe02c8b684f9b3d6
0491b77344d79b48e13537f3a09d3fe34cca4a51 25-Oct-2017 Brad Ebinger <breadley@google.com> Merge "Fix dial emergency call redial issue by China Unicom."
59e4b922ae816df8e85ff066cbb6c0ce36f739ae 24-Oct-2017 Jack Yu <jackyu@google.com> Added capabilities changed history into local log

Added capabilities changed history into local log.

Test: Manual
bug: 67979821
Change-Id: I5e0fc9d95d4ae5ecc5ac4c2e7912ddb77633ce65
ataconnection/DataConnection.java
d0261789f859e00636a8377387db714af9761084 25-Oct-2017 Jordan Liu <jminjie@google.com> Merge "Make it possible to dial an operator specific code" am: 52910bd109 am: 0f1489a3a7
am: 37db2d1674

Change-Id: I12c18b19a9cee76c01ed014eab0e70a9929e46bb
37db2d16747d013929c424067b671746d77cdef2 25-Oct-2017 Jordan Liu <jminjie@google.com> Merge "Make it possible to dial an operator specific code" am: 52910bd109
am: 0f1489a3a7

Change-Id: Icdde7cd7f57a60286d889b1576ad0f03f6b181f1
26d7e38ef34912cfca6788ae11fae4f13390a7c6 25-Oct-2017 Tyler Gunn <tgunn@google.com> Remove empty override of saveClirSetting in ImsPhoneBase.

When the CLIR setting is changed via GSM, the base Phone#saveClirSetting
method gets called to save the user's CLIR setting to shared prefs.
It turns out that when the IMS code was written, an empty stub override
was added for ImsPhone. If an attempt was made to save the CLIR setting
over IMS, the network would be updated but the shared prefs would not be.

Removing the empty override ensures the default base Phone version of the
save logic gets used.

Test: Manual, performed CLIR set operations over IMS and verified saves.
Bug: 68029544
Change-Id: I678fccd8ec7c610002b503a18261e3807586af4d
msphone/ImsPhoneBase.java
36bc1ea8cc7522e141ad4b4dec6a70898d61592c 25-Oct-2017 Neil Fuller <nfuller@google.com> Use Android data for MCC-based time zone lookup

Instead of using IANA's time zone ordering from zone.tab,
use Android data for MCC-based time zone lookup.

This allows us to remove a code hack for Australia (
which was forcing the use of Australia/Sydney over the
Australia/Lord_Howe given in the IANA data) and
improves a few others. It also means that the selection
is controlled in files mastered by Android and not files
taken directly from IANA.

With 2017b rules data it means the following
differences from prior behavior:

[ISO code]: Old answer, New answer.

[fm]: Old: Pacific/Chuuk, New: Pacific/Pohnpei
[ru]: Old: Europe/Kaliningrad, New: Europe/Moscow
[um]: Old: Pacific/Midway, New: Pacific/Wake
[uz]: Old: Asia/Samarkand, New: Asia/Tashkent

In all cases these are the zone IDs understood to cover the
region's capital.

This change only affects time zone lookups when only
the MCC is known (i.e. in the absence of NITZ).

Bug: 36971201
Bug: 62418027
Test: All known country ISO codes (and some unknown) tried
Change-Id: I7ee2d133802d2d91f36b247b05974c77abb957dc
ccTable.java
4c3074749b34189d47b273d4bb0526ea9700a0b9 25-Oct-2017 Nathan Harold <nharold@google.com> Trim Empty PLMNs from the list of parsed PLMNs

aosp/428381/ changed the PLMN parsing in IccUtils
to trim all 'f' characters, which resulted in a few
functions returning empty instead of ffffff for SIM
records that were unfilled. To fix those methods,
we now trim all results that are returned as empty

Bug: 68218015
Test: cts - testGetForbiddenPlmns()
Change-Id: I07fa0f2ef3d0135f672bd50b5079d23e46cce636
icc/SIMRecords.java
3fe6c7f53963649d11777137c79585f9e3270ff9 16-Sep-2016 Sandeep Gutta <sangutta@codeaurora.org> MSIM: Fix to update display name in subinfo record

Currently display name in subinfo record is updated from
SubscriptionInfoUpdater.java when SIM state moves to LOADED.

For the SIM cards which does not have valid EF_SPN sim file,
by the time SIM state moves to loaded, setSpnFromConfig()
not getting called and due to that default display string
of "CARD 1/2" updated in subinfo record.

To fix update valid spn name from config, call setDisplayName() once again
after SPN name updated by SIMRecords.

Bug: 36497632
Test: manual - tested with SIM does not have EF_SPN
Change-Id: I27a9b34dc35e70c49872622f000ade6764c07c11
icc/SIMRecords.java
672bd67147462b4449ca7c5bdc64bb4e8815d5e7 29-Sep-2014 Adrian Muzyka <adrian.muzyka@sonymobile.com> Make it possible to dial an operator specific code

The modify that the device allows the FAC(feature access code) to be
sent as a normal call by the operator requirement.

Test: manual - Checked that special codes which configured in
CarrierConfig are dialed as a normal call.
Bug: 67664279

Change-Id: Iefdb36b6f6b32356cea8935c048bc62ba7386c55
sm/GsmMmiCode.java
adec655be7b40cb6b9ed3f4196054f63b180c43a 24-Oct-2017 Jordan Liu <jminjie@google.com> Merge "Correct the value of access technology." am: ee2b0302d1 am: 65b6f0b46c
am: 851f74a7dc

Change-Id: Ieb7e295cc7e87b38c6bbbc25c1fbeef2dea27c51
851f74a7dcf76314b2ce17ca70378ae1fb10bfe4 24-Oct-2017 Jordan Liu <jminjie@google.com> Merge "Correct the value of access technology." am: ee2b0302d1
am: 65b6f0b46c

Change-Id: I4efc4ff2081ced2cb1654449d49006f652850b03
ee2b0302d10e5355748b52764646f9a762db0bd4 24-Oct-2017 Jordan Liu <jminjie@google.com> Merge "Correct the value of access technology."
6c7560e7dd28fed4ae9feb0622edba70b0f94613 21-Apr-2017 Yujing Gu <guy@codeaurora.org> Correct the value of access technology.

The byte in java is a signed variable.
The last byte in one record(bytes[offset + 4) will be 0xfxx if the first
byte in the next record is 0xf.
And the beginning in each record is 0xfffff to indicate the default PLMN.
To correct the value of accessTechs in the record, filtered the
bytes[offset + 4] with 0xff.

Fixes: 37884144
Change-Id: Ie88952321c4add09e6ad91f4a6db4e28d72daafc
icc/PlmnActRecord.java
816992ffbceb9e81da6062615e1db9db46de2e72 24-Oct-2017 Pengquan Meng <mpq@google.com> resolve merge conflicts of 0a1b7c2b2 to stage-aosp-master
am: 103e42f1b1

Change-Id: Ia09280c1d0aaf9c521d1eb79742c742f047f1bd9
103e42f1b13ba43eeac478f53b9d2402e11d6e30 24-Oct-2017 Pengquan Meng <mpq@google.com> resolve merge conflicts of 0a1b7c2b2 to stage-aosp-master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic4ce6a0cf640ccd7706c66672ee75b716e795bc4
0a1b7c2b2cfa37dbe8eaf753d2b06e2b0a1c9250 23-Oct-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Improves service state changed notification"
b60225e86e3a02197f95cede8fe6989d7a129b96 09-Oct-2017 Pengquan Meng <mpq@google.com> Improves service state changed notification

The service of GsmCdmaPhone and ImsPhone are changed independently, but
the service state tracker only notify the service state of
GsmCdmaPhone. This changed make the ServiceStateTracker notify the
merged state of GsmCdmaPhone and ImsPhone even if these two phone change
their service state independently.

Bug: 67471135
Test: manually test and unit test

Change-Id: Iba99fc2b02ae536897d9cde07d81b6ab64b5a9cb
erviceStateTracker.java
msphone/ImsPhone.java
4d7052fe42d19be0bf71b55d3c69196f4d8ffec7 20-Oct-2017 Pengquan Meng <mpq@google.com> Merge "[telephony] Fixed sgianl strength issue" am: 04d8d2ff76 am: 686b915435 am: e37080ea48
am: 321622b16e

Change-Id: Id62df21dc29c6307475d2f2bcf9fe7dff3e705ad
321622b16ed1e3daeb3eefb4f783d97e90a4dd91 20-Oct-2017 Pengquan Meng <mpq@google.com> Merge "[telephony] Fixed sgianl strength issue" am: 04d8d2ff76 am: 686b915435
am: e37080ea48

Change-Id: Ib0f2085ea4bdcf26221bc9d1c98c523712eb71dc
686b9154354f150be3305b53bec6aabbab8ade9c 20-Oct-2017 Pengquan Meng <mpq@google.com> Merge "[telephony] Fixed sgianl strength issue"
am: 04d8d2ff76

Change-Id: I3c990a706b49f60d6f8e1dae8d393def6e63d9ed
04d8d2ff76580e2b24d31db823a99876ff19647f 20-Oct-2017 Pengquan Meng <mpq@google.com> Merge "[telephony] Fixed sgianl strength issue"
8aa1902515048e1622a78829b6834f965227dfc8 19-Oct-2017 Jordan Liu <jminjie@google.com> Merge "Don't cancel CS reject cause notifications"
am: 6632298d07

Change-Id: Iede834e53aeba0ab2089ba7c5690c9ce2a09dcc9
6632298d0771084277936a4324944ab3b63d9725 19-Oct-2017 Jordan Liu <jminjie@google.com> Merge "Don't cancel CS reject cause notifications"
4a3f566dc6323010dc7d036c602c2ebfdf0fe71c 27-Sep-2017 Jordan Liu <jminjie@google.com> Don't cancel CS reject cause notifications

Notification should stay until the user dismisses it. Since the error
that causes this notification is a permanent error (until power cycle or
SIM swap), we shouldn't cancel it when we enter a new service state or
the SIM is removed.

Test: manual
Merged-In: I25735ca2c13a655a604d76880a805d9cf63ad1f6
Change-Id: I25735ca2c13a655a604d76880a805d9cf63ad1f6
Fixes: 64194949
erviceStateTracker.java
a700c38857528b9671293e90df10bd0bfdbd86ba 19-Oct-2017 Pengquan Meng <mpq@google.com> [telephony] Fixed sgianl strength issue

The flag GSM of signal strength maybe unknown under OOS, but the signal
strength changed has been notified. In this case, set the flag GSM based
on the signal strength data.

Test: manual
Bug: 62431424

Change-Id: Ic400faf8f480f5d8dd0f79342e34f94a2deaa4e2
erviceStateTracker.java
2abd432236638691bf7415887daa11eb4059b5cf 19-Oct-2017 Jordan Liu <jminjie@google.com> Merge "MSIM:Fix sim state change intent broadcasted for both slots." am: 140e9cd2c5 am: 66be3d9974 am: 4901a0f0c1
am: a07cb60cac

Change-Id: I5edadf9aa8258b73dda79e91de436324c37517a6
a07cb60cacf82c040c0536e5331fb12c1c6bea65 19-Oct-2017 Jordan Liu <jminjie@google.com> Merge "MSIM:Fix sim state change intent broadcasted for both slots." am: 140e9cd2c5 am: 66be3d9974
am: 4901a0f0c1

Change-Id: Ib98809f055d6e0c9c813ed962fa66add39dd9d2e
66be3d99743dbae7f1b480bfa1338c0ffa8c8f14 19-Oct-2017 Jordan Liu <jminjie@google.com> Merge "MSIM:Fix sim state change intent broadcasted for both slots."
am: 140e9cd2c5

Change-Id: Ic384c46ab11c1762724384f94a177eb176494ea4
140e9cd2c5a6476e5f53b8fca36c03c955bd4c2b 19-Oct-2017 Jordan Liu <jminjie@google.com> Merge "MSIM:Fix sim state change intent broadcasted for both slots."
b0f9de81aae1572b8edcd87378cc60e38aba0fdd 18-Oct-2017 Pengquan Meng <mpq@google.com> Merge "Improves service state changed notification"
2e62e9d6bd87cd12c4209cea1d57565b219be5b0 18-Oct-2017 kun.tang <kun.tang@spreadtrum.com> Merge "Restore saved network selection accordding to config.xml" am: 094224702a am: 7ee4fab308 am: f3c91f3bef
am: 38b0c82ea9

Change-Id: I37093b72e9000f3850db23507b00ae25ed6c4b6a
38b0c82ea99e04d7691561cccc992f4b6022fbca 18-Oct-2017 kun.tang <kun.tang@spreadtrum.com> Merge "Restore saved network selection accordding to config.xml" am: 094224702a am: 7ee4fab308
am: f3c91f3bef

Change-Id: I43933a1eb2a5f214d4eae4ad0f16da1368b4a7af
7ee4fab30862d9061ef3736bd26a595b1bb75a17 18-Oct-2017 kun.tang <kun.tang@spreadtrum.com> Merge "Restore saved network selection accordding to config.xml"
am: 094224702a

Change-Id: Ie071650b269133e0ac35d4a6133afb7fdfa16361
094224702aa33ba119aa13e5bbdbb0cdd312928c 18-Oct-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Restore saved network selection accordding to config.xml"
3ddc9ba0e2fb9f474e071c64132b23115991921f 18-Oct-2017 Jordan Liu <jminjie@google.com> Merge "Ignore the exception when parsing remaining attempts" am: ec74a2c882 am: 8303137c36 am: 429924b1f0
am: 6baa27abd5

Change-Id: Ibfbc8f5f29463b99907d82f72c90b7e87be5370f
6baa27abd56d4d925f3080e8a984e1e74ddadd2a 17-Oct-2017 Jordan Liu <jminjie@google.com> Merge "Ignore the exception when parsing remaining attempts" am: ec74a2c882 am: 8303137c36
am: 429924b1f0

Change-Id: I2b4591b33eee31e432f9cfa4700eb450fff493f1
8303137c3693e6e234fed11637b1c4e2a0da4d77 17-Oct-2017 Jordan Liu <jminjie@google.com> Merge "Ignore the exception when parsing remaining attempts"
am: ec74a2c882

Change-Id: I298255b385f30ce44e49ed648e930d66c5b2a595
ec74a2c882f54ffcd177256d82254a4861bf42ec 17-Oct-2017 Jordan Liu <jminjie@google.com> Merge "Ignore the exception when parsing remaining attempts"
28280a96cf76f90ee70780ad5e8e5c38dab7bc7c 17-Oct-2017 Amit Mahajan <amitmahajan@google.com> Merge "Add a timeout in waiting state to unblock the state machine after 30s."
am: 1ef77a5070

Change-Id: I4202b2b45770b230daf0f910f4f90b4c1e513cef
1ef77a5070caa6340c567f4ac06c47d4b025ddbb 17-Oct-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Add a timeout in waiting state to unblock the state machine after 30s."
f5af26993f76b7bc19f79c5dd6447817caf2256f 22-Sep-2017 Amit Mahajan <amitmahajan@google.com> Add a timeout in waiting state to unblock the state machine after 30s.

This is so that if the state machine is stuck in waiting state, the
current message can be dropped and other messages can still be
processed.

Test: manual with hacks to make state machine be stuck in waiting
state
runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/
internal/telephony/gsm/GsmInboundSmsHandlerTest.java
--test-method testWaitingStateTimeout
Bug: 65599291
Merged-in: Ib944b28023c1225d6db8945b56eff8996d0a0248
Change-Id: Ib944b28023c1225d6db8945b56eff8996d0a0248
nboundSmsHandler.java
3c3872c2fd25c9d4ea837ef5b339e167a9071113 22-Mar-2017 Ruthwar Kumar Ambeer <ruthwar@codeaurora.org> Ignore the exception when parsing remaining attempts

Currently when the user inputs the wrong PIN, the vendor RIL/Modem
returns failure and number of remaining attempts.
To parse the number of remaining attempts we need to ignore the exception.


Bug: 37782683
Change-Id: Ibab9514d2753cb46071491a32a473f167c6cfb8a
icc/UiccCardApplication.java
64cd89e7e63363e5c931cba7adb59fa123b2a6d5 17-Oct-2017 Sooraj Sasindran <sasindran@google.com> Merge "Enhance network scan request" am: 0cd7ef0e6d am: 6e6c19bafd am: fb42fd0b3a
am: 1d06fbe142

Change-Id: I1f666639e9176c38aabd608879c74c846dab141c
e79a4ccf573197cd6a0cf7fb0132aed219ef4e8a 17-Oct-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Send user reject for SET_UP_CALL timeout" am: c2496e85c7 am: 457ad6ff52 am: 68c7f3f214
am: 45e5673d16

Change-Id: Icaa0b538f053c0918cea3de9503bf580585de833
1d06fbe142cd771a26e92c0f54c0ed55d369267b 17-Oct-2017 Sooraj Sasindran <sasindran@google.com> Merge "Enhance network scan request" am: 0cd7ef0e6d am: 6e6c19bafd
am: fb42fd0b3a

Change-Id: Ic18d3fee0f30ff85f81d864d2c271f52b091edf6
6e6c19bafd0e4f68b92fcdb24b9c02a73064ce52 17-Oct-2017 Sooraj Sasindran <sasindran@google.com> Merge "Enhance network scan request"
am: 0cd7ef0e6d

Change-Id: I42f16c6c7f574986c9813b9078f5178eb757bf41
0cd7ef0e6d1c3e0aaa99355ea0c27fdb2078feae 17-Oct-2017 Sooraj Sasindran <sasindran@google.com> Merge "Enhance network scan request"
45e5673d160641ec8c2705d5936fdaed6f60d07e 17-Oct-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Send user reject for SET_UP_CALL timeout" am: c2496e85c7 am: 457ad6ff52
am: 68c7f3f214

Change-Id: I5a910661b8c9fb8b374cf789c59c5202acc6fe43
457ad6ff520eae5aa2b62fa909174631cbb46804 17-Oct-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Send user reject for SET_UP_CALL timeout"
am: c2496e85c7

Change-Id: I9757f992c0775d1de6247ac9da17fa151cdeb1f9
ffac118f2399d342c4ca4ddb5167667e52db5adf 20-Jul-2017 Sooraj Sasindran <sasindran@google.com> Enhance network scan request

BUG=63865942

Test: Verified by making changes in settings app to call the api
and confirmed that the new information is delivered to vendor
code
Merged-In: I32a2e935f43ed66f56582a24662627dcaeacb263
Change-Id: I32a2e935f43ed66f56582a24662627dcaeacb263
etworkScanRequestTracker.java
IL.java
ce55e28db34cb2c38649693b64cb0223d045febf 17-Oct-2017 qingbiao.meng <qingbiao.meng@spreadtrum.com> Fix dial emergency call redial issue by China Unicom.

Dial emergency call like 112 use China Unicom card, and if wait
remote server end the call, then disconnect code will be 31(NORMAL_UNSPECIFIED),
this code will be treat as DisconnectCause.ERROR in telecom-service at last,
and cause redial in telecom-service.

To fix, I change it to DisconnectCause.OTHER.

Test: Build pass
smCdmaConnection.java
213f182cd7bdad7324187eef2f5b3608e2ad938e 16-Oct-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Imsi: Accounting for gzipped certificate data from the website. Bug: 35606429 Test: runtest -x CarrierKeyDownloadMgrTest" into oc-mr1-dev am: 6b22702451
am: 67928a212a

Change-Id: Iaafa7d59a76ed58b01b40e349e944e6380756b5f
67928a212a8a36648df6198b3e08a42b49515067 16-Oct-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Imsi: Accounting for gzipped certificate data from the website. Bug: 35606429 Test: runtest -x CarrierKeyDownloadMgrTest" into oc-mr1-dev
am: 6b22702451

Change-Id: Icd4f2eb99dd0b14a4ef282b83f1c7f7771d77e2e
6b227024518b0a799ca36c6a76ea770c82f93735 16-Oct-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Imsi: Accounting for gzipped certificate data from the website. Bug: 35606429 Test: runtest -x CarrierKeyDownloadMgrTest" into oc-mr1-dev
2a5474900a9a856d01c5beb2bebc67571e37dc51 12-Oct-2017 pkanwar <pkanwar@google.com> Imsi: Accounting for gzipped certificate data from the website.
Bug: 35606429
Test: runtest -x CarrierKeyDownloadMgrTest

Change-Id: Iefb20a0a30382c06dde1982e51ee770279c14b75
arrierKeyDownloadManager.java
a2532a5fd76c325c672bdf0f606170796fd5e056 09-Oct-2017 Pengquan Meng <mpq@google.com> Improves service state changed notification

The service of GsmCdmaPhone and ImsPhone are changed independently, but
the service state tracker only notify the service state of
GsmCdmaPhone. This changed make the ServiceStateTracker notify the
merged state of GsmCdmaPhone and ImsPhone even if these two phone change
their service state independently.

Bug: 67471135
Test: manually test and unit test

Change-Id: Iba99fc2b02ae536897d9cde07d81b6ab64b5a9cb
erviceStateTracker.java
msphone/ImsPhone.java
a070eed5a94be2a3cb5941fc7f89b0657fab0539 12-May-2017 Sandeep Gutta <sangutta@codeaurora.org> Send user reject for SET_UP_CALL timeout

For the setup call command, a 'no response from user' is incorrectly
sent from the dialog activity when user doesn't respond to the dialog or
the dialog loses foreground focus.

Correct response per spec is 'user did not accept the proactive command'.
Route the error handling to the SET_UP_CALL handler to send this.

Bug: 38253898
Change-Id: I4f3263a2bf18979fb493da72039584f95c671d4d
at/CatService.java
4b101ab46e71b657c4837065132862ef99c3cc76 10-Oct-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Fix power blaming log to show up using dumpsys in bugreport." into oc-mr1-dev am: c6e33eadcd
am: 0399e59a20

Change-Id: I34851778aedf13802e318a96fe18fa942dbf0acc
0399e59a207e3a61bccf376c0e830f91bda100c7 10-Oct-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Fix power blaming log to show up using dumpsys in bugreport." into oc-mr1-dev
am: c6e33eadcd

Change-Id: I027d3bdd83ae558e810003038fb054a78e5a2aea
c6e33eadcda2a8b5cc65c89fdc9ffb9f688c6328 10-Oct-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Fix power blaming log to show up using dumpsys in bugreport." into oc-mr1-dev
ad44212e1cb9fc97679378036f6224c2c287cebf 10-Oct-2017 Sanket Padawe <sanketpadawe@google.com> Fix power blaming log to show up using dumpsys in bugreport.

Bug: 67481566
Test: manual
Change-Id: I237a6d8e4a8cf218a0d1ae9a706cb29d6e1358bd
lientWakelockTracker.java
IL.java
316b7d0be21ddb554b886da0dbd46126e6baa7cc 09-Oct-2017 Chen Xu <fionaxu@google.com> Merge "clear mdn cache on SIM absent" into oc-mr1-dev am: 6cfdfd6ea9
am: 82ba94bf23

Change-Id: If472c790d002dd5c4af7ed45712cf5d2b9f164e4
82ba94bf23dfcaee96aa15ea3a59a2969e21eb8e 09-Oct-2017 Chen Xu <fionaxu@google.com> Merge "clear mdn cache on SIM absent" into oc-mr1-dev
am: 6cfdfd6ea9

Change-Id: I735abb4b11d7c82d5298d0ea3dde600b3fbc3254
6cfdfd6ea9029d34478edbb8217ca92a71e02350 09-Oct-2017 Chen Xu <fionaxu@google.com> Merge "clear mdn cache on SIM absent" into oc-mr1-dev
e681be9bd0a6df4720de64f0954745eb67e0ce0e 07-Oct-2017 fionaxu <fionaxu@google.com> clear mdn cache on SIM absent

mdn cache is not cleared on SIM absent. on SIM swap, getLine1Number
returns staled MDN of previous SIM util RUIM records loaded.
Fix is proactively clear mdn cache on SIM absent.

Bug: 67074980
Test: Manual
Change-Id: Ibb1815d27e9f5ee1704cc12c960ffc49d32669d8
erviceStateTracker.java
a8a1214b9cca917b310e0a8d8b6dc15527864b9a 06-Oct-2017 Pankaj Kanwar <pkanwar@google.com> Merge "resolve merge conflicts of Imsi to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp
am: 9c35ab6d94

Change-Id: I8b1e7c2bef0ae00f42839b3a7abe0c4b66acc730
9c35ab6d94eed5af46008b619d3c87e39622dfa5 06-Oct-2017 Pankaj Kanwar <pkanwar@google.com> Merge "resolve merge conflicts of Imsi to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp
d78dad16d7dabb82aee3ab01b747b9bdee97ecf6 06-Oct-2017 Jordan Liu <jminjie@google.com> Merge "Display "No service" on status bar when SIM unready" am: 182b81be6a am: f941a19256
am: 2665d8b49d

Change-Id: I29a3afb1b1dfed01e2d9e3ca3e616104e8b09747
f941a192569f765a2a3fd8101a0f156617752fdd 06-Oct-2017 Jordan Liu <jminjie@google.com> Merge "Display "No service" on status bar when SIM unready"
am: 182b81be6a

Change-Id: Ia5c74607a680e177d7e839f93331244afba19fc4
6d5f4de85dbdff84bef6def31a33c62bc35b5ca0 30-Sep-2017 pkanwar <pkanwar@google.com> Imsi: move to certificate instead of public key.

Bug: 35606429
Test: runtest -x CarrierKeyDownloadMgrTest
Merged-In: Ic2fd40be6aa3104dc74f19ea959973d42bdbc9f2
Change-Id: I9071c93f017710f5cc8f29109b23531ba63e2b22
arrierKeyDownloadManager.java
7ff8b690109b506a91f5da1a85ef09c4170ab536 30-Sep-2017 pkanwar <pkanwar@google.com> resolve merge conflicts of Imsi to oc-mr1-dev-plus-aosp

Bug: 35606429
Test: runtest -x CarrierKeyDownloadMgrTest
Change-Id: Ic2fd40be6aa3104dc74f19ea959973d42bdbc9f2
arrierKeyDownloadManager.java
182b81be6a2698cf3e98a5f66d356b79eed89364 06-Oct-2017 Jordan Liu <jminjie@google.com> Merge "Display "No service" on status bar when SIM unready"
616d16fb161137c989a7d124aa1c1685db82fcf9 05-Oct-2017 Jordan Liu <jminjie@google.com> Merge "Display "No service" on status bar when SIM unready"
03a6d9d327c0c407e6442c04976ba2334225207f 05-Oct-2017 Jordan Liu <jminjie@google.com> Merge "Handle LANGUAGE NOTIFICATION command" am: ed094bc500 am: 2230c5f895 am: db4a088b41
am: 09689a6806

Change-Id: I00ceeff6efe50afc2ff4327ea58ef8c8e93678ab
09689a6806c7fa7c0f713277f3192996c353345e 05-Oct-2017 Jordan Liu <jminjie@google.com> Merge "Handle LANGUAGE NOTIFICATION command" am: ed094bc500 am: 2230c5f895
am: db4a088b41

Change-Id: I245f36696f0ec205fb185cc77d6aea23317d7b6a
2230c5f895711b253dd8040a6ac74d14654d700f 05-Oct-2017 Jordan Liu <jminjie@google.com> Merge "Handle LANGUAGE NOTIFICATION command"
am: ed094bc500

Change-Id: I0cde53cd78440e3d2168ab335656ec5164b72a2f
ed094bc500d8a2db65775da27901b8a583445260 05-Oct-2017 Jordan Liu <jminjie@google.com> Merge "Handle LANGUAGE NOTIFICATION command"
293f5c7471ab17792e47bdebb6d37523ee1120db 26-Sep-2017 Abhishek Panjikar <apanji@codeaurora.org> IMS: De-registration happens when modem comes up from low power mode.

- When modem goes into low power mode and then comes up,ims
deregistration takes place soon after registration.

- When modem comes up from low power mode, onDataEnabledChanged is called
before the carrier config is actually loaded. Hence, while in the
process of updating ims service ims gets deregistered as carrier related
information is loaded.

- Allowing to update ims service only after carrier config is properly
loaded.Also, resetting the mCarrierConfigLoaded flag when config service
is no longer available or we get an empty carrier config.

Test: Manual
Bug: 67033695
Change-Id: Idb1abc86bcf502d56428e4fb1e5696e73f2bc773
msphone/ImsPhoneCallTracker.java
f6aad4256fb170fc654487b22df01c4d295e5f76 05-Oct-2017 Jordan Liu <jminjie@google.com> Don't cancel CS reject cause notifications am: 390628aa55
am: ca6f74822b

Change-Id: I6e07281e98b9b4643d17d23dc88eba3cd332bd5b
ca6f74822be04f87c14e5886beb93badf1d36044 05-Oct-2017 Jordan Liu <jminjie@google.com> Don't cancel CS reject cause notifications
am: 390628aa55

Change-Id: I145896128fc73b00ffb0e685f836e1c31218d635
1713132a565fbe221c74011551362e896b7280ed 05-Oct-2017 Jordan Liu <jminjie@google.com> Add import which was lost due to diverged codebase am: 2e69595758
am: 004c10e3c3

Change-Id: I9e973824734b66efe1d16009f176436b786ac477
2e69595758e844e27b0279003c64008fdcc7a198 05-Oct-2017 Jordan Liu <jminjie@google.com> Add import which was lost due to diverged codebase

Test: manual
Change-Id: If29854a26535ca786c082ba1b97719c01be4a910
msphone/ImsPhoneMmiCode.java
f64cff33e3797e226b5d1c89d73b9cf8cf99dd4d 11-Feb-2016 Toshiya Ikenaga <toshiya.ikenaga@sonymobile.com> Display "No service" on status bar when SIM unready

Introduce carrier config to forcibly display "No Service" instead of
"Emergency calls only" when SIM is unready.

Test: manual - checked displaying "No service" on status bar
Bug: 29191964
Merged-In: I744ec9a3c70376199ba94d68331604276ea761c3
Change-Id: I744ec9a3c70376199ba94d68331604276ea761c3
erviceStateTracker.java
23002282a9fbffea4b639ffda3917ebebbee1bc7 05-Oct-2017 Jordan Liu <jminjie@google.com> Merge "IMS: Handle IMS Reason CODE_FDN_BLOCKED" am: 415158fb4a am: 1d7047684c
am: 26990670f8

Change-Id: I6e16d68579d636eadbaa2bc0d01e8ac4cb567e3b
1d7047684c9e420bf762b3c19c34c1925a1cd8ae 05-Oct-2017 Jordan Liu <jminjie@google.com> Merge "IMS: Handle IMS Reason CODE_FDN_BLOCKED"
am: 415158fb4a

Change-Id: I55607f747c0ea2128cfcb6e29e03487902549965
390628aa550a2edb01716a48e4e36f4a9b1aa927 27-Sep-2017 Jordan Liu <jminjie@google.com> Don't cancel CS reject cause notifications

Notification should stay until the user dismisses it. Since the error
that causes this notification is a permanent error (until power cycle or
SIM swap), we shouldn't cancel it when we enter a new service state or
the SIM is removed.

Test: manual
Change-Id: I25735ca2c13a655a604d76880a805d9cf63ad1f6
Fixes: 64194949
erviceStateTracker.java
436542230d2251bb65431ae99a983f99f913f667 11-Feb-2016 Toshiya Ikenaga <toshiya.ikenaga@sonymobile.com> Display "No service" on status bar when SIM unready

Introduce carrier config to forcibly display "No Service" instead of
"Emergency calls only" when SIM is unready.

Test: manual - checked displaying "No service" on status bar
Bug: 29191964
Change-Id: I744ec9a3c70376199ba94d68331604276ea761c3
erviceStateTracker.java
17455474895f02c9e84b08ad1a0102c2f940bced 28-Jun-2017 Benergy Meenan Ravuri <bravuri@codeaurora.org> IMS: Handle IMS Reason CODE_FDN_BLOCKED

Handle Ims Reason CODE_FDN_BLOCKED to show FDN failure dialog

Test: Manual - Checked that FDN failure dialog is shown when
IMS UT requests(Call forwarding, Call waiting etc) fail with
FDN enabled.
Bug: 63104754
Merged-In: Ic5c709c9aa48101ce4e46b6029e8a4837510ea6b
Change-Id: Ic5c709c9aa48101ce4e46b6029e8a4837510ea6b
msphone/ImsPhone.java
msphone/ImsPhoneMmiCode.java
6c0ffe880af4318ac91596803d12fced24e5c335 28-Jun-2017 Benergy Meenan Ravuri <bravuri@codeaurora.org> IMS: Handle IMS Reason CODE_FDN_BLOCKED

Handle Ims Reason CODE_FDN_BLOCKED to show FDN failure dialog

Test: Manual - Checked that FDN failure dialog is shown when
IMS UT requests(Call forwarding, Call waiting etc) fail with
FDN enabled.
Bug: 63104754
Change-Id: Ic5c709c9aa48101ce4e46b6029e8a4837510ea6b
msphone/ImsPhone.java
msphone/ImsPhoneMmiCode.java
8770b406ee40a26f44ad98a8d2e6b8c25809c1a2 21-Jun-2016 Takanori Nakano <takanori.x.nakano@sonymobile.com> Handle LANGUAGE NOTIFICATION command

The terminal shall handle LANGUAGE NOTIFICATION command and return
TERMINAL RESPONSE (OK) to the UICC in order to pass the test cases
described in the section 27.22.4.25 of ETSI TS 102 384.

Bug: 30175964
Test: manual - Confirmed that the command works as expected.

Change-Id: Ia1d09cb19021742e4fcc2f8e0d15140853d553cb
at/AppInterface.java
at/CatService.java
at/CommandParams.java
at/CommandParamsFactory.java
2c566204d1326554398d086a30b3047cf5c59264 03-Oct-2017 Pengquan Meng <mpq@google.com> Merge "Fix data call retry issue on non dds sub" am: 0e454d9c78 am: cff30202ac am: d12cc2df52
am: 1da7e640a0

Change-Id: I096150150b67982fe10d63031f9d02531e9437c5
1da7e640a0ca86369604f8726b133a3ca0ce19e4 02-Oct-2017 Pengquan Meng <mpq@google.com> Merge "Fix data call retry issue on non dds sub" am: 0e454d9c78 am: cff30202ac
am: d12cc2df52

Change-Id: Id272e8c967eaf7537d2cfac89a3e52f5bbd7b92d
cff30202ac92b476855bd72dcb72fed06ddd0535 02-Oct-2017 Pengquan Meng <mpq@google.com> Merge "Fix data call retry issue on non dds sub"
am: 0e454d9c78

Change-Id: Ib26b9490c4e7b4a2509a384ec5a75a6280c5595f
0e454d9c78888ca761caa7069f5791b29db78afb 02-Oct-2017 Pengquan Meng <mpq@google.com> Merge "Fix data call retry issue on non dds sub"
e6bfa9e6bb968f676567a9a9cae12a554ec4dc60 29-Sep-2017 Pengquan Meng <mpq@google.com> Merge "Fixed UT request issue over IMS" am: a31b1412aa am: 317e2bbe0f am: 887f0992f4
am: 817deb9c96

Change-Id: Iaddd4740f5b143bc450b0c277c59cffd8e977481
817deb9c969d65df1ed4853bff0fb6728f424e66 29-Sep-2017 Pengquan Meng <mpq@google.com> Merge "Fixed UT request issue over IMS" am: a31b1412aa am: 317e2bbe0f
am: 887f0992f4

Change-Id: I39be6d9d80edbc89ebb83b11b5fc139da06a8d60
317e2bbe0fad4d45046746e54869e5fd0b7f1718 29-Sep-2017 Pengquan Meng <mpq@google.com> Merge "Fixed UT request issue over IMS"
am: a31b1412aa

Change-Id: If5edf9ba2e7a129138d05cc7f595f9efffe2dee5
a31b1412aaa0139b194d915d25bc3c37f028a939 29-Sep-2017 Pengquan Meng <mpq@google.com> Merge "Fixed UT request issue over IMS"
d4c6318ac02de1788a9770f0a7ba27f016d92958 28-Sep-2017 Jordan Liu <jminjie@google.com> Merge "Set additional info for LaunchBrowser error case." am: 69a23fcfa8 am: d1bbcb4536 am: 1a868adcec
am: ecd4761f38

Change-Id: I3d30cfa825c241a242a343c1d5f924e8ac82694f
ecd4761f38ce4975913ef85610e20b9acd224eaa 28-Sep-2017 Jordan Liu <jminjie@google.com> Merge "Set additional info for LaunchBrowser error case." am: 69a23fcfa8 am: d1bbcb4536
am: 1a868adcec

Change-Id: I249798678ead0ef40559b5846fcb8a0e1e6366cf
d1bbcb4536256bb8414b473a070783b066c45219 28-Sep-2017 Jordan Liu <jminjie@google.com> Merge "Set additional info for LaunchBrowser error case."
am: 69a23fcfa8

Change-Id: I765ffd41b107df1e68e88b584a9f47a76468da8a
69a23fcfa88f2f2d1adfb5f91e58c05dc6d0639e 28-Sep-2017 Jordan Liu <jminjie@google.com> Merge "Set additional info for LaunchBrowser error case."
e49ecf2d1ae19c7eb06da4891759e6e84b73b4b1 28-Sep-2017 Pankaj Kanwar <pkanwar@google.com> Merge "After this change, we'll show the emergency notification even in Airplane Mode when the user is registered for Wifi Calling." into oc-mr1-dev am: d142983a72
am: 2dbb59cf2b

Change-Id: Ieffb4f2a7a8eebfb507817fe2a14ee5459374f4a
2dbb59cf2b67841d19c02087f1e7f3abf50a082a 28-Sep-2017 Pankaj Kanwar <pkanwar@google.com> Merge "After this change, we'll show the emergency notification even in Airplane Mode when the user is registered for Wifi Calling." into oc-mr1-dev
am: d142983a72

Change-Id: Ibe6a8669239c9d4ef744b338d88be769241c8807
e42263844ffa5814594351cb089bcc82dcec8784 28-Sep-2017 Pengquan Meng <mpq@google.com> Fixed UT request issue over IMS

Currently UT request is not going over PS (IMS) even when useImsForUt is true
but the isImsEnabled is false. This changed make sure when useImsForUt
is true, the UT request should go over PS call.

Bug: 37263750
Test: manually test

Change-Id: I70b67d60a775dc3cf74e3f334b9a0b5a9a088685
smCdmaPhone.java
d142983a7254329ab4f535ebffe9f4beea9971fe 28-Sep-2017 Pankaj Kanwar <pkanwar@google.com> Merge "After this change, we'll show the emergency notification even in Airplane Mode when the user is registered for Wifi Calling." into oc-mr1-dev
ebb5717eed7380442f7c32a377aeae597d1f2a90 28-Sep-2017 pkanwar <pkanwar@google.com> After this change, we'll show the emergency notification even in Airplane Mode
when the user is registered for Wifi Calling.

Bug: 65692603
Test: manual
Change-Id: Ifec15a871217cda8c0d87ae5eaee2c48b00f9ea2
arrierServiceStateTracker.java
1daad530cc44ab7c4912a486c84ef44d43f4104a 28-Sep-2017 pkanwar <pkanwar@google.com> Building IMSI support for encryption. Changes to the JSON fields. CPed from master. am: 5363996028
am: e929e1ef95

Change-Id: I7f9cf144b9c12725b9f10e8541dd89b243446f12
e929e1ef95ecf4e4d3a514753bfc4c850d4bd61f 28-Sep-2017 pkanwar <pkanwar@google.com> Building IMSI support for encryption. Changes to the JSON fields. CPed from master.
am: 5363996028

Change-Id: Ib63c77cb37d09aae7eec2967da76f36d47d3c3f1
5363996028cca9a2707dae86ffc1b94b364e3cb0 25-Sep-2017 pkanwar <pkanwar@google.com> Building IMSI support for encryption. Changes to the JSON fields.
CPed from master.

BUG: 35606429
Test: runtest -x CarrierKeyDownloadMgrTest
Change-Id: Ie6b5e8607e661d0745e90df0e67f3c074a88f94a
arrierKeyDownloadManager.java
03e0a381a07a9e7634a0c0c9c83829c3f98f3a2a 26-Sep-2017 nharold <nharold@google.com> Merge "Remove sysprop based radio reset sync mechanism" am: 49573da2b6 am: 2d5cdc3157 am: becb42c1a9
am: ae1836dcb7

Change-Id: I060344260ce1194ad542214922fe1667fab65c50
ae1836dcb7f7c4a523b8c2bab22ec924b77f6fcd 26-Sep-2017 nharold <nharold@google.com> Merge "Remove sysprop based radio reset sync mechanism" am: 49573da2b6 am: 2d5cdc3157
am: becb42c1a9

Change-Id: I51125ffc2e812f3868c3c1e0333fe1ae07d960c6
2d5cdc3157bc43b39f87a39ee70d4b0096d20407 26-Sep-2017 nharold <nharold@google.com> Merge "Remove sysprop based radio reset sync mechanism"
am: 49573da2b6

Change-Id: If847ee76a1ae8a27441b340846967880663b4c64
49573da2b6c08a31a059c1da281db8d3d2b1b62d 26-Sep-2017 nharold <nharold@google.com> Merge "Remove sysprop based radio reset sync mechanism"
4f580e63be8e5787ce636c3b47335529ceb973b9 14-Sep-2016 Susheel nyamala <snyamala@codeaurora.org> Fix data call retry issue on non dds sub

Data call retry on non dds sub is aborted due to subid mismatch.
Dds sub id is being passed in the retry alarm intent, which is
causing issue for non dds sub.

Pass subid from phone instance instead of dds sub id

Bug: 36498535

Change-Id: I8a51d41aa1cdc8add81491b7ef75a90b247aee32
ataconnection/DcTracker.java
fc7e59579742d8888abd288ac5c36f2da17c29db 07-Aug-2017 Nathan Harold <nharold@google.com> Remove sysprop based radio reset sync mechanism

This CL removes the gsm.radioreset system property that
could ostensibly be used to initiate an out-of-band
radio reset, which relies on both the framework and OEM
code to synchronously write the value of the gsm.radioreset
system property.

This property isn't being used by any vendor implementations
that are currently active, unless that usage is obfuscated
within binaries.

Bug: 64444973
Test: compilation
Change-Id: I5837d01d1d949ebf57a2d25f9a6fb52ed9f6db94
ataconnection/DcTracker.java
028c483d0223ffedb9c2ca20638f00ae4da478e2 26-Sep-2017 Amit Mahajan <amitmahajan@google.com> Merge "Add a timeout in waiting state to unblock the state machine after 30s." into oc-mr1-dev am: 10453eb75b
am: 607d4fb2c1

Change-Id: I7402563d12e2c3e56942d2f500073f3e95976763
607d4fb2c101f53bd6e762b9b563c0db49e765ba 26-Sep-2017 Amit Mahajan <amitmahajan@google.com> Merge "Add a timeout in waiting state to unblock the state machine after 30s." into oc-mr1-dev
am: 10453eb75b

Change-Id: I4ff488f5016e0c6c2018eec1fd92dfb4e8cc873e
10453eb75b81525e9afcfe6836a908ba2d2c4a6f 26-Sep-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Add a timeout in waiting state to unblock the state machine after 30s." into oc-mr1-dev
76739e7ece2fda467219453255149af7b2df6793 22-Sep-2017 Amit Mahajan <amitmahajan@google.com> Add a timeout in waiting state to unblock the state machine after 30s.

This is so that if the state machine is stuck in waiting state, the
current message can be dropped and other messages can still be
processed.

Test: manual with hacks to make state machine be stuck in waiting
state
runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/
internal/telephony/gsm/GsmInboundSmsHandlerTest.java
--test-method testWaitingStateTimeout
Bug: 65599291
Change-Id: Ib944b28023c1225d6db8945b56eff8996d0a0248
nboundSmsHandler.java
71c7fa3b17048d6a83d2a96b2e10ba655796a5bd 07-Jun-2017 Umashankar Godachi <umasha@codeaurora.org> MSIM:Fix sim state change intent broadcasted for both slots.

In SubscriptionInfoUpdater while handling the sim loaded
event, sim state change intent is wrongly getting broadcasted
for both slots. This will have potential issue in case of SIM
PIN lock.

Fix: Broadcast the sim state change intent only for the sim
which is in LOADED state.

Test: Manual - Checked that SIM PIN lock screen dismissed only
when user enters the correct PIN for all SIM.

Bug: 62520405
Change-Id: I7ef7dfc749d0f73c684e3a77113821687496cc78
ubscriptionInfoUpdater.java
36c9552644c11827114220019ac2f7121ac133ec 24-Sep-2017 pkanwar <pkanwar@google.com> Building IMSI support for encryption. am: aba07fa1ac
am: 48947b03af

Change-Id: I1889a6b43d18f732868cc14f4aa02b98abe75599
48947b03af0d53ef819698a29116fcabaf4d704f 24-Sep-2017 pkanwar <pkanwar@google.com> Building IMSI support for encryption.
am: aba07fa1ac

Change-Id: Iaa9f263d933c360f1113027f0afa24aa32da7fdb
aba07fa1ac55d4f2866409f6c6bb85b66b8b3251 06-Sep-2017 pkanwar <pkanwar@google.com> Building IMSI support for encryption.

Adding tests for CarrierKeyDownloadManager.
BUG: 35606429
Test: runtest -x CarrierKeyDownloadMgrTest
CP from master

Change-Id: I70b5d89edf3587404f41e053f67fee7ef2fc2cc0
arrierKeyDownloadManager.java
31b09ea65091b77ad6fb6a29b7578637f2924d59 22-Sep-2017 Pengquan Meng <mpq@google.com> Merge "Fix to return data connection state" am: 940538ef37 am: 351ad88db2 am: 7fc0302dd7
am: 32005bce0d

Change-Id: I501b931607dc59cb0f3a1db902358211c79c19a0
2adc88225d254e4e80501d0b42095bbf69bdc64a 22-Sep-2017 Pengquan Meng <mpq@google.com> Merge "Get default from CdmaSubscriptionSourceManager" am: 736138c72f am: 8f0fd579be am: 5a920ef790
am: e54456e71e

Change-Id: I6b3a972e755f2d484b7c3e14f3550dd1d59a21ed
32005bce0dea6ef13f2e2da175169bba8b54fb4d 22-Sep-2017 Pengquan Meng <mpq@google.com> Merge "Fix to return data connection state" am: 940538ef37 am: 351ad88db2
am: 7fc0302dd7

Change-Id: I671a89c1f486d207a3826afb02f05691d6d3208c
e54456e71e0ef141c32cf24a5cd5773a75e0036a 22-Sep-2017 Pengquan Meng <mpq@google.com> Merge "Get default from CdmaSubscriptionSourceManager" am: 736138c72f am: 8f0fd579be
am: 5a920ef790

Change-Id: Ic3e1b8a91086e05a4d44d2f54140f92738aefe6d
351ad88db287de342f5f4c068efba00817533b8b 22-Sep-2017 Pengquan Meng <mpq@google.com> Merge "Fix to return data connection state"
am: 940538ef37

Change-Id: I07045bf70266af6e998f3de39dfa873bf791d945
8f0fd579be12bcc4315f72f30f2a7830769e6bc6 22-Sep-2017 Pengquan Meng <mpq@google.com> Merge "Get default from CdmaSubscriptionSourceManager"
am: 736138c72f

Change-Id: I536f42f6cdc07982e33db22380a8b07808f87ff2
940538ef3780ee687c767693ffde9000ea1ddff6 22-Sep-2017 Pengquan Meng <mpq@google.com> Merge "Fix to return data connection state"
736138c72fc9be2e3651c063afec2b9bea3d4c65 22-Sep-2017 Pengquan Meng <mpq@google.com> Merge "Get default from CdmaSubscriptionSourceManager"
3e02c5865505ba3bb3813f5b90578dff3c2adf7c 22-Sep-2017 Tyler Gunn <tgunn@google.com> Merge "Fix issue where video call continues on LTE when wifi lost and data off."
am: 2c1254ac1d

Change-Id: Ie4d6058fe11a2d345eaba6f524505e4dcd1b8ae1
74ccd4e67a5a55a587c2666984ec73bad13a0632 19-Sep-2017 Tyler Gunn <tgunn@google.com> Fix issue where video call continues on LTE when wifi lost and data off.

Due to changes in b/36900451 to decouple VT from the data enabled state
of the device, there was a regression in the case where WIFI is lost during
a WIFI video call and mobile data is off.

Changed code to properly handle this case by triggering a disconnect when
video pause signalling is in use.

Test: Manual - turn off wifi when on WIFI video call and mobile data is
disabled. Regression tested mobile data off auto-pausing.
Bug: 64531514

Merged-In: Ibfcc9c38b261f3162c4af92c705be740b07a6e67
Change-Id: I6561f653cd446b74f127951e02d482f7c9267c9d
msphone/ImsPhoneCallTracker.java
f8920643fa83c6004f81efc9ad7f6ae5594d6610 21-Sep-2017 Tyler Gunn <tgunn@google.com> Merge "Expand call forwarding logging." into oc-mr1-dev am: 8bea94c852
am: af24201a7f

Change-Id: I6274dcd9ff53e007e8ec71a1b056e36ec1f9fb49
55507dfda4aa27c19b41e831c2f8f2ad0c049fc3 21-Sep-2017 Tyler Gunn <tgunn@google.com> Fix issue where video call continues on LTE when wifi lost and data off. am: 64f3d6bc69
am: 6f6a8ada5c

Change-Id: I8d169ac6f7f7b985769605364fb66fbd5ae695f3
63fa599fef0383b41f85e1fc3a38d33c4434e24a 20-Sep-2017 Tyler Gunn <tgunn@google.com> resolve merge conflicts of 214a3eb16 to stage-aosp-master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Id750164d7ed0d0966a2125394924630c30d25a6a
f256dac7132f990472af3b53a1803bd8b765a9ee 20-Sep-2017 Ningyuan Wang <nywang@google.com> telephony: Remove persist argument for setting wifi country code

Bug: 29353903
Test: compile, unit tests
Change-Id: Ib281c5edb162789ba9fb558e56e9e24e7156622a
ccTable.java
hone.java
214a3eb16a55b25784b87d035f284d47dd642cc3 20-Sep-2017 Tyler Gunn <tgunn@google.com> Merge "Support auto-downgrade of video calls when mobile data is metered."
794ae2fac38df4ac0b8891c44742cda9dc5b5d5b 20-Sep-2017 Tyler Gunn <tgunn@google.com> Merge "Add supp service notification test intent."
c77a37742d3267a97ff5fbfa6b9976cd7bbc09d9 20-Sep-2017 Brad Ebinger <breadley@google.com> Merge "Fixed TTY Mode RIL update bug"
am: b713975f20

Change-Id: I76f3277c3cdc69fa8755105cb207ad09fe787eb8
b713975f201b99d3f5a971a3dbcb5ede13f39917 20-Sep-2017 Brad Ebinger <breadley@google.com> Merge "Fixed TTY Mode RIL update bug"
d992ba5b56493102188b543870b6b3342e36f213 08-Jun-2017 Tyler Gunn <tgunn@google.com> Add supp service notification test intent.

Add new test intent used to manually trigger supp service notifications.
Since the call forwarded supp service notification is not something
that can be tested domestically, this test intent provides a means of
invoking the functionality.

Test: Test harness.
Bug: 33761801
Merged-In: I4d17e2e3b24ccc65a58899c784d8c411aecd4001
Change-Id: Ic23a65c02e419587d1095d2c24b52df76fc14826
elephonyTester.java
7a411d4797fb60914f5f6230bde24fc25b12f920 17-Aug-2017 Tyler Gunn <tgunn@google.com> Support auto-downgrade of video calls when mobile data is metered.

The previous code supported downgrading video calls (either to audio,
or pausing video, or terminating the call, depending on carrier reqs)
when mobile data is disabled.

These changes provide support for downgrading a video call over wifi
when it hands over to LTE (that work is in onCallHandover). The rest
of the changes in ImsPhoneCallTracker were to refactor the downgrade
code so it could be reused.

In ImsPhoneConnection, added support for temporarily disabling VT on the
local side. This way, if a wifi video call downgrades to audio-only due
to mobile data being disabled, the "upgrade to video" button will not
be available allowing the user to upgrade back to video (thereby defeating
the fact data is disabled).

Test: Manual
Bug: 36900451
Change-Id: Ib29c7b2fb31f4dcf505609bedfbaca0be7f8f265
Merged-In: I07eb69d83a727ddd21992832753d8ecc187dbfd7
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
af24201a7fc3eaa0d96d7ce5983f6da0ee8de666 20-Sep-2017 Tyler Gunn <tgunn@google.com> Merge "Expand call forwarding logging." into oc-mr1-dev
am: 8bea94c852

Change-Id: I4d06c842c3d21304e1df719a6d37085781f22e21
8bea94c852ceb6e61e66c46eaf2fdb08a28f7324 20-Sep-2017 Tyler Gunn <tgunn@google.com> Merge "Expand call forwarding logging." into oc-mr1-dev
6f6a8ada5c46dc55e126ea0e9c1e54c5e8d6f3b4 20-Sep-2017 Tyler Gunn <tgunn@google.com> Fix issue where video call continues on LTE when wifi lost and data off.
am: 64f3d6bc69

Change-Id: Ibfcc9c38b261f3162c4af92c705be740b07a6e67
bbd1c7e7cf9a446a73d87f5a733289cb18378e78 23-May-2017 Susheel Nyamala <snyamala@codeaurora.org> Fix to return data connection state

When the data is OOS and phone type is cdma lte return the state
as DISCONNECTED

Change-Id: Ife9adee73cfe4e620697c4262ad0ed8c9cf1dd90
Bug-Id: 63315987
smCdmaPhone.java
fb57981411b8c9c0cc7d2c5b560d78606083cb2d 20-Sep-2017 Sneh Bansal <snehb@codeaurora.org> Merge "Add extra data to auto network selection message." am: 5c5d3d834b am: 056efe7dd9 am: 475892a4b4
am: 7c94127351

Change-Id: I8b364414cec1bdc968ca73ae69c37b8772372375
7c94127351d3d32c732e12183e2270c2a8946f10 20-Sep-2017 Sneh Bansal <snehb@codeaurora.org> Merge "Add extra data to auto network selection message." am: 5c5d3d834b am: 056efe7dd9
am: 475892a4b4

Change-Id: I9afa6487cc9d6486459463678e32ce3a7b79d077
056efe7dd97977dd58de3ad62a08e42b4b776a6e 20-Sep-2017 Sneh Bansal <snehb@codeaurora.org> Merge "Add extra data to auto network selection message."
am: 5c5d3d834b

Change-Id: I5fd560e8a8c763b8d5675e52fc2e1f51186c2dd6
5c5d3d834b630d495a2e968ae299424b932405f4 20-Sep-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Add extra data to auto network selection message."
6bc158f06f6f0b4c27b48cd24cdcb5c33dff65de 20-Sep-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Add the slot id when broadcasting card state to STK app." am: 1ce6c5ac00 am: df1d951a39 am: f9479a8943
am: eb918b9330

Change-Id: I37b5e02e7a392e90c0be67bedcc3f770468da621
eb918b93303801f7d4dea7c1afc7d0917e4d39cd 20-Sep-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Add the slot id when broadcasting card state to STK app." am: 1ce6c5ac00 am: df1d951a39
am: f9479a8943

Change-Id: I6a39c2d23bbc2dc2b1d04866a7e124993b6fcae1
df1d951a39f7c0c79d09cc7f3c5c358d0f8b7cfa 20-Sep-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Add the slot id when broadcasting card state to STK app."
am: 1ce6c5ac00

Change-Id: I35adf66b6dd51784cec4a4a747226ee094b57385
1ce6c5ac00a63114e29bee4d4ecccf4690151322 20-Sep-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Add the slot id when broadcasting card state to STK app."
c9ccc7158bc3a3b73944fed68e6f3fc390a08eec 06-Sep-2017 Brad Ebinger <breadley@google.com> Fixed TTY Mode RIL update bug

A recent fix caused a regression where the setTTYMode
RIL command wasn't being sent when TTY was turned on.
This was due to the Phone#setTTYMode method being
overridden in GsmCdmaPhone and not ever being called.

Test: Manual, looked at logs
Bug: 65287215
Merged-In: I7ded0db27100de0c3825c66bdfbdb454c5cbc28b
Change-Id: I5de32c74d4124a2ded37868e5594ab48d92f35ee
smCdmaPhone.java
msphone/ImsPhone.java
64f3d6bc6909237bfc1afe8907bac8e5e47d6cc3 19-Sep-2017 Tyler Gunn <tgunn@google.com> Fix issue where video call continues on LTE when wifi lost and data off.

Due to changes in b/36900451 to decouple VT from the data enabled state
of the device, there was a regression in the case where WIFI is lost during
a WIFI video call and mobile data is off.

Changed code to properly handle this case by triggering a disconnect when
video pause signalling is in use.

Test: Manual - turn off wifi when on WIFI video call and mobile data is
disabled. Regression tested mobile data off auto-pausing.
Bug: 64531514

Change-Id: I6561f653cd446b74f127951e02d482f7c9267c9d
msphone/ImsPhoneCallTracker.java
6efba0815ae839252eefd01edd76a03da8a2f153 19-Sep-2017 Tyler Gunn <tgunn@google.com> Expand call forwarding logging.

Cleaned up logging code surrounding call forwarding indication changes.
Diagnosing failures to update the CFI indicator was not possible due
to missing logging.

Test: Manually togged CFI to confirm log messages.
Bug: 65760595
Change-Id: I94d546486a08547d0b1958708884b5e1725e322d
allForwardInfo.java
efaultPhoneNotifier.java
smCdmaPhone.java
hone.java
54c4ad761674379d8f6fb80cbac3475e19f7576d 19-Sep-2017 Cassie <xih@google.com> Merge "Support both ARA-D and ARA-M for Carrier Privilege Rules" am: c8cc2c35e5 am: 92f6da5ae5 am: f551b06e6d
am: efd83064aa

Change-Id: Ifec02805bde7cf081e077a2a328f4b132deee754
efd83064aab2374802fb1407c38b97fe2e7c507d 19-Sep-2017 Cassie <xih@google.com> Merge "Support both ARA-D and ARA-M for Carrier Privilege Rules" am: c8cc2c35e5 am: 92f6da5ae5
am: f551b06e6d

Change-Id: Ib29f30497fa5bdb45a39ad07298e2bd5c534b00b
92f6da5ae5de96dfb120c01e18de41a5fffd0cc3 19-Sep-2017 Cassie <xih@google.com> Merge "Support both ARA-D and ARA-M for Carrier Privilege Rules"
am: c8cc2c35e5

Change-Id: I5d494bb71193a263aaea8daae77de33cff001875
c8cc2c35e5c87d90cd15da1426dc6dd8ab62c417 19-Sep-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Support both ARA-D and ARA-M for Carrier Privilege Rules"
8ffc5196519711d9f6821a9e1836ca32190bd6f6 19-Sep-2017 Tyler Gunn <tgunn@google.com> Merge "Adding parcelable class checking for call extras." am: 8827ca3a4a am: 12e7e67b4c am: 2cd9dd109f
am: 435599c3f4

Change-Id: I72d3b913d6a3a9fdbfa0aef2c76f4a8babcfac7f
435599c3f425e325c5041fb623548129f929bc8d 19-Sep-2017 Tyler Gunn <tgunn@google.com> Merge "Adding parcelable class checking for call extras." am: 8827ca3a4a am: 12e7e67b4c
am: 2cd9dd109f

Change-Id: Iac4320bb635c9a148e6a9cfcc2246972b15f87f5
12e7e67b4c78a204484857ac412eda4ef1121d99 19-Sep-2017 Tyler Gunn <tgunn@google.com> Merge "Adding parcelable class checking for call extras."
am: 8827ca3a4a

Change-Id: Ib984b227b68c485c73eaf86c0baf969be396a74a
8827ca3a4afb542d335f7d1c9c10d00d4e8f57b5 19-Sep-2017 Tyler Gunn <tgunn@google.com> Merge "Adding parcelable class checking for call extras."
b5fa771f00ffadb9d544cc868cc6c8f4431d5358 09-Mar-2017 Sneh Bansal <snehb@codeaurora.org> Add extra data to auto network selection message.

If device is already in auto mode, and choose network automatically
option is selected, then network selection complete message is sent to the
application, which triggered the request, without sending the request
to RIL. On the app side, it is not known whether the request was
actually sent to RIL or not.

Add information to the message so that application knows if the request
has been sent to RIL or not.

Change-Id: Ieb5d87041aab2929c4478cb9139abc555114bbeb
Bug-Id: 37200906
hone.java
23b7fa63af2182b7764375eca575281f6e2937ca 19-Sep-2017 Pengquan Meng <mpq@google.com> Merge "Tests for correct decoding when TP-OA contains non-integer information" am: 2377a2f5a4 am: 0db16527b6 am: 5eef12fa29
am: 19cb836af3

Change-Id: Ie23e609e7fc70ff46fd2087754803138913e0891
19cb836af3ec4a12f94dcb3de58d4a486d2a3bb7 19-Sep-2017 Pengquan Meng <mpq@google.com> Merge "Tests for correct decoding when TP-OA contains non-integer information" am: 2377a2f5a4 am: 0db16527b6
am: 5eef12fa29

Change-Id: I3b9d730ea26fdb7f22b57aa3dafc3f12dc6c0fdc
0db16527b6dae7e3dd8b4d277a9191a1d27568c2 19-Sep-2017 Pengquan Meng <mpq@google.com> Merge "Tests for correct decoding when TP-OA contains non-integer information"
am: 2377a2f5a4

Change-Id: I809b0e0e339d69f1baec19d741648234fb6e0be3
2377a2f5a47315b3ac3ce9d9ac4ce59b58a3bef6 19-Sep-2017 Pengquan Meng <mpq@google.com> Merge "Tests for correct decoding when TP-OA contains non-integer information"
dff5ca22c114b183d8811f2ea2ec5fb6a0b2121f 29-Aug-2017 Cassie <xih@google.com> Support both ARA-D and ARA-M for Carrier Privilege Rules

Android currently only support ARA-M. GP added ARA-D as the new applet
specifically for application access control purpose. If there is any
conflict with the rules in ARA-M and ARA-D, ARA-D has the higher
priority.
State logic diagram:
https://docs.google.com/a/google.com/drawings/d/1QL8WJU4VvreD9jTsebRVzvZFAI_1S1WucL1Ra7v9WKo/edit?usp=sharing

Bug: 65160846
Test: Basic telephony sanity
Change-Id: Ied79c4e33301f07ddcd53ad8d075a9768f2af7b1
icc/UiccCarrierPrivilegeRules.java
2dd017099bd6bda4436863f77a59c5c81812fe31 15-Sep-2017 Brad Ebinger <breadley@google.com> Merge "IMS: Update IMS feature flags after feature is ready." am: 8af367a136 am: fcb4a8ecef am: cad1918189
am: 99009b8c3c

Change-Id: I141c825fae25248eddce0fc74f8978c4f166eea0
99009b8c3c6bb99734a886e6cd560c7c4a17b809 15-Sep-2017 Brad Ebinger <breadley@google.com> Merge "IMS: Update IMS feature flags after feature is ready." am: 8af367a136 am: fcb4a8ecef
am: cad1918189

Change-Id: Id737284f202ae1f98309c14ad96486578ba9e30f
fcb4a8ecef0cd9ce2f66581ec288a1c525445a55 15-Sep-2017 Brad Ebinger <breadley@google.com> Merge "IMS: Update IMS feature flags after feature is ready."
am: 8af367a136

Change-Id: I0ed09c685a979c26721d4b9eecefb5c27f4a291b
8af367a136afdd24adf2ed29525f7f1c38fb1aa2 15-Sep-2017 Brad Ebinger <breadley@google.com> Merge "IMS: Update IMS feature flags after feature is ready."
1956a1890be18399896db2739733aa373ef45292 15-Sep-2017 Jack Yu <jackyu@google.com> Merge "Fixed that video calling data usage was not counted under phone app"
am: 06a3161030

Change-Id: I5cca57b1671ab56dfd81fc754a973d7db9ca3ffb
82c8d0a275f713a0881bbc1cf9e36af9b4f6c854 15-Sep-2017 Jack Yu <jackyu@google.com> Fixed that video calling data usage was not counted under phone app am: c1a30c1a5f am: ca9cdf0f2b
am: 1235ff6988

Change-Id: Icb518569fa1e8f06a87bf69f66fd541874115f45
1235ff69880d07510e9e5d54230c7976b99d1137 15-Sep-2017 Jack Yu <jackyu@google.com> Fixed that video calling data usage was not counted under phone app am: c1a30c1a5f
am: ca9cdf0f2b

Change-Id: I8910bac8ed3d62d914e8ce8ce234cf01428736d8
ca9cdf0f2b4b01e9364c3f599bfae928ccc5bd0e 15-Sep-2017 Jack Yu <jackyu@google.com> Fixed that video calling data usage was not counted under phone app
am: c1a30c1a5f

Change-Id: I9b97305814769d437bd4f0de0105a2e877e50f31
5cb335370dcc8b4a9551b5c06a5d506869d950dd 14-Sep-2017 Jack Yu <jackyu@google.com> Fixed that video calling data usage was not counted under phone app

The default dialer uid was not initialized correctly in telephony.
Added another check to ensure the uid is set correctly at the time
when we calculate data usage.

Test: Manual
bug: 65644451
Merged-In: I870d0a253c6df46dcbafa834d73123536e36e45f
Change-Id: I870d0a253c6df46dcbafa834d73123536e36e45f
(cherry picked from commit c1a30c1a5f0e3b8fee03790b0a1bfc087f22075c)
msphone/ImsPhoneCallTracker.java
c1a30c1a5f0e3b8fee03790b0a1bfc087f22075c 14-Sep-2017 Jack Yu <jackyu@google.com> Fixed that video calling data usage was not counted under phone app

The default dialer uid was not initialized correctly in telephony.
Added another check to ensure the uid is set correctly at the time
when we calculate data usage.

Test: Manual
bug: 65644451
Change-Id: I870d0a253c6df46dcbafa834d73123536e36e45f
msphone/ImsPhoneCallTracker.java
ef8a3141bad5991a9dfb3ceae52e89f4e5067019 14-Sep-2017 fionaxu <fionaxu@google.com> enable systemBlockable for roaming notification am: 81cb84b8fc
am: dbebd475f2

Change-Id: I76999be39f92b07095a8a6430dc6fccc24170d5b
dbebd475f2fa2670202e62900d31808e0192b1a0 14-Sep-2017 fionaxu <fionaxu@google.com> enable systemBlockable for roaming notification
am: 81cb84b8fc

Change-Id: I0620abfa32bf4134463f2a11593f186c3cfac082
47b68b6eb69f1263734f31b967e196da3b97785f 12-Sep-2017 Tyler Gunn <tgunn@google.com> Adding parcelable class checking for call extras.

Currently, call extras originate from vendor code in the ImsCallProfile.
It is possible for a vendor to put in a package-local parcelable class,
which can cause problems in Telecom and other consumers of the
parcelable class. The result is that the Bundle and its contents will be
lost.
This change ensures that the Connection class, which is currently the
primary entry point from extras in the ImsCallProfile class will filter
out Bundle contents which are not valid. The exisint Bundle.filterValues
method accomplishes this by ensuring only primitive types and android.*
namespace parcelables are included in the Bundle.

Although ImsCallProfile is technically the best place to enforce this,
the vendor modem code currently runs in the same process as Telephony, so
the parceling code there never gets run. Hence the filtering here.

Also, added a new unit test for the ImsCallProfile to verify the parcel
enforcement happening at that level as well.

Test: Manual, also wrote new unit tests
Bug: 65562929
Change-Id: Iabaae8d0a44a1114b3618937e4238e9f4619cf5a
onnection.java
81cb84b8fcc47ad060dcfbc701d82f34dba3008d 12-Sep-2017 fionaxu <fionaxu@google.com> enable systemBlockable for roaming notification

Users living in border will be disturbed by this notificaiton
frequently. In MR1 we have already lowered the importance for this
notification, we should also allow users to block this system
notification.

Bug: 65540737
Test: Manaul adb shell setprop telephony.test.forceRoaming true
Change-Id: Ie10faa13774af763fb3f2edca31777ae2dbcab6a
til/NotificationChannelController.java
d6ed121122d712da9a74fa4be953637ccc1c0c33 12-Sep-2017 Tyler Gunn <tgunn@google.com> Merge "Add workaround for modem issue where pause bit is not set when on hold."
dba043892846f9c03988e9a163e85ed09c1d5f6a 20-Jul-2017 Benergy Meenan Ravuri <bravuri@codeaurora.org> IMS: Update IMS feature flags after feature is ready.

Update IMS feature flags like Volte/Vt/Wfc when Ims feature
state is ready.

This is to ensure Ims feature values are sent to modem
after DDS swtich.

Test: Manual
Bug: 64098630
Change-Id: Id396c6f4cd45a52b81812e068950bb4705179ba3
msphone/ImsPhoneCallTracker.java
f0171d829ac152864bdda5e52c9463a41327217b 12-Sep-2017 Brad Ebinger <breadley@google.com> Merge "IMS: Reset Ims capabilities when feature state becomes not available." am: 52650f794d am: 5c14a453a2 am: fc85e4d3d9
am: 6eb3aee002

Change-Id: Ia14318eb0122134d5840dbe5ead91fac176cb7bd
6eb3aee002ded736cd021dfbabaead9806b58171 12-Sep-2017 Brad Ebinger <breadley@google.com> Merge "IMS: Reset Ims capabilities when feature state becomes not available." am: 52650f794d am: 5c14a453a2
am: fc85e4d3d9

Change-Id: Ie025d079a61aa4d55a625961fe9f72b5c30604eb
5c14a453a2d069520222b6c6838141e9cefd7f34 12-Sep-2017 Brad Ebinger <breadley@google.com> Merge "IMS: Reset Ims capabilities when feature state becomes not available."
am: 52650f794d

Change-Id: Ic4c548f2756a32ae134ae8ce4ecb4fc3af4a7bad
52650f794dbf6574a0db81a55535f175f5cb960d 12-Sep-2017 Brad Ebinger <breadley@google.com> Merge "IMS: Reset Ims capabilities when feature state becomes not available."
65cd15597c5e611184a3f4c8ead5f42644fc00d6 22-Jul-2017 Tyler Gunn <tgunn@google.com> Add workaround for modem issue where pause bit is not set when on hold.

When a call is remotely held, the modem is not setting the pause bit on
the video state as it should. This causes a cascading failure where the
user cannot turn the camera on/off (because another video pause hack is
not able to detect that the video is paused and thus activate the hack).

Test: Manual
Change-Id: I2a83b73df5488454b7030d7e4f7c78f360a27eda
Merged-In: Id30c5839b1e8c0d419ebcf03045ad1bcfe3b7d57
Fixes: 63153661
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
767bc0f34192b43a887d85f46e6789bcedd4520b 04-Aug-2017 Benergy Meenan Ravuri <bravuri@codeaurora.org> IMS: Reset Ims capabilities when feature state becomes not available.

If device is supporting only one IMS stack, when DDS is moved from
Sub1 to Sub2 (non-IMS), feature state of Sub1 becomes not available.

When feature state is not available, registration listener will be removed.

So if the IMS registration state change and service status updates are
received from modem after the listner is removed, feature capabilities
are not updated to phone account. As a result, make video call option
is shown on dialer UI, though there is no ims registration and video
capability for any of the subscriptions.

To fix this, reset the ims capabilities when ims feature state becomes
not available for that subscription.

Test: Manual
Bug: 64098630
Change-Id: I7b59a48539560e0bf40e41799a4b6513424db6c7
msphone/ImsPhoneCallTracker.java
c82bacfac474ef425d08f43a2c09207b81c8fbdc 04-Aug-2017 Ravindra Thattahalli Javaraiah <c_rthat@codeaurora.org> Fix to notify ECBM exit to registrants

When device is out of ECBM imsphone has to inform default
phone registrants on the ecbm exit

Test: Manual
Bug: 62369966
Change-Id: I04d25a56ad771dc528bae02bc4f55554bb5e02be
msphone/ImsPhone.java
3d876cbd7647780554878b1f47ab31e40b3630f1 08-Sep-2017 yifan.bai <yifan.bai@spreadtrum.com> Merge "Fix notifySignalStrength method." am: eb140d5359 am: 20a857997b am: 1e7c1d66cf
am: b4d56b00ca

Change-Id: Ie15b7216d0336785cedb245e4e8d87904e9ef6e5
b4d56b00ca4d386dc00b24c71961620bae3daa9b 08-Sep-2017 yifan.bai <yifan.bai@spreadtrum.com> Merge "Fix notifySignalStrength method." am: eb140d5359 am: 20a857997b
am: 1e7c1d66cf

Change-Id: I87038081b58d5c0cba6833b67544ee28991aca77
20a857997b7a102aa36912801cac9bc06ba0ae7d 08-Sep-2017 yifan.bai <yifan.bai@spreadtrum.com> Merge "Fix notifySignalStrength method."
am: eb140d5359

Change-Id: Idb20928f9d552c78ce8739b8c12c4fc673968cd1
eb140d53590a7f9ccefbaa092a5bcf9e5fedb072 08-Sep-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fix notifySignalStrength method."
83b6676e650d5ff6c4f611d474354fbdbd045fc6 16-Nov-2015 Yujing Gu <guy@codeaurora.org> Add the slot id when broadcasting card state to STK app.

Add the slot id when broadcasting card state to STK app.

Bug: 38010849
Change-Id: Iad6df264a0223c5097a1983ae13911485a6d269e
at/CatService.java
2d1a5996a9ee0a1abe6f5a26d26ddee211452a0f 08-Sep-2017 Brad Ebinger <breadley@google.com> Merge "Fixed TTY Mode RIL update bug" into oc-mr1-dev am: 377cda6bd2
am: 6b276abf02

Change-Id: I75c7f53194cb05375b794c570ed06f40fff8fc60
6b276abf027b11645bf1c3f536a4f63a8d071fcb 07-Sep-2017 Brad Ebinger <breadley@google.com> Merge "Fixed TTY Mode RIL update bug" into oc-mr1-dev
am: 377cda6bd2

Change-Id: I7ded0db27100de0c3825c66bdfbdb454c5cbc28b
b91b43d335a3d16923b9c52bc40c5d865f26df16 07-Sep-2017 kun.tang <kun.tang@spreadtrum.com> Restore saved network selection accordding to config.xml

It is better to restore the network accordding to the configuration file.
Test: Build

Change-Id: Icc64406498b818b8675d2245e8bd2cef076103da
hone.java
a7b4a11e2ead954df7ee5d771685bfb2a5376fb3 07-Sep-2017 Tyler Gunn <tgunn@google.com> Merge "Ensure emergency calls dialed over IMS use CLIR suppression." into oc-mr1-dev am: dcc3cc8283
am: 3c0f8bfbc2

Change-Id: I3240522b33de4328d6ab3e241dd5f7c99d39dfb5
3ae635e249413741302da5d209e32a034ba355a8 06-Sep-2017 Brad Ebinger <breadley@google.com> Fixed TTY Mode RIL update bug

A recent fix caused a regression where the setTTYMode
RIL command wasn't being sent when TTY was turned on.
This was due to the Phone#setTTYMode method being
overridden in GsmCdmaPhone and not ever being called.

Test: Manual, looked at logs
Bug: 65287215
Change-Id: I5de32c74d4124a2ded37868e5594ab48d92f35ee
smCdmaPhone.java
msphone/ImsPhone.java
3c0f8bfbc26a3b0deab723d0adfd8da867438203 06-Sep-2017 Tyler Gunn <tgunn@google.com> Merge "Ensure emergency calls dialed over IMS use CLIR suppression." into oc-mr1-dev
am: dcc3cc8283

Change-Id: Ia3a6c4741eab51df6379d6b6baa0973c5dbb2b06
dcc3cc828377d346972f3e06f93783737763311b 06-Sep-2017 Tyler Gunn <tgunn@google.com> Merge "Ensure emergency calls dialed over IMS use CLIR suppression." into oc-mr1-dev
b4149d56e4a9af63b03932a0191364df0d582d26 06-Sep-2017 Xiangyu/Malcolm Chen <refuhoo@google.com> Merge "Add local log to record roaming status." into oc-mr1-dev am: 81237db62c
am: 379b357b2d

Change-Id: Iabc2face99a8bb708d745b224ab460000b1f1c66
379b357b2decad5d0d8dc12360f811baf6fab9f7 06-Sep-2017 Xiangyu/Malcolm Chen <refuhoo@google.com> Merge "Add local log to record roaming status." into oc-mr1-dev
am: 81237db62c

Change-Id: I95b05ecd894dd27fcef446107ef272864bd61056
81237db62cf89a10d30bf535668b443d5be0fa7f 06-Sep-2017 Xiangyu/Malcolm Chen <refuhoo@google.com> Merge "Add local log to record roaming status." into oc-mr1-dev
f36f94a942ad38ba444080f26497f388ac0274ae 06-Sep-2017 pkanwar <pkanwar@google.com> Building support for IMSI encryption.
am: cf034892f8

Change-Id: I6921ef4bf8ee5a87a6e37ef42fb063d8af7d683f
673d2662761d32d2304f9634d0b3622037ac8fd8 06-Sep-2017 Cassie <xih@google.com> Merge "Make access rule format compatible with GP."
am: d8cd250167

Change-Id: I0e0b151355604081ead7ef94ac1c7b6c1b7d0a32
d8cd25016728ff69700476f58a3e67f777e68783 06-Sep-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Make access rule format compatible with GP."
34cdd957de8a067721f874209e0e8c9766b65aeb 05-Sep-2017 Shuo Qian <shuoq@google.com> Merge "Add unit test for RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED"
am: 58d780a4e4

Change-Id: I35fc193703bd49e39ac20b781cf5c98f65b4f46e
c84908f6414c0f70448e36f8869f5cdf2c877c3c 31-Aug-2017 sqian <shuoq@google.com> Add unit test for RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED

- add getAppPacakageName method in SmsTracker and
refactor its usage for testability

Also fix checkCallingOrSelfPermission method in ContextFixture
for this unit test and also for supporting more telephony unit
tests in the future.

Test: runtest --path frameworks/opt/telephony/tests/telephonytests/
Bug: 34773406
Bug: 65205717
Change-Id: I6dae277ced9a87b89fbb6eac22856fc73b9fdbba
Merged-In: I6dae277ced9a87b89fbb6eac22856fc73b9fdbba
MSDispatcher.java
msUsageMonitor.java
cf034892f8e80846d829c5f7dc3e0cb458db5e64 29-Jun-2017 pkanwar <pkanwar@google.com> Building support for IMSI encryption.

Adding a Download Manager to download the keys.
BUG: 35606429
Test: manual. adding tests in a different CL.

Change-Id: I0683a8113c3a3b156ea915a457eeb5f500583424
(cherry picked from commit bef4b76670927f8f3868cf8ac72423839ec0ba75)
arrierKeyDownloadManager.java
smCdmaPhone.java
63b6bd12f35272300dce1a61c771ba9170722b73 05-Sep-2017 Shuo Qian <shuoq@google.com> Merge "Add unit test for RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED" into oc-mr1-dev am: f2518bd2f5
am: 4028b1e595

Change-Id: I4ec2adaddcc2240cd986eeeba3129cc1f2e86068
4028b1e595edd7b368c018b442362a27a044ecbe 05-Sep-2017 Shuo Qian <shuoq@google.com> Merge "Add unit test for RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED" into oc-mr1-dev
am: f2518bd2f5

Change-Id: I0c63201b550599db139682c0f1204a4b0b05e103
f2518bd2f5b0840e3684693314193db7bf1dd0af 05-Sep-2017 Shuo Qian <shuoq@google.com> Merge "Add unit test for RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED" into oc-mr1-dev
729a99541300000831f89ebcfe9e17c40eebd57f 03-Sep-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Building support for IMSI encryption."
bef4b76670927f8f3868cf8ac72423839ec0ba75 29-Jun-2017 pkanwar <pkanwar@google.com> Building support for IMSI encryption.

Adding a Download Manager to download the keys.
BUG: 35606429
Test: manual. adding tests in a different CL.

Change-Id: I0683a8113c3a3b156ea915a457eeb5f500583424
arrierKeyDownloadManager.java
smCdmaPhone.java
1d72bf9b7684fa8c9f1cbcf1b6a61d6446d417a6 01-Sep-2017 Brad Ebinger <breadley@google.com> Merge "Revert "Revert "Move ExponentialBackoff to frameworks/base"""
ba3b8c9ebd8e36da54ce0fec81c6ea5f460aa51e 31-Aug-2017 sqian <shuoq@google.com> Add unit test for RESULT_ERROR_SHORT_CODE_NEVER_ALLOWED

- add getAppPacakageName method in SmsTracker and
refactor its usage for testability
- add isDuringSuW method and refactor its usage
for SmsUsageMonitor for testablity

Also fix checkCallingOrSelfPermission method in ContextFixture
for this unit test and also for supporting more telephony unit
tests in the future.

Test: runtest --path frameworks/opt/telephony/tests/telephonytests/
Bug: 34773406
Bug: 65205717
Change-Id: I6dae277ced9a87b89fbb6eac22856fc73b9fdbba
MSDispatcher.java
msUsageMonitor.java
e953596dda4e51be568829a3a7fde4c7ac4db286 01-Sep-2017 Xiangyu/Malcolm Chen <refuhoo@google.com> Merge "Make sure MOBILE_DATA value is updated in onSetUserDataEnabled."
fb41d485d74fba0504e24dd13474d4acdd75a5ef 22-Aug-2017 Cassie <xih@google.com> Make access rule format compatible with GP.

1. Allow a 4F tag with length of 6 and value "FF FF FF FF FF FF".
2. Allow optional tags before the DB tag.

Cherry-picked cleanly from: ag/2772379

Bug: 64021133
Change-Id: If189ad01bd1124d84f93a60bd96426d2555c9c91
Test: Basic telephony sanity
(cherry picked from commit f561305faeb51ce51ecb48d3be462ca64ba8188a)
icc/UiccCarrierPrivilegeRules.java
75485203ba5a23026e22057a4cb13ff53d108d49 01-Sep-2017 Brad Ebinger <breadley@google.com> Merge "Hold Call displayed for few seconds after Con. call connected" am: 21003bba8d am: 605518f0bd am: e27e7cf9a1
am: a5c305c5e7

Change-Id: I4aad1f3f7002edfa5e2c98d2c8114832aa4107ac
a5c305c5e7fd5175de0753731ab9d8448094f749 01-Sep-2017 Brad Ebinger <breadley@google.com> Merge "Hold Call displayed for few seconds after Con. call connected" am: 21003bba8d am: 605518f0bd
am: e27e7cf9a1

Change-Id: I8fbf9c64a0b2ac19d955046cbac1c13689390fe6
605518f0bd572aa31d3499e55d7eefb7dc5dc3b7 01-Sep-2017 Brad Ebinger <breadley@google.com> Merge "Hold Call displayed for few seconds after Con. call connected"
am: 21003bba8d

Change-Id: Ic8767cce7e6e397bdd04d7f9c6217116a46bb297
21003bba8d68bdaa747f732c46627ec9deeead08 01-Sep-2017 Brad Ebinger <breadley@google.com> Merge "Hold Call displayed for few seconds after Con. call connected"
e2b25c138d61072f3532c69110c3713006dabf20 01-Sep-2017 Tyler Gunn <tgunn@google.com> Ensure emergency calls dialed over IMS use CLIR suppression.

When dialing an emergency call, the framework will use the user's chosen
CLIR mode (network default, invocation (show caller ID to remote),
suppression (hide caller ID to remote).

This change ensures that the telephony framework will show the caller's
ID when an emergency call is dialed over IMS.

Test: Manual, unit test
Bug: 64049180
Change-Id: Ic52caf4bc47045ac0d9b0d024882b30d057b3a16
msphone/ImsPhoneCallTracker.java
5908b65ed99b667d9941c7e73031932b8d2e2eb4 01-Sep-2017 yifan.bai <yifan.bai@spreadtrum.com> Fix notifySignalStrength method.

New received SignalStrength is compared with last SignalStrength.
But last SignalStrength is never assigned.

Test: Build
erviceStateTracker.java
10757e356f9384581fb3eb2679c73ddfb2f775e4 21-Jul-2017 Malcolm Chen <refuhoo@google.com> Make sure MOBILE_DATA value is updated in onSetUserDataEnabled.

In onSetUserDataEnabled, we used to call getDataEnabled to check
against "enable". Since getDataEnabled always returns true when
provisioning, onSetUserDataEnabled(true) never writes "true"
into Settings.Global.MOBILE_DATA. Now we are making sure
Settings.Global.MOBILE_DATA is updated in onSetUserDataEnabled.

Bug: 34351475
Test: Build
Change-Id: Iec2245f6ee1c087e488829344ff7c352acdbf602
ataconnection/DataEnabledSettings.java
ataconnection/DcTracker.java
dd1b2b058c484975802d50508f8c37ddcfd7897b 25-Aug-2017 Edward Savage-Jones <edward.savage-jones@sony.com> Tests for correct decoding when TP-OA contains non-integer information

When receiving a GSM SMS message where the TP-Originating-Address
(TP-OA) field contains non-integer information, it is currently
decoded incorrectly.

This CL adds support for decoding BCD according to spec:
ETSI TS 123 040 V9.3.0

Section: 9.1.2.3 Semi-octet representation
"If a mobile receives an address field containing non-integer
information in the semi-octets other than "1111" (e.g. 1110)
it shall display the semi-octet as the representation given
in GSM 44.008 [12] under "called BCD number", viz 1010="*",
1011="#", 1100="a", 1101="b", 1110="c"."

This also updated the codes related to the BCD decoding.

See frmks/base commit with the same Change-Id

Bug: 65042708
Test: runtest --path frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/GsmSmsTest.java --test-method testAddressing
Change-Id: Ied2d6ca4d84d5c3ca6cc5c4d9875d2ff2a8e5df9
icc/AdnRecord.java
icc/SIMRecords.java
d5e1c529220ab72046a867825cbab09b37070bce 26-Aug-2017 Malcolm Chen <refuhoo@google.com> Add local log to record roaming status.

When we have roaming disabled but still have a data connection
on roaming network, we record it in a local log.

Bug: 64746542
Test: Manual
Change-Id: I0618bc19112a686a50bd37a80bfee5884ebf3f77
ataconnection/DcAsyncChannel.java
ataconnection/DcTracker.java
b81d15be52ad8b63e42f333fd84a5ac39d40a9e6 30-Jun-2016 Prasath Balakrishnan <bpras@codeaurora.org> Hold Call displayed for few seconds after Con. call connected

When two calls are merged to form a Conference call, Secondary info
is displaying the HOLD call in the UI. This was due wrongly handling
the successful call conference state. Fix is to handle failure case only
if call conference request returns with a exception else conference is
successful

Bug: 36497551
Test: Manual
Change-Id: I387eed3ca02af86bd1a32bc3afe0ff348efb546c
smCdmaCallTracker.java
9ec2e6b634486f5d74963eb029ae6bc45cfcaace 31-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Ensure IMS dial uses the correct CLIR mode."
am: 39b22f4a3d

Change-Id: If09350552f58446a240c725b03d34c55c101a8b1
b5d360d8b2d91103ff85fdda405cc0f5debe6825 31-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Support auto-downgrade of video calls when mobile data is metered." into oc-mr1-dev am: 333a4a4916
am: 574a8f9bbe

Change-Id: Ic33c77d53525d7169895af645316a8ff39a5f1f3
574a8f9bbe2b8206e9d958b340c28bfa3db31e4c 31-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Support auto-downgrade of video calls when mobile data is metered." into oc-mr1-dev
am: 333a4a4916

Change-Id: I07eb69d83a727ddd21992832753d8ecc187dbfd7
333a4a4916d057b03943084666edd3595b3cdec8 31-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Support auto-downgrade of video calls when mobile data is metered." into oc-mr1-dev
309676454b6650f48072ff6841636a9a2153c171 31-Aug-2017 pkanwar <pkanwar@google.com> resolve merge conflicts of 66128c653 to oc-mr1-dev-plus-aosp

Change-Id: I13bfc2db5c28e77ab1cc8390932c8a04d9186fbc
Test: compile
Merged-In: Ib2f22ef8867cd4b999d13f81247e855b13c595af
66128c6530db9a6f4c673797aa28a9949badc57a 31-Aug-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Show notification when VoWiFi is active, and user is out of service for voice." into oc-mr1-dev
889d4140a5c4715b27a969f70c1311869949125c 31-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Ensure IMS dial uses the correct CLIR mode." into oc-mr1-dev am: fb6f7632fa
am: cf1f704252

Change-Id: I29428480181d60764b73a6426396e5ef31507212
cf1f704252575d16c5a98646f7cd9d549db260e2 31-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Ensure IMS dial uses the correct CLIR mode." into oc-mr1-dev
am: fb6f7632fa

Change-Id: Ia3afc453fc26e4e7af6a824bab71fc0f2001e613
3818d30dce112008297b3594ce55ac2d0c2c93c3 30-Aug-2017 Tyler Gunn <tgunn@google.com> Ensure IMS dial uses the correct CLIR mode.

The IMS dial method was getting the shared pref CLIR_KEY to determine the
CLIR mode for an outgoing call. Everywhere else in the code, the CLIR
mode is stored under key CLIR_KEY + phoneId, against the phoneId of the
Gsm/Cdma phone.
In ImsPhoneCallTracker, the default phone for the ImsPhone is the Gsm/Cdma
phone, and we need to use that id when accessing the key.
Also, added some more logging for oir mode sync/save.

Test: Manual
Bug: 64291602
Merged-In: I231f8fb74c29347da2085318b9ca42d5efec5271
Change-Id: I231f8fb74c29347da2085318b9ca42d5efec5271
smCdmaPhone.java
hone.java
msphone/ImsPhoneCallTracker.java
fb6f7632fa5432312ae3004c09098f2aab436627 31-Aug-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Ensure IMS dial uses the correct CLIR mode." into oc-mr1-dev
8a5a72a07198058cb484862649397f2da1cd463a 30-Aug-2017 Amit Mahajan <amitmahajan@google.com> Merge "Clean up calls gracefully on phone type switch."
am: af96f41f57

Change-Id: If4bc29477e685b1945347578fc520b49d780e4be
80e8beca45a801590b004ad9ea71841822547ed9 30-Aug-2017 Jeff Tinker <jtinker@google.com> Revert "Revert "Move ExponentialBackoff to frameworks/base""

This reverts commit 90ea1d43b5fdc193bfd0726009e4a1d0369b1da5.

Reverting the revert based on Brad's comment that this
should be a transient failure.

Change-Id: I5521814463654ea7384c69bc66d9d39f29f53e6b
xponentialBackoff.java
845661cc5a5f7fd025d2f9b075c1e3603b577b86 30-Aug-2017 Jeff Tinker <jtinker@google.com> Merge "Revert "Move ExponentialBackoff to frameworks/base""
90ea1d43b5fdc193bfd0726009e4a1d0369b1da5 30-Aug-2017 Jeff Tinker <jtinker@google.com> Revert "Move ExponentialBackoff to frameworks/base"

This reverts commit e830d24d72b7594a99c919c65f04a3425bd9bb22.

This change broke git_master build, reverting by android-build-cop
for now to unblock the build, PTAL and submit a proper change later.

Change-Id: I140ee70146c1b1e6d706d0e3b17cece840790297
xponentialBackoff.java
ea172968e6279b997e13c93efb842ac7e7fc9d7d 29-Aug-2017 Amit Mahajan <amitmahajan@google.com> Clean up calls gracefully on phone type switch.

Also disabled an unrelated unit test that's failing frequently
on treehugger.

Test: runtest --path frameworks/opt/telephony/tests/telephonytests
Bug: 63764233
Merged-in: I09bd6a5610f66af918d26590c81efbf464d35156
Change-Id: I09bd6a5610f66af918d26590c81efbf464d35156
smCdmaCallTracker.java
3528515075fe657bd7402009a5d5f786eaeb68f4 30-Aug-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Show notification when VoWiFi is active, and user is out of service for voice."
e063db11d331c2d676ee8539732095938a3e019a 30-Aug-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Enable data after phone switches from CDMA to GSM" into oc-mr1-dev
fb3917021c45f77b5707089235827e866d5ed31a 30-Aug-2017 Brad Ebinger <breadley@google.com> Merge "Move ExponentialBackoff to frameworks/base"
a092e4830ed77a5f158de5673944c395b475192f 11-Aug-2017 pkanwar <pkanwar@google.com> Show notification when VoWiFi is active, and user is out of service for
voice.

Bug: 62618428
Test: manual
Merged-In: Ib2f22ef8867cd4b999d13f81247e855b13c595af

Change-Id: Ib2f22ef8867cd4b999d13f81247e855b13c595af
arrierServiceStateTracker.java
bdb9b8f05fdc4c8a87229e76dbe47bee9a784b31 11-Aug-2017 pkanwar <pkanwar@google.com> Show notification when VoWiFi is active, and user is out of service for
voice.

Bug: 62618428
Test: manual

Change-Id: Ib2f22ef8867cd4b999d13f81247e855b13c595af
(cherry picked from commit c5f8903840b03186b4425ab3b9869257045da340)
arrierServiceStateTracker.java
738cc4255d183f9a8686a89d9ec27afc946e660c 30-Aug-2017 Amit Mahajan <amitmahajan@google.com> Clean up calls gracefully on phone type switch. am: 1ef9decdec
am: da52be9acd

Change-Id: I325028ab5de311938364eca40c7b91e3528491c7
da52be9acdc75254814a684560f00afe3ebf95c0 30-Aug-2017 Amit Mahajan <amitmahajan@google.com> Clean up calls gracefully on phone type switch.
am: 1ef9decdec

Change-Id: I949860c16c75a3af67542887aad2ad5b3079a3dc
af47cc3ff0b27a3e640aa1478773f99c299bf9f9 30-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Enable data after phone switches from CDMA to GSM" am: 964e46228c am: 59e4671054 am: 43b70eb679
am: 0cdd5d5528

Change-Id: I21b85f1dac6ee0bafce6c0a45f4d95bf236bdf1c
c36d61b9728452068d2441d8da78601f65b35d12 30-Aug-2017 Amit Mahajan <amitmahajan@google.com> Merge "Add DUN as a NetworkCapability if current APN is the DUN APN as well."
am: d33414fb75

Change-Id: I94c9dcdf723bfce5d495f0e0e8c40670eabb984c
d04bdfe07ddf5523ca4d1c07780c3f131c4254be 30-Aug-2017 Tyler Gunn <tgunn@google.com> Ensure IMS dial uses the correct CLIR mode.

The IMS dial method was getting the shared pref CLIR_KEY to determine the
CLIR mode for an outgoing call. Everywhere else in the code, the CLIR
mode is stored under key CLIR_KEY + phoneId, against the phoneId of the
Gsm/Cdma phone.
In ImsPhoneCallTracker, the default phone for the ImsPhone is the Gsm/Cdma
phone, and we need to use that id when accessing the key.
Also, added some more logging for oir mode sync/save.

Test: Manual
Bug: 64291602
Change-Id: I231f8fb74c29347da2085318b9ca42d5efec5271
smCdmaPhone.java
hone.java
msphone/ImsPhoneCallTracker.java
89de1e99927618edb2df58b62a7a2850748d0f13 24-Aug-2017 Amit Mahajan <amitmahajan@google.com> Add DUN as a NetworkCapability if current APN is the DUN APN as well.

Test: manual
Bug: 64432476
Change-Id: Ic3eec1580497c12df27a81f99fb78f6f1689e22b
ataconnection/DataConnection.java
1ef9decdecd648f958772fdeee92e5f02751b08c 29-Aug-2017 Amit Mahajan <amitmahajan@google.com> Clean up calls gracefully on phone type switch.

Also disabled an unrelated unit test that's failing frequently
on treehugger.

Test: runtest --path frameworks/opt/telephony/tests/telephonytests
Bug: 63764233
Change-Id: I09bd6a5610f66af918d26590c81efbf464d35156
smCdmaCallTracker.java
6a836a0bef4deb2c12d60ba6de43993396077e21 30-Aug-2017 Tyler Gunn <tgunn@google.com> Enable data after phone switches from CDMA to GSM

Before initiating emergency call on CDMA
phone data will be disabled, if while in
emergency call phone switches from
CDMA to GSM then data will be diabled state
after ending call data will not enable since
phone already switched to GSM.

Test: Manual
Merged-In: Ibe3dd360b65fac05812a6f73fb541cfb37c9500b
Change-Id: Ibe3dd360b65fac05812a6f73fb541cfb37c9500b
Bug: 63513900
(cherry picked from commit 0cdd5d5528a2f0867f32ad6c9d97d6c82a911021)
smCdmaCallTracker.java
0cdd5d5528a2f0867f32ad6c9d97d6c82a911021 30-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Enable data after phone switches from CDMA to GSM" am: 964e46228c am: 59e4671054
am: 43b70eb679

Change-Id: Ibe3dd360b65fac05812a6f73fb541cfb37c9500b
59e467105432657bfd50f72876cc250a201f902c 29-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Enable data after phone switches from CDMA to GSM"
am: 964e46228c

Change-Id: I26206960e8dac9cc8cd12acf9c20fcdea1da9c09
964e46228cdb0690d2abf5e38ef944902a842009 29-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Enable data after phone switches from CDMA to GSM"
359e1e69f2914fe549f823dbdb7dd73084d1f3ad 25-Aug-2017 Tyler Gunn <tgunn@google.com> When IMS connections are merged, track connect time elapsed.

When IMS connections are meged, we need to track the elapsed time as well.
This is used when the actual conference is formed.

Merged-In: I95c605ff1d649e6620e02b7b18b5c352f3d1970c
Change-Id: Ie61f99b5716d381ca841ddd3e5b163e1ef51dd8a
Test: Manual, unit test
Bug: 64068300
onnection.java
msphone/ImsPhoneCall.java
dc0704e2e4a02569a1aaaf695ee74f1a4fba8129 29-Aug-2017 Cassie <xih@google.com> Merge "Make access rule format compatible with GP." into oc-mr1-dev am: faf0668dad
am: 96a1941bf5

Change-Id: Ib6637193e4bce383808aaf2f0cdbbbe1af864ad9
96a1941bf5f2857619b10f312f2ec0f36796547e 29-Aug-2017 Cassie <xih@google.com> Merge "Make access rule format compatible with GP." into oc-mr1-dev
am: faf0668dad

Change-Id: If9a25dce272aff8ceba0d345643d972b92ffcd8e
faf0668dad661f5fd854cde95ff0508f19c5a06f 29-Aug-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Make access rule format compatible with GP." into oc-mr1-dev
e830d24d72b7594a99c919c65f04a3425bd9bb22 28-Aug-2017 Brad Ebinger <breadley@google.com> Move ExponentialBackoff to frameworks/base

Move ExponentialBackoff to frameworks/base
in order to reduce code duplication between
telephony and ims projects.

Bug: 64540800
Test: Manual
Change-Id: I1a5823584f882022aa6cf7e0587e30fdcb4d334a
xponentialBackoff.java
925b6c664714e96ce1cd6629b53e609bccc071e5 07-Jun-2017 Srikanth Chintala <srikchin@codeaurora.org> Enable data after phone switches from CDMA to GSM

Before initiating emergency call on CDMA
phone data will be disabled, if while in
emergency call phone switches from
CDMA to GSM then data will be diabled state
after ending call data will not enable since
phone already switched to GSM.

Enable data when phone switches to GSM while in
emergency call.

Bug: 63513900
Change-Id: Ia5cbe19bffdf4692347fed20bfadcad3ff780ac9
smCdmaCallTracker.java
8f64d0aaf4eb131e1c2560792415624b06c90881 28-Aug-2017 Amit Mahajan <amitmahajan@google.com> Add DUN as a NetworkCapability if current APN is the DUN APN as well. am: 15a1dc57ec
am: b1240d0642

Change-Id: I67c0377d37d3f40e443ec7fcac5cda83ac3dee52
b1240d064229e5d0c1f083abf066ca0a58d5dfe1 28-Aug-2017 Amit Mahajan <amitmahajan@google.com> Add DUN as a NetworkCapability if current APN is the DUN APN as well.
am: 15a1dc57ec

Change-Id: Id47c0b6b9a8fff41f138cf47fa307b720800aa73
15a1dc57ecef73f6aa0e7e702e05f39fc0fec573 24-Aug-2017 Amit Mahajan <amitmahajan@google.com> Add DUN as a NetworkCapability if current APN is the DUN APN as well.

Test: manual
Bug: 64432476
Change-Id: Ic3eec1580497c12df27a81f99fb78f6f1689e22b
ataconnection/DataConnection.java
8cc1a012527de0cbb60c7ddc7e9be5671da69319 25-Aug-2017 Brad Ebinger <breadley@google.com> Merge "Emergency redial implementation" am: 2341ae2e65 am: e5629078be
am: 91aa94c153

Change-Id: I303552ca071a73c1bb0322e4d8ee1bd565d297d6
e5629078be7375db7d44aac1966c84aaa8f2b0b6 25-Aug-2017 Brad Ebinger <breadley@google.com> Merge "Emergency redial implementation"
am: 2341ae2e65

Change-Id: Ib0358222b3413a8b812438c41666268c1f19d287
2341ae2e65e7b4d7e49ed8760cac9fd45ae940b7 25-Aug-2017 Brad Ebinger <breadley@google.com> Merge "Emergency redial implementation"
19484b70679d2ab49bf842284b1ad8bf995ab526 25-Aug-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Read network notification delay config based on subId" am: 3a144f483d am: 41177db506 am: ec201916dc
am: f6921579fe

Change-Id: Ie6aedfb9aa5e90752ce631b6e3b86eb7fafd44e9
f6921579fea170a0ddd8e0fb3bc564d1a33a6c0b 25-Aug-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Read network notification delay config based on subId" am: 3a144f483d am: 41177db506
am: ec201916dc

Change-Id: I90b2c65958c9b3022a24971655241498c510d3ae
41177db5068098cca022eaf4d68dcc5c481ff8ac 25-Aug-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Read network notification delay config based on subId"
am: 3a144f483d

Change-Id: I18a1174519c7e61f1a9982829e2ab28f9fc7bec0
3a144f483d8971da16a52bc626b9b490751629d5 25-Aug-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Read network notification delay config based on subId"
9ff3494e8c5de8b40b8441a237d2def4051a5796 25-Aug-2017 Shuo Qian <shuoq@google.com> Merge "Add new error code handling for sending short code message"
am: 6f5340f2c4

Change-Id: I22fa9f1b94847aedf3811725f5018122a867d29d
6f5340f2c4a0cc2ff17a09b84dc6e7c562a79ee9 25-Aug-2017 Shuo Qian <shuoq@google.com> Merge "Add new error code handling for sending short code message"
577e4aef12257100f20b46a88ee3ae65e540fea3 04-May-2017 Srikanth Chintala <srikchin@codeaurora.org> Emergency redial implementation

Map EMERGENCY_TEMP_FAILURE and
EMERGENCY_PERM_FAILURE RIL fail cause
to telephony DisconnectCause.

Bug: 27059146
Change-Id: Ie72ab2901ec05d972204ed11f115a05b79173c1d
allFailCause.java
smCdmaConnection.java
msphone/ImsPhoneCallTracker.java
1f1f83574bb25212b84c9fb050512ceb91edc159 25-Aug-2017 Brad Ebinger <breadley@google.com> Merge "Emergency redial implementation"
82d17fc984dc21fe3c0f67bd54089067fd90d53c 25-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "When IMS connections are merged, track connect time elapsed." am: 040230d788 am: 114a16a2c6 am: e07787e2ce
am: 310fcec78f

Change-Id: I95c605ff1d649e6620e02b7b18b5c352f3d1970c
310fcec78fd99515b581ff980aecbd6b49658447 25-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "When IMS connections are merged, track connect time elapsed." am: 040230d788 am: 114a16a2c6
am: e07787e2ce

Change-Id: I59f139f9a30f856be4fc6d6a1c8d9c8e7e48a3ca
114a16a2c6af1ea59c4de61b18febd8c23b63b18 25-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "When IMS connections are merged, track connect time elapsed."
am: 040230d788

Change-Id: If8032f9b3f049660cfe13456053498234734aeb0
040230d7888584fd67abeafc4b6165279b446d36 25-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "When IMS connections are merged, track connect time elapsed."
85cc36dffdc6c1f0557aa478317ac47907df09a7 25-Aug-2017 Shuo Qian <shuoq@google.com> Merge "Add new error code handling for sending short code message" into oc-mr1-dev am: 953edc0503
am: 8c07de51c3

Change-Id: Ie859e2664b183fc80d780382e3a2fd997a248705
aa62ca0a289a65195f477be7fb223148789aa7db 24-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Handle low battery ImsReason and translate to low battery disconnect cause."
am: 4dc2c73a77

Change-Id: I8baec969b22680f1a9faa0122c7ef57c0da6dd7d
e12ae91a4e74dfb246ba9ed7031748dc8f18d154 10-Aug-2017 sqian <shuoq@google.com> Add new error code handling for sending short code message

Design doc: https://docs.google.com/a/google.com/document/d
/1YPTNoM2Atjz8oISGAsRYlFVSA1NcYP8MbqYQIzLcJ9E/edit?usp=sharing

Test: compile/flash code; test locally
Bug: 34773406
Change-Id: Idb85d6e9d9387616d6ad88d5799cebc07df746f8
Merged-In: Idb85d6e9d9387616d6ad88d5799cebc07df746f8
MSDispatcher.java
8c07de51c3a7f3851443df4315caa1d81f1dafd8 24-Aug-2017 Shuo Qian <shuoq@google.com> Merge "Add new error code handling for sending short code message" into oc-mr1-dev
am: 953edc0503

Change-Id: I013e908b180c90d9334fa8cdb170073662929488
4dc2c73a77f341b13bb80ebf49d285677ceaf312 24-Aug-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Handle low battery ImsReason and translate to low battery disconnect cause."
953edc05039dedd8761e45c502d2853502ef2de4 24-Aug-2017 Shuo Qian <shuoq@google.com> Merge "Add new error code handling for sending short code message" into oc-mr1-dev
211683484f0dd3ef1572c0200f7531260f5e162a 22-Aug-2017 Tyler Gunn <tgunn@google.com> Handle low battery ImsReason and translate to low battery disconnect cause.

There are two scenarios where we can run into a low battery:
1. onCallTerminated - this would be a mid-call termination.
2. onCallStartFailed - this would be while dialing.

Modified getDisconnectCauseFromReasonInfo to generate the correct
disconnect cause based on whether the call being disconnected is in
progress or dialing.

Test: Manual
Merged-In: If8672f4fb34e63f68868821b1fb203cd2676f78b
Change-Id: If8672f4fb34e63f68868821b1fb203cd2676f78b
Fixes: 63936576
msphone/ImsPhoneCallTracker.java
a81d308428c1c0639cc90e6fec89e4a07389e182 17-Aug-2017 Tyler Gunn <tgunn@google.com> Support auto-downgrade of video calls when mobile data is metered.

The previous code supported downgrading video calls (either to audio,
or pausing video, or terminating the call, depending on carrier reqs)
when mobile data is disabled.

These changes provide support for downgrading a video call over wifi
when it hands over to LTE (that work is in onCallHandover). The rest
of the changes in ImsPhoneCallTracker were to refactor the downgrade
code so it could be reused.

In ImsPhoneConnection, added support for temporarily disabling VT on the
local side. This way, if a wifi video call downgrades to audio-only due
to mobile data being disabled, the "upgrade to video" button will not
be available allowing the user to upgrade back to video (thereby defeating
the fact data is disabled).

Test: Manual
Bug: 36900451
Change-Id: Ib29c7b2fb31f4dcf505609bedfbaca0be7f8f265
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
b2e00e58218606397d0860dff0e46ca223905e06 24-Aug-2017 Chen Xu <fionaxu@google.com> Merge "add debugging log for ADN record loading" into oc-mr1-dev am: a9e8836ffb
am: 9668b01e25

Change-Id: Ic5e59090258dad3cc6d9bcc3b1cc1c22f6960afb
9668b01e25dd896d70300cbd9d8aceafc925a5a3 24-Aug-2017 Chen Xu <fionaxu@google.com> Merge "add debugging log for ADN record loading" into oc-mr1-dev
am: a9e8836ffb

Change-Id: Ib540613de02da7e3518f23e8c0493d49485dd18f
a9e8836ffbe6b8622463750e9adab8dd2ba91a99 24-Aug-2017 Chen Xu <fionaxu@google.com> Merge "add debugging log for ADN record loading" into oc-mr1-dev
a44e3a456220a500a36fa2121fbe35690563b329 04-May-2017 Srikanth Chintala <srikchin@codeaurora.org> Emergency redial implementation

Map EMERGENCY_TEMP_FAILURE and
EMERGENCY_PERM_FAILURE RIL fail cause
to telephony DisconnectCause.

Test: Unit Tests
Bug: 27059146
Change-Id: Ie72ab2901ec05d972204ed11f115a05b79173c1d
allFailCause.java
smCdmaConnection.java
msphone/ImsPhoneCallTracker.java
268420402db383b56a6d51bc728a173f37790932 24-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Handle low battery ImsReason and translate to low battery disconnect cause." into oc-mr1-dev am: fc83e5e862
am: ee1c400073

Change-Id: Ifc76abd6e8ea0d1bf51bf6d69e36b45f67e8b264
ee1c400073f9b8e09e859bfad742c5b6e23a2fbe 24-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Handle low battery ImsReason and translate to low battery disconnect cause." into oc-mr1-dev
am: fc83e5e862

Change-Id: Iac8af8ccd6d0638850cb4654444dd6e81a6d96bf
fc83e5e86242ee2b3fdafc99c0de6b7b78889cc6 24-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Handle low battery ImsReason and translate to low battery disconnect cause." into oc-mr1-dev
b2e7c842392afaf32785fc5cb5cf8c7e0aae2c92 24-Aug-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Reset EF_AD (mMncLength) on sim refresh event."
4bc8b75020dee19d91662b4c3b83981eed37020c 24-Aug-2017 Chen Xu <fionaxu@google.com> Merge "make service ban notification expandable" into oc-mr1-dev am: d9cd1b4067
am: 593f4c10af

Change-Id: I9443914d437e464a8cccecd053fc0f7680d78021
593f4c10af2dbc129fa48be5c88cde331e484155 24-Aug-2017 Chen Xu <fionaxu@google.com> Merge "make service ban notification expandable" into oc-mr1-dev
am: d9cd1b4067

Change-Id: I30af2f94e6682b964996d2a46522ffe4a89e0a7c
d9cd1b406761f60ec637ed8332e5883653017f85 24-Aug-2017 Chen Xu <fionaxu@google.com> Merge "make service ban notification expandable" into oc-mr1-dev
f561305faeb51ce51ecb48d3be462ca64ba8188a 22-Aug-2017 Cassie <xih@google.com> Make access rule format compatible with GP.

1. Allow a 4F tag with length of 6 and value "FF FF FF FF FF FF".
2. Allow optional tags before the DB tag.

Bug: 30613668
Change-Id: If189ad01bd1124d84f93a60bd96426d2555c9c91
Test: Basic telephony sanity
icc/UiccCarrierPrivilegeRules.java
745dce04d7334df0f6b52696b672d86f3bf86027 22-Aug-2017 Tyler Gunn <tgunn@google.com> Handle low battery ImsReason and translate to low battery disconnect cause.

There are two scenarios where we can run into a low battery:
1. onCallTerminated - this would be a mid-call termination.
2. onCallStartFailed - this would be while dialing.

Modified getDisconnectCauseFromReasonInfo to generate the correct
disconnect cause based on whether the call being disconnected is in
progress or dialing.

Test: Manual
Change-Id: If8672f4fb34e63f68868821b1fb203cd2676f78b
Fixes: 63936576
msphone/ImsPhoneCallTracker.java
c768e9712814804b7ad7b0c63c5ec4ed80e96551 23-Aug-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Check SIM valid before forcing network auto select"
8954c831db28642cb167fdae410654f81f33bb92 23-Aug-2017 Amit Mahajan <amitmahajan@google.com> Merge "Fix timezone cannot be updated automatically when no NITZ received" am: a15a4f0d87 am: 046452681b am: aa0bb5706c am: 748a6b8c89
am: 1fce8ea99f

Change-Id: I99b61ca4fcd4cb909892857b6701a5b57301de2c
1fce8ea99f935bc80ceb860bb09da317d9a75f70 23-Aug-2017 Amit Mahajan <amitmahajan@google.com> Merge "Fix timezone cannot be updated automatically when no NITZ received" am: a15a4f0d87 am: 046452681b am: aa0bb5706c
am: 748a6b8c89

Change-Id: I7c6c83d3332c1460753f41c194cc5988cddffbbe
748a6b8c8925fb71f8e75faa549e98837ff48e8b 23-Aug-2017 Amit Mahajan <amitmahajan@google.com> Merge "Fix timezone cannot be updated automatically when no NITZ received" am: a15a4f0d87 am: 046452681b
am: aa0bb5706c

Change-Id: Iff1c8ae5d0274429d71bc853025bef2ad0876a98
a15a4f0d87dec58f81424136ae80f71fc1399085 23-Aug-2017 Amit Mahajan <amitmahajan@google.com> Merge "Fix timezone cannot be updated automatically when no NITZ received"
f4f6f7acdf4e3739a199dda7d6de23641c6bc9b6 23-Aug-2017 fionaxu <fionaxu@google.com> make service ban notification expandable

Bug: 38506086
Test: Manual
Change-Id: I78f3c57efd5eb28b5e4748d60f846163a0ddf77a
erviceStateTracker.java
4d39c077d1c6b1badf9685d8bfef137fbade3e60 23-Aug-2017 Amit Mahajan <amitmahajan@google.com> Merge "Revert "Don't assume 3GPP as active app on CDMA with LTE device"" am: e9f33e6f3b am: df34b8d29d
am: 85b84b7b1a

Change-Id: I02453d60a130c9ebea2a127a1f294ae240e649e0
d16c6156936ceaf024300cad868783ebcc03801f 23-Aug-2017 Hall Liu <hallliu@google.com> Merge "Pin IMS on/off to actual TTY mode" am: df81b1b862 am: c44321470e
am: bfe077337a

Change-Id: I233d187c218634a80a2c5b7dc5e96e695e6cd1dd
02f9d4b31c3e67b6262018a17f1055b434d16ea3 23-Aug-2017 fionaxu <fionaxu@google.com> add debugging log for ADN record loading

This is to help debugging the potential race condition on loading ADN
record from the SIM. Its unclear why SIM_IO response is received but
the waiting thread is not being notified.

Bug: 64850872
Test: Build
Change-Id: I637a0381c8ab54efc7ae5134aee209d0f1a39bc7
sm/UsimPhoneBookManager.java
icc/IccFileHandler.java
e9f33e6f3b5a5ce420f3a3d3f5264e239b46150d 22-Aug-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Revert "Don't assume 3GPP as active app on CDMA with LTE device""
df81b1b86207d3c0dfc2f0bfae75171bdfd1f7d2 22-Aug-2017 Hall Liu <hallliu@google.com> Merge "Pin IMS on/off to actual TTY mode"
586b310594bb58896ce3a6f7eadbffa1d41b9147 18-Aug-2017 Hall Liu <hallliu@google.com> Pin IMS on/off to actual TTY mode

Make changes to only toggle IMS on/off if the actual TTY option
is on (i.e. UI preference is enabled and TTY accessory is plugged in)

Test: manual
Change-Id: I8a96d921aa9d8cddeb1987e6a4c7f7e0d0b87953
Fixes: 63968802
smCdmaPhone.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
181a84ec0ac5fb4bf3840535d4107986603d9dd7 17-Aug-2017 Amit Mahajan <amitmahajan@google.com> Revert "Don't assume 3GPP as active app on CDMA with LTE device"

This reverts commit a635fd92e8022f103fde2e8728b312b2cb8fa0c6.

Test: none, just reverting a CL
Bug: 63871136
Change-Id: Ife9abd8f8ebbba7d556c11c9a32fd9422d047ca1
icc/IccCardProxy.java
30d0b3a7a3f1b0f373e7b6f59e80321422a35d94 20-Jul-2017 Amit Mahajan <amitmahajan@google.com> Clear calling identity in SmsNumberUtils.needToConvert()

Test: Basic SMS sanity
Bug: 37256870
Change-Id: I6757dc5c9109ed5a3330db9c85eae856fe055be4
msNumberUtils.java
04c115651ea5f42eb5301bf02ee9a920e796412a 08-Jul-2017 Amit Mahajan <amitmahajan@google.com> Add class IntentBroadcaster to rebroadcast intents on USER_UNLOCKED.

This is to have a single point for broadcasting intents that need
to be rebroadcast, and helps rebroadcast them in the right order.

Test: Verified manually through logcat
Bug: 37730013
Change-Id: I5285dc1b96b3f6429e86eaa6b4aee58dfb55ccd1
ntentBroadcaster.java
honeFactory.java
ubscriptionInfoUpdater.java
icc/IccCardProxy.java
afe71ef98351f33c82d5cf513e0d24078bba2d2c 26-Apr-2017 Amit Mahajan <amitmahajan@google.com> Always fetch dun APNs from apn db.

Also added emergency as a non-wildcardable APN type.

Test: Verified tethering manually for T-Mo and AT&T
Bug: 38186417
Change-Id: I6d0da610557f2f48bfc79a3a9015d5d01173bddf
ataconnection/DcTracker.java
106b0beaa63a26a6a5c29eecbbbff3931ab51c13 12-Aug-2017 Tyler Gunn <tgunn@google.com> When IMS connections are merged, track connect time elapsed.

When IMS connections are meged, we need to track the elapsed time as well.
This is used when the actual conference is formed.

Test: Manual, unit test
Bug: 64068300
Change-Id: I2936ed2c65ac14a8807853b21398d08dfef55e69
onnection.java
msphone/ImsPhoneCall.java
d9be5fb196cc153aa4f27ef7a4a6b3a561ee8229 10-Aug-2017 sqian <shuoq@google.com> Add new error code handling for sending short code message

Design doc: https://docs.google.com/a/google.com/document/d
/1YPTNoM2Atjz8oISGAsRYlFVSA1NcYP8MbqYQIzLcJ9E/edit?usp=sharing

Test: compile/flash code; test locally
Bug: 34773406
Change-Id: Idb85d6e9d9387616d6ad88d5799cebc07df746f8
MSDispatcher.java
3dd679f9456f1f1472a0ef0349b547d315518aa0 13-Jul-2017 Sanket Padawe <sanketpadawe@google.com> Reset EF_AD (mMncLength) on sim refresh event.

Test: Build and TH.
Change-Id: I7d4de60709e1307db2f46161163036872894e188
Merged-in: I7d4de60709e1307db2f46161163036872894e188
Fix: 62803651
icc/IccRecords.java
12194aa8fc1c0a428b416fdc3491b65e0a5dc580 21-Aug-2017 Chen Xu <fionaxu@google.com> Merge "add NullPointerCheck for serviceStateTracker"
am: 6e8ec6c86c

Change-Id: I4baf8d552d4f5ec179603a541aced4db1dc60a41
daca5804baaf58936c6ade0097c5f710e709eff5 27-Jul-2017 fionaxu <fionaxu@google.com> add NullPointerCheck for serviceStateTracker

ServiceStateTracker is not created inside GsmCdmaPhone, thus there is no
SST inside SipPhone. Add a null pointer check inside CarrierActionAgent.
In the long term we should move CarrierActionSignal and
CarrierSignalAgent from Phone to GsmCdmaPhone

Bug: 64104240
Test: Manaul test by making a SIP call
Change-Id: Ia48ff128c9656446058816043cc825a1f60c8a20
arrierActionAgent.java
52b472b1294b300fd2f71e1dde468bd0052a5f18 18-Aug-2017 Hall Liu <hallliu@google.com> Pin IMS on/off to actual TTY mode am: 959f77a422
am: 79897b3b82

Change-Id: I67ca26753a8e2656420ab43ebd70dc952890c460
79897b3b820476cb48bd3530e1e9dd6c0f942dbd 18-Aug-2017 Hall Liu <hallliu@google.com> Pin IMS on/off to actual TTY mode
am: 959f77a422

Change-Id: I1676b6ce73b589245d209d5b956fe6affd2b9b1a
41372b06f74232fe898ddd8ac8e5993f43a80e41 18-Aug-2017 yifan.bai <yifan.bai@spreadtrum.com> Fix timezone cannot be updated automatically when no NITZ received

When no NITZ received, timezone can be updated by mobile country code.
This procedure is in pollStateDone method and only happens when network
changed. So if user manually changed timezone then turn on AutoTimezone
Setting and network is stable, timezone cannot be automatically updated.

To fix, when turn on auto timezone setting, if there is no NITZ timezone
, immediately update timezone by country code.

Test: Build pass
erviceStateTracker.java
a5adaf6e79ec73d2eb321e358856b2c16afe8d1a 18-Aug-2017 Jack Yu <jackyu@google.com> Merge "Reduced the retry after disconnect delay" am: 36a9411567 am: 40bc5f79b9
am: 5b0edd409b

Change-Id: If98c9dacacdc08347dda7e0c30a061e6c345bc42
40bc5f79b92ef55e4aa5f1e7dbaebe4f106560e7 18-Aug-2017 Jack Yu <jackyu@google.com> Merge "Reduced the retry after disconnect delay"
am: 36a9411567

Change-Id: Ia301242a08eae8f0acb1f4bca0d4917f2af4a8d5
36a941156748fecbf8b5148439c38069c1bf721d 18-Aug-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Reduced the retry after disconnect delay"
2a55c99365d52eaccc41a6b2516104038f908afa 18-Aug-2017 Sukanya Rajkhowa <srajkh@codeaurora.org> Merge "Add Dual Transfer Mode support" am: f05993f654 am: 3596431950 am: b56f283ebb am: 4f2b0d15a5
am: e0a26390dc

Change-Id: I5826fe0d574b5d6d5953818d58b0d495b00ae8aa
e0a26390dcb648ae40670ee5566eb5620bc8f81f 18-Aug-2017 Sukanya Rajkhowa <srajkh@codeaurora.org> Merge "Add Dual Transfer Mode support" am: f05993f654 am: 3596431950 am: b56f283ebb
am: 4f2b0d15a5

Change-Id: Ia97acbb01f9b4dab2f7d43ca321a3e129be42dec
4f2b0d15a54d87db82ced7d1f4ff31b6758fc5f8 18-Aug-2017 Sukanya Rajkhowa <srajkh@codeaurora.org> Merge "Add Dual Transfer Mode support" am: f05993f654 am: 3596431950
am: b56f283ebb

Change-Id: Ib2e4514a959b4b35ca9e1985e913feeb36b1ef93
359643195086ed48050289aff75d0bf34ba785ed 18-Aug-2017 Sukanya Rajkhowa <srajkh@codeaurora.org> Merge "Add Dual Transfer Mode support"
am: f05993f654

Change-Id: Ifa531a6117236192f87752e10ae7c8fb92d94c03
e5a04145480c77b8703572234ab7cf1f5c217102 18-Jul-2017 Sukanya Rajkhowa <srajkh@codeaurora.org> Add Dual Transfer Mode support

This change includes the following to support DTM:
(1) For GSM, decode the "concurrent services support indicator" field
from RIL_REQUEST_VOICE_REGISTRATION_STATE request and based on the
value of this CSSI field allow concurrent CS and PS services to
applications.

(2) Notify data connection changed on CSS indicator update.

(3) When the phone moves from a DTM cell to a non DTM cell while in
active voice call, data connection is not suspended. To fix this,
consider CSS indicator change also for notifying data connection.

(4) To determine concurrent voice and data support, it is necessary to
query Data Radio Tech.

Test: with modified RIL to return desired css indicator
Test: Passed new unit test
Bug: 21079150

Change-Id: I57c445ee28be4e1c0f2934cb136a70d39447511c
honeInternalInterface.java
erviceStateTracker.java
959f77a422b23c133225e360e1feebe0433daea9 18-Aug-2017 Hall Liu <hallliu@google.com> Pin IMS on/off to actual TTY mode

Make changes to only toggle IMS on/off if the actual TTY option
is on (i.e. UI preference is enabled and TTY accessory is plugged in)

Test: manual
Change-Id: I8a96d921aa9d8cddeb1987e6a4c7f7e0d0b87953
Fixes: 63968802
smCdmaPhone.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
3bada89601efe7b2247a47710555e2eb9b348b51 16-Aug-2017 Jack Yu <jackyu@google.com> Reduced the retry after disconnect delay

Reduced the delay from 20 seconds to 10 seconds. And created
a separate delay configuration for it.

Test: Manual
bug: 63633916
Merged-In: I793e2172657e27fb2153d456e846a0c9c5e451af
Change-Id: I793e2172657e27fb2153d456e846a0c9c5e451af
(cherry picked from commit da21f0de2087657b20b18817b33d59778720bffb)
etryManager.java
ataconnection/ApnContext.java
ataconnection/DcTracker.java
eb81b2edbb9023c5c4d72c6860c58b9311f0795c 17-Aug-2017 Amit Mahajan <amitmahajan@google.com> Merge "Revert "Don't assume 3GPP as active app on CDMA with LTE device"" into oc-mr1-dev am: 8daf638078
am: f7801f3bf7

Change-Id: Ia90551694393164dec79d5407d286a7cd3027024
f7801f3bf719eae7a971355934564c9d7994980f 17-Aug-2017 Amit Mahajan <amitmahajan@google.com> Merge "Revert "Don't assume 3GPP as active app on CDMA with LTE device"" into oc-mr1-dev
am: 8daf638078

Change-Id: I30ae8c8f6b4f66e58e1889cad3ad60760a846d87
8daf638078b09959a09d268bf5d0da38f3c71ee3 17-Aug-2017 Amit Mahajan <amitmahajan@google.com> Merge "Revert "Don't assume 3GPP as active app on CDMA with LTE device"" into oc-mr1-dev
c309f7edbbba378cdc332776b45729c7bf25578a 17-Aug-2017 Jack Yu <jackyu@google.com> Merge "Reduced the retry after disconnect delay" into oc-mr1-dev am: e5fd3f2011
am: ea9e25330a

Change-Id: I55d1792fd30ae25cd4fc7a698667209929d26fbb
ea9e25330a558a054c83c29c7235272fe4a7ce33 17-Aug-2017 Jack Yu <jackyu@google.com> Merge "Reduced the retry after disconnect delay" into oc-mr1-dev
am: e5fd3f2011

Change-Id: I63fe4ad87894bbcd5772e603215729d227f8fcfe
e5fd3f201190ee21a6b01d258125046e4b79509d 17-Aug-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Reduced the retry after disconnect delay" into oc-mr1-dev
fedc3ad83834d510caa3e3c0d51c6ac3a0722665 17-Aug-2017 Amit Mahajan <amitmahajan@google.com> Revert "Don't assume 3GPP as active app on CDMA with LTE device"

This reverts commit a635fd92e8022f103fde2e8728b312b2cb8fa0c6.

Test: none, just reverting a CL
Bug: 63871136
Change-Id: Ife9abd8f8ebbba7d556c11c9a32fd9422d047ca1
icc/IccCardProxy.java
bc4d9ebb8a645ab1df24f73da46521563a3009ec 17-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Ensure call forwarding and barring MMI codes can work over IMS." into oc-mr1-dev am: 3ab81254e5
am: 3b0be08c0e

Change-Id: I6c3fbe9394b9c5e9e259490bf875aada94ec28bc
3a0850475eda3494b2e8e62034d95875531347fb 16-Aug-2017 Brad Ebinger <breadley@google.com> Merge "Update ImsConnectionStateListener"
530a7cd0d532eed2228a7079ddd52dd93199d7f4 16-Aug-2017 Brad Ebinger <breadley@google.com> Merge "Add cleanupCalls to call tracker."
am: 41cdaa6359

Change-Id: I89905bfd5155320019a5fe1afb259daee29803cb
3b0be08c0ede7b3a9fa46ac92b4a0180335c948b 16-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Ensure call forwarding and barring MMI codes can work over IMS." into oc-mr1-dev
am: 3ab81254e5

Change-Id: I0aa5ccbf020c6f9606d193ef944d4458c6f6c355
3ab81254e57122dcc21c62f6c67d3bf5b258d4ab 16-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Ensure call forwarding and barring MMI codes can work over IMS." into oc-mr1-dev
14e3a6149f1aadfe41eea3856e6cae3c6d13d168 12-Dec-2016 Meng Wang <mewan@google.com> Update ImsConnectionStateListener

1. Replace onImsConnected() with onImsConnected(int)
2. Replace onImsProgressing() with onImsProgressing(int)

Bug: 33430556
Test: m
Merged-In: I5021b41b2c44b1242f5866791cbb11f07815d86c
Change-Id: I5021b41b2c44b1242f5866791cbb11f07815d86c
msphone/ImsPhoneCallTracker.java
677d7d4c801b0045d834b6188f20b66452bb44a1 08-Jul-2017 Tyler Gunn <tgunn@google.com> Add cleanupCalls to call tracker.

For GsmCdmaCallTracker, this calls pollCallsWhenSafe(). By polling the
calls in the RIL, the GSMCdmaCallTracker will reconcile the calls it knows
about with what the RIL reports, removing stale calls.

Test: Manual
Bug: 63317180
Merged-In: I7195783318bb798bfdbed4341596d25f2d278282
Change-Id: I7ee8609c41376bf21c428d04aab7d76151200699
allTracker.java
smCdmaCallTracker.java
da21f0de2087657b20b18817b33d59778720bffb 16-Aug-2017 Jack Yu <jackyu@google.com> Reduced the retry after disconnect delay

Reduced the delay from 20 seconds to 10 seconds. And created
a separate delay configuration for it.

Test: Manual
bug: 63633916
Change-Id: I793e2172657e27fb2153d456e846a0c9c5e451af
etryManager.java
ataconnection/ApnContext.java
ataconnection/DcTracker.java
619e64aaa2e416a4a61bf62f3b9888750f61cce1 16-Aug-2017 Shuo Qian <shuoq@google.com> Merge "Remove/Modify some logs in SubscriptionController to prevent log flood." am: 037c07ef01 am: 9fc6d5e361
am: 9201628846

Change-Id: I81089661259cdb61543600aec63bab85dc0c9031
9fc6d5e36116ae7c91bbbe731675773dc8d56713 16-Aug-2017 Shuo Qian <shuoq@google.com> Merge "Remove/Modify some logs in SubscriptionController to prevent log flood."
am: 037c07ef01

Change-Id: I48df40de22d030de89d4addeb314732033762610
037c07ef01068f035e3b6d196b7acf9b8f430c75 16-Aug-2017 Shuo Qian <shuoq@google.com> Merge "Remove/Modify some logs in SubscriptionController to prevent log flood."
477c4db10f1a8162354795267ee2d8700eea3138 15-Aug-2017 Brad Ebinger <breadley@google.com> Merge "Update ImsPhone to have default OUT_OF_SERVICE state"
am: 6958edf5f6

Change-Id: If945ff2883fe8c0a14f3022d4968a667180f23d4
bc21e32fa195500e27188c483f61185ac1f66553 14-Aug-2017 sqian <shuoq@google.com> Remove/Modify some logs in SubscriptionController to prevent log flood.

Test: no need; treehuger
Bug: 64155166
Change-Id: I77197d23960966a8e6270598b41b2ed1dfc086c3
Merged-In: I77197d23960966a8e6270598b41b2ed1dfc086c3
(cherry picked from commit 72fb3ffccc8b897b0452ee1aa32abe3f71c4ddba)
ubscriptionController.java
b4cd9d7f8b45293fb5e5d9853bc5dd8dcf24858f 15-Aug-2017 sqian <shuoq@google.com> resolve merge conflicts of 7c121bee1 to stage-aosp-master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I3154f6d332db1558bc96d25bb448c6a5d99068d0
50f86f4e1f2c840ccf98f052095248930a599932 15-Aug-2017 sqian <shuoq@google.com> Remove/Modify some logs in SubscriptionController to prevent log flood. am: 72fb3ffccc
am: 31be7baa29

Change-Id: Ice6916a8e883d077c0abb082b0b5e46dc5d8652e
6958edf5f6defb173c3c03c0e8619b1a1a4366cb 15-Aug-2017 Brad Ebinger <breadley@google.com> Merge "Update ImsPhone to have default OUT_OF_SERVICE state"
31be7baa29ff81ae72e7a55010c9722e5c7bd1fa 15-Aug-2017 sqian <shuoq@google.com> Remove/Modify some logs in SubscriptionController to prevent log flood.
am: 72fb3ffccc

Change-Id: I0c0cce112d3d670517466791347f7b63e0a8ad4e
2e4aad90ad05d3d4f3f8699b0032f508ae92225b 15-Aug-2017 Brad Ebinger <breadley@google.com> Merge "Do not set the state to POWER_OFF when in APM for ImsPhone"
am: 63a4e77c5c

Change-Id: I969741e133d3c45fecf9bc716482c9722b7c2142
75417bac9f6996df0c09db72ada7d488576cbc4c 15-Aug-2017 Brad Ebinger <breadley@google.com> Merge "Fix emergency call failure over IMS after boot"
am: ebb95bbe66

Change-Id: I6d03e4441dc020f96915821466233f7cefee1b79
b1e4365262d0661361f6297e6d60ebe52b433354 15-Aug-2017 kun.tang <kun.tang@spreadtrum.com> Merge "Unregister receiver when SIMRecords dispose." am: 375768dd0b am: b12efdedaf am: dbabd2f6c1 am: 2268d99663
am: e2f004875c

Change-Id: I864f6d3595bc664f077aff1eed05d71aefc84012
853796b9b97032affbedbb9aae92d00a5c550b5a 15-Aug-2017 kun.tang <kun.tang@spreadtrum.com> Merge "Fixed NullPointerException when parseEfSpdi." am: 3b2aa31a45 am: 2063878de6 am: 19dc833cd0 am: 6cdacab160
am: 59075bee15

Change-Id: I933a59087c5a0714bccddd0a90097fa6bde4033d
72b6af0b7409bc76c45cb242d147bd1ea46cdf0e 15-Aug-2017 Brad Ebinger <breadley@google.com> resolve merge conflicts of 4e1353794 to stage-aosp-master

Test: Manual
Change-Id: I889e4c607ca09c3149b4ee3741b755dce009b0a3
e2f004875c5d2cb5fb0ce7a67460c05a1be82fda 15-Aug-2017 kun.tang <kun.tang@spreadtrum.com> Merge "Unregister receiver when SIMRecords dispose." am: 375768dd0b am: b12efdedaf am: dbabd2f6c1
am: 2268d99663

Change-Id: I7c20c5d129be91b1f62b0238df8c3d8d65513d6a
59075bee15aa825dd5fdd27b748485ed41e3e763 15-Aug-2017 kun.tang <kun.tang@spreadtrum.com> Merge "Fixed NullPointerException when parseEfSpdi." am: 3b2aa31a45 am: 2063878de6 am: 19dc833cd0
am: 6cdacab160

Change-Id: I826c0d9f4b29de130a1824e80e5700d1050b0ab2
2268d996637d885261d944ffb19118b3c89ccf38 15-Aug-2017 kun.tang <kun.tang@spreadtrum.com> Merge "Unregister receiver when SIMRecords dispose." am: 375768dd0b am: b12efdedaf
am: dbabd2f6c1

Change-Id: I55c1908e6f85c6552d090428a497c9559253e3b3
6cdacab160017a2de069a98d79769b67082b64fa 15-Aug-2017 kun.tang <kun.tang@spreadtrum.com> Merge "Fixed NullPointerException when parseEfSpdi." am: 3b2aa31a45 am: 2063878de6
am: 19dc833cd0

Change-Id: I9a8f4967f8e8a6682dc121fd4ba7687567cefa69
b12efdedaf51460e7479eb21dc36653840feaece 15-Aug-2017 kun.tang <kun.tang@spreadtrum.com> Merge "Unregister receiver when SIMRecords dispose."
am: 375768dd0b

Change-Id: I996780ebfe23a3b1eb1c6f95f5112e190ea3932e
2063878de6fd554053c345d117f5c1fb67b65e3d 15-Aug-2017 kun.tang <kun.tang@spreadtrum.com> Merge "Fixed NullPointerException when parseEfSpdi."
am: 3b2aa31a45

Change-Id: I9dcf060c6bd1408d238e75c8897d380bb447383c
fd32a49c00bd06bee7b245568637de58ff2fddc5 15-Aug-2017 Hall Liu <hallliu@google.com> Merge "Make a copy of the sSlotIndexToSubId's entryset"
am: eebd4b6294

Change-Id: I6c25ab38466cf8f1ad7ed8ae406b7d382971de4c
86c78ada0764f49473b9b50a4b05cd8d113f82ea 15-Aug-2017 Hall Liu <hallliu@google.com> Merge "Clear voicemail information if CDMA sim is inserted"
am: 68133d9523

Change-Id: Idae1e98167fa147e0eb9520552bda1a79f46e82d
7c121bee18d00765e4a3bd517daf0412f385c6e6 15-Aug-2017 Shuo Qian <shuoq@google.com> Merge "Check string variable against both empty and null string"
72fb3ffccc8b897b0452ee1aa32abe3f71c4ddba 14-Aug-2017 sqian <shuoq@google.com> Remove/Modify some logs in SubscriptionController to prevent log flood.

Test: no need; treehuger
Bug: 64155166
Change-Id: I77197d23960966a8e6270598b41b2ed1dfc086c3
ubscriptionController.java
63a4e77c5c12049ce51e0375f719ad3a1e420f49 14-Aug-2017 Brad Ebinger <breadley@google.com> Merge "Do not set the state to POWER_OFF when in APM for ImsPhone"
ebb95bbe66c796458404473c5d4b44718104e5a8 14-Aug-2017 Brad Ebinger <breadley@google.com> Merge "Fix emergency call failure over IMS after boot"
a2e398fdf1e58a38564059f639dfa22e1da02942 15-Jun-2017 Brad Ebinger <breadley@google.com> Fix emergency call failure over IMS after boot

With some recent changes to the ImsPhone, we now never go into
the STATE_POWER_OFF state. This was how the GsmCdmaPhone used
to verify that the ImsPhone was not ready to make calls, so
it was not falling back to CS in this small space of time
before the ImsService came up and instead failing to make the call.

This change fixes this issue in two ways:
1) Instead of looking for the STATE_POWER_OFF state, it will instead
check to see if the ImsService is up.
2) If the emergency call fails over IMS, then fallback to CS
automatically.

Bug: 62618800
Test: Place emergency call right after boot up
Merged-In: I86057265b04ed2e6857d1f0beaafa21e3f5ea0b7
Change-Id: Ia290681983e995568d01e84fa81d38d4b986d9b0
smCdmaPhone.java
hone.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
5e234c6717dfdc6172c774c2c7cc4cfbe6c116a6 30-Jun-2017 Brad Ebinger <breadley@google.com> Do not set the state to POWER_OFF when in APM for ImsPhone

There is no need to set the ImsPhone to the state POWER_OFF
when we move into APM, since there is no difference between that
and the OUT_OF_SERVICE state.

Also, removes the POWER_OFF check from the ImsPhoneCallTracker,
as it should only determine whether or not it can dial a call
from the ImsService capabilities at the time of the call.

Bug:62816248
Test: Manual, Test E911 call
Merged-In: Ia4cb40e9d8ddfb9099eae3fbe51a6ad19b521435
Change-Id: I904be6a8e79d40ebf8f8dae81277169ad7dabfcc
smCdmaPhone.java
msphone/ImsPhoneCallTracker.java
7a7f25cf5b76151261e7c3d535bf1e18b030cb52 07-Jun-2017 Brad Ebinger <breadley@google.com> Update ImsPhone to have default OUT_OF_SERVICE state

ImsPhone only has the voice registration state POWER_OFF when
it is constructed. After it registers with IMS (or fails), it
moves to the STATE_IN_SERVICE and STATE_OUT_OF_SERVICE states.
There is no need to start it in the STATE_POWER_OFF voice
registration state and can instead be constructed in the
STATE_OUT_OF_SERVICE state.

Bug: 62114647
Test: Manual emergency call testing
Merged-In: I1323342c644f195992c89ec9cb1aca437a6ccdcf
Change-Id: I836548a460b6da70be9bf2807e4d791ee7724cc3
msphone/ImsPhone.java
4e13537946d67c65df14771afbffd9832e1493b2 14-Aug-2017 Brad Ebinger <breadley@google.com> Merge "Don't return false if the Phone is GSM for ECBM"
8411f1c467f56b77e46c07cb1fdfc940b442810c 14-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Add cleanupCalls to call tracker." into oc-dr1-dev am: 7bd07276f1 am: b2264dc08a
am: 3aa014ce06

Change-Id: I896bd3248bf733828e298047b665ec4a3acf458c
3aa014ce06a18c4a9673d0a4d7125d1f6998f086 14-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Add cleanupCalls to call tracker." into oc-dr1-dev am: 7bd07276f1
am: b2264dc08a

Change-Id: I45e10bacd4f1044f60be59d1631efd19238b2c8e
b2264dc08a0ee421c96f93d9e92b9fcfd6115c34 14-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Add cleanupCalls to call tracker." into oc-dr1-dev
am: 7bd07276f1

Change-Id: I7195783318bb798bfdbed4341596d25f2d278282
714936faa3da78e70a2c4f4c14dcc74d76343727 14-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Add cleanupCalls to call tracker." into oc-dr1-dev
am: 7bd07276f1

Change-Id: Ia5b2d6ad3981f279172d370a5ce6dac57ba4493b
7bd07276f13b27328d6478bfbe6a87092fed8ac8 14-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Add cleanupCalls to call tracker." into oc-dr1-dev
aad0a1adc82fc17fc57bf30af24cdf321a31928d 14-Aug-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Add unit tests for ImsVideoCallProviderWrapper."
103b42ecdefd57022a9627febe3dbca8fbbb8b0a 09-Aug-2017 Tyler Gunn <tgunn@google.com> Ensure call forwarding and barring MMI codes can work over IMS.

The code included a mDialingNumber != null check which would prevent
call forwarding and call barring codes from ever being handled over IMS.
E.g. *30#6505551212 should be handled because it is a valid SC_CLIP
request, but the 6505551212 dialing number would prevent this from going
over IMS.

Test: Dialed MMI code and verified it goes over IMS.
Change-Id: I4bc93085a9c012d80fcce67c65b851995cfe8996
Fixes: 38439766
msphone/ImsPhoneMmiCode.java
4dd930cb512fabe1b716aa12daa9e7d9d56d3c8a 11-May-2017 Tyler Gunn <tgunn@google.com> Add unit tests for ImsVideoCallProviderWrapper.

Specifically adding tests to ensure that the issue described in the bug
is handled correctly.

Test: Manual/unit
Bug: 35304446
Merged-In: I40fb4b7df15c55114bda506442e5efa0aefbd809
Change-Id: I40fb4b7df15c55114bda506442e5efa0aefbd809
msphone/ImsPhoneCallTracker.java
375768dd0b233cdc2856608c3d4456530ed0044d 12-Aug-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Unregister receiver when SIMRecords dispose."
3b2aa31a459f61aedc2c0cdc03c6ed993e211f72 12-Aug-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fixed NullPointerException when parseEfSpdi."
eebd4b629405b1265cddc98192709c5b5e0b5535 11-Aug-2017 Hall Liu <hallliu@google.com> Merge "Make a copy of the sSlotIndexToSubId's entryset"
68133d9523ad3bc0c50cd7a0e024ae0afc605e8f 11-Aug-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Clear voicemail information if CDMA sim is inserted"
4bf628e0be9ca7b10bdfb76a45b879fcf193bad3 11-Aug-2017 sqian <shuoq@google.com> Check string variable against both empty and null string

The new RIL in O changes all null strings to empty strings, but the code
only checks some string variable against null in some areas of frameworks/
opt/telephony. This CL adds the check against both empty and null for
these strings.

Test: TreeHugger
Bug: 62490549
Change-Id: If18154e896666eb9d5398181b9efe7cce40d7f75
Merged-In: If18154e896666eb9d5398181b9efe7cce40d7f75
(cherry picked from commit 0b23fe5834db6b9f53111487e2911cbc394fe761)
adioResponse.java
etrics/TelephonyMetrics.java
1ec98512102696e2ee98df06b78c8e4466a76658 11-Aug-2017 Chen Xu <fionaxu@google.com> Merge "reset carrier actions when exits roaming state."
am: 6c2213399b

Change-Id: I559ecedcaa02c1edc99a4dc08483a57ce3f8e279
1592d204ba06d7bbd9815618aa2be48cb756bb20 01-Jun-2017 Brad Ebinger <breadley@google.com> Don't return false if the Phone is GSM for ECBM

ECBM can still be triggered on CDMA+LTE voice
RATs when there is no SIM and the phone camps
on a CDMA+LTE network. We should still be able
to get into ECBM in these cases.

This change removes the GSM only check for
isInEcm().

Bug: 62042256
Test: Build and run
Merged-In: I4f023339968631d2a34146f9ff1f5b4a58e1e656
Change-Id: I4f023339968631d2a34146f9ff1f5b4a58e1e656
smCdmaPhone.java
hone.java
msphone/ImsPhone.java
a4881cfd7163ee2497527d6ad97e76deea1f2d3a 21-Jul-2017 fionaxu <fionaxu@google.com> reset carrier actions when exits roaming state.

carrier apps might restrict mobile data if users enter roaming state
without any romaing plan/balance. however when users exit roaming state,
we should reset carrier data restrictions to re-evaluate data state.

Test: manual test roaming on->off->on by setprop
telephony.test.forceRoaming

Bug: 63819703
Merged-in: If91042054ce973c384fe03aa0b733de9f8033bf6
Change-Id: If91042054ce973c384fe03aa0b733de9f8033bf6
arrierActionAgent.java
erviceStateTracker.java
ataconnection/DataConnection.java
ataconnection/DcTracker.java
c67708d55b3f85e15999d96014f13fd1a34441a0 11-Aug-2017 Shuo Qian <shuoq@google.com> Merge "Fix MVNO override feature"
am: e5788ffd68

Change-Id: I67134fe4d1b8d4492dbb21631a976481ececfaa7
e5788ffd684267000ca970c719bf7fef841b7940 11-Aug-2017 Shuo Qian <shuoq@google.com> Merge "Fix MVNO override feature"
3aa8c871462bbee9eb01a3c22afb5dcdd414eab2 29-Jul-2017 Sanket Padawe <sanketpadawe@google.com> Client side logging for SMS metrics.

1) Add logging for Cellbroadast messages.
2) Fix some issues with sms logging

Test: manual
Bug: 62384061
Bug: 63939342
Change-Id: I710ed2360a29c6952d130a833806e45a64d92990
ellBroadcastHandler.java
IL.java
dma/CdmaInboundSmsHandler.java
etrics/SmsSessionEventBuilder.java
etrics/TelephonyMetrics.java
b695372c678ef00d56b0af8106f5da40ec2d6943 11-Aug-2017 kun.tang <kun.tang@spreadtrum.com> Fixed NullPointerException when parseEfSpdi.

The return value of bcdPlmnToString may be null, so it is necessary to judge null here.
Test:build

Change-Id: I3d0c7bd69912f14ed6a9d4b8a8cc8c980157c4cf
icc/SIMRecords.java
b4c2c7dd8a2090b9a323208bf6c9af062e0f9574 11-Aug-2017 kun.tang <kun.tang@spreadtrum.com> Unregister receiver when SIMRecords dispose.

To make object normally released, receiver should be unregistered when SIMRecords dispose.
Test:Build

Change-Id: Ia396642ca61b60d61a330bde8fd6556666cb1ae0
icc/SIMRecords.java
0eaa5dec571ea313dc557ae5a11931d51730757e 11-Aug-2017 Brad Ebinger <breadley@google.com> Merge "Initialization causes IMS to deregister"
am: 0624b77b7d

Change-Id: Ic7f457edd81d14bd374567a43b0dd43ffc0f46f7
0624b77b7dc80e546a76f46a02be52fb0a3c03d2 11-Aug-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Initialization causes IMS to deregister"
a16ab1562cb8156df1f075103d91891e6c5db33a 11-Aug-2017 Jayachandran C <jayachandranc@google.com> Merge "Use PLMN instead of SPN override for Rogers, DTAG and Telstra" into oc-dr1-dev am: 2e8ce3ca16 am: 7a0b66e095
am: 383097b964

Change-Id: If2aa93409744f51e7d8802f7a6c45d66bf12f176
383097b964e41eb3a3e039ff7db97765ad93403d 11-Aug-2017 Jayachandran C <jayachandranc@google.com> Merge "Use PLMN instead of SPN override for Rogers, DTAG and Telstra" into oc-dr1-dev am: 2e8ce3ca16
am: 7a0b66e095

Change-Id: I7a8483341575bdaafcc1fd359c32f78254edb916
7a0b66e0954cc12d31996d15f2dc5adfcce9d6e7 11-Aug-2017 Jayachandran C <jayachandranc@google.com> Merge "Use PLMN instead of SPN override for Rogers, DTAG and Telstra" into oc-dr1-dev
am: 2e8ce3ca16

Change-Id: I24cb497b6c4cc416d3e03cb6fe0a35cda5788fda
4007c2ef41946d4ee0ec1a62bc0622bff95747c6 11-Aug-2017 Jayachandran C <jayachandranc@google.com> Merge "Use PLMN instead of SPN override for Rogers, DTAG and Telstra" into oc-dr1-dev
am: 2e8ce3ca16

Change-Id: I74f9b9b47bee08d5bd2153598ba8cbd90592f6b4
2e8ce3ca169d6e9fe80885efdefdad31efcf5535 11-Aug-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Use PLMN instead of SPN override for Rogers, DTAG and Telstra" into oc-dr1-dev
e8b0d818aeb9f0bc65b6afb0d98147841f678dfd 10-Aug-2017 Jack Yu <jackyu@google.com> Merge "Fixed the aggresive data call setup"
am: a6e4d34137

Change-Id: I033fc149bfd57018167c3dd3d89e4d44ff3aca1f
c29bd2373fd9e52fc1b38fc3d1a0613aaa03c569 10-Aug-2017 Jack Yu <jackyu@google.com> Merge "Fixed deactivate data call request not sent while radio is off"
am: b69ed3c016

Change-Id: I879e72efab1c7ea7f6119df8b565b58280ffcc0b
7a4666cb2aadd8302ab8024acb6921165f2767ff 10-Aug-2017 Jack Yu <jackyu@google.com> Merge "Fixed that VT dropped when handover from LTE to IWLAN"
am: 5506cb5df5

Change-Id: Ica3104d7df9dde0bef4cec63d4b6eeeca3eeec19
3c5f1948b3e57f12db7f14f0770af1c98d9a281b 10-Aug-2017 Jack Yu <jackyu@google.com> Merge "Fixed that modem data roaming state was not preserved properly"
am: 9d5ea027e3

Change-Id: I4eb85361f5482d11bf8081f45456dcafffdd3a21
acc549131182e3c3c7ff949c511ecfe97b2c519d 10-Aug-2017 Shuo Qian <shuoq@google.com> Merge "Add SharedPreference information in TelephonyDebugService dumpsys"
am: f14a5a119f

Change-Id: I087ea8c3190f34f582cf0c3aebac310350ee1845
94e25b3ffeeb9a93a8fa24ae327a574dbadcd10d 10-Aug-2017 Shuo Qian <shuoq@google.com> Merge "Provide a machanism to override MVNO parameters below CarrierConfig"
am: d46c8e7c88

Change-Id: Ib60b60826452d1a67a02ff7f16427c7f2d970efe
0e61240958ddbd2e5f54368db92f501a307af597 10-Aug-2017 Chen Xu <fionaxu@google.com> Merge "handle carrier config change race conditions"
am: 4f3e153175

Change-Id: I4c98ee0f7d5d07b62f26e119c0c50ff4a0886816
a6e4d341374e5fef20e5148f03be16586bd4aa69 10-Aug-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fixed the aggresive data call setup"
e2470ce8b72afd901efe5b249814deb2c150095e 17-Jul-2017 Hall Liu <hallliu@google.com> Make a copy of the sSlotIndexToSubId's entryset

If sSlotIndexToSubId is modified on another thread between simInfoSet
being initialized and the iteration, the sizes may not match and an
array-out-of-bounds error may occur.

Change-Id: If1ed9678d5652f1e3161a7a29d34c047daa8e469
Test: builds
Fixes: 63715198
ubscriptionController.java
6bf91cd19509a17acdfb7ab8aade828d29b3dfc1 01-Aug-2017 Hall Liu <hallliu@google.com> Clear voicemail information if CDMA sim is inserted

When a new sim is inserted and we connect to a CDMA network, the
voicemail information may not be updated. This changes the behavior to
be the same as for GSM.

Change-Id: Ie8745832673a79b3ad88819cd82caa8569a20ad6
Fixes: 63615700
Test: manual
smCdmaPhone.java
b69ed3c016ff2e062c87df7c82a92018173eb0b2 10-Aug-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fixed deactivate data call request not sent while radio is off"
5506cb5df55d462536ccdecd7350fc4385eb7fb9 10-Aug-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fixed that VT dropped when handover from LTE to IWLAN"
45b8aad8a7ea90ed87bb48a48c6e7343dc6ef591 03-Aug-2017 Jack Yu <jackyu@google.com> Fixed the aggresive data call setup

Whenever data RAT changes we try to setup a data call. Now we will
not do that if it switches to RIL_RADIO_TECHNOLOGY_UNKNOWN.

Test: Manual
bug: 64099426
Merged-In: I9c655bae80cf3a0fda069df241a88ce2f0f5cefc
Change-Id: I9c655bae80cf3a0fda069df241a88ce2f0f5cefc
ataconnection/DcTracker.java
d7cb7a30c18c0e1143038392cba06d699bfc550b 06-Aug-2017 Jack Yu <jackyu@google.com> Fixed deactivate data call request not sent while radio is off

The data call deactivation request should be sent down regardless
of radio state. The data connection might be on IWLAN (wifi) without
radio turned on.

Test: Manual
bug: 63936310
Merged-In: I4483d4022e9aea7d11f22d092a6a7d315218ab82
Change-Id: I4483d4022e9aea7d11f22d092a6a7d315218ab82
ataconnection/DataConnection.java
c984fd522f17f1e8c8240184bc3143202f2767f0 03-Aug-2017 Jack Yu <jackyu@google.com> Fixed that modem data roaming state was not preserved properly

The modem data roaming state (comparing to the data roaming state
that might be overridden by carrier config or resource overlay)
was saved after it got overridden. Now save it as soon as we get
the state from the modem.

Test: Telephony sanity tests + unit tests
bug: 64155609
Merged-In: I7c54ab2a3fa6d1d6dae7b2c83f5a41bad1faa38b
Change-Id: I7c54ab2a3fa6d1d6dae7b2c83f5a41bad1faa38b
erviceStateTracker.java
eb2735c41f371805722f837b0e04a0ca5b066a28 02-Aug-2017 Jack Yu <jackyu@google.com> Fixed that VT dropped when handover from LTE to IWLAN

Added a workaround so that we don't tear down the data connection
when the old APN list can cover the new APN list, and if we are
not roaming, ignore the roaming protocol field.

Test: Telephony unit tests
bug: 63917285
Merged-In: Ie588f1bc2ef7f38370aa517f0581787d2e4000c9
Change-Id: Ie588f1bc2ef7f38370aa517f0581787d2e4000c9
ataconnection/ApnSetting.java
ataconnection/DcTracker.java
26e421a70b918fbbd27ee663f1288f8bb5e52ef7 17-Jun-2017 sqian <shuoq@google.com> Fix MVNO override feature

EVENT_GET_AD_DONE will try to set mMncLength with real sim data.
This should be set with Faked value as well when test mode is in.

Test: Manual
Bug: 32591388
Change-Id: If38168109c334347057e383e27cb802a7502ebfd
Merged-In: If38168109c334347057e383e27cb802a7502ebfd
(cherry picked from commit 15eff80b3ae45cdf77bd25e1b1e490868b8e9b84)
icc/SIMRecords.java
e3b27942545c7c46e6e472a8b89051409559c743 10-Aug-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Parse response from hal even in case of error."
f14a5a119ff18b119d2cb0c16d0614d7bb576494 10-Aug-2017 Shuo Qian <shuoq@google.com> Merge "Add SharedPreference information in TelephonyDebugService dumpsys"
d46c8e7c886fc9de3501e6fa739b263cdcba676c 10-Aug-2017 Shuo Qian <shuoq@google.com> Merge "Provide a machanism to override MVNO parameters below CarrierConfig"
f6dc7f49f6540486032475ae5b7c68611fb3f05a 10-Aug-2017 Amit Mahajan <amitmahajan@google.com> Merge "The method of parseEfSpdi does not match TS24008." am: 84aab18843 am: 78eee16577 am: 42afb740b8 am: 9d744f48ec
am: 01d35f3f52

Change-Id: I06c2ebe1ad1ae13b7cfa57a6d2c2c7e29cbe8acb
8821775d79938651dcfc8759bc9e604f6e28f9d1 10-Aug-2017 Amit Mahajan <amitmahajan@google.com> Merge "Get isim card data use subId." am: e36b65e479 am: cf95dc6dc1 am: ba4702223b am: 6ba6b30d47
am: 8218eafdda

Change-Id: I9ed80078078fdebf263fabd3a328160fc61ac758
01d35f3f523faf76e6757d4e1b68720f731534a5 10-Aug-2017 Amit Mahajan <amitmahajan@google.com> Merge "The method of parseEfSpdi does not match TS24008." am: 84aab18843 am: 78eee16577 am: 42afb740b8
am: 9d744f48ec

Change-Id: I6007866aa1111f77a0bf1bc3989503b6b837b937
a2f3192ec25368a41277fa0d537cc9e6c956b1a4 14-Jul-2017 fionaxu <fionaxu@google.com> support carrier action reset on mobile data off

Bug: 63681072
Test: Manual test
Change-Id: I6fab9b4ccc58e3befe5f9f8f5f72b8189308bde3
arrierActionAgent.java
8218eafdda92d2dba4136820fa9e214975bf3a5d 10-Aug-2017 Amit Mahajan <amitmahajan@google.com> Merge "Get isim card data use subId." am: e36b65e479 am: cf95dc6dc1 am: ba4702223b
am: 6ba6b30d47

Change-Id: I25ac0c05fec7fe837f1547550601dca689e9bcdd
9d744f48ecff8d552d3f58098a8208bf3f4a0870 10-Aug-2017 Amit Mahajan <amitmahajan@google.com> Merge "The method of parseEfSpdi does not match TS24008." am: 84aab18843 am: 78eee16577
am: 42afb740b8

Change-Id: I1934041e12cd46ec6a3841756cf5f588ca436db7
ec64fcf30fa6f9fa09da48c3687079ce4646c5e8 10-Aug-2017 fionaxu <fionaxu@google.com> resolve merge conflicts of 22fdeabb4 to oc-dr1-dev-plus-aosp am: a145cd4716
am: 13ac9e5bfe

Change-Id: I9e77f81cfea408d4d0b24ad325d1b09fd682f187
893acc4915e2dabd3044e802848f77d7c8baff6a 10-Aug-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Existing APN profile is incorrectly getting merged"
6ba6b30d4762e77092ccf6607fe86bec23e126dd 10-Aug-2017 Amit Mahajan <amitmahajan@google.com> Merge "Get isim card data use subId." am: e36b65e479 am: cf95dc6dc1
am: ba4702223b

Change-Id: I9b0e48d3a39ae3e8bc00a5723857684882c74ba5
9460f33d9c2c41d8e1134c9ba2ad945692ead677 11-May-2017 Amit Mahajan <amitmahajan@google.com> Parse response from hal even in case of error.

Test: manual sim pin testing, basic telephony sanity
Bug: 37941868
Merged-in: I1a0b576c84ebb9bf4ac3de41538d148a1a043c05
Change-Id: I1a0b576c84ebb9bf4ac3de41538d148a1a043c05
adioResponse.java
13ac9e5bfedc8305f631b2ee3341b2ff2728f4da 10-Aug-2017 fionaxu <fionaxu@google.com> resolve merge conflicts of 22fdeabb4 to oc-dr1-dev-plus-aosp
am: a145cd4716

Change-Id: I194098ca137353f414a27f5658da5a66c2fd95f2
4f3e15317576020a0654623181508971de458813 10-Aug-2017 Chen Xu <fionaxu@google.com> Merge "handle carrier config change race conditions"
1c6f62c5939787e688f5dada83ac2e5f8e333fb5 10-Aug-2017 Chen Xu <fionaxu@google.com> Merge "support carrier action reset on mobile data off"
b28c5032df156085a756294fad35e5c15aa247e8 09-Aug-2017 Jayachandran C <jayachandranc@google.com> Use PLMN instead of SPN override for Rogers, DTAG and Telstra

Rogers, DTAG and Telstra want the actual SIM card SPN to be displayed

Having SPN override in /etc/spn-conf.xml always overrides SPN of the SIM
card irrespective of Wi-Fi calling registered or not. Carriers doesn't
like this as they don't see SIM card SPN even when the device is camped
on cellular RATs.

This CL
1) Removes the carriers Rogers, DTAG and Telstra from spn-conf.xml.
2) Adds a logic in updateSpnDisplay() to use PLMN if SPN is empty
and Voice over Wi-Fi is registered case.

Test: Tested using T-Mobile SIM card after removing T-Mobile entries
from the /etc/spn-conf.xml.

Bug: 64137294
Bug: 64139429
Change-Id: Ia350b4d06739f47d5da4eba0a5b0970af6db5f36
erviceStateTracker.java
78eee16577eb4f4462d7f87cd6503412bcd8bfdb 10-Aug-2017 Amit Mahajan <amitmahajan@google.com> Merge "The method of parseEfSpdi does not match TS24008."
am: 84aab18843

Change-Id: I5466054ce05f8be4ba30d466ea73d6da5d42b4f6
cf95dc6dc165de71534f7f99dedd41f6b16ce727 10-Aug-2017 Amit Mahajan <amitmahajan@google.com> Merge "Get isim card data use subId."
am: e36b65e479

Change-Id: I412e3ab0f4a4dad0c735ffd9743b8953a88fc253
84aab188438af33fa6e6e7719d504de40576050f 10-Aug-2017 Amit Mahajan <amitmahajan@google.com> Merge "The method of parseEfSpdi does not match TS24008."
e36b65e47955d886adb32902aa87218baea448ea 10-Aug-2017 Amit Mahajan <amitmahajan@google.com> Merge "Get isim card data use subId."
165337287bbf16a7d07076b40e7c5cfd7765a04d 03-Feb-2017 pkanwar <pkanwar@google.com> Existing APN profile is incorrectly getting merged

Added more fields protocol and roaming protocol to the primary key.

Bug: 28757188
Test: No tests

Merged-In: I1ddae7bec1967fc7596a766c17edd3cc5c40be4d
Change-Id: I1ddae7bec1967fc7596a766c17edd3cc5c40be4d
ataconnection/DcTracker.java
a145cd4716c9875edca2b41fab1e005342c803c9 10-Aug-2017 fionaxu <fionaxu@google.com> resolve merge conflicts of 22fdeabb4 to oc-dr1-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I689984e373365aa243342aa2d5e9b6fbdf0aede5
bd7f57124d20936a81eff9abe6a7519080914b10 14-Jul-2017 fionaxu <fionaxu@google.com> support carrier action reset on mobile data off

Bug: 63681072
Test: Manual test
Change-Id: I6fab9b4ccc58e3befe5f9f8f5f72b8189308bde3
arrierActionAgent.java
a6b6f1ceb2aec09cdd82b502d95d45fc68a63195 10-Aug-2017 Chen Xu <fionaxu@google.com> Merge "bypass waiting apn list check on unknown data rat"
am: 28f42ebfea

Change-Id: Icbb5e2497ad75696e5059e065ac9fd16dcd54b6c
6dec79e089104f18c1aa0c9a7ceaba5555802d7a 16-Jun-2017 fionaxu <fionaxu@google.com> handle carrier config change race conditions

In some rare cases, up-to-date config could be fetched with delay and
all signals have already been delivered the receivers from the default
carrier config. To handle this raciness, we should notify those
receivers (from old configs) and reset carrier actions. This should be done
before mCachedWakeSignalConfigs and mCachedNoWakeSignalConfig got purged
and written with the up-to-date value. Otherwise, those receivers from the old
config might lingers without properly clean-up.

Bug: 62070135
Test: runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/CarrierSignalAgentTest.java
Change-Id: Id9d599b277fa5c0c87cff14c580c0ce7f09a95d7
arrierSignalAgent.java
fec6e6c4d64e80b883a349289629f45d2106a3ce 10-Aug-2017 Jack Yu <jackyu@google.com> Merge "Fixed deactivate data call request not sent while radio is off" into oc-dr1-dev am: 6934f1aabb am: a6453af0f4
am: 96b516116b

Change-Id: If9888a29b48097357fb99c0465b9c79cb41e19c3
e996a89f15d07d8c9fae23e9b03d47fff17087d8 28-Jun-2017 fionaxu <fionaxu@google.com> bypass waiting apn list check on unknown data rat

Bug: 62985606
Test: runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java

Change-Id: I260ec48f40f420af27cec7d2b622726457f2fadf
ataconnection/DcTracker.java
aefe6883326a9f810e6a8b729296368fcdb4b3d2 10-Aug-2017 Xiangyu/Malcolm Chen <refuhoo@google.com> Merge "Check SIM valid before forcing network auto select" into oc-dr1-dev am: 1cc0f11077 am: a150454b5d
am: fa4d64a8bc

Change-Id: I0dd368e98c93098114ce40439340bfe22ff26b26
96b516116b5906bab35b5982f870f261abbb1be2 10-Aug-2017 Jack Yu <jackyu@google.com> Merge "Fixed deactivate data call request not sent while radio is off" into oc-dr1-dev am: 6934f1aabb
am: a6453af0f4

Change-Id: Ie2162321e897ae5ceab66a49fb53e0797de7bc46
a6453af0f4d0281d3199a83cff8c112b6d5fec9c 10-Aug-2017 Jack Yu <jackyu@google.com> Merge "Fixed deactivate data call request not sent while radio is off" into oc-dr1-dev
am: 6934f1aabb

Change-Id: I2d463ba60d0c1303790087fa7dfa17d382845efb
954ad55b26b046923ac4ba600ddd1c6a87448a20 10-Aug-2017 Jack Yu <jackyu@google.com> Merge "Fixed deactivate data call request not sent while radio is off" into oc-dr1-dev
am: 6934f1aabb

Change-Id: I35f6b98e644f4b14d6650ac22fab4cc9a0211af3
6934f1aabb1dc6687f3685705227f3a2cd5a8973 10-Aug-2017 Jack Yu <jackyu@google.com> Merge "Fixed deactivate data call request not sent while radio is off" into oc-dr1-dev
fa4d64a8bc1163a6621b6cf49c2ee1351a2a3f3c 10-Aug-2017 Xiangyu/Malcolm Chen <refuhoo@google.com> Merge "Check SIM valid before forcing network auto select" into oc-dr1-dev am: 1cc0f11077
am: a150454b5d

Change-Id: I53e293f25cbb3daadd5e1d819dd6367a820b1aeb
a150454b5d811e7d5f5da7b44cd10e21892b40d2 10-Aug-2017 Xiangyu/Malcolm Chen <refuhoo@google.com> Merge "Check SIM valid before forcing network auto select" into oc-dr1-dev
am: 1cc0f11077

Change-Id: Ib90e07e11f8f72c0e3bd67a392541e6355a8992b
06602c9c3f6b3b1051cd1ae7f2a5a4dd57008eb1 10-Aug-2017 Xiangyu/Malcolm Chen <refuhoo@google.com> Merge "Check SIM valid before forcing network auto select" into oc-dr1-dev
am: 1cc0f11077

Change-Id: Iceb3581d4ef16790e63982f570797a1e047ca2ca
1cc0f110777e6bccda3d70f2562d5544fb7b8549 10-Aug-2017 Xiangyu/Malcolm Chen <refuhoo@google.com> Merge "Check SIM valid before forcing network auto select" into oc-dr1-dev
23ed70082f3ccbfa6c5f58610a5c32b5e8e4f0fa 10-Aug-2017 Chen Xu <fionaxu@google.com> Merge "cleanup and reset waiting apnlist on RAT change"
am: c80402405e

Change-Id: I5cf807678f850177aa94c864e1dab96e68839106
9e8445a3b6ac430ee830c9485386d1a3a98b86d6 10-Aug-2017 Brad Ebinger <breadley@google.com> Merge "Suppress Registration Errors when WFC disabled"
am: 2b76694afe

Change-Id: Ide063bbf391ad6e11b0da94c4cf856ec3f0f3118
fa5b2304536f34f6bbfbfa2896a2812f4ad95119 09-Aug-2017 Jack Yu <jackyu@google.com> resolve merge conflicts of ea130bb35 to stage-aosp-master

Test: I solemnly swear I did not test this conflict resolution.
Merged-In: I9841904775f1422b1ff3d02d520eaf29f1393ffd
Change-Id: Idbcd78faae93cbe8c05bf639d0df9fc933de0bfb
dbd6752afb37112b292e2fc41c7ffa6263b22865 06-Jun-2017 fionaxu <fionaxu@google.com> cleanup and reset waiting apnlist on RAT change

check apn waiting list update during data rat or apn data change.
If the new waiting list is different with the currentWaitingList,
then cleanup the associated data connection and reset apnWaitingList
with the lastest one which matches with both current data rat and apn
settings. Reuse cleanupConnectionsOnUpdatedApns to detect waiting list change
and cleanup the connections. remove the duplicate logic from
setupDataOnConnectableApns

Bug:31252975
Test: runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java
--test-method testUpdateWaitingApnListOnDataRatChange
Merged-In: I8408df09a7b25ed2e17cd38b7bebbb8fd20eca72
Change-Id: I8408df09a7b25ed2e17cd38b7bebbb8fd20eca72
ataconnection/DcTracker.java
2b76694afef23bf3e7e885fa0be0ef1ab2ee490d 09-Aug-2017 Brad Ebinger <breadley@google.com> Merge "Suppress Registration Errors when WFC disabled"
cc433fab7992a2de474b4c63c3ce7d1cd37d7c47 02-Aug-2017 Malcolm Chen <refuhoo@google.com> Check SIM valid before forcing network auto select

When handling EVENT_POLL_STATE_NETWORK_SELECTION_MODE, we make
sure it's valid subId before we try to force automatic network
selection mode to the modem.

Bug: 63969102
Test: manual
Change-Id: Ic831056ab658146a845b3271b494a505c2e72053
Merged-In: Ic831056ab658146a845b3271b494a505c2e72053
smCdmaPhone.java
erviceStateTracker.java
653ebce0bfb3a21ac61631a0b05d25e391c7e5c1 08-Aug-2017 Brad Ebinger <breadley@google.com> Suppress Registration Errors when WFC disabled

There is still the possibility of IMS registration
failing for a time after the user has disabled WFC.
This causes registration error messages
to keep popping up. This change suppresses
those notifications when the WFC setting is off.

Bug: 64412124
Test: Manual
Merged-In: I77d5a15644c3735ca99ef58d6b92f8092807c5fe
Merged-In: I5c0b4531655bed57e5a8efe0ebffe13a027e597f
Change-Id: I5c0b4531655bed57e5a8efe0ebffe13a027e597f
msphone/ImsPhone.java
1f209d9dad84c35ab153cf3d24f5221433ea434d 09-Aug-2017 Jack Yu <jackyu@google.com> Merge "Fixed a race when slot-to-sub mapping table is rebuilding"
am: e9a834708f

Change-Id: Ic22fb7e3cea2960a11a5fdf43e491c9a23ad613a
03ba9e233f4bde48974a8856c3123af563278a0e 09-Aug-2017 Jack Yu <jackyu@google.com> Merge "Fixed incorrect time zone when the device is on IWLAN"
am: 5f7d47c201

Change-Id: I5a2540786edd5aaf7c82a91ff5fec13eaee6dd6e
9aa9a5d81b191bb53dc66f336aa53c4237dcae2b 09-Aug-2017 Jack Yu <jackyu@google.com> Merge "Fixed the incorrect roaming override"
am: 5a82437173

Change-Id: Idb453c006dea935774ae2e40070175707f272000
d113d6c75c2984c90ee1effef3ea8a733826da23 09-Aug-2017 Jack Yu <jackyu@google.com> Merge "Proper handling of roaming override case"
am: 7d64fae545

Change-Id: Ia2597f3b0f0c321d4857b4945b34788dad03c773
08fac289f80f499d4c3674aaf3f9e075da7b4b5f 09-Aug-2017 fionaxu <fionaxu@google.com> resolve merge conflicts of eef3bbab6 to stage-aosp-master

Test: I solemnly swear I tested this conflict resolution.

Change-Id: I7e9bbede8165ea67be4bac08ee21f05ba76cd6e4
ea130bb355f651138c848bac6a50f305a28e83d0 09-Aug-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fixed cell broadcast configuration not sent when no sim is inserted"
e9a834708fcf5b4d3da4fb4e7c1ca4c79243e194 09-Aug-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fixed a race when slot-to-sub mapping table is rebuilding"
5f7d47c201faebcacb44cb5670d74f0ee8a574fc 09-Aug-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fixed incorrect time zone when the device is on IWLAN"
9981a70deb6bb1bb2ac16485ffcab691bdbd832d 28-Jul-2017 Jack Yu <jackyu@google.com> Fixed a race when slot-to-sub mapping table is rebuilding

When updateSubscriptionInfoByIccId is called, we always clear
the slot-to-sub id map first and then rebuild it. If other threads
access this map while the rebuilding is ongoing, subscription
controller returns an empty map that leads other threads think we
don't have any valid subscription at that moment. This indeed caused
some issues such like no data connection or device issued unexpected
LTE detach request to the mobile network.

Adding a lock to protect the entire rebuilding process and the map
might be an option but actually the Telephony provider, which
also has its own lock, has dependency on this map. The reverse lock
acuisition orders can cause deadlock, which eventually leads to an
ANR.

A workaround here is that we only clear the map when one/some SIMs
are gone.

A more comprehensive refactoring for building this slot-to-sub map
will be added in future releases.

Test: Manual + unit tests
bug: 63949982, 64004402, 63872700, 64176629
Merged-In: I88992d9cc92d18f7e344b58ea49b1d3007b50b41
Change-Id: I88992d9cc92d18f7e344b58ea49b1d3007b50b41
ubscriptionController.java
ubscriptionInfoUpdater.java
00dadd20823e0f2c15301744a73bda6da539f00e 29-Jun-2017 Jack Yu <jackyu@google.com> Fixed incorrect time zone when the device is on IWLAN

If the device is on IWLAN, modems manufacture a ServiceState
with the MCC/MNC of the SIM as if we were talking to towers.
Telephony code then uses that with mccTable to suggest a timezone.
We shouldn't do that if the MCC/MNC is from IWLAN.

Test: Telephony sanity tests
bug: 62563032
Merged-In: I7e5463909854c68ec57feae198071c73b0c5571c
Change-Id: I7e5463909854c68ec57feae198071c73b0c5571c
erviceStateTracker.java
e72d5449612ddb45ade911baec20240592a9ad1b 18-Jul-2017 Jack Yu <jackyu@google.com> Fixed the incorrect roaming override

If the empty string is in the roaming override resource overlay,
it might incorrectly override the roaming state.

Test: Manual
bug: 63687431
Merged-In: I6629b2b4815f6740ada4bd0a69eb2bf8829db1fc
Change-Id: I6629b2b4815f6740ada4bd0a69eb2bf8829db1fc
erviceStateTracker.java
a867306bd263335db5d25656271efd1fe52d2c2f 22-Jul-2017 Jack Yu <jackyu@google.com> Fixed cell broadcast configuration not sent when no sim is inserted

If no SIM is inserted, use the default phone instead of failing
the request.

Test: Manual
bug: 63903157
Merged-In: I9841904775f1422b1ff3d02d520eaf29f1393ffd
Change-Id: I9841904775f1422b1ff3d02d520eaf29f1393ffd
roxyController.java
iccSmsController.java
8f446114abfe0360138d459858222e9bd25ad37a 13-Jul-2017 yanxue.xu <yanxue.xu@spreadtrum.com> Get isim card data use subId.

Get isim card data is obtained the default card data instead of the corresponding card data.
It is necessary to obtain the card data according to the subid.
Test: Get isim card data use subId.

Change-Id: I7d455740fa293203ba158135e18c4bb718fd9885
honeSubInfoController.java
2dc3018f6dd3fc38c8d62a18266c9b0dedf71c80 26-Jun-2017 Jack Yu <jackyu@google.com> Proper handling of roaming override case

If the roaming state is overridden by the framework, we should
pass allowRoaming=true down to the modem so the data call will
not be rejected. Also we should pass the actual roaming state
to ril_service so it can pick the correct protocol (for old
modem backward compatibility support).

Test: Telephony sanity tests
bug: 62807105, 62285365
Merged-In: Ida93e6aa3949c8434aa58468f12e4512c9a02351
Change-Id: Ida93e6aa3949c8434aa58468f12e4512c9a02351
erviceStateTracker.java
ataconnection/DataConnection.java
ataconnection/DcTracker.java
de8b9acd731361b40ef0426f04bafb79e0c30cf9 09-Aug-2017 Jack Yu <jackyu@google.com> resolve merge conflicts of 55a9f2812 to stage-aosp-master am: 0b65565476
am: 367d816f39

Change-Id: Ib4e17a3b02b2a4a826235c58386ea7ae49e4218e
02bc9e86d0fa52d0c8aafad23b2932a947c507c4 09-Aug-2017 Brad Ebinger <breadley@google.com> Merge "Suppress Registration Errors when WFC disabled" into oc-dr1-dev am: c30d264d22 am: 1cf1cb90b0
am: d6ebecd27b

Change-Id: I6c6e82511ae1b2654faa4606802d894cce53a46a
d6ebecd27bcc1b2e8df3041b88f45cfd8a70a0c9 09-Aug-2017 Brad Ebinger <breadley@google.com> Merge "Suppress Registration Errors when WFC disabled" into oc-dr1-dev am: c30d264d22
am: 1cf1cb90b0

Change-Id: I438de72305eaed66edd0b9678c609de49fada707
23e64c1f1182fbbd0f54fd1b3728c0cea8eb2c79 09-Aug-2017 Brad Ebinger <breadley@google.com> Merge "Suppress Registration Errors when WFC disabled" into oc-dr1-dev
am: c30d264d22

Change-Id: Icbe2c5b6763a0cc8d9828c412a43856692d74d4a
1cf1cb90b00104e7572305e1ec10cb7c2aa71465 09-Aug-2017 Brad Ebinger <breadley@google.com> Merge "Suppress Registration Errors when WFC disabled" into oc-dr1-dev
am: c30d264d22

Change-Id: I77d5a15644c3735ca99ef58d6b92f8092807c5fe
eef3bbab664bea30ffa1f4af5eabb851621ffaae 09-Aug-2017 Chen Xu <fionaxu@google.com> Merge "support carrier specific initial value of data_roaming"
c30d264d22409d5bcd42571db89d62e4cfad0a85 09-Aug-2017 Brad Ebinger <breadley@google.com> Merge "Suppress Registration Errors when WFC disabled" into oc-dr1-dev
0b65565476fc55ff0f9ca7e22c37acad3efe89e1 09-Aug-2017 Jack Yu <jackyu@google.com> resolve merge conflicts of 55a9f2812 to stage-aosp-master

Test: I solemnly swear I did not test this conflict resolution.
Change-Id: I1b30969134b305207e35d79a0e267d0e65533a4f
e06e36bf5b5dcfd6d223d15c6122dc4efe118750 09-Aug-2017 Jack Yu <jackyu@google.com> Merge "Only tearing down restricted metered data when data is enabled"
am: 19191f3778

Change-Id: I1b5343e11280686d9947d18cd683b99bfd2b5f55
55a9f28125744d9d519e8c9a3d7faf63de9eb298 09-Aug-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fixed debug messages and typos"
ccca8742200a1add1cb6d47fa042d1e9d84ed382 23-Jun-2017 fionaxu <fionaxu@google.com> support carrier specific initial value of data_roaming

1. new carrier config for default data roaming value
to support carrier specific feature: turn on data_roaming by default.
2. use a sharedpref to record if user has ever touch the setting
before.
3. on sim loaded, update data roaming setting: In the absence of
user-pref, override with the carrier default value. otherwise migrate
user-pref when swap to new SIM.

Bug: 63532986
Test: manual tests includes factory reset, hot sim swap and build
updates without factory reset.
Change-Id: I64619a0df27ad36595f4d063cd66f73595ad24f3
smCdmaPhone.java
hone.java
ataconnection/DcTracker.java
39b496f0c6d418e3ea2e7b0428740f9f800a505e 12-Jul-2017 Jack Yu <jackyu@google.com> Fixed debug messages and typos

Test: Build
Merged-In: I13f87a72f1a54fed7b8b69332379e5e11e61c25b
Change-Id: I13f87a72f1a54fed7b8b69332379e5e11e61c25b
ubscriptionInfoUpdater.java
icc/IccCardProxy.java
icc/UiccCard.java
e5c00a1dca2e90f24e309e4a46a09bba95b41a78 05-Jul-2017 Jack Yu <jackyu@google.com> Only tearing down restricted metered data when data is enabled

Reverted the behavior introduced in ag/2091549 that causes
restricted unmetered IMS data connection disconnected.

Test: Manual
bug: 63279719
Merged-In: I03e19cb66f29e8b0f06e66ff64d64575b9345a47
Change-Id: I03e19cb66f29e8b0f06e66ff64d64575b9345a47
ataconnection/DcTracker.java
c78e06031f13627a41d4c2b2618836e8ac99b9ba 08-Aug-2017 Brad Ebinger <breadley@google.com> Suppress Registration Errors when WFC disabled

There is still the possibility of IMS registration
failing for a time after the user has disabled WFC.
This causes registration error messages
to keep popping up. This change suppresses
those notifications when the WFC setting is off.

Bug: 64412124
Test: Manual
Change-Id: I5c0b4531655bed57e5a8efe0ebffe13a027e597f
msphone/ImsPhone.java
bb5819dbb621393ccae2520c932e8f760e91a699 20-Apr-2017 sqian <shuoq@google.com> Provide a machanism to override MVNO parameters below CarrierConfig

- maintain fake variables of imsi, gid1, gid2, and spn in IccRecord,
and add them into toString() and dump()
- provide a machanism to override Imsi, gid1, gid2, and spn during
sim/ruim record loading
- refactor the usages of getIMSI(), getGid1(), getGid2(),
and getServiceProviderName()
- fix potential crash issue in SIMRecord

Test: Manual
Bug: 32591388
Change-Id: I6dde2c29ca2f5c1dc55807e244260891ace08838
Merged-In: I6dde2c29ca2f5c1dc55807e244260891ace08838
(cherry picked from commit 1f4fd861e2e79e3ae47a389aa2c4d5e33e537cd1)
icc/CarrierTestOverride.java
icc/IccRecords.java
icc/RuimRecords.java
icc/SIMRecords.java
a6a6944305ee9f52945b284f490f70eebb64d9ab 08-Aug-2017 sqian <shuoq@google.com> Add SharedPreference information in TelephonyDebugService dumpsys

Test: Mannual
Bug: 32342371
Change-Id: Ic34812b8a562a8aa3d26ab19e97cd9e4b9364d6d
Merged-In: Ic34812b8a562a8aa3d26ab19e97cd9e4b9364d6d
honeFactory.java
45684db3b2c80b73dba220a992ae61a2509cafa2 08-Aug-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Treat "GMT" persist.sys.timezone as unset." into oc-mr1-dev
72a500177ff657cf70892a25b91c21879c006a8b 08-Aug-2017 fionaxu <fionaxu@google.com> Merge "Notify carrier app of other default networks" into oc-dr1-dev am: b60182fd03 am: 542b865360
am: 9b08622ff3

Change-Id: I3106b07bc83ac196cb56cbb17e7e8f491571eb26
9b08622ff36d71a3b92a59ff2b92e3000c54877c 08-Aug-2017 fionaxu <fionaxu@google.com> Merge "Notify carrier app of other default networks" into oc-dr1-dev am: b60182fd03
am: 542b865360

Change-Id: Idf7d1641ec0fa8cb04b1f366c9ee0b4479c12f12
542b865360226e1648a0582286191cbee518c1f9 08-Aug-2017 fionaxu <fionaxu@google.com> Merge "Notify carrier app of other default networks" into oc-dr1-dev
am: b60182fd03

Change-Id: I7eead5b646d150b436597cb0526e00b0de952cee
e4afd24b3bd1d8f3f3e835e1d06bc4f27448c61f 08-Aug-2017 fionaxu <fionaxu@google.com> Merge "Notify carrier app of other default networks" into oc-dr1-dev
am: b60182fd03

Change-Id: I31845997fedfd1b94eb8912441ae536cbe688b9e
b60182fd03c80d70a90dc3b6e4393efc6744cd74 08-Aug-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Notify carrier app of other default networks" into oc-dr1-dev
d97cb9753d2b17ae21c522d9a438b0e38c529121 24-May-2017 fionaxu <fionaxu@google.com> Notify carrier app of other default networks

When we need to disable data its common for the carrier to send the user
text messages explaining why with a URL. The Carrier App will
url-clicks in this case and reroute them to a private network. However,
it's possible for the user to get other sms's with links and if there is
another network to load them on we should not hijack them. This CL
adds a new carrier action for carrier apps to register/unregister
notifications of other networks from ConnectivityService instead of
notifying only when carrier apps has disabled cell data. in that way
framework has decoupled the logic of network status registration from
cell data status.

Bug: 62487488
Test: Manual
Change-Id: I0a7b87ad07a0cf2fdb14f939e8f2865eedf7b008
arrierActionAgent.java
arrierSignalAgent.java
smCdmaPhone.java
hone.java
4f12e59b95ac3a33423fd72a3fef67a4d934162e 08-Aug-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Improvements to pref network notification." into oc-dr1-dev am: 97217bb7b2 am: 2a96037b4b
am: 8ded4eb2f8

Change-Id: Iea5c8eaab7126d1ad641f7d03e9e1560345a1f8f
8ded4eb2f809537ca9203ba4324c8aee0bdcb3ae 08-Aug-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Improvements to pref network notification." into oc-dr1-dev am: 97217bb7b2
am: 2a96037b4b

Change-Id: Ibc8f22a8b1f47550131d829f0212fbe7ddff0e76
2a96037b4b29fe046c5a90e5cbc2722377740623 08-Aug-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Improvements to pref network notification." into oc-dr1-dev
am: 97217bb7b2

Change-Id: I9910f05892d793ef86b866c296fe2e261d3d060a
5acda46c4de8fee03e49f0c348ec3868f9e6fb7d 08-Aug-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Improvements to pref network notification." into oc-dr1-dev
am: 97217bb7b2

Change-Id: I8023630d7beb478ca8979de3f9794a697f5d9f69
97217bb7b219d17b297c6e8ef07a74142f5ff745 08-Aug-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Improvements to pref network notification." into oc-dr1-dev
2cab3ec97219a25aa7dabfd48a98cddba79ceeba 07-Aug-2017 pkanwar <pkanwar@google.com> Improvements to pref network notification.

Canceling notifications that in currently in-queue, and checking the
state.

Bug:64242879
Test: manual
Change-Id: Iafdaf4540a0507854c0c0089196f489d00a4d72f
arrierServiceStateTracker.java
327cd4fe9b89ed04fdc610f3ab210c143ec2bb70 28-Jul-2017 Przemyslaw Szczepaniak <pszczepaniak@google.com> Treat "GMT" persist.sys.timezone as unset.

Previously, telephony coded depended on
persist.sys.timezone not being set as a signal
to try to deduce a timezone from sim card information.

Due to recent change, timezone is set by default to
"GMT" value. This value is synthetic and never occurs
when set from other sources.

Test: flashall & FrameworksTelephonyTests
Bug: 64056758
Change-Id: I219c2745aff38687b5039ce47eb9f5de3ff57256
(cherry picked from commit 5eb42db34888774de3bb16e4f66a0533bf098294)
ccTable.java
2c5f018199a1e263576f8e456377d162011e3240 06-Aug-2017 Jack Yu <jackyu@google.com> Fixed deactivate data call request not sent while radio is off

The data call deactivation request should be sent down regardless
of radio state. The data connection might be on IWLAN (wifi) without
radio turned on.

Test: Manual
bug: 63936310
Change-Id: I4483d4022e9aea7d11f22d092a6a7d315218ab82
ataconnection/DataConnection.java
1fca6232b4145354e50b3d95c5162b19fd40e9fe 06-Aug-2017 Jack Yu <jackyu@google.com> Merge "Refactored no data due to roaming notification" am: 69614c66c4 am: 40edfa4f41
am: eed4ec1198

Change-Id: I356b4985757e83c3a6583bd1db3d1412ec54ea7d
40edfa4f41b9d185d2e82ef69fc70b77580b29e1 06-Aug-2017 Jack Yu <jackyu@google.com> Merge "Refactored no data due to roaming notification"
am: 69614c66c4

Change-Id: I4b35ca0745ec2fddf094c186422820d9dd579556
613469682b7631ff63f549927f45b999e558633d 06-Aug-2017 Chen Xu <fionaxu@google.com> Merge "rename notification channel" into oc-mr1-dev am: 40a02fdad9
am: bbe15b04bd

Change-Id: Ia132e04e2b5902d176d644ee766ef7fc2f0fdd4e
bbe15b04bd6cfbb464152b458ae3572e725029cd 06-Aug-2017 Chen Xu <fionaxu@google.com> Merge "rename notification channel" into oc-mr1-dev
am: 40a02fdad9

Change-Id: I61956927598faa5aa8b0e3bb0b05ef1c4a239eee
40a02fdad98960adcc32c5af95cc398f476563b3 06-Aug-2017 Chen Xu <fionaxu@google.com> Merge "rename notification channel" into oc-mr1-dev
b8fa5c7082deeeb17434b42ed4838a5891a38769 18-Jul-2017 Jack Yu <jackyu@google.com> Refactored no data due to roaming notification

Instead of listening to ACTION_ANY_DATA_CONNECTION_STATE_CHANGED,
we now listent to mobile data settings changed, data roaming
settings changed, carrier config changed, roaming status changed,
and default data subscription changed event. This will make the
notification show/hide become more reliable.

Test: manual
bug: 63027846
Merged-In: Ie602cb1edbb90ae9bff21b3e7b8074217543cf38
Change-Id: Ie602cb1edbb90ae9bff21b3e7b8074217543cf38
hone.java
ettingsObserver.java
ataconnection/DataConnectionReasons.java
ataconnection/DcTracker.java
e96ce31e020b3e9eb5ac8a740f504ebec97c129c 05-Aug-2017 fionaxu <fionaxu@google.com> rename notification channel

rename notification channel from mobile_data_alert to mobile_data_status
as the channel is of low importance and user facing name should refect
that.

Bug: 64367389
Test: Manaual
Change-Id: I31fea8ea1666d8f8f9dcfe39b7d4dfcbfe3bc7bc
til/NotificationChannelController.java
301f40d11758d3ccedcc3f42a6b8b73eecc21b07 02-Aug-2017 Malcolm Chen <refuhoo@google.com> Check SIM valid before forcing network auto select

When handling EVENT_POLL_STATE_NETWORK_SELECTION_MODE, we make
sure it's valid subId before we try to force automatic network
selection mode to the modem.

Bug: 63969102
Test: manual
Change-Id: Ic831056ab658146a845b3271b494a505c2e72053
smCdmaPhone.java
erviceStateTracker.java
6ab43ae65c57058c40b5c7b439f50b66a331b91a 04-Aug-2017 Pengquan Meng <mpq@google.com> Merge "Notify Ims service state changed" into oc-dr1-dev am: f97040889a am: e31316655b
am: 6aa5143011

Change-Id: I95ba946f69415a8f58847d67fa031a7c08616b20
6aa5143011d567f1754777a973ab600a3470efa5 04-Aug-2017 Pengquan Meng <mpq@google.com> Merge "Notify Ims service state changed" into oc-dr1-dev am: f97040889a
am: e31316655b

Change-Id: Ic4a6f6f9afca3615e06235f05cfa4d5bb2b1d59b
e1ed9fa6e6269086362bb24234cb1ea48f68d9be 04-Aug-2017 Pengquan Meng <mpq@google.com> Merge "Notify Ims service state changed" into oc-dr1-dev
am: f97040889a

Change-Id: I0578f06caf841c1e0dab9c51a52f7d881860eafa
e31316655bd628edd6dc11c6e267d3b8772c648b 04-Aug-2017 Pengquan Meng <mpq@google.com> Merge "Notify Ims service state changed" into oc-dr1-dev
am: f97040889a

Change-Id: I0322788d68acaf6a20d65e04693454d32dc49846
f97040889a1f970346a92c6e272ab4a58823287c 04-Aug-2017 Pengquan Meng <mpq@google.com> Merge "Notify Ims service state changed" into oc-dr1-dev
87caa72529465e829480da163ea3a1c350f68f1e 04-Aug-2017 Jack Yu <jackyu@google.com> Merge "Fixed the aggresive data call setup" into oc-dr1-dev am: e513467a73 am: e816cba91e
am: 1127cc30ea

Change-Id: Iecb5b62b24af8b45ea23085b4b8d4085024b14a4
a0042c85fa679389ad11c3a94cb0a166038b8b78 27-Jun-2017 Brad Ebinger <breadley@google.com> Initialization causes IMS to deregister

When the ImsPhone is initialized, it calls
ImsManager#updateImsServiceConfig before the CarrierConfig
has loaded. This causes telephony to signal the radio to
deregister IMS and then register again once the CarrierConfig
is loaded.

This change removes the updateImsServiceConfig calls during
initialization.

Bug: 37763722
Test: Telephony unit tests and analyzing logs
Merged-In: I40cd561055a85a473d1827cef0f8e2e1c6e1a665
Change-Id: I762ba2a23cb0cae88af8256d3903a6852cface68
hone.java
msphone/ImsPhoneCallTracker.java
1127cc30ea7b7b9ef9e10e4d9454c3f69a8c3dc6 04-Aug-2017 Jack Yu <jackyu@google.com> Merge "Fixed the aggresive data call setup" into oc-dr1-dev am: e513467a73
am: e816cba91e

Change-Id: I195e172238f112af053998e4dd0ed029d6deea89
e816cba91e8371d643efdc302978d2c73cac7af4 04-Aug-2017 Jack Yu <jackyu@google.com> Merge "Fixed the aggresive data call setup" into oc-dr1-dev
am: e513467a73

Change-Id: I7a51e0e1216eeca10a7edd53ed561c0000836dae
f0aba61ee744b778eb4401ac60836568049be516 04-Aug-2017 Jack Yu <jackyu@google.com> Merge "Fixed the aggresive data call setup" into oc-dr1-dev
am: e513467a73

Change-Id: If9398e7673b27358c30486b992bb6810a1df0849
ee06fd193b86276f93357d9e53b5471461f68a94 04-Aug-2017 Jack Yu <jackyu@google.com> Merge "Fixed that modem data roaming state was not preserved properly" into oc-dr1-dev am: 915dfa4244 am: b3f556a14d
am: fd8076d90c

Change-Id: Ica3228f3397ed5e295d5ed2fde8ee365d6c41978
fd8076d90cdd59a036558e1506d6c57a3b91a05c 04-Aug-2017 Jack Yu <jackyu@google.com> Merge "Fixed that modem data roaming state was not preserved properly" into oc-dr1-dev am: 915dfa4244
am: b3f556a14d

Change-Id: I2af0d523e745d046233f9e6b2df48dd915a395a7
e513467a7388ce80322c87a6636d4a2568aae87f 04-Aug-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fixed the aggresive data call setup" into oc-dr1-dev
b3f556a14d6ce4ef7e70bbc641f1c6231449aaa7 04-Aug-2017 Jack Yu <jackyu@google.com> Merge "Fixed that modem data roaming state was not preserved properly" into oc-dr1-dev
am: 915dfa4244

Change-Id: Icc43c65c0abc16a133f0312c2392642cd4d635b3
32bada9157f99f241069bf815013d4e463a65027 04-Aug-2017 Jack Yu <jackyu@google.com> Merge "Fixed that modem data roaming state was not preserved properly" into oc-dr1-dev
am: 915dfa4244

Change-Id: I2d5adc45239501489154d69cea51ce669d035a40
915dfa42441f8133587ff1ee3da7a3aff7a24d0e 04-Aug-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fixed that modem data roaming state was not preserved properly" into oc-dr1-dev
ecb8d8e8ff29465c6bc0ede99b540b54a7e5e0e4 02-Aug-2017 Pengquan Meng <mpq@google.com> Notify Ims service state changed

This fixed the server state is not being notified correctly if the
voiceRegState is changed in ImsPhone.

Test: unit test
BUG: 63514380

Change-Id: I072ad0c3c33b64f1d7b028295a474c524e093765
msphone/ImsPhone.java
b5072c6da24adbc4bef8f26e061aee985a014086 03-Aug-2017 Jack Yu <jackyu@google.com> Fixed the aggresive data call setup

Whenever data RAT changes we try to setup a data call. Now we will
not do that if it switches to RIL_RADIO_TECHNOLOGY_UNKNOWN.

Test: Manual
bug: 64099426
Change-Id: I9c655bae80cf3a0fda069df241a88ce2f0f5cefc
ataconnection/DcTracker.java
ed97a675684a8ac72fa5014fff64403343b1dbd9 03-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Ignore phone number changes for outgoing calls." into oc-dr1-dev am: adcd5e5561 am: 302cf59b34
am: 70774d9c14

Change-Id: Ib3c7131e4bc84db612e211599d50f0097924948e
70774d9c14e107eb797b7ea3afc42deffb438341 03-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Ignore phone number changes for outgoing calls." into oc-dr1-dev am: adcd5e5561
am: 302cf59b34

Change-Id: Icfb9dc7466937524f4d7e1b6463159ffea25cd34
791ef8a3cfb9737b54741774b1505c84b9854658 03-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Ignore phone number changes for outgoing calls." into oc-dr1-dev
am: adcd5e5561

Change-Id: I7bfb6e4917e3d2e20fc28a91b41e3149f5263836
302cf59b3457d843e82188784dd00bbea0f2ac27 03-Aug-2017 Tyler Gunn <tgunn@google.com> Merge "Ignore phone number changes for outgoing calls." into oc-dr1-dev
am: adcd5e5561

Change-Id: Ifda47a24937736ac1b78c14d0179146e0d85e247
adcd5e5561c76d6132f09e157c98128287168d73 03-Aug-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Ignore phone number changes for outgoing calls." into oc-dr1-dev
476e25301febb7080a04ad270cc53366cb79598c 03-Aug-2017 Narayan Kamath <narayan@google.com> Merge "DataConnection: Use InetAddress.isNumeric rather than a regex." am: 39eda215ad am: 1f2b12fe1b am: 06030c1830 am: 7d5ac28f51
am: 41da47291b

Change-Id: Ifaf051d612fafa2229c4a97a5ea92521a3ac9146
41da47291be208a78a9908d000756945760fdc50 03-Aug-2017 Narayan Kamath <narayan@google.com> Merge "DataConnection: Use InetAddress.isNumeric rather than a regex." am: 39eda215ad am: 1f2b12fe1b am: 06030c1830
am: 7d5ac28f51

Change-Id: Ia25fe35cb3f92758fbd25c5a262f5cc778bbb12c
7d5ac28f51510dbb7023a429a8a58505bc40e3cd 03-Aug-2017 Narayan Kamath <narayan@google.com> Merge "DataConnection: Use InetAddress.isNumeric rather than a regex." am: 39eda215ad am: 1f2b12fe1b
am: 06030c1830

Change-Id: I97e8bbf1cefc6c120ad9ebb6b2b4cc9e9f6dd9c5
1f2b12fe1bb98c442f5ce24868bd0e5dc294c131 03-Aug-2017 Narayan Kamath <narayan@google.com> Merge "DataConnection: Use InetAddress.isNumeric rather than a regex."
am: 39eda215ad

Change-Id: Id99209e3afc48a0a43145f7d2b4780ba419ff508
39eda215ad65e064a9335216ddb75764cfc82935 03-Aug-2017 Narayan Kamath <narayan@google.com> Merge "DataConnection: Use InetAddress.isNumeric rather than a regex."
a148807570b2341127d557fcdf4c5b83916755e3 03-Aug-2017 Jack Yu <jackyu@google.com> Fixed that modem data roaming state was not preserved properly

The modem data roaming state (comparing to the data roaming state
that might be overridden by carrier config or resource overlay)
was saved after it got overridden. Now save it as soon as we get
the state from the modem.

Test: Telephony sanity tests + unit tests
bug: 64155609
Change-Id: I7c54ab2a3fa6d1d6dae7b2c83f5a41bad1faa38b
erviceStateTracker.java
7cd7f3c8f29a08447abd58f4a569918774ab189e 03-Aug-2017 Jack Yu <jackyu@google.com> Merge "Fixed that VT dropped when handover from LTE to IWLAN" into oc-dr1-dev am: 74c44da3f5 am: feb433ad6f
am: b8b1a2dcaf

Change-Id: I4e6a7a6c2aa75b64386454bd000585e30c26fa36
b8b1a2dcaf8bf290715ede3383829322dcd7c00d 03-Aug-2017 Jack Yu <jackyu@google.com> Merge "Fixed that VT dropped when handover from LTE to IWLAN" into oc-dr1-dev am: 74c44da3f5
am: feb433ad6f

Change-Id: I66b2049793510bf5fd740c4ffab31decb8a2be35
feb433ad6fa07ee3182f8e19197ffb9340f5fb18 03-Aug-2017 Jack Yu <jackyu@google.com> Merge "Fixed that VT dropped when handover from LTE to IWLAN" into oc-dr1-dev
am: 74c44da3f5

Change-Id: I1257fb7e5c1f382c9fc863b0bf816f4d81dba8b9
cc17a4321bbc483a8650d0abf414f03786a79715 03-Aug-2017 Jack Yu <jackyu@google.com> Merge "Fixed that VT dropped when handover from LTE to IWLAN" into oc-dr1-dev
am: 74c44da3f5

Change-Id: Ic26877387504c7b0cc60c1aa192b14da2a473992
74c44da3f5d2d0183bbfa91dcb17e9a4a50c6845 03-Aug-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fixed that VT dropped when handover from LTE to IWLAN" into oc-dr1-dev
9fea8a3dfa6ed302ba33d77edf654f51f81ad24a 02-Aug-2017 Jack Yu <jackyu@google.com> Fixed that VT dropped when handover from LTE to IWLAN

Added a workaround so that we don't tear down the data connection
when the old APN list can cover the new APN list, and if we are
not roaming, ignore the roaming protocol field.

Test: Telephony unit tests
bug: 63917285
Change-Id: Ie588f1bc2ef7f38370aa517f0581787d2e4000c9
ataconnection/ApnSetting.java
ataconnection/DcTracker.java
0ffad3984a42f37916dc2ea92e61d97a5635b0e2 03-Aug-2017 Jeff Davidson <jpd@google.com> Merge "Update subscription list when SIM state is NOT_READY." into oc-dr1-dev am: cfecf97925 am: e116b53c04
am: 90d28b0f7a

Change-Id: I9dbe0f99c7b3ed352086ff44edba32cca79d8439
90d28b0f7adb94a646c75fb5c8fc4b481899e408 03-Aug-2017 Jeff Davidson <jpd@google.com> Merge "Update subscription list when SIM state is NOT_READY." into oc-dr1-dev am: cfecf97925
am: e116b53c04

Change-Id: I40bd0d00267563885bf84ac20d4cbe0d571d06f8
25dd5a7475fbdcb0277493a3a70f79cc5e0818e4 03-Aug-2017 Jeff Davidson <jpd@google.com> Merge "Update subscription list when SIM state is NOT_READY." into oc-dr1-dev
am: cfecf97925

Change-Id: I2a616494249661b7ffe54bd412e17b3eed010ba6
e116b53c04b97d66711b0de331a740556c288096 03-Aug-2017 Jeff Davidson <jpd@google.com> Merge "Update subscription list when SIM state is NOT_READY." into oc-dr1-dev
am: cfecf97925

Change-Id: I3d1a1b3c2432cd97a97baa89e043e46ff6d8c75d
cfecf97925d05c8e6e63d51f9f10dd0945812cc4 03-Aug-2017 Jeff Davidson <jpd@google.com> Merge "Update subscription list when SIM state is NOT_READY." into oc-dr1-dev
2fb7f1ee04ffcbcd6b98205208f0c03aa8c4835b 03-Aug-2017 Hall Liu <hallliu@google.com> Merge "Clear voicemail information if CDMA sim is inserted" into oc-dr1-dev am: 1306a53132 am: b6e4484d0a
am: 7306c1c632

Change-Id: Ie8c65b34f002ffff846ce3c15f4f727e4b258adb
7306c1c63216cdcc0b176895d2bd0ccf34f95310 03-Aug-2017 Hall Liu <hallliu@google.com> Merge "Clear voicemail information if CDMA sim is inserted" into oc-dr1-dev am: 1306a53132
am: b6e4484d0a

Change-Id: I90cc83ba2176e30868a07f8e536f85e0c6dfd41d
b6e4484d0a307d3a476a908fa29251deedd0158c 03-Aug-2017 Hall Liu <hallliu@google.com> Merge "Clear voicemail information if CDMA sim is inserted" into oc-dr1-dev
am: 1306a53132

Change-Id: Iec6abded0f1bfd34ab4fe2c50bfcf17a8e91e803
eb39dddef7471d0f614f2703b1028523fba0ab1c 03-Aug-2017 Hall Liu <hallliu@google.com> Merge "Clear voicemail information if CDMA sim is inserted" into oc-dr1-dev
am: 1306a53132

Change-Id: I265de2f0e445e100574f132a037e61b466e4a6ee
1306a53132097846bc6c54683a68c93ae9fb65a0 03-Aug-2017 Hall Liu <hallliu@google.com> Merge "Clear voicemail information if CDMA sim is inserted" into oc-dr1-dev
919151c24b581560e84fd503f06d9ae9fddf21c1 06-Jun-2017 Jeff Davidson <jpd@google.com> Update subscription list when SIM state is NOT_READY.

This is required to support the eSIM boot profile, as NOT_READY is the
terminal state when this profile is active.

This also requires that we perform the update even if the IccId query
is not done, as this query don't be done in this case. The update
should nevertheless be safe since it's only doing database
manipulations local to the eSIM logic and not touching other state
within SubscriptionInfoUpdater.

Bug: 64113021
Test: TreeHugger, on-device switches and eSIM resets
Change-Id: I19c1e8d4b72aed28599178f73d335b3b10e61772
ubscriptionInfoUpdater.java
fe215a7ee5ad268048410d545c0436b7d4a6bdd7 01-Aug-2017 Tyler Gunn <tgunn@google.com> Ignore phone number changes for outgoing calls.

Similar to b/63743426 (which was for IMS), ignoring phone number changes
reported by the modem for outgoing calls.

Test: Manual
Change-Id: Id050e9086f17530457f59b64b510116ede866393
Fixes: 64192519
onnection.java
smCdmaConnection.java
msphone/ImsPhoneConnection.java
571722dfb679d0ecb832a02c2376c57fd7d0f4f4 02-Aug-2017 Przemyslaw Szczepaniak <pszczepaniak@google.com> Merge "Treat "GMT" persist.sys.timezone as unset." am: 82afccd5c8 am: 290246f17f am: e4d8606f41 am: 59ce6ef5de
am: 42d1954406

Change-Id: I5141c01baeb9991ff2838221cd354471aebda802
42d1954406bbed69ee9beb9ad4d114ed83a79340 02-Aug-2017 Przemyslaw Szczepaniak <pszczepaniak@google.com> Merge "Treat "GMT" persist.sys.timezone as unset." am: 82afccd5c8 am: 290246f17f am: e4d8606f41
am: 59ce6ef5de

Change-Id: If71a8e27b1c9a0966f9c2f4045f5c4c6ad87dffc
59ce6ef5de12ede3764f4bcdcb0b22fd6160fe4a 02-Aug-2017 Przemyslaw Szczepaniak <pszczepaniak@google.com> Merge "Treat "GMT" persist.sys.timezone as unset." am: 82afccd5c8 am: 290246f17f
am: e4d8606f41

Change-Id: I8f333b3488832d0aeffbfabc409409f8fe80f87d
290246f17f92a0be2ec1d52f242b1e6e839f52cf 02-Aug-2017 Przemyslaw Szczepaniak <pszczepaniak@google.com> Merge "Treat "GMT" persist.sys.timezone as unset."
am: 82afccd5c8

Change-Id: I6e8591c7d485ea8032743081ad95b38e0cbaed8a
413f617dc96fc3c9f60207fc3e04950ee8caeaef 02-Aug-2017 Shuo Qian <shuoq@google.com> Merge "Cache the getActiveSubscriptionInfoList() in SubscriptionController" into oc-mr1-dev
a32da8bcea44d88eda775f0ace711e68d573bf63 01-Aug-2017 Pengquan Meng <mpq@google.com> Merge "Add tests for RIL"
60ed48f97ff2740674694d862424a18d5c79428e 01-Aug-2017 Hall Liu <hallliu@google.com> Clear voicemail information if CDMA sim is inserted

When a new sim is inserted and we connect to a CDMA network, the
voicemail information may not be updated. This changes the behavior to
be the same as for GSM.

Change-Id: Ie8745832673a79b3ad88819cd82caa8569a20ad6
Fixes: 63615700
Test: manual
smCdmaPhone.java
9532f2980833b32446de2b3762bd993ec6de1b62 01-Aug-2017 Narayan Kamath <narayan@google.com> DataConnection: Use InetAddress.isNumeric rather than a regex.

android.util.Patterns is pretty heavy weight; it can take a long
time to initialize and can increase java heap usage (dirty memory)
by hundreds of kilobytes. InetAddress.isNumeric provides the same
functionality using getaddrinfo(..AI_NUMERIC) and friends, and
provides a guarantee that the resulting string will be parseable
by InetAddress.getByName and friends can parse it correctly.

Bug: 63107244
Test: DataConnectionTest

Change-Id: I9078aea83dd2da621576ff3328b975bd65c00b72
ataconnection/DataConnection.java
8bbc03e4b9df690dcab83870d53dbde8a99455fd 01-Aug-2017 Jack Yu <jackyu@google.com> Merge "Fixed a race when slot-to-sub mapping table is rebuilding" into oc-dr1-dev am: 02558a9f23 am: cb64ba6fb2
am: 50c17bfdee

Change-Id: Ia6db7b72cf4d3c9ee1a125fb2ddd61bedded6e7f
50c17bfdee1de86591f500f866a73f8da3cb33c4 01-Aug-2017 Jack Yu <jackyu@google.com> Merge "Fixed a race when slot-to-sub mapping table is rebuilding" into oc-dr1-dev am: 02558a9f23
am: cb64ba6fb2

Change-Id: I2794859cbe4302e4592cdb0086fbe866bc018c12
cb64ba6fb297a2de18fe57ec7d13427d3b5b1e79 01-Aug-2017 Jack Yu <jackyu@google.com> Merge "Fixed a race when slot-to-sub mapping table is rebuilding" into oc-dr1-dev
am: 02558a9f23

Change-Id: I4de826b7e1a1bf4e501f91b8a3fd782a14634d4e
6bd2f8e404fe8597536418e531c6983b9dcb3fe7 01-Aug-2017 Jack Yu <jackyu@google.com> Merge "Fixed a race when slot-to-sub mapping table is rebuilding" into oc-dr1-dev
am: 02558a9f23

Change-Id: Idb900534391aa590eba2e1366a41d1541c382d0e
02558a9f2320ef25a6bf5d4c104b47cd886382b6 01-Aug-2017 Jack Yu <jackyu@google.com> Merge "Fixed a race when slot-to-sub mapping table is rebuilding" into oc-dr1-dev
3e8562b43016c4d7b5f90fb81f7f6c69698e3982 01-Aug-2017 Meng Wang <mewan@google.com> Merge "Show error code in WFC error notification." into oc-dr1-dev am: 00e96a763f am: 2025518192
am: 17cd24a6a0

Change-Id: I25004882272b9e87d2a12768d30bccd829b66582
d922de0ecf35acc967fc09166974354f6ab9e8d5 22-May-2017 shuoq <shuoq@google.com> Cache the getActiveSubscriptionInfoList() in SubscriptionController

To fast reading the active subscription info list (the subinfo list
currently in the phone slotes), a cache is created and maintained inside
the SubscriptionController.

To protect cache, refresh the content of the cache every time there
is an update on the database, populate/regenerate the cache with
the updated information and thereby the reference of the cache object
will be changed.

When getting an Active Subscription Info list, get a deep copy of the
cache instead of its reference.

Test: Manual
Bug: 29877775
Change-Id: Ib26c550d63d4befa6f71ef82dfd6d73579b17e24
Merged-In: Ib26c550d63d4befa6f71ef82dfd6d73579b17e24
ubscriptionController.java
ubscriptionInfoUpdater.java
17cd24a6a086b48d1e91cbdf0976d8c2fb72368f 01-Aug-2017 Meng Wang <mewan@google.com> Merge "Show error code in WFC error notification." into oc-dr1-dev am: 00e96a763f
am: 2025518192

Change-Id: Ib151cc43ed4bed11c87f4ad3bf8bbaa7df5b6fae
1673faaa40caee18845a63e94194dc7bc0f27254 01-Aug-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Cache the getActiveSubscriptionInfoList() in SubscriptionController"
20255181921e4dc2721e6f3258b107fdaab96edb 01-Aug-2017 Meng Wang <mewan@google.com> Merge "Show error code in WFC error notification." into oc-dr1-dev
am: 00e96a763f

Change-Id: I846124595cab35869c57cce6ff57d8bca477cc59
6d71be892168ad2e5a5ec56c6155cdae256b1260 01-Aug-2017 Meng Wang <mewan@google.com> Merge "Show error code in WFC error notification." into oc-dr1-dev
am: 00e96a763f

Change-Id: I5d11d16a4192029b2cb602ba6bbdc05f82818a39
00e96a763f4332a5bd15f4159a3282167adaa83e 01-Aug-2017 Meng Wang <mewan@google.com> Merge "Show error code in WFC error notification." into oc-dr1-dev
e1ed8e95521e50cb449e42d08070376f99ee8581 28-Jul-2017 Jack Yu <jackyu@google.com> Fixed a race when slot-to-sub mapping table is rebuilding

When updateSubscriptionInfoByIccId is called, we always clear
the slot-to-sub id map first and then rebuild it. If other threads
access this map while the rebuilding is ongoing, subscription
controller returns an empty map that leads other threads think we
don't have any valid subscription at that moment. This indeed caused
some issues such like no data connection or device issued unexpected
LTE detach request to the mobile network.

Adding a lock to protect the entire rebuilding process and the map
might be an option but actually the Telephony provider, which
also has its own lock, has dependency on this map. The reverse lock
acuisition orders can cause deadlock, which eventually leads to an
ANR.

A workaround here is that we only clear the map when one/some SIMs
are gone.

A more comprehensive refactoring for building this slot-to-sub map
will be added in future releases.

Test: Manual + unit tests
bug: 63949982, 64004402, 63872700, 64176629
Change-Id: I88992d9cc92d18f7e344b58ea49b1d3007b50b41
ubscriptionController.java
ubscriptionInfoUpdater.java
6d2f2f9fb91e6b99b3631010016b856c7b81a639 22-May-2017 shuoq <shuoq@google.com> Cache the getActiveSubscriptionInfoList() in SubscriptionController

To fast reading the active subscription info list (the subinfo list
currently in the phone slotes), a cache is created and maintained inside
the SubscriptionController.

To protect cache, refresh the content of the cache every time there
is an update on the database, populate/regenerate the cache with
the updated information and thereby the reference of the cache object
will be changed.

When getting an Active Subscription Info list, get a deep copy of the
cache instead of its reference.

Test: Manual
Bug: 29877775
Change-Id: Ib26c550d63d4befa6f71ef82dfd6d73579b17e24
ubscriptionController.java
ubscriptionInfoUpdater.java
5eb42db34888774de3bb16e4f66a0533bf098294 28-Jul-2017 Przemyslaw Szczepaniak <pszczepaniak@google.com> Treat "GMT" persist.sys.timezone as unset.

Previously, telephony coded depended on
persist.sys.timezone not being set as a signal
to try to deduce a timezone from sim card information.

Due to recent change, timezone is set by default to
"GMT" value. This value is synthetic and never occurs
when set from other sources.

Test: flashall & FrameworksTelephonyTests
Bug: 64056758
Change-Id: I219c2745aff38687b5039ce47eb9f5de3ff57256
ccTable.java
c066b40160496c1265e21a3b624e267e47807137 29-Jun-2017 Pengquan Meng <mpq@google.com> Add tests for RIL

Add some unit tests for RIL.java.

Test: "runTest -x RILTest.java" under the test directory
Bug: 38511400
Change-Id: Idded1dd46053f51dbd5b5ef26d3361def2285851
IL.java
ILRequest.java
273da67a9f26ce151c6cf174dafe2a78d59c598a 28-Jul-2017 fionaxu <fionaxu@google.com> add NullPointerCheck for serviceStateTracker am: 5ddb6ec362 am: 309a3f240b
am: 3bcf6a3e80

Change-Id: I539ea8ba0588ae3fe6234a48fd84b6c232990895
3bcf6a3e800f94559ecc74f55f4a7f7ed73d1473 28-Jul-2017 fionaxu <fionaxu@google.com> add NullPointerCheck for serviceStateTracker am: 5ddb6ec362
am: 309a3f240b

Change-Id: I5722b9f4f72df66ed91bb2bc8df5c865ef320185
67971fefa3ada81facab6924636e7f23ba8e899a 28-Jul-2017 Meng Wang <mewan@google.com> Show error code in WFC error notification.

Bug: 62213418
Test: manual
Change-Id: Idf7766a31c4dca046c2d63e6cb81bcefc77608f9
msphone/ImsPhone.java
309a3f240b30d648e5ee95b36eeb56a41d15250b 28-Jul-2017 fionaxu <fionaxu@google.com> add NullPointerCheck for serviceStateTracker
am: 5ddb6ec362

Change-Id: I0db8120c83ceacae722a3ddf6833e0bb30913002
67c3934a1ba9d5fe4f8337251ccbc6029eaf00f4 28-Jul-2017 fionaxu <fionaxu@google.com> add NullPointerCheck for serviceStateTracker
am: 5ddb6ec362

Change-Id: I1194c9dfdfe1c9e5f8ada0724c386afadb1d2f32
5ddb6ec362673fab1ece512d4c9f1068e1642697 27-Jul-2017 fionaxu <fionaxu@google.com> add NullPointerCheck for serviceStateTracker

ServiceStateTracker is not created inside GsmCdmaPhone, thus there is no
SST inside SipPhone. Add a null pointer check inside CarrierActionAgent.
In the long term we should move CarrierActionSignal and
CarrierSignalAgent from Phone to GsmCdmaPhone

Bug: 64104240
Test: Manaul test by making a SIP call
Change-Id: Ia48ff128c9656446058816043cc825a1f60c8a20
arrierActionAgent.java
d7ffd60b43b067fda4d32cd7bb2b8dba8cfe008e 27-Jul-2017 Pengquan Meng <mpq@google.com> Merge "Add exponential backoff to ImsServiceController"
cc93c3f54aa475451f94d0701da40dfea2014b18 12-Jul-2017 Pengquan Meng <mpq@google.com> Add exponential backoff to ImsServiceController

This add exponential backoff with jitter applied to
ImsServiceController to replace the constant time retry mechanism.

Test: "JUnit tests"
Bug:34635764

Change-Id: I3069c0144ff76429315768fc8d1f6e232e3aaa3c
xponentialBackoff.java
ms/ImsServiceController.java
8a7fb28a0abddbfbf622f7c7c9fa0bd037989066 26-Jul-2017 Chen Xu <fionaxu@google.com> Merge "reset carrier actions when exits roaming state." into oc-dr1-dev am: ff5b1b9fe4
am: 70c495da11

Change-Id: I0bf821aaddf8fc3ee191a9d485385008cd95883f
70c495da112aaa813248f69288eeb5f077ccd30d 26-Jul-2017 Chen Xu <fionaxu@google.com> Merge "reset carrier actions when exits roaming state." into oc-dr1-dev
am: ff5b1b9fe4

Change-Id: If0299072040d5c720083ce9a03750d904952cdfb
229ce693f4300046ba044bf30550a33ab1a425f3 26-Jul-2017 Chen Xu <fionaxu@google.com> Merge "reset carrier actions when exits roaming state." into oc-dr1-dev
am: ff5b1b9fe4

Change-Id: I818246b4cdace19affd432fcce527e7ab2f43619
ff5b1b9fe45b718c7803a9832ad94c4c82f95b4f 26-Jul-2017 Chen Xu <fionaxu@google.com> Merge "reset carrier actions when exits roaming state." into oc-dr1-dev
138ee15aec8a69bf7bbfc34506cd48dd570823f9 25-Jul-2017 Jack Yu <jackyu@google.com> Merge "Fixed cell broadcast configuration not sent when no sim is inserted" into oc-dr1-dev am: efbe1208d4
am: 030bb7d6f4

Change-Id: Ida077192078208c8ee24b0298d964ddd286038dd
030bb7d6f4deeda48bc864ab9fddbeea33f74e72 25-Jul-2017 Jack Yu <jackyu@google.com> Merge "Fixed cell broadcast configuration not sent when no sim is inserted" into oc-dr1-dev
am: efbe1208d4

Change-Id: Ic5ca50fc40b7cea283649e09d640a563c940f307
86efdde1a8e745263c6a9882a38ff66c8e9ec82d 25-Jul-2017 Jack Yu <jackyu@google.com> Merge "Fixed cell broadcast configuration not sent when no sim is inserted" into oc-dr1-dev
am: efbe1208d4

Change-Id: I365c3f232b49c99a8087fa0a7995363fc3ddeaa9
efbe1208d4c7a04d9d3d6162cac67c8243226d24 25-Jul-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fixed cell broadcast configuration not sent when no sim is inserted" into oc-dr1-dev
ea00c6eaaa782d655068ba1af0acdb5c1ec96d8e 25-Jul-2017 Chen Xu <fionaxu@google.com> Merge "downgrade roaming notification channel importance" into oc-dr1-dev
am: c735cc387f

Change-Id: If8a410284176124009e97f77e002333afada82a2
97b8879802403475812c9650d8c3b8ab58aac177 25-Jul-2017 Chen Xu <fionaxu@google.com> Merge "downgrade roaming notification channel importance" into oc-dr1-dev
am: c735cc387f

Change-Id: I0c83f63917b09af04da39d36441509e4f36ce0b5
c735cc387f4928d60f8fb15c63def1f1b254831d 25-Jul-2017 Chen Xu <fionaxu@google.com> Merge "downgrade roaming notification channel importance" into oc-dr1-dev
ca06fd0bdce80aba08f0885ed55c3d7a063a3136 25-Jul-2017 Jeff Davidson <jpd@google.com> Merge "Revert "Update SubscriptionInfo when the SIM transitions to a NOT_READY state."" into oc-dr1-dev
am: 606faf06c0

Change-Id: I7d725f7d851265791edf40a58a7e4478da7dae32
7bd944315668b9e5234a95868134a787f858ddf6 25-Jul-2017 Jeff Davidson <jpd@google.com> Merge "Revert "Update SubscriptionInfo when the SIM transitions to a NOT_READY state."" into oc-dr1-dev
am: 606faf06c0

Change-Id: I1cadddc8b889fee73232c4f42e247c0cb23f93e6
606faf06c032fa754943023542d9042fd42fa5a5 25-Jul-2017 Jeff Davidson <jpd@google.com> Merge "Revert "Update SubscriptionInfo when the SIM transitions to a NOT_READY state."" into oc-dr1-dev
ce0b4b2ce4fc7696cdfc957e52edbada276bb105 24-Jul-2017 Tyler Gunn <tgunn@google.com> Ensure mShouldIgnoreVideoStateChanges is set on/off on fake pause/resume.
am: 6dee0e40c7

Change-Id: I930bdf25a77ff2c240181df4b8485acb0534952d
1e7224628e3829c19d6f0b53615f207c7b46d859 24-Jul-2017 Tyler Gunn <tgunn@google.com> Ensure mShouldIgnoreVideoStateChanges is set on/off on fake pause/resume.
am: 6dee0e40c7

Change-Id: I16fff8d4714cc4cae9593e07026ebe30ec1ccdb1
65e6c18c48c51eab80f82423ba594c2718c9d534 24-Jul-2017 fionaxu <fionaxu@google.com> downgrade roaming notification channel importance

delete the old channel and create a new one with downgraded low
importance to suppress default sound and vibration since its
irritating when users are on the edge of the network
(ping pong between roaming and non-roaming).

Bug: 63910379
Test: Manual test adb shell setprop telephony.test.forceRoaming true
Change-Id: I50c25399d451545a8893424a33f6938ad77a2437
til/NotificationChannelController.java
0db00d61d6b53b480235cc1567d5b06f55d15046 22-Jul-2017 Jack Yu <jackyu@google.com> Fixed cell broadcast configuration not sent when no sim is inserted

If no SIM is inserted, use the default phone instead of failing
the request.

Test: Manual
bug: 63903157
Change-Id: I9841904775f1422b1ff3d02d520eaf29f1393ffd
roxyController.java
iccSmsController.java
6dee0e40c77ac373820e7e266ff372a481e30bef 24-Jul-2017 Tyler Gunn <tgunn@google.com> Ensure mShouldIgnoreVideoStateChanges is set on/off on fake pause/resume.

This is a fix for a modem bug where video state changes are not relayed
to the framework.
When I made the initial fix to add the changetoPausedState methods,
I thought I'd fixed the bug but it turns out I forget to set the
mShouldIgnoreVideoStateChanges variable. There is a bit of a race
condition when reproducing this bug and I hit the race condition and
erroneously thought I'd solved it.

Test: Manual
Bug: 63153661
Change-Id: I82c9cb7bcf57df8f86964a3bff37469f0b999f1a
msphone/ImsPhoneConnection.java
f73daac840d9d81b962b9cbdbfb91727f0ae2aa9 24-Jul-2017 Tyler Gunn <tgunn@google.com> Merge "Only update address of IMS call for incoming calls." into oc-dr1-dev
am: 2434d43664

Change-Id: I975826a84d2c229ea740ed2bfa66cd2de3b2880a
b926e7ab612411ca074b45e4b5314b148e284a1f 24-Jul-2017 Tyler Gunn <tgunn@google.com> Merge "Only update address of IMS call for incoming calls." into oc-dr1-dev
am: 2434d43664

Change-Id: If7bada0f5abac315da352c0db82561992b7d5250
2434d4366485eda5c93a111d1f7c20241a384c85 24-Jul-2017 Tyler Gunn <tgunn@google.com> Merge "Only update address of IMS call for incoming calls." into oc-dr1-dev
eb7465409290618ca5d7b5f8ba2ffabba2d936d9 19-Jul-2017 Tyler Gunn <tgunn@google.com> Only update address of IMS call for incoming calls.

Although the modem will report address changes for outgoing calls, we will
prevent those changes from being propagated to the UI. Cases such as
calling the user's voicemail will cause the dialed number to change to
the SIP URI of the voicemail server, which is not apppropriate for display
to the user.

Test: Manual
Change-Id: Ief978ee186bb6f9727e82b0c2a550b0d7af4ee28
Fixes: 63743426
msphone/ImsPhoneConnection.java
92f5e2afff7fee0f93580f0ded6bb3111605ad48 22-Jul-2017 Tyler Gunn <tgunn@google.com> Merge "Add workaround for modem issue where pause bit is not set when on hold." into oc-dr1-dev
am: d70fdd534b

Change-Id: I7934754d90e1dec346c31906f3298cd5e666c56b
449bc0b1fdbf55f7dcf8cb945c1edbefb4a4c1e5 22-Jul-2017 Tyler Gunn <tgunn@google.com> Merge "Add workaround for modem issue where pause bit is not set when on hold." into oc-dr1-dev
am: d70fdd534b

Change-Id: I6a5c0e8013ad1bdf89b7cde26535afec7e235b8f
d70fdd534bf4ffd12bc2c3790514d570719a81e1 22-Jul-2017 Tyler Gunn <tgunn@google.com> Merge "Add workaround for modem issue where pause bit is not set when on hold." into oc-dr1-dev
2139a3074d151c6e9838ca9c122ad0143189cc4c 22-Jul-2017 Chen Xu <fionaxu@google.com> Merge "handle NPE for findAppRequestInfoSmsIntentLocked" into oc-dr1-dev
am: 34f3d0cd4b

Change-Id: I8b69c23cd780dbef6a8b0247c65479db443d844e
5ef33f286a31d7e8d7d3ac2e47c8ff5959517fe9 22-Jul-2017 Chen Xu <fionaxu@google.com> Merge "handle NPE for findAppRequestInfoSmsIntentLocked" into oc-dr1-dev
am: 34f3d0cd4b

Change-Id: Ia0991aacdc4f1a390cc7bbccaa7aca4350d08ab0
34f3d0cd4b28aa7c4f28656198e1a0e040417d76 22-Jul-2017 Chen Xu <fionaxu@google.com> Merge "handle NPE for findAppRequestInfoSmsIntentLocked" into oc-dr1-dev
44b58c8044c5fc0b271432429fc97707c4c773e1 22-Jul-2017 Tyler Gunn <tgunn@google.com> Add workaround for modem issue where pause bit is not set when on hold.

When a call is remotely held, the modem is not setting the pause bit on
the video state as it should. This causes a cascading failure where the
user cannot turn the camera on/off (because another video pause hack is
not able to detect that the video is paused and thus activate the hack).

Test: Manual
Change-Id: I2a83b73df5488454b7030d7e4f7c78f360a27eda
Fixes: 63153661
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
3ad1c50b01bb16ad5f60e12fead319208b9a9862 21-Jul-2017 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Skip sending RIL_REQUEST_ALLOW_DATA on single SIM devices" into oc-dr1-dev
am: 2530f95b77

Change-Id: If7266a8b0453e116cca6b2df7e3ef66629f29349
cc8cd9565310bb10a98e249a18b67e5bc1350fb1 21-Jul-2017 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Skip sending RIL_REQUEST_ALLOW_DATA on single SIM devices" into oc-dr1-dev
am: 2530f95b77

Change-Id: I732b778dacad43a300faaa097c56ef1f35ad8391
2530f95b77c0f744c9ab60f60405ff5bdcbe6200 21-Jul-2017 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Skip sending RIL_REQUEST_ALLOW_DATA on single SIM devices" into oc-dr1-dev
226f2f36139db0d9e29d1855e96993fc9f4653da 21-Jul-2017 fionaxu <fionaxu@google.com> handle NPE for findAppRequestInfoSmsIntentLocked

Bug: 63797078
Test: Manual
Change-Id: I06181f7ce30585d091f5ecedce8107cfc75d9dd2
ppSmsManager.java
35055d475df715f96be6b037f1a938ac7bc284f8 21-Jul-2017 Jeff Davidson <jpd@google.com> Revert "Update SubscriptionInfo when the SIM transitions to a NOT_READY state."

This reverts commit 6c1c6edb0ed8734465c614bc5d2ef2b19154fd7e.

This CL introduced a regression where the "No SIM" icon appears for a
few seconds during a cellular network switch. We will need to revert
it for now and come up with a better solution to the original problem.

Bug: 63404529
Change-Id: I6960b7d238427f20d3309d2383ab70db8f03d24e
Test: TreeHugger
ubscriptionInfoUpdater.java
26fbfe0106bace2919e990b5a9dc4c90097aaf2b 21-Jul-2017 Amit Mahajan <amitmahajan@google.com> Merge "Clear calling identity in SmsNumberUtils.needToConvert()" into oc-dr1-dev
am: d617ef1e4b

Change-Id: I3a682998526fa3e9b1e9294dabc4dfb562e1b4f3
0ccda04ecb97b95b0b3b29873e0d2da986f629d6 21-Jul-2017 Amit Mahajan <amitmahajan@google.com> Merge "Clear calling identity in SmsNumberUtils.needToConvert()" into oc-dr1-dev
am: d617ef1e4b

Change-Id: I7391ac35373d8d6d7e2c6d43fac6329e17d50d2b
d617ef1e4b5057faa1a53749c7d455c48afba8aa 21-Jul-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Clear calling identity in SmsNumberUtils.needToConvert()" into oc-dr1-dev
0d6ff7958dac61b9e2d689267c34ddfa0c666d9d 21-Jul-2017 fionaxu <fionaxu@google.com> reset carrier actions when exits roaming state.

carrier apps might restrict mobile data if users enter roaming state
without any romaing plan/balance. however when users exit roaming state,
we should reset carrier data restrictions to re-evaluate data state.

Test: manual test roaming on->off->on by setprop
telephony.test.forceRoaming

Bug: 63819703
Change-Id: If91042054ce973c384fe03aa0b733de9f8033bf6
arrierActionAgent.java
erviceStateTracker.java
ataconnection/DataConnection.java
ataconnection/DcTracker.java
c3a015d2b1b1d89606d77ee09cd0f96744967968 21-Jul-2017 Jayachandran C <jayachandranc@google.com> Skip sending RIL_REQUEST_ALLOW_DATA on single SIM devices

RIL_REQUEST_ALLOW_DATA on single SIM devices causes lab
test cases to fail as it triggers detach on some cases.

There is no need to send this on single SIM devices as the
data subscription is not going to change dynamically.

Test: Telephony data sanity, verified data working upon
SIM hotswap, preferred network type changes

Bug: 62872229
Bug: 62844965
Change-Id: Ia89e5180b7c023163af176d9ff058375b7765fc2
honeSwitcher.java
1a223c2ffb2fd7a4d880d3c5ff89eb28e17799fa 20-Jul-2017 Amit Mahajan <amitmahajan@google.com> Merge "Add class IntentBroadcaster to rebroadcast intents on USER_UNLOCKED." into oc-dr1-dev
am: 47c1a77d5f

Change-Id: I049f4819b180dcefc1f53b80ab90d2282296e398
7eb8c6231dca0c1b954212f6720477d6b8044566 20-Jul-2017 Amit Mahajan <amitmahajan@google.com> Merge "Add class IntentBroadcaster to rebroadcast intents on USER_UNLOCKED." into oc-dr1-dev
am: 47c1a77d5f

Change-Id: If91c4c83d00d86bf7eff2e7dfece5db43e569e90
e1346966c9c17871a999c88cdd2761bc51c5b761 20-Jul-2017 Amit Mahajan <amitmahajan@google.com> Clear calling identity in SmsNumberUtils.needToConvert()

Test: Basic SMS sanity
Bug: 37256870
Change-Id: I6757dc5c9109ed5a3330db9c85eae856fe055be4
msNumberUtils.java
47c1a77d5f6af0067f42cbc8372306c970a78e31 20-Jul-2017 Amit Mahajan <amitmahajan@google.com> Merge "Add class IntentBroadcaster to rebroadcast intents on USER_UNLOCKED." into oc-dr1-dev
d1d2aa157fa5047507393405b76dfb49fc9ffc0f 08-Jul-2017 Amit Mahajan <amitmahajan@google.com> Add class IntentBroadcaster to rebroadcast intents on USER_UNLOCKED.

This is to have a single point for broadcasting intents that need
to be rebroadcast, and helps rebroadcast them in the right order.

Test: Verified manually through logcat
Bug: 37730013
Change-Id: I5285dc1b96b3f6429e86eaa6b4aee58dfb55ccd1
ntentBroadcaster.java
honeFactory.java
ubscriptionInfoUpdater.java
icc/IccCardProxy.java
7697da29fef2492dc107a0a61b793a003b0762ab 20-Jul-2017 Jeff Davidson <jpd@google.com> Merge "Fix crash when LPA is unavailable." into oc-dr1-dev am: db8e390435
am: 5a218caa79

Change-Id: I7f33030935b7a9da26046ccb64b16b19d2a31c7d
5a218caa79ed8d7087f9e7d858bf8eb4484bfa98 20-Jul-2017 Jeff Davidson <jpd@google.com> Merge "Fix crash when LPA is unavailable." into oc-dr1-dev
am: db8e390435

Change-Id: If73b6dee35e9307f9fc5645a3ed631cd2ef00abc
db8e39043538cb0edc5ae9bfff40be83ac5586d7 20-Jul-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fix crash when LPA is unavailable." into oc-dr1-dev
644ca05fda516098d63b0a439b17803777be6268 19-Jul-2017 Jack Yu <jackyu@google.com> Merge "Refactored no data due to roaming notification"
2377d4655a0559ce781c1e92a8d6b593b79b9b88 19-Jul-2017 Hall Liu <hallliu@google.com> Merge "Make a copy of the sSlotIndexToSubId's entryset" into oc-dr1-dev am: eae86190b8
am: 7a6d52fb94

Change-Id: I9f8ef6cb213a61fa3857a243a0184327d826fee3
7a6d52fb946a81ed212818664d8f8e5749138d98 19-Jul-2017 Hall Liu <hallliu@google.com> Merge "Make a copy of the sSlotIndexToSubId's entryset" into oc-dr1-dev
am: eae86190b8

Change-Id: I4b1c3cd039c943fd26fbc3a26e1aaf293c61fc57
eae86190b8294dcf2dd5e048a725e0de8084471e 19-Jul-2017 Hall Liu <hallliu@google.com> Merge "Make a copy of the sSlotIndexToSubId's entryset" into oc-dr1-dev
28ebacb54648e0cf9e7035007217bf8e08dacc71 19-Jul-2017 Jack Yu <jackyu@google.com> Merge "Fixed the incorrect roaming override" into oc-dr1-dev am: 03ea5dd151
am: a44c120532

Change-Id: I7de3b15e99db8adbd67d98b9d2dc09c86709de69
a44c12053273c7381d612534a57cb5c88a47b025 19-Jul-2017 Jack Yu <jackyu@google.com> Merge "Fixed the incorrect roaming override" into oc-dr1-dev
am: 03ea5dd151

Change-Id: Icf6f00d68c896aafb40e8ee77955c7960d058ad8
03ea5dd1513bee8a31458e92f71d5b80fc77950f 19-Jul-2017 Jack Yu <jackyu@google.com> Merge "Fixed the incorrect roaming override" into oc-dr1-dev
55d04c278805d57e2baa9bb063640673634c3d78 19-Jul-2017 Jeff Davidson <jpd@google.com> Fix crash when LPA is unavailable.

Fixes: 63802770
Test: Unit test + TreeHugger
Change-Id: I323abf692993436aaa4d1b2108c53386b97f6ec9
uicc/EuiccConnector.java
8ef0c6f59a5785414fbce23a0c91e1a65f73485e 19-Jul-2017 Chen Xu <fionaxu@google.com> Merge "support carrier specific initial value of data_roaming" into oc-dr1-dev am: 42705ae4de
am: 71c7cda7b3

Change-Id: I1afd7a813a731520314404577d4a04a58dc018e3
71c7cda7b324f3f5303b69976a61b87a1f04a66a 19-Jul-2017 Chen Xu <fionaxu@google.com> Merge "support carrier specific initial value of data_roaming" into oc-dr1-dev
am: 42705ae4de

Change-Id: I4dab63af9e256d4d11c99b9a8b5927fdc160d528
42705ae4de3263d3c93e0e9cf59aec25869db593 19-Jul-2017 Chen Xu <fionaxu@google.com> Merge "support carrier specific initial value of data_roaming" into oc-dr1-dev
21e6af8d6197a071d025733fffeffc157d0085bc 23-Jun-2017 fionaxu <fionaxu@google.com> support carrier specific initial value of data_roaming

1. new carrier config for default data roaming value
to support carrier specific feature: turn on data_roaming by default.
2. use a sharedpref to record if user has ever touch the setting
before.
3. on sim loaded, update data roaming setting: In the absence of
user-pref, override with the carrier default value. otherwise migrate
user-pref when swap to new SIM.

Bug: 63532986
Test: manual tests includes factory reset, hot sim swap and build
updates without factory reset.
Change-Id: I64619a0df27ad36595f4d063cd66f73595ad24f3
smCdmaPhone.java
hone.java
ataconnection/DcTracker.java
565b45663e85b82a8d7e653e181adfe858b71c82 18-Jul-2017 Jack Yu <jackyu@google.com> Refactored no data due to roaming notification

Instead of listening to ACTION_ANY_DATA_CONNECTION_STATE_CHANGED,
we now listent to mobile data settings changed, data roaming
settings changed, carrier config changed, roaming status changed,
and default data subscription changed event. This will make the
notification show/hide become more reliable.

Test: manual
bug: 63027846
Change-Id: Ie602cb1edbb90ae9bff21b3e7b8074217543cf38
hone.java
ataconnection/DataConnectionReasons.java
ataconnection/DcTracker.java
2dd5ef8b4a36262fd75d79ec3ae7e30678aa0cc5 18-Jul-2017 Jack Yu <jackyu@google.com> Fixed the incorrect roaming override

If the empty string is in the roaming override resource overlay,
it might incorrectly override the roaming state.

Test: Manual
bug: 63687431
Change-Id: I6629b2b4815f6740ada4bd0a69eb2bf8829db1fc
erviceStateTracker.java
6b26614e56f23a12c67819e45c3ae596c66d1150 18-Jul-2017 Chen Xu <fionaxu@google.com> Merge "support carrier action reset on mobile data off" into oc-dr1-dev am: 64ed23160f
am: fe53931932

Change-Id: Ic0a064553973aabb669e1b6b5c9cdcd8db28ec7f
fe53931932e1eb01a1fec565cb19f6632eecff2e 18-Jul-2017 Chen Xu <fionaxu@google.com> Merge "support carrier action reset on mobile data off" into oc-dr1-dev
am: 64ed23160f

Change-Id: Ia025fc2ad3fcdd47a938d7fa4cd2ab9dd576d286
64ed23160f0ab1d8c71fea0df6221fc83c81ffb4 18-Jul-2017 Chen Xu <fionaxu@google.com> Merge "support carrier action reset on mobile data off" into oc-dr1-dev
8a8637aa1f387f135b7891ffe181465e1a848b10 14-Jul-2017 fionaxu <fionaxu@google.com> support carrier action reset on mobile data off

Bug: 63681072
Test: Manual test
Change-Id: I6fab9b4ccc58e3befe5f9f8f5f72b8189308bde3
arrierActionAgent.java
ettingsObserver.java
42af1c6f5579d8a8ff73d0f6fa0b0e97e5205861 17-Jul-2017 Hall Liu <hallliu@google.com> Make a copy of the sSlotIndexToSubId's entryset

If sSlotIndexToSubId is modified on another thread between simInfoSet
being initialized and the iteration, the sizes may not match and an
array-out-of-bounds error may occur.

Change-Id: If1ed9678d5652f1e3161a7a29d34c047daa8e469
Test: builds
Fixes: 63715198
ubscriptionController.java
4f7a80a0caf58c343062ca442e1ae42739209331 15-Jul-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Reset EF_AD (mMncLength) on sim refresh event." into oc-dr1-dev am: dfd823bb9c
am: d4e4599582

Change-Id: Ic99853e253effbd46ccbb2fb64a5fb62d5b83d61
d4e459958202adc988b555d49a9fbb87ff4836a2 15-Jul-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Reset EF_AD (mMncLength) on sim refresh event." into oc-dr1-dev
am: dfd823bb9c

Change-Id: I3a34b7e17e791d1d9af9e35a766d71904fcedadc
dfd823bb9c6c78100a341bdb4fef0bca5f0cd51e 15-Jul-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Reset EF_AD (mMncLength) on sim refresh event." into oc-dr1-dev
e0b011a2d08e304c7cf1a6697a5d5417cdb68d59 14-Jul-2017 Jeff Sharkey <jsharkey@google.com> Merge "Follow removal of NetworkInfo metered flag."
ef6329089cdf952843f507969abf85028e72f193 14-Jul-2017 Naveen Kalla <mrnaveen@google.com> Convert CDMA caller ID codes while roaming on 3GPP networks
am: 3516de95ef

Change-Id: Ia1095ab532b436cc6739381dd81c344cf48c4e82
c68596069aa958f997a320f944b88aa055f1494c 14-Jul-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Convert CDMA caller ID codes while roaming on 3GPP networks"
947183ce4b882fcffefea8d3fd50750a997a58b6 12-Jul-2017 Jeff Sharkey <jsharkey@android.com> Follow removal of NetworkInfo metered flag.

The OS now completely relies on NET_CAPABILITY_NOT_METERED to avoid
confusion and staleness.

Bug: 63391323
Test: builds, boots, Wi-Fi policy is upgraded
Change-Id: I306092056f7c350081688bc2fdfbb97a1b25f00c
ataconnection/DataConnection.java
3516de95ef0ecb54dbd2c7ddbf7c81051ef4044c 11-Jul-2017 Naveen Kalla <mrnaveen@google.com> Convert CDMA caller ID codes while roaming on 3GPP networks

Convert CDMA CLIR MMI codes to 3GPP MMI codes when a CDMA
device is roaming on a 3GPP network. Use a Carrier Config
to control this feature.

Bug: 62933474
Test: Manually tested the following scenarios
1) Device is not roaming on UMTS/IMS. Dialed String was not converted
2) Device was roaming on UMTS/IMS and Carrier Config was not set. Dial
String was not converted.
3) Device was roaming on UMTS/IMS and Carrier Config was set to true.
Dial String with *67 and *82 were converted to their 3GPP
equivalent MMI coded dial strings.

Change-Id: I411cbfea77f0a42a76827b372c2b08fb05975548
Merged-In: I411cbfea77f0a42a76827b372c2b08fb05975548
miCode.java
hone.java
sm/GsmMmiCode.java
msphone/ImsPhoneMmiCode.java
4a3806e694b588dfc1bf83486c360e07c43d7529 13-Jul-2017 kun.tang <kun.tang@spreadtrum.com> Merge "Fix lost query sim status in UiccController when device is unencrypted." am: 39443c8284 am: 1723f4d798 am: 60780ab6e1
am: cb32902b8c

Change-Id: Ic6605a6da6f9564c6ed8b4f065ca0e66ea14afd0
cb32902b8cd0b52774d7647f6c5538e3cc24ba93 13-Jul-2017 kun.tang <kun.tang@spreadtrum.com> Merge "Fix lost query sim status in UiccController when device is unencrypted." am: 39443c8284 am: 1723f4d798
am: 60780ab6e1

Change-Id: I36d1dd45448b0a4e6ec2ae9ae158cbf4a0310cd6
1723f4d7985cc7b0399c70c5bdc49aa81c8e9662 13-Jul-2017 kun.tang <kun.tang@spreadtrum.com> Merge "Fix lost query sim status in UiccController when device is unencrypted."
am: 39443c8284

Change-Id: Ib5cc51c88b9e7c4f2f1b0529682b44b14d836a1a
39443c82847983e81fb08422b5cf305153e9e4c7 13-Jul-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fix lost query sim status in UiccController when device is unencrypted."
e05d915a60c49ba70230a291c1f8c02306a3f626 11-Jul-2017 Naveen Kalla <mrnaveen@google.com> Convert CDMA caller ID codes while roaming on 3GPP networks

Convert CDMA CLIR MMI codes to 3GPP MMI codes when a CDMA
device is roaming on a 3GPP network. Use a Carrier Config
to control this feature.

Bug: 62933474
Test: Manually tested the following scenarios
1) Device is not roaming on UMTS/IMS. Dialed String was not converted
2) Device was roaming on UMTS/IMS and Carrier Config was not set. Dial
String was not converted.
3) Device was roaming on UMTS/IMS and Carrier Config was set to true.
Dial String with *67 and *82 were converted to their 3GPP
equivalent MMI coded dial strings.

Change-Id: I411cbfea77f0a42a76827b372c2b08fb05975548
miCode.java
hone.java
sm/GsmMmiCode.java
msphone/ImsPhoneMmiCode.java
b34891e1c8e1b6645b2e997ff7462fa93175207d 10-Jul-2017 kun.tang <kun.tang@spreadtrum.com> Fix lost query sim status in UiccController when device is unencrypted.

Some devices are unencrypted and vold.decrypt is not been setted.
In this case, UiccController cannot query sim status.

Test: build
Change-Id: Id1a06df0e1fbb92c6f68e745def88261fb503e22
icc/UiccController.java
202d11700d371d060509e8ccdf240334ee286118 13-Jul-2017 Sanket Padawe <sanketpadawe@google.com> Reset EF_AD (mMncLength) on sim refresh event.

Test: Build and TH.
Change-Id: I7d4de60709e1307db2f46161163036872894e188
Fix: 62803651
icc/IccRecords.java
879da87515fefec372b7328ae39a468a7b0263cd 12-Jul-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fixed debug messages and typos"
4e2fb8205c3f997838923b0e91e05ab0493e8e4b 12-Jul-2017 Jack Yu <jackyu@google.com> Fixed debug messages and typos

Test: Build
Change-Id: I13f87a72f1a54fed7b8b69332379e5e11e61c25b
ubscriptionInfoUpdater.java
icc/IccCardProxy.java
icc/UiccCard.java
d430a58ab37dba4af74bf0cab5ba5610fe208378 11-Jul-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Unregister from carrier privilege notification on updateIccAvailability." into oc-dr1-dev
289bdfbf7e2439e1c87675847b4d5c275a663b2b 11-Jul-2017 Shishir Agrawal <shishir@google.com> Unregister from carrier privilege notification on updateIccAvailability.

Bug: 63276405
Test: On SIM swap, only a single SIM LOADED event should fire.
Merged-In: I6a7675b575ca14bb7050e16ca56585828325a43e
Change-Id: I6a7675b575ca14bb7050e16ca56585828325a43e
(cherry picked from commit 37d870b3561daf84c6293a7dd7e36cc8e2ef0113)
icc/IccCardProxy.java
a2e5a9184e79f7cbc81fa47c794b661b6123f053 11-Jul-2017 shishir <shishir@google.com> Merge "Unregister from carrier privilege notification on updateIccAvailability." am: 2ceab1c487 am: f21220de40 am: 3e111d1970
am: 9c0daf8c2f

Change-Id: Idc7db1b6fe5515dcd0f0ac38a0ebdb95971bdb18
9c0daf8c2f37e4864627b58a36dfc9503a15e516 11-Jul-2017 shishir <shishir@google.com> Merge "Unregister from carrier privilege notification on updateIccAvailability." am: 2ceab1c487 am: f21220de40
am: 3e111d1970

Change-Id: I33721853700c9b0b5fd125f3f9a9996bcfa5da96
f21220de408d6857cf6064230517350e659afc4d 11-Jul-2017 shishir <shishir@google.com> Merge "Unregister from carrier privilege notification on updateIccAvailability."
am: 2ceab1c487

Change-Id: Ic4edf26a7fb0a67ad764270d1d86395dbd6012b9
2ceab1c487720ccd6b1b7bd2e0f1167d39897df0 11-Jul-2017 shishir <shishir@google.com> Merge "Unregister from carrier privilege notification on updateIccAvailability."
e2e625bb1f165524064847c6b654c067d79f7788 20-Apr-2017 Chaitanya Saggurthi <csaggurt@codeaurora.org> Optimize power for incoming SMS

- In the current implementation, a wakelock is acquired when SMS is
received in IdleState. The wakelock is released 3 seconds after
returning back to IdleState. This happens even during bootup when
there are no pending messages to be handled.

- Add a change to ensure that while booting up, the wakelock is
not held if there are no pending messages to be handled.

Test: manual - Send and receive SMS

Bug: 34801294
Merged-in: I30d9ac2ee312bac0cd720047037d9048b540ec3f
Change-Id: I30d9ac2ee312bac0cd720047037d9048b540ec3f
nboundSmsHandler.java
37d870b3561daf84c6293a7dd7e36cc8e2ef0113 11-Jul-2017 Shishir Agrawal <shishir@google.com> Unregister from carrier privilege notification on updateIccAvailability.

Bug: 63276405
Test: On SIM swap, only a single SIM LOADED event should fire.
Change-Id: I6a7675b575ca14bb7050e16ca56585828325a43e
icc/IccCardProxy.java
7f038555955fba33afc7a673f4378e648b3aebec 10-Jul-2017 Jordan Liu <jminjie@google.com> Merge "Get system resources instead of phone context"
am: 7fc619b811

Change-Id: I22cac9188472b44cc9aecb132186a79f9c8b7334
7fc619b81179e62c828d2629687824129d9af36a 10-Jul-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Get system resources instead of phone context"
0abe6181d2b50301c519ffcf550686d59f828a47 10-Jul-2017 Pankaj Kanwar <pkanwar@google.com> Merge "IMS-VT: Read the correct carrier config to notify handover from Wifi to Lte" am: 1bc7d8713b am: 05b47b6889 am: 1a47f1c0b2
am: a6919d195f

Change-Id: I2c0380f3fca9b08c88f89dfa5c2dfb653f0c8903
a6919d195fc7c32a2059edcc5dc7856481ace039 10-Jul-2017 Pankaj Kanwar <pkanwar@google.com> Merge "IMS-VT: Read the correct carrier config to notify handover from Wifi to Lte" am: 1bc7d8713b am: 05b47b6889
am: 1a47f1c0b2

Change-Id: I09ea70befd786c06d4ba760aa77f88e8647f054c
05b47b6889dec0809e7c803e046580f97f0f7f7c 10-Jul-2017 Pankaj Kanwar <pkanwar@google.com> Merge "IMS-VT: Read the correct carrier config to notify handover from Wifi to Lte"
am: 1bc7d8713b

Change-Id: If3ecbf1c40009852c62a1174fd2694b1be53a781
04e0fc69f6f42e67eecc882e3dcd3b50da15675b 18-Apr-2016 Srikanth Chintala <srikchin@codeaurora.org> Set additional info for LaunchBrowser error case.

A recent change in 3GPP TS 31.124 27.22.4.26 spec for
LAUNCH BROWSER SEQ 1.6. expects an additional info
'Default URL unavailable' incase where default url
is not set.

Fix: In CatService, while handling the Launch Browser
error response include the additonal info 'Default
URL unavailable'.

3GPP Ref link:
http://www.etsi.org/deliver/etsi_ts/131100_131199/131124/
13.02.00_60/ts_131124v130200p.pdf

Bug: 63270501
Change-Id: Idb80c1b8f36749a0ad6e5d53c7a4ac693917d884
at/CatService.java
1b1b34593696f0cb9c9de5bc118c82d501e5ef1e 27-Jan-2017 Nivedita Sarkar <nsarkar@codeaurora.org> IMS-VT: Read the correct carrier config to notify handover from Wifi to Lte

- We are reading the incorrect carrier config flag
"KEY_NOTIFY_VT_HANDOVER_TO_WIFI_FAILURE_BOOL" for showing
the notification when handing over from Wifi to Lte while on
a video call

- Fixed the code to read carrier config flag
"KEY_NOTIFY_HANDOVER_VIDEO_FROM_WIFI_TO_LTE_BOOL" instead
to enable the feature

Bug: 63135908
Test: manual

Change-Id: I645a134c33ccfc4fb61c0754e6e60d0fa295f94f
msphone/ImsPhoneCallTracker.java
be4a5adab00210b3745a9c27b15cf0dcf7beba16 08-Jul-2017 Derek Tan <derektan@google.com> Merge "Prevent any app except LPA to create logical channel to AID of ISD-R." into oc-dr1-dev am: 747c6e8319
am: 15793f87f0

Change-Id: Ifda96d82aee48591f364dc454e002cd623eb9558
15793f87f0de4af5febaba23f711197ea248d9d7 08-Jul-2017 Derek Tan <derektan@google.com> Merge "Prevent any app except LPA to create logical channel to AID of ISD-R." into oc-dr1-dev
am: 747c6e8319

Change-Id: I40ae56cbafdb2cdc634704294b55ce4d65428c5c
747c6e83190e41bfe71d5921c5bc88b1b3a7ad58 08-Jul-2017 Derek Tan <derektan@google.com> Merge "Prevent any app except LPA to create logical channel to AID of ISD-R." into oc-dr1-dev
83de772342a33a411591cdae121689a641781afa 08-Jul-2017 Tyler Gunn <tgunn@google.com> Add cleanupCalls to call tracker.

For GsmCdmaCallTracker, this calls pollCallsWhenSafe(). By polling the
calls in the RIL, the GSMCdmaCallTracker will reconcile the calls it knows
about with what the RIL reports, removing stale calls.

Test: Manual
Bug: 63317180
Change-Id: I7ee8609c41376bf21c428d04aab7d76151200699
allTracker.java
smCdmaCallTracker.java
ba67fa1b559e20e2048b8a5cbbda70b6f17cbd04 07-Jul-2017 Amit Mahajan <amitmahajan@google.com> Merge "Always fetch dun APNs from apn db." into oc-dr1-dev am: d99fe0deec
am: 694a4cd890

Change-Id: I53d58af39e5473e76e604662406c6bfea60b89b8
694a4cd89026c9f66439097d3dfd8295d217ba0c 07-Jul-2017 Amit Mahajan <amitmahajan@google.com> Merge "Always fetch dun APNs from apn db." into oc-dr1-dev
am: d99fe0deec

Change-Id: Id4e82d163d715d8f8880d84c40d1e331cf9b8252
d99fe0deec25db3120370d94a81f374fc5b3f882 07-Jul-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Always fetch dun APNs from apn db." into oc-dr1-dev
7ef36bc62d5e4b905c65e578743550c170217037 30-Jun-2017 Jordan Liu <jminjie@google.com> Get system resources instead of phone context

Use Resources.getSystem() instead of mPhone.getContext().getResources()
to load config_cdma_home_system to resolve roaming indicator.

Fixes: 62843620
Test: runtest --path tests/ (existing unit tests pass)
Change-Id: If3af44f22f5e2b5fc090f4478ccef6192c5ecb16
Merged-In: If3af44f22f5e2b5fc090f4478ccef6192c5ecb16
erviceStateTracker.java
d9f1ee5fc7be374fe31860d741ca6dd7bacd1a31 06-Jul-2017 Jordan Liu <jminjie@google.com> Merge "Get system resources instead of phone context" into oc-dr1-dev am: e15bce385e
am: 8151ffe299

Change-Id: Iada5693a13a2fcaeefae94d62bf086716190b2d4
8151ffe299add9568d3f4c94f7cc2502f88149b5 06-Jul-2017 Jordan Liu <jminjie@google.com> Merge "Get system resources instead of phone context" into oc-dr1-dev
am: e15bce385e

Change-Id: Ie18bd90d22b2f0631f4dca40ac8e1a009ddbeb0a
e15bce385e5f57a57f06cdaf5c388c989e7e4bc9 06-Jul-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Get system resources instead of phone context" into oc-dr1-dev
813653335f187c191c7ddef89f50879b2438f7ef 05-Jul-2017 Brad Ebinger <breadley@google.com> Merge "Do not set the state to POWER_OFF when in APM for ImsPhone" into oc-dr1-dev am: bcd7484068
am: bd8dfb53e8

Change-Id: Id7cffee81e15ab42b01743383da4e6bef1e6384c
bd8dfb53e87ccd0ee7a0a6c01a90d86b3ebd0603 05-Jul-2017 Brad Ebinger <breadley@google.com> Merge "Do not set the state to POWER_OFF when in APM for ImsPhone" into oc-dr1-dev
am: bcd7484068

Change-Id: Ia4cb40e9d8ddfb9099eae3fbe51a6ad19b521435
ce0c001931dc9befc6de8799cda4f29f5bb97a2c 30-Jun-2017 Jordan Liu <jminjie@google.com> Get system resources instead of phone context

Use Resources.getSystem() instead of mPhone.getContext().getResources()
to load config_cdma_home_system to resolve roaming indicator.

Fixes: 62843620
Test: runtest --path tests/ (existing unit tests pass)
Change-Id: If3af44f22f5e2b5fc090f4478ccef6192c5ecb16
erviceStateTracker.java
bcd74840680a9423ff08b1cf28a04d6a333498cb 05-Jul-2017 Brad Ebinger <breadley@google.com> Merge "Do not set the state to POWER_OFF when in APM for ImsPhone" into oc-dr1-dev
31761a6f7d9340db75a3dca6efb9973d4f3f451b 05-Jul-2017 Jack Yu <jackyu@google.com> Merge "Only tearing down restricted metered data when data is enabled" into oc-dr1-dev am: dbc97213c3
am: 76fef02b7d

Change-Id: Ib3eea3c8b407cbaeae193c74d3fd8b569fcdef6c
76fef02b7dac3a9bbd29a038d423f22e9c961f36 05-Jul-2017 Jack Yu <jackyu@google.com> Merge "Only tearing down restricted metered data when data is enabled" into oc-dr1-dev
am: dbc97213c3

Change-Id: Id08f6deca271cb00ee24e8acbdd8ce349c97b9fd
dbc97213c3dbc54168a975990dfa4b43bcdee76c 05-Jul-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Only tearing down restricted metered data when data is enabled" into oc-dr1-dev
d96715fae6d3e51b4ce856dfcbf242b9b39f0a64 05-Jul-2017 Jeff Davidson <jpd@google.com> Bypass consent dialogs for privileged eUICC switches. am: 2938f11d0b
am: 0df34fc6f3

Change-Id: I6c9f90c06d6bae42319f1c8da4daefc419335c34
0df34fc6f34155373cc5f81a947806d12565aab0 05-Jul-2017 Jeff Davidson <jpd@google.com> Bypass consent dialogs for privileged eUICC switches.
am: 2938f11d0b

Change-Id: Idaeb0b97fd9cc17ee8bf11d50c150c89ed8aaf6c
ee00c053e0cbbbdb22737c923b1a214e10453646 05-Jul-2017 Jack Yu <jackyu@google.com> Only tearing down restricted metered data when data is enabled

Reverted the behavior introduced in ag/2091549 that causes
restricted unmetered IMS data connection disconnected.

Test: Manual
bug: 63279719
Change-Id: I03e19cb66f29e8b0f06e66ff64d64575b9345a47
ataconnection/DcTracker.java
2938f11d0b1e409089828c0247a5b79f3550a35a 01-Jul-2017 Jeff Davidson <jpd@google.com> Bypass consent dialogs for privileged eUICC switches.

Privileged code should only be triggering switches in response to user
action or at other trusted times. Don't require user consent so the
code can have finer-grained control over its consent UI as needed.

Change-Id: If1ce4cf4de4d1d1287d801812de4109c505c7799
Fixes: 63134740
Test: Unit test
uicc/EuiccController.java
d913f668eaaa68716beccc4084417dfc56b7be89 30-Jun-2017 Brad Ebinger <breadley@google.com> Do not set the state to POWER_OFF when in APM for ImsPhone

There is no need to set the ImsPhone to the state POWER_OFF
when we move into APM, since there is no difference between that
and the OUT_OF_SERVICE state.

Also, removes the POWER_OFF check from the ImsPhoneCallTracker,
as it should only determine whether or not it can dial a call
from the ImsService capabilities at the time of the call.

Bug:62816248
Test: Manual, Test E911 call
Change-Id: I904be6a8e79d40ebf8f8dae81277169ad7dabfcc
smCdmaPhone.java
msphone/ImsPhoneCallTracker.java
5fd5bb14cf73b74120041e4cc317684c5a43a67c 26-Apr-2017 Amit Mahajan <amitmahajan@google.com> Always fetch dun APNs from apn db.

Also added emergency as a non-wildcardable APN type.

Test: Verified tethering manually for T-Mo and AT&T
Bug: 38186417
Change-Id: I6d0da610557f2f48bfc79a3a9015d5d01173bddf
ataconnection/DcTracker.java
5a5aab1b0369b4e68e801817785e167f83184837 29-Jun-2017 yinxu <yinxu@google.com> Merge "Use Bundle for inter-process message"
am: bfc44f2e2a

Change-Id: I9e2547ee5ac753f876e5d86962cfc03830cb069f
17a99fb630467e9bd505a2a90d70f2e80cad2571 29-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Improve the Safety Checks on IccCardStatus.toString()" into oc-dr1-dev
bfc44f2e2ac6cb8e8ba51e4250a10401714bf198 29-Jun-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Use Bundle for inter-process message"
d20bfd8067ef8a4aa90cb99eb4f183012e9ef066 29-Jun-2017 Jack Yu <jackyu@google.com> Merge "Fixed incorrect time zone when the device is on IWLAN" into oc-dr1-dev am: cd7d8320fd
am: f2d75e8f4b

Change-Id: I7bbdb4a27f2167b9c3baa5d0accc2af8faf90801
f2d75e8f4b81b09b6e03fe7a2f67833ae3a02d20 29-Jun-2017 Jack Yu <jackyu@google.com> Merge "Fixed incorrect time zone when the device is on IWLAN" into oc-dr1-dev
am: cd7d8320fd

Change-Id: I15bdf8b0b78c6e095eb580b7780cf5ec293d65ab
cd7d8320fd2452fd9cd00103a72c385e9d24856a 29-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fixed incorrect time zone when the device is on IWLAN" into oc-dr1-dev
a96df4dd1fd76832bfb4e7a662f8727867830c21 29-Jun-2017 Chen Xu <fionaxu@google.com> Merge "bypass waiting apn list check on unknown data rat" into oc-dr1-dev am: 0cff7c25e3
am: 3bcecec300

Change-Id: I9b284fc7d298502b573c25571378adc6c92c6be8
3bcecec300bca8fcff845633ca6b1b86cbdc0714 29-Jun-2017 Chen Xu <fionaxu@google.com> Merge "bypass waiting apn list check on unknown data rat" into oc-dr1-dev
am: 0cff7c25e3

Change-Id: If5a2228d14d7046f1035d52a61f1dcf5f46b1ba6
0cff7c25e3f325e3291e6ae4156770c56c56a7ee 29-Jun-2017 Chen Xu <fionaxu@google.com> Merge "bypass waiting apn list check on unknown data rat" into oc-dr1-dev
c03c5b28a4d5630d31a0e7b5e25a6e3e1ad7cd2d 29-Jun-2017 Jack Yu <jackyu@google.com> Fixed incorrect time zone when the device is on IWLAN

If the device is on IWLAN, modems manufacture a ServiceState
with the MCC/MNC of the SIM as if we were talking to towers.
Telephony code then uses that with mccTable to suggest a timezone.
We shouldn't do that if the MCC/MNC is from IWLAN.

Test: Telephony sanity tests
bug: 62563032
Change-Id: I7e5463909854c68ec57feae198071c73b0c5571c
erviceStateTracker.java
199944e3562f228e9402f6bc1014d57f2ca2479d 28-Jun-2017 Brad Ebinger <breadley@google.com> Merge "Initialization causes IMS to deregister" into oc-dr1-dev am: 13365de15e
am: 36deecebef

Change-Id: If668776ed185580085fa26e101cab67e3abd9066
36deecebef626cc70410c218da8e033a8dca8b5c 28-Jun-2017 Brad Ebinger <breadley@google.com> Merge "Initialization causes IMS to deregister" into oc-dr1-dev
am: 13365de15e

Change-Id: I40cd561055a85a473d1827cef0f8e2e1c6e1a665
13365de15e888db438ff634e9e7102a6e70870f0 28-Jun-2017 Brad Ebinger <breadley@google.com> Merge "Initialization causes IMS to deregister" into oc-dr1-dev
0b2cb51616a53ae46a96ca6cb816dfc39921dc3e 27-Jun-2017 yinxu <yinxu@google.com> Use Bundle for inter-process message

The message sent from NetworkScanRequestTracker to TelephonyScanManager
might be across different process, so we have to wrap the List<CellInfo> into
Bundle because List<> is not parcelable.

Cherry-picked cleanly from:
https://googleplex-android-review.googlesource.com/#/c/2466963/

Test: Telephony sanity tests
Bug: 30954762

Merged-in: I53f935353c392a94cb5caf8a463dc0d8db319db1
Change-Id: I53f935353c392a94cb5caf8a463dc0d8db319db1
(cherry picked from commit f302b76950d6d26803605c314779219bcdbaec6b)
etworkScanRequestTracker.java
76903c42042ed08e96569f55ccaa52c647bd8603 28-Jun-2017 Jeff Davidson <jpd@google.com> Merge "Passthrough implementation of retainSubscriptionsForFactoryReset." into oc-dr1-dev am: b0c1c0d24a
am: 8344689495

Change-Id: I56f61af925a6af52486dd4d182e0c4a1cf11f6c3
834468949572f9b518d77cbce45e0c97d97a6779 28-Jun-2017 Jeff Davidson <jpd@google.com> Merge "Passthrough implementation of retainSubscriptionsForFactoryReset." into oc-dr1-dev
am: b0c1c0d24a

Change-Id: I53abc954c055d258d27cf4d6f26ae39709b6ad37
b0c1c0d24aeaddae3721ac250e0e2a7d29dbb0c5 28-Jun-2017 Jeff Davidson <jpd@google.com> Merge "Passthrough implementation of retainSubscriptionsForFactoryReset." into oc-dr1-dev
f939508c4d770e534cbf1909d4d0663e64b933dd 28-Jun-2017 Jun Yin <junyin@google.com> Merge "Update SubscriptionInfo when the SIM transitions to a NOT_READY state." into oc-dr1-dev am: 3598cbde10
am: 497d5a9676

Change-Id: I27694fd5200aed7c9b85b3c872607b6594e23174
497d5a9676b991842f53f3dcec9c6ca69a93d8aa 28-Jun-2017 Jun Yin <junyin@google.com> Merge "Update SubscriptionInfo when the SIM transitions to a NOT_READY state." into oc-dr1-dev
am: 3598cbde10

Change-Id: Ia01d2a0d756d811020a1f9fedd166496445cb225
3598cbde101a824d105ae60c936eff0a6181d8a6 28-Jun-2017 Jun Yin <junyin@google.com> Merge "Update SubscriptionInfo when the SIM transitions to a NOT_READY state." into oc-dr1-dev
335820c50e656261fdb3d16d209c15a3eb471dff 28-Jun-2017 Ying Xu <yinxu@google.com> Merge "Use Bundle for inter-process message" into oc-dr1-dev am: 2c1f1fdebd
am: 33d0bda3b1

Change-Id: I9aa827e65a8eacbf42a44f7ea2010d6d1937203b
be81b0ce029477c8010a70a083f260e87589ccfd 27-Jun-2017 Derek Tan <derektan@google.com> Prevent any app except LPA to create logical channel to AID of ISD-R.

Bug: 33077154
Test: manual verification using LPA and other app to open logical
channel to ISD-R separately.
Change-Id: If5c6d05a4d6def1fcaa6af34f3cebf462a7c7220
uicc/EuiccConnector.java
33d0bda3b17f7ac7c5dced35960177b8837dd819 28-Jun-2017 Ying Xu <yinxu@google.com> Merge "Use Bundle for inter-process message" into oc-dr1-dev
am: 2c1f1fdebd

Change-Id: I583070e0ca10768eb3ddf119aedf7d3d9dcd2d63
2c1f1fdebdcf90f8e0e8660d4d1abd18d91b9127 28-Jun-2017 Ying Xu <yinxu@google.com> Merge "Use Bundle for inter-process message" into oc-dr1-dev
796abd05cbdabaa0f0392e7e146265ed8b779410 28-Jun-2017 fionaxu <fionaxu@google.com> bypass waiting apn list check on unknown data rat

Bug: 62985606
Test: runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java

Change-Id: I260ec48f40f420af27cec7d2b622726457f2fadf
ataconnection/DcTracker.java
28deee390504b9fd76465f3a4da7aff611bddb39 28-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Radio Interface changes to pass the encryption object, including the key,to the modem." into oc-dr1-dev
0efd94c5d4dd0304faf6f04d711994ba1e8243d8 28-Jun-2017 sqian <shuoq@google.com> Merge "Check string variable against both empty and null string" into oc-dr1-dev am: 17d48d0492
am: 939f767889

Change-Id: Ia8c1fa28f43e0379d698a856188b405d00f994a6
939f767889b4647d5714c4d7ef501efbeff9f306 28-Jun-2017 sqian <shuoq@google.com> Merge "Check string variable against both empty and null string" into oc-dr1-dev
am: 17d48d0492

Change-Id: I70ce908207b5e9fe22eb21aa113d41e08b50f0f2
17d48d04925c2f4fdc58884e9bc3ba4075dde4b3 28-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Check string variable against both empty and null string" into oc-dr1-dev
316e49af3bf1b4ef5d7230a6af8fb0b973afb40a 28-Jun-2017 Jordan Liu <jminjie@google.com> Merge "Add log to show mccmnc of resource configuration"
am: 00ababf930

Change-Id: I2cb775c2f75b04554a37116624f53b4ca6f423e7
00ababf930604467c78be915fd425e25a7c2ea79 28-Jun-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Add log to show mccmnc of resource configuration"
f24d4ef9f3ee9b53119a83954cd03c06528ac484 21-May-2017 pkanwar <pkanwar@google.com> Radio Interface changes to pass the encryption object, including the
key,to the modem.

We will now pass the ImsiEncryptionInfo object which includes mnc/mcc.
BUG: 35606429
Test: manual

Merged-In: I1bcaf7de424ad6143587fa001b9ecb631009c463
Change-Id: I1bcaf7de424ad6143587fa001b9ecb631009c463
ommandsInterface.java
IL.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
0b23fe5834db6b9f53111487e2911cbc394fe761 27-Jun-2017 sqian <shuoq@google.com> Check string variable against both empty and null string

The new RIL in O changes all null strings to empty strings, but the code
only checks some string variable against null in some areas of frameworks/
opt/telephony. This CL adds the check against both empty and null for
these strings.

Test: TreeHugger
Bug: 62490549
Change-Id: If18154e896666eb9d5398181b9efe7cce40d7f75
adioResponse.java
etrics/TelephonyMetrics.java
f302b76950d6d26803605c314779219bcdbaec6b 27-Jun-2017 yinxu <yinxu@google.com> Use Bundle for inter-process message

The message sent from NetworkScanRequestTracker to TelephonyScanManager
might be across different process, so we have to wrap the List<CellInfo> into
Bundle because List<> is not parcelable.

Test: Telephony sanity tests
Bug: 30954762
Change-Id: I53f935353c392a94cb5caf8a463dc0d8db319db1
etworkScanRequestTracker.java
d352d22f799f98700eab708e65b7186af9dfa032 27-Jun-2017 Ying Xu <yinxu@google.com> Merge "Check whether the bands and channels are null" into oc-dr1-dev
a9c50823e758d35bac39cf2a7e674fcaf957fd4b 17-Jun-2017 Jeff Davidson <jpd@google.com> Passthrough implementation of retainSubscriptionsForFactoryReset.

Change-Id: I000aed82e63a22d5d29667a277171e43c4aec25c
Test: TreeHugger
Fixes: 62681577
uicc/EuiccConnector.java
uicc/EuiccController.java
2d56a52434cbb8aafdb68b53aa0d67eb6ed2b277 27-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Stubs for Keepalive API" into oc-dr1-dev
209b695fd9e47ef2e5f7fe5231d936b387cf02af 27-Jun-2017 Jordan Liu <jminjie@google.com> Merge "Add log to show mccmnc of resource configuration" into oc-dr1-dev am: a00a501056
am: cea41de010

Change-Id: I0295f2140ddd70e372f26f9219f23ae73dee5680
cea41de0101eb1c340664fe7e5c1b7532f54a5e0 27-Jun-2017 Jordan Liu <jminjie@google.com> Merge "Add log to show mccmnc of resource configuration" into oc-dr1-dev
am: a00a501056

Change-Id: Ibd2ed7e697a7faca1e427c2c43d45c16ae853b72
a00a501056f031eb670eecbe64da0eac3fc28abc 27-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Add log to show mccmnc of resource configuration" into oc-dr1-dev
69a26139452775dfb19d50434424cb6857be8ef2 27-Jun-2017 Jeff Davidson <jpd@google.com> Merge "Make eUICC SubInfo refreshes blocking." into oc-dr1-dev am: 3cdb72eb9f
am: f66581917a

Change-Id: I37a15df4c361b33c72c499cbf6f6e75436351392
f66581917a93d176c7accf40f878b7706273ad4a 27-Jun-2017 Jeff Davidson <jpd@google.com> Merge "Make eUICC SubInfo refreshes blocking." into oc-dr1-dev
am: 3cdb72eb9f

Change-Id: I1029ced9efd8f5b0de921b8d4481f878b8e76d60
3cdb72eb9fb44d4aefc1add506b290a660340905 27-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Make eUICC SubInfo refreshes blocking." into oc-dr1-dev
6c1c6edb0ed8734465c614bc5d2ef2b19154fd7e 27-Jun-2017 Shishir Agrawal <shishir@google.com> Update SubscriptionInfo when the SIM transitions to a NOT_READY state.

Change-Id: I76feb0649afb6fc7b2cfa7f7c10dfad9fc9e86bd
Fixes: 62375433,62374682
Test: SubscriptionInfoUpdaterTest.
ubscriptionInfoUpdater.java
216973ae6ddd102fd72695c46d0fb776a2dce05f 09-Jun-2017 Nathan Harold <nharold@google.com> Improve the Safety Checks on IccCardStatus.toString()

Tighter range checks in the toString() method to cross
validate the application array against the app indices.

Bug: 62459080
Test: none
Change-Id: I078315f5ea773eb117303cccfcedda06280fffab
(cherry picked from commit 257732fb4f37de9c87fb8190babc9a50b455b1a1)
icc/IccCardStatus.java
ac07351e9493a66c0df2a4cef7214fbfcb1e4dad 26-Jun-2017 Jordan Liu <jminjie@google.com> Add log to show mccmnc of resource configuration

Bug: 63003244
Test: Unit tests pass; no change to behavior
Change-Id: Ia84036f146a4f728b7859cedb96f8b1d08a7e83f
Merged-In: Ia84036f146a4f728b7859cedb96f8b1d08a7e83f
erviceStateTracker.java
f0557944326536f20c375297bd74377d8a60b116 27-Jun-2017 Jeff Davidson <jpd@google.com> Merge "Fix double prompt when downloading profiles." into oc-dr1-dev am: 53178817cb
am: 7778608cd1

Change-Id: Ia69bf0e33bba7cf3e5acee89f13383931e7dc7f4
f31f3fded031e62d13226fc068ec3b5ab5e3bd5d 27-Jun-2017 Ying Xu <yinxu@google.com> Merge "Check whether the bands and channels are null" am: 4e10aa21ad am: 0939d5ec1b am: 7e9295d201
am: 582989a068

Change-Id: I47111738d32a30ee20802e0325632a2ee29cde85
dd65defea70e96dd5beb4129ebcca11e702a4ab4 27-Jun-2017 Jack Yu <jackyu@google.com> Merge "Proper handling of roaming override case" into oc-dr1-dev am: 0261767402
am: 6debec6e91

Change-Id: If561769d4d13b9f3927ed9b18f47812626715f59
7778608cd15189785263809524f89a051f363e7a 27-Jun-2017 Jeff Davidson <jpd@google.com> Merge "Fix double prompt when downloading profiles." into oc-dr1-dev
am: 53178817cb

Change-Id: Ic8921d10d9d05338f2882356f24cea828caa3133
53178817cb156aef112cecfde3ac2a6cfedeadda 27-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fix double prompt when downloading profiles." into oc-dr1-dev
352a24258c175a1109604b0809b6530620ecae93 27-Jun-2017 Brad Ebinger <breadley@google.com> Initialization causes IMS to deregister

When the ImsPhone is initialized, it calls
ImsManager#updateImsServiceConfig before the CarrierConfig
has loaded. This causes telephony to signal the radio to
deregister IMS and then register again once the CarrierConfig
is loaded.

This change removes the updateImsServiceConfig calls during
initialization.

Bug: 37763722
Test: Telephony unit tests and analyzing logs
Change-Id: I762ba2a23cb0cae88af8256d3903a6852cface68
hone.java
msphone/ImsPhoneCallTracker.java
582989a068a12dd11611db5240bc7e2a46d93084 27-Jun-2017 Ying Xu <yinxu@google.com> Merge "Check whether the bands and channels are null" am: 4e10aa21ad am: 0939d5ec1b
am: 7e9295d201

Change-Id: I736b398f8140f8e744c004786cfc99f9785c1f54
0939d5ec1b0fc1e1fd51b4d71d8b67e019438c69 27-Jun-2017 Ying Xu <yinxu@google.com> Merge "Check whether the bands and channels are null"
am: 4e10aa21ad

Change-Id: I57016ad3c3b3b18330867a3c4c3792e63ce76330
4e10aa21ad325f7819590c7e5181e21850fd2088 27-Jun-2017 Ying Xu <yinxu@google.com> Merge "Check whether the bands and channels are null"
d728841b17b19ab8268a426051f51f64a6913142 10-Jun-2017 Jeff Davidson <jpd@google.com> Make eUICC SubInfo refreshes blocking.

Otherwise, after a profile download/delete completes and returns
control to the caller, the SubscriptionInfo may not be in a complete
state. For example, a newly-downloaded profile will not return true in
SubscriptionInfo#isEmbedded() until this refresh completes.

Fixes: 62547811
Test: TreeHugger / verified bug fix
Change-Id: I40ef30feb3dce94ed456abe930749e9c30da6d96
honeFactory.java
ubscriptionController.java
ubscriptionInfoUpdater.java
uicc/EuiccController.java
339d69aefd3861537b4f92b984b9fd0f6554f126 24-Jun-2017 yinxu <yinxu@google.com> Check whether the bands and channels are null

We need to first check whether bands and channels are null before
doing anything else on them.

Cherry-picked cleanly from:
https://android-review.googlesource.com/#/c/422286/

Test: Telephony sanity tests
Bug: 30954762

Merged-in: Idaa3ebeabe37248d9de05f8397fecc4dc9938d66
Change-Id: Idaa3ebeabe37248d9de05f8397fecc4dc9938d66
(cherry picked from commit c771233f58b5cdad14c407a7bbbc87a35ba49b17)
etworkScanRequestTracker.java
IL.java
706cbe16492314ffd897338da7aad687a9b0f927 27-Jun-2017 Ying Xu <yinxu@google.com> Merge "Add the new scan request and response to log string." into oc-dr1-dev
6debec6e912faf26906ebd36d3ff148d7d758dd2 26-Jun-2017 Jack Yu <jackyu@google.com> Merge "Proper handling of roaming override case" into oc-dr1-dev
am: 0261767402

Change-Id: Ic91a3b30777aa3d57d0a8cc623bb9e0811fa8c9f
02617674026e2e9faa9770ab35eda98b8b337c75 26-Jun-2017 Jack Yu <jackyu@google.com> Merge "Proper handling of roaming override case" into oc-dr1-dev
19295a923acc6ce25d6e9b567cbf79ca143879d1 26-Jun-2017 Jordan Liu <jminjie@google.com> Add log to show mccmnc of resource configuration

Bug: 63003244
Test: Unit tests pass; no change to behavior
Change-Id: Ia84036f146a4f728b7859cedb96f8b1d08a7e83f
erviceStateTracker.java
cc40713c49908aeaac0070bf4ea796247f9066b5 26-Jun-2017 Jack Yu <jackyu@google.com> Proper handling of roaming override case

If the roaming state is overridden by the framework, we should
pass allowRoaming=true down to the modem so the data call will
not be rejected. Also we should pass the actual roaming state
to ril_service so it can pick the correct protocol (for old
modem backward compatibility support).

Test: Telephony sanity tests
bug: 62807105, 62285365
Change-Id: Ida93e6aa3949c8434aa58468f12e4512c9a02351
erviceStateTracker.java
ataconnection/DataConnection.java
ataconnection/DcTracker.java
c771233f58b5cdad14c407a7bbbc87a35ba49b17 24-Jun-2017 yinxu <yinxu@google.com> Check whether the bands and channels are null

We need to first check whether bands and channels are null before
doing anything else on them.

Test: Telephony sanity tests
Bug: 30954762
Change-Id: Idaa3ebeabe37248d9de05f8397fecc4dc9938d66
etworkScanRequestTracker.java
IL.java
0407e2b6c4911db78c620f306084c1ed86ff7865 23-Jun-2017 yinxu <yinxu@google.com> Add the new scan request and response to log string.

Test: Telephony sanity tests
Bug: 30954762

Cherry-picked cleanly from:
https://android-review.git.corp.google.com/#/c/421047/

Merged-in: I78cf7d8d14e5c68f890d2ad21f35be783be49cf5
Change-Id: I78cf7d8d14e5c68f890d2ad21f35be783be49cf5
(cherry picked from commit a88c366bfe12bd5b3bdd54bf9114ed625911fc3a)
IL.java
760b56993e55492a3bc288a0bc44840737ed9cd2 23-Jun-2017 Ying Xu <yinxu@google.com> Merge "Add the new scan request and response to log string." am: 5982445aee am: 3e7d9df940 am: dbf4d547f1
am: 48efd29ca9

Change-Id: Ifbdd4c6f18974406c26b360900a49646a13e446c
48efd29ca9fd583e05cf3382bf0331a11cd0b70a 23-Jun-2017 Ying Xu <yinxu@google.com> Merge "Add the new scan request and response to log string." am: 5982445aee am: 3e7d9df940
am: dbf4d547f1

Change-Id: I619725708641e10c57d70c034b40ff833c2b1a98
dbf4d547f10053542a411cdd167980aa29a651ac 23-Jun-2017 Ying Xu <yinxu@google.com> Merge "Add the new scan request and response to log string." am: 5982445aee
am: 3e7d9df940

Change-Id: Ic0fd4f1fb45fba962fff54f883e42fbb09d32ce2
5982445aeef48b55bec83ac5ba73a7b6a6a13d66 23-Jun-2017 Ying Xu <yinxu@google.com> Merge "Add the new scan request and response to log string."
99f1ba3b1619c4f9790198fc1a0854a0352164c7 23-Jun-2017 kun.tang <kun.tang@spreadtrum.com> Merge "getIccCardStatus with slot index when modem response sim refresh." am: 644c6785cd am: 8b1060654b am: e375538117
am: cd747e092e

Change-Id: I2f45d8e2e627b25e107f3ea93723ed2b0efb829f
cd747e092eb13926c0eb0f1f784290751106dc9f 23-Jun-2017 kun.tang <kun.tang@spreadtrum.com> Merge "getIccCardStatus with slot index when modem response sim refresh." am: 644c6785cd am: 8b1060654b
am: e375538117

Change-Id: Ie7fd0a5099930846839b8b547930a16590a702f3
e375538117e8418dc950df4d9aae278f5b63fa81 23-Jun-2017 kun.tang <kun.tang@spreadtrum.com> Merge "getIccCardStatus with slot index when modem response sim refresh." am: 644c6785cd
am: 8b1060654b

Change-Id: I461da872bfdab59382aecac7e0b6929f0ba439b5
0bb3807b7985c108ff641fa0759633a7eb1d1382 23-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Suppress conference initiation when already in the process of merging." into oc-dr1-dev am: a7d94e63d7
am: ea37c8a204

Change-Id: I9d000f90d39bc18e00ce8fc1931183ea6a0ca74b
ea37c8a204bb6b96c0ff1cae027d05c4d3c5ba09 23-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Suppress conference initiation when already in the process of merging." into oc-dr1-dev
am: a7d94e63d7

Change-Id: Ic27b967bcc45870cafc9a8553d7b05258904c3b3
a7d94e63d7a3cbea6ed0d62885269e2fade5631a 23-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Suppress conference initiation when already in the process of merging." into oc-dr1-dev
a88c366bfe12bd5b3bdd54bf9114ed625911fc3a 23-Jun-2017 yinxu <yinxu@google.com> Add the new scan request and response to log string.

Test: Telephony sanity tests
Bug: 30954762
Change-Id: I78cf7d8d14e5c68f890d2ad21f35be783be49cf5
IL.java
4267096952c5924d7998cadfb72c1ea5078a877c 23-Jun-2017 Meng Wang <mewan@google.com> Merge "Show error code in WFC error messages." into oc-dr1-dev am: 35efea7fa3
am: 720cc109e5

Change-Id: I0cfced909106817c4765a10f26e8fa6a69867222
720cc109e5e14ed57fb79a591917304de56c5698 23-Jun-2017 Meng Wang <mewan@google.com> Merge "Show error code in WFC error messages." into oc-dr1-dev
am: 35efea7fa3

Change-Id: I90780c9089fb60980b8a940c6d79099f444823ea
35efea7fa3771a101fc0fa213a6c3b73937cad70 23-Jun-2017 Meng Wang <mewan@google.com> Merge "Show error code in WFC error messages." into oc-dr1-dev
145d3db15ee563e329eca3213d631e25dfd32c0f 23-Jun-2017 kun.tang <kun.tang@spreadtrum.com> getIccCardStatus with slot index when modem response sim refresh.

If SIM2 refresh and call getIccCardStatus without slotId, SIM1 will handle the EVENT_GET_ICC_STATUS_DONE event.
So we should call getIccCardStatus by passing in arguments.

Test: Build pass

Change-Id: I6695fc954753fba8e1bebac13821211efaf74136
icc/UiccController.java
f23bcfd89c39d5b4efd7cfd725b8e9c9c144c801 23-Jun-2017 Chen Xu <fionaxu@google.com> Merge "handle carrier config change race conditions" into oc-dr1-dev am: c7e9b869fa
am: 9a34ab6183

Change-Id: Ic3d43a5603001f8ce01795d1f68f797828b47273
9a34ab6183220845d69bc763b8ad2bcfa9ac67fd 23-Jun-2017 Chen Xu <fionaxu@google.com> Merge "handle carrier config change race conditions" into oc-dr1-dev
am: c7e9b869fa

Change-Id: Ib9f33167a420d366e952f1985a976f4f51f2fd1f
c7e9b869fa5e668973faa72266deb15f992434c8 23-Jun-2017 Chen Xu <fionaxu@google.com> Merge "handle carrier config change race conditions" into oc-dr1-dev
497d1b48130085ebc109dacb8bcd893eddf11823 23-Jun-2017 yifan.bai <yifan.bai@spreadtrum.com> Merge "Fix Automatic time zone not working when no NITZ received." am: fe7f0dc4e0 am: 56725dd755 am: 0651ce20c9
am: 7e6c02f58e

Change-Id: I48ddcf645bdd39de9f26f241bdd321f355cb3d88
7e6c02f58e4b2f7175263319a5a74fa8ef19e476 23-Jun-2017 yifan.bai <yifan.bai@spreadtrum.com> Merge "Fix Automatic time zone not working when no NITZ received." am: fe7f0dc4e0 am: 56725dd755
am: 0651ce20c9

Change-Id: I34f084f3078e5471fd3a5a34dc9d6b70becea7c2
0651ce20c94cf80751269d13270455a65964d414 23-Jun-2017 yifan.bai <yifan.bai@spreadtrum.com> Merge "Fix Automatic time zone not working when no NITZ received." am: fe7f0dc4e0
am: 56725dd755

Change-Id: I6872ad4ed99565eb88a3830ecd957309ad1176b3
fe7f0dc4e06d66f7d317a40b8e80578be34c60c9 23-Jun-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fix Automatic time zone not working when no NITZ received."
dc50f4a5c6d0b5bc61a3bc80118b8c9967e66905 23-Jun-2017 Ying Xu <yinxu@google.com> Merge "Handles the RIL error from the CommandException" into oc-dr1-dev
26cacd7346a126a6e5cba72bcc9e300d95f6eee8 27-May-2017 Nathan Harold <nharold@google.com> Stubs for Keepalive API

Bug: 33277538
Test: tbd
Change-Id: I7c96e857419573e4c44c8264134c921e6766677e
(cherry picked from commit f256f53a996bcedd9691589bcdde99f775f2cd1a)
adioIndication.java
adioResponse.java
87b455aa8ea247efe5168d882fb2353a82dcb9be 22-Jun-2017 fionaxu <fionaxu@google.com> fix the build failure
am: a50a8f5d25

Change-Id: Icb3193d82d77b8b2a752a490b9697238d10b6cdf
5f639894339c845e357296bee5771686ee301d28 22-Jun-2017 Chen Xu <fionaxu@google.com> Revert "fix the build failure"
am: dd6c058b4c

Change-Id: I962a7a6cda132233adfd6a20c539221e0b155550
bc3ef42cb8e1129e19c05799087e3edc6f97ba76 21-Jun-2017 Tyler Gunn <tgunn@google.com> Suppress conference initiation when already in the process of merging.

When a conference merge is already in process, skip initiation of a
conference merge requested by the user. This ensures if the user hammers
on the merge button in the UI or mistakenly double-taps, the modem won't
try to merge multiple times, one which will fail and generate an error
to the user.

Also cleaned up the log messages a wee bit to show the call IDs of the
calls merging.

Test: Manual
Bug: 38151476
Change-Id: I8a7e0d104b10d1d1cfbc6a76d8bf62a0adfa85c5
msphone/ImsPhoneCallTracker.java
a50a8f5d25fca71d9ee76736816626603ff2affa 22-Jun-2017 fionaxu <fionaxu@google.com> fix the build failure

Change-Id: Ia3fcb420d6c19fef00849096c90b83a26d11a0bb
erviceStateTracker.java
dd6c058b4c4ea9f9f222148fb0afd1853ba6efb7 22-Jun-2017 Chen Xu <fionaxu@google.com> Revert "fix the build failure"

This reverts commit 4a120a1e64368b859da15cdad9a6feb569c828b9.

Change-Id: I390910d714bdf9140ab96332d4ba519727917b01
erviceStateTracker.java
82e1f856792086eeb2544dc16e3daff497bb34db 22-Jun-2017 Naveen Kalla <mrnaveen@google.com> Exit Emergency callback mode if modem resets am: 44fd6f60bc
am: 7b72be5bed

Change-Id: I6312528be85b1cb94fac2491ac7f681e5a204690
0f880ed3177e162ca849121881da5ccd780f1fd9 22-Jun-2017 fionaxu <fionaxu@google.com> fix the build failure
am: 4a120a1e64

Change-Id: I1df1a1c2c7756d15f5c69ea951710cc122d35046
7b72be5bed9536c49bde4415891f3e2688f548ea 22-Jun-2017 Naveen Kalla <mrnaveen@google.com> Exit Emergency callback mode if modem resets
am: 44fd6f60bc

Change-Id: I555e60b11686498761c91e71c6633617068eb25f
4a120a1e64368b859da15cdad9a6feb569c828b9 22-Jun-2017 fionaxu <fionaxu@google.com> fix the build failure

This is cuased by a bad conflict merge patch

Bug: 37885668
Change-Id: Ia31aa19a621c20c25271bfc605de64cd549acc92
erviceStateTracker.java
44fd6f60bc5aca75938a2c3e725f88b6e897983a 10-Jun-2017 Naveen Kalla <mrnaveen@google.com> Exit Emergency callback mode if modem resets

If the modem resets when the phone is in Emergency
callback mode, exit emergency callback mode.

Bug: 62255356
Test: New unit test "testModemResetInEmergencyCallbackMessages"
in GsmPhoneTest under telephonytests
Change-Id: I3030b59292252e4c0a6c91603f52084cee59d885
aseCommands.java
ommandsInterface.java
smCdmaPhone.java
hone.java
adioIndication.java
msphone/ImsPhone.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
b7a8fad2412f2b6c53df7de00a72bc1cfe751784 22-Jun-2017 Tyler Gunn <tgunn@google.com> Add Rlog.pii for SMSNumberUtils address filtering. am: 2c93941ab1 am: ca542f90f8
am: 4877710909

Change-Id: I5c3c76078d56d17a500cac239d121cbe8c1d8617
4877710909847eadfa4ab68c7ebdc8f0c7ac459b 22-Jun-2017 Tyler Gunn <tgunn@google.com> Add Rlog.pii for SMSNumberUtils address filtering. am: 2c93941ab1
am: ca542f90f8

Change-Id: I0b036de4f66c07a939e17dd2a78598e59544f185
ca542f90f861518e16e1c0f181c639fffc6fc2c6 22-Jun-2017 Tyler Gunn <tgunn@google.com> Add Rlog.pii for SMSNumberUtils address filtering.
am: 2c93941ab1

Change-Id: I69d5e045a5ce63591fc7fb1a344af98d2c2ff468
291e7f81c48ee076e903074197db96a8ed735633 22-Jun-2017 Tyler Gunn <tgunn@google.com> Add Rlog.pii for SMSNumberUtils address filtering.
am: 2c93941ab1

Change-Id: Ib9db415c8d1152d3004c47d1d0bbe721585cb09f
e83e02b8bae701e1dfe6ebff20cd3af771eb3ccb 16-Jun-2017 fionaxu <fionaxu@google.com> handle carrier config change race conditions

In some rare cases, up-to-date config could be fetched with delay and
all signals have already been delivered the receivers from the default
carrier config. To handle this raciness, we should notify those
receivers (from old configs) and reset carrier actions. This should be done
before mCachedWakeSignalConfigs and mCachedNoWakeSignalConfig got purged
and written with the up-to-date value. Otherwise, those receivers from the old
config might lingers without properly clean-up.

Bug: 62070135
Test: runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/CarrierSignalAgentTest.java
Change-Id: Id9d599b277fa5c0c87cff14c580c0ce7f09a95d7
arrierSignalAgent.java
17ae810687ff6f763365e1406b7f88c25bf32ea9 22-Jun-2017 fionaxu <fionaxu@google.com> resolve merge conflicts of 90f778925 to oc-dev-plus-aosp
am: 231e3ef685

Change-Id: I1806a54737eee4953868002f1edc8620d5fd9df5
231e3ef685222fedc5ec722b747f7fcddb193bdb 22-Jun-2017 fionaxu <fionaxu@google.com> resolve merge conflicts of 90f778925 to oc-dev-plus-aosp

Change-Id: I5c7b1f8722042c473b7c0091a13433841ef4066a
2c93941ab1a107b67dbfa27bb2680073306f6aff 21-Jun-2017 Tyler Gunn <tgunn@google.com> Add Rlog.pii for SMSNumberUtils address filtering.

Adding Rlog.pii for phone number information which is potentially logged
to the SmsNumberUtils logs.

Test: Manual
Bug: 62827376
Change-Id: I46e6626972f0ff6657feec4bb66af35bc2b07a70
msNumberUtils.java
4fbc78be26b9f691ab38ebe0d0021c6d4cca960e 21-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Inform ImsVideoCallProviderWrapper of video state changes." into oc-dev am: 1159483294 am: d0ef146182
am: 3a4774c33b

Change-Id: Ic17f813be78be829e31394892d9a334b2845f009
3a4774c33bd3be0998ca948b6cfd6dacaeb5c0d6 21-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Inform ImsVideoCallProviderWrapper of video state changes." into oc-dev am: 1159483294
am: d0ef146182

Change-Id: Ib3cfc8cb757a7e10531123391487faea899339d6
d0ef146182beb5803bb2758be5b0fda38aa9d963 21-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Inform ImsVideoCallProviderWrapper of video state changes." into oc-dev
am: 1159483294

Change-Id: If92cf5cb7a90b02b5339ca78ab66cd377187cbec
5ae0e757408282ca04882eb3423648ec07b0555b 21-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Inform ImsVideoCallProviderWrapper of video state changes." into oc-dev
am: 1159483294

Change-Id: I812d1f0136930c7f1b6a07bd28392041dba562c7
115948329431a20e1899f5c26780369519ccb4d5 21-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Inform ImsVideoCallProviderWrapper of video state changes." into oc-dev
a57a3a492873c5c2ff8488d85116d90bb73b607a 21-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Ensure empty string MMI responses default to "MMI Complete"." into oc-dev am: d387ead53d am: da8bd5caa0
am: aecd9c26ed

Change-Id: I265547ed722280275fd99ee6cd6375e24302ab0c
aecd9c26ed734201981c38badc2563d45fd06c0f 21-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Ensure empty string MMI responses default to "MMI Complete"." into oc-dev am: d387ead53d
am: da8bd5caa0

Change-Id: I8a17d020ad27065b21e41fe1f9b7a4c6928b7114
da8bd5caa0911b323b960a20d9013664abf93737 21-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Ensure empty string MMI responses default to "MMI Complete"." into oc-dev
am: d387ead53d

Change-Id: I11af74a875470de0f6b37b3c8fb0b1286c1448dc
1a18fef8597019b1b1f1b93e13e3f618d88898b4 21-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Ensure empty string MMI responses default to "MMI Complete"." into oc-dev
am: d387ead53d

Change-Id: Iba5af87cd2e89ec8ddb97d064d55bc44a40aba9f
d387ead53d190d76eff3935e7eed0987fe7dfc31 21-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Ensure empty string MMI responses default to "MMI Complete"." into oc-dev
3bb878d757c8f0166bdc92fed58b4ffe906a5599 21-Jun-2017 Sanket Padawe <sanketpadawe@google.com> Hide celllocation getting printed in bugreport. am: 1ed9d2cb20 am: 284e1db0d4
am: 13601bcbe9

Change-Id: If28b27b5152e699fab28a59d313a248ef28703bc
13601bcbe9b02b3a894506f9a7e7f456d5f1d91d 21-Jun-2017 Sanket Padawe <sanketpadawe@google.com> Hide celllocation getting printed in bugreport. am: 1ed9d2cb20
am: 284e1db0d4

Change-Id: I3a0cb6da64f759582206066fb8929607379e40d3
dd337803a0297bc1e50d75af75520e4dd32a523c 21-Jun-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Added methods to insert/get carrier keys from the carrier provider."
284e1db0d463d6f225fb7d8afbc8e654f3c6b15e 21-Jun-2017 Sanket Padawe <sanketpadawe@google.com> Hide celllocation getting printed in bugreport.
am: 1ed9d2cb20

Change-Id: Ib8d6206ec3118c5e02fd0c693400c29e9892c265
0d20f106f3d12121c7e15cfe4c8c5235fc93f8f4 21-Jun-2017 Sanket Padawe <sanketpadawe@google.com> Hide celllocation getting printed in bugreport.
am: 1ed9d2cb20

Change-Id: I76fdb07c353c7db2af0003b96e3f3bb2149c205e
4f4a1971ab6607c9b9d840173205e31a7c2de4b0 14-Jun-2017 yinxu <yinxu@google.com> Handles the RIL error from the CommandException

In RadioResponse.java, all the RIL errors will be converted into
CommandException and sent back to the caller with the callback message.
So the AsyncResult in the callback message of 'EVENT_START_NETWORK_SCAN_DONE'
and 'EVENT_START_NETWORK_SCAN_DONE' will either contains a NetworkScanResult
without any exception, or contains an exception without any NetworkScanResult.
So if there is any error when trying to start/stop a scan, the error
code must be extracted from the CommandException.

Cherry-picked cleanly from:
https://android-review.git.corp.google.com/#/c/415900/

Test: Telephony sanity tests
Merged-in: I9766b7fd530e9146e6d9867478ed79ad8f7ba1fc
Change-Id: I9766b7fd530e9146e6d9867478ed79ad8f7ba1fc
(cherry picked from commit a234d03c40520ae6d0163ffcac02e060124fb556)
etworkScanRequestTracker.java
adioResponse.java
ee1d6fd10040ffb191c26d8b8fc9588b1fef0bca 21-Jun-2017 Chen Xu <fionaxu@google.com> Merge "migrate roaming operator configs to carrier config"
aa9890f48a5545dd8dfac8dcfdd4d78321498dd4 02-Jun-2017 fionaxu <fionaxu@google.com> migrate roaming operator configs to carrier config

Bug:37885668
Test: runtest --path
packages/apps/CarrierConfig/tests/src/com/android/carrierconfig/CarrierConfigTest.java
Test: runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/ServiceStateTrackerTest.java
Change-Id: I43efc8316d69f178ceab04d42e1601ba542dc5f2
Merged-In: I43efc8316d69f178ceab04d42e1601ba542dc5f2
erviceStateTracker.java
f5bd60e5d8cb7700aced832ee685da8a77044a22 21-Jun-2017 Tyler Gunn <tgunn@google.com> Ensure empty string MMI responses default to "MMI Complete".

The existing code checks for null only, but it looks like the modem or
network can sometimes return empty string when there is not result,
which would cause no "MMI Complete" dialog to show.
Checking for empty string as well will solve this problem.

Test: Regression tested MMI codes.
Bug: 37561464
Change-Id: I09caec7eae944bd3dfe97ac8f89c8a113800de1e
sm/GsmMmiCode.java
msphone/ImsPhoneMmiCode.java
6d38b8661c84d25f15a8b3d6796590341edc83b4 21-Jun-2017 Ying Xu <yinxu@google.com> Merge "Handles the RIL error from the CommandException" am: dd952ce68c am: b44a1edc45 am: 92bbda605f
am: 1af5185190

Change-Id: Id3e04dbbf3af6fc391ca3ac616cfc806af61626b
1af5185190a6b48c490c6e3f91b48020287b88de 21-Jun-2017 Ying Xu <yinxu@google.com> Merge "Handles the RIL error from the CommandException" am: dd952ce68c am: b44a1edc45
am: 92bbda605f

Change-Id: Ib4d67644ae2286bad3656248bfa495194cd7e9fe
99ea18f0323a53cacf6824db5ec4dd460f9b3798 21-Jun-2017 Tyler Gunn <tgunn@google.com> Inform ImsVideoCallProviderWrapper of video state changes.

This ensures it will know when the modem un-pauses the video without it
being requested by the UI.

Test: Manual
Bug: 62779713
Bug: 62784036
Change-Id: I15478996e6e14219c84d2ca4bbfbad6f39a8a47c
msphone/ImsPhoneConnection.java
92bbda605ff9100c1707c5b88d7d8f30d31730b5 21-Jun-2017 Ying Xu <yinxu@google.com> Merge "Handles the RIL error from the CommandException" am: dd952ce68c
am: b44a1edc45

Change-Id: Id5b975c42312cff105fd0df2b95f3b8b79b1c11d
dd952ce68ce22245a38f957ead488157c46d280e 21-Jun-2017 Ying Xu <yinxu@google.com> Merge "Handles the RIL error from the CommandException"
1e42be6c35ede49557caed841801f2dbb175cc76 21-Jun-2017 sqian <shuoq@google.com> Merge "Fix MVNO override feature" into oc-dr1-dev am: bbdd40dd8c
am: b54bc0f38f

Change-Id: I8f071b60e378e3cd763f3b19d2acbf063fcb58e1
b54bc0f38f6356a3d7b9ade541d15654d610bbc0 21-Jun-2017 sqian <shuoq@google.com> Merge "Fix MVNO override feature" into oc-dr1-dev
am: bbdd40dd8c

Change-Id: If8cc27d8fd423c50f9c41b33be00b67f37bc2e3f
bbdd40dd8ceac79373806c7390404f59884d9fbb 21-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fix MVNO override feature" into oc-dr1-dev
b73b89a57a075ff8eadc30b38939bd4531a3bc92 11-Jun-2017 pkanwar <pkanwar@google.com> Added methods to insert/get carrier keys from the carrier provider.

BUG: 35606429
Test: manual
Change-Id: I010019c0bedc3c8d6e425d05e8aaec8efc4e75d1
arrierInfoManager.java
smCdmaPhone.java
8ab605dddbddac5303fc7d496897140d94220bf3 21-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Add logging for isRoamIndForHomeSystem" into oc-dr1-dev
1ed9d2cb208a6cbb669ad630b383539daf55f9d6 21-Jun-2017 Sanket Padawe <sanketpadawe@google.com> Hide celllocation getting printed in bugreport.

Change-Id: I19efc4b344b28387fe74b03ba6dfec78f6421562
Fix: 62827374
Test: manual
erviceStateTracker.java
5ff9f06e9cca641eadda73c2b3dfa5e9d4140b1a 21-Jun-2017 Chen Xu <fionaxu@google.com> Merge "migrate roaming operator configs to carrier config"
28be8f5766afab100b33de86ada4f8d4745945db 21-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Suppress Connection address changes while merge is in progress." into oc-dr1-dev
am: 16342962c3

Change-Id: I0100e8ccade513498ea59fce48823be44fe93e5d
16342962c385b2af6f3eb609d4e02171ef12ffce 21-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Suppress Connection address changes while merge is in progress." into oc-dr1-dev
15eff80b3ae45cdf77bd25e1b1e490868b8e9b84 17-Jun-2017 sqian <shuoq@google.com> Fix MVNO override feature

EVENT_GET_AD_DONE will try to set mMncLength with real sim data.
This should be set with Faked value as well when test mode is in.

Test: Manual
Bug: 32591388
Change-Id: If38168109c334347057e383e27cb802a7502ebfd
icc/SIMRecords.java
69b2034e6b2ac17719ec4649d2d173a73c8f024d 20-Jun-2017 Chen Xu <fionaxu@google.com> Merge "cleanup and reset waiting apnlist on RAT change" into oc-dr1-dev
am: 2c82ece4d4

Change-Id: I5b51a8bec1ea2f43607e8dcab31eaf1e111685ef
7e616a7f51c4b81c2ca88cd3ee0dfa79fc60c469 20-Jun-2017 Jordan Liu <jminjie@google.com> Add logging for isRoamIndForHomeSystem

ServiceStateTracker seems to be setting roaming=true even when the
cdma home system list means it should be false. This CL adds some
logging to better diagnose the problem.

Bug: 62721891
Test: built locally
Change-Id: I2d0bc5646ab707ffc9814a788dbd6af1dd4a615a
Merged-In: I2d0bc5646ab707ffc9814a788dbd6af1dd4a615a
erviceStateTracker.java
fb1431e3e4e467df255b182bf1d91ef007dd4b71 20-Jun-2017 Jordan Liu <jminjie@google.com> Merge "Add logging for isRoamIndForHomeSystem" am: 7c6eb32124 am: ed3bcbcffe
am: 5c5b276c8a

Change-Id: I7c2d9a3bd45ce10175a7d1f8d76d469498cf14ae
2c82ece4d49a46774413775aa938e2e0b6e027d5 20-Jun-2017 Chen Xu <fionaxu@google.com> Merge "cleanup and reset waiting apnlist on RAT change" into oc-dr1-dev
5c5b276c8afc1c556ea85beffbfc1204789036c0 20-Jun-2017 Jordan Liu <jminjie@google.com> Merge "Add logging for isRoamIndForHomeSystem" am: 7c6eb32124
am: ed3bcbcffe

Change-Id: I770a7355150891f30d8e3e4b10fcd83da0039016
7c6eb3212470be9a70e67ace65da7ce37e72028a 20-Jun-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Add logging for isRoamIndForHomeSystem"
d89f2dd4e40c56201c36abb2f0f2094e100393e1 20-Jun-2017 kun.tang <kun.tang@spreadtrum.com> The method of parseEfSpdi does not match TS24008.

Accordding to TS51101 and TS31102, Each PLMN is coded as follows:
Mobile Country Code (MCC) followed by the Mobile Network Code (MNC) according to 3GPP TS 24.008
Test: Boot phone and check log, wether parseEfSpdi works fine.

Change-Id: I383a74b8a39baf7091f1388ea7abc96c74d0b2a3
icc/SIMRecords.java
c92a023628835fc0d1f41abb446926d7d517e0f4 02-Jun-2017 fionaxu <fionaxu@google.com> migrate roaming operator configs to carrier config

Bug:37885668
Test: runtest --path
packages/apps/CarrierConfig/tests/src/com/android/carrierconfig/CarrierConfigTest.java
Test: runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/ServiceStateTrackerTest.java
Change-Id: I43efc8316d69f178ceab04d42e1601ba542dc5f2
erviceStateTracker.java
9f053c79699e0b1318b3a6b2ceab444d8da33080 20-Jun-2017 Jordan Liu <jminjie@google.com> Add logging for isRoamIndForHomeSystem

ServiceStateTracker seems to be setting roaming=true even when the
cdma home system list means it should be false. This CL adds some
logging to better diagnose the problem.

Bug: 62721891
Test: built locally
Change-Id: I2d0bc5646ab707ffc9814a788dbd6af1dd4a615a
erviceStateTracker.java
ced725ec28e37e37a61bbfa56a931b7f12ab9db7 06-Jun-2017 fionaxu <fionaxu@google.com> cleanup and reset waiting apnlist on RAT change

check apn waiting list update during data rat or apn data change.
If the new waiting list is different with the currentWaitingList,
then cleanup the associated data connection and reset apnWaitingList
with the lastest one which matches with both current data rat and apn
settings. Reuse cleanupConnectionsOnUpdatedApns to detect waiting list change
and cleanup the connections. remove the duplicate logic from
setupDataOnConnectableApns

Bug:31252975
Test: runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java
--test-method testUpdateWaitingApnListOnDataRatChange
Change-Id: I8408df09a7b25ed2e17cd38b7bebbb8fd20eca72
ataconnection/DcTracker.java
0564aa1e24499a49d19fdf27a28fba2b8f960a4b 19-Jun-2017 Meng Wang <mewan@google.com> Show error code in WFC error messages.

Bug: 62213418
Test: manual
Change-Id: Idce869215ba33f039d033fda7dbd5567a4779d24
msphone/ImsPhone.java
286e95aa9cd740c6d8e9fd32aeefeceaf0c81695 16-Jun-2017 Tyler Gunn <tgunn@google.com> Suppress Connection address changes while merge is in progress.

Due to the manner in which conferences are formed, the IMS session
associated with the conference is swapped into the call which initiated
the merge briefly before the conference is added to Telecom and the
session is moved to that conference. The issue is that in some cases
the new conference session will have a conference URI associated with it.
To mitigate this, this change blocks address changes during the merge
process.

Test: Manual
Bug: 62017197
Change-Id: I7e7c21e26380c55a6b4ed34ad50f384be7df9d5f
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
9a0052ac0fdfd57f8e646c40031efc3273d2a92b 19-Jun-2017 Ying Xu <yinxu@google.com> Merge "Add the NetworkScanRequestTracker" into oc-dr1-dev
a234d03c40520ae6d0163ffcac02e060124fb556 14-Jun-2017 yinxu <yinxu@google.com> Handles the RIL error from the CommandException

In RadioResponse.java, all the RIL errors will be converted into
CommandException and sent back to the caller with the callback message.
So the AsyncResult in the callback message of 'EVENT_START_NETWORK_SCAN_DONE'
and 'EVENT_START_NETWORK_SCAN_DONE' will either contains a NetworkScanResult
without any exception, or contains an exception without any NetworkScanResult.
So if there is any error when trying to start/stop a scan, the error
code must be extracted from the CommandException.

Test: Telephony sanity tests
Change-Id: I9766b7fd530e9146e6d9867478ed79ad8f7ba1fc
etworkScanRequestTracker.java
adioResponse.java
362d8ab7ac3883a1fbbc5b2689f2c2613e6386c5 17-Jun-2017 nharold <nharold@google.com> Merge "Stubs for Keepalive API" am: 7e00265641 am: 842091fe7a
am: 3c78cc3c75

Change-Id: I4ec195d5618030546235f6456f0179ea6956bfd0
3c78cc3c75aa7a06455226300585f14943257ac3 17-Jun-2017 nharold <nharold@google.com> Merge "Stubs for Keepalive API" am: 7e00265641
am: 842091fe7a

Change-Id: Icb96c049cf40f5fe70e51d31fe43c5d3ccaa30b3
7e002656413cd3207f4231d3788fd1af655a7adb 17-Jun-2017 nharold <nharold@google.com> Merge "Stubs for Keepalive API"
e0d956e161aa690c7c8c2f0be6a5e7c3f6bcad89 30-May-2017 yinxu <yinxu@google.com> Add the NetworkScanRequestTracker

NetworkScanRequestTracker is part of the new network scan API
implementaion, which stores all the live and pending network scans
and handles the multiplexing of multiple scans.

Test: Telephony sanity tests
Bug: 30954762

Merged-in: I2fd9825f0a5ce3a2fd341cf8d2d9480af81716bd
Change-Id: I2fd9825f0a5ce3a2fd341cf8d2d9480af81716bd
(cherry picked from commit 84de7198887db7ba56c5cfd1d653033e7b4631a9)
ommandsInterface.java
smCdmaPhone.java
etworkScanRequestTracker.java
honeInternalInterface.java
IL.java
msphone/ImsPhoneBase.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
ip/SipPhoneBase.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
af14150c19d6796d6e6c8fc99957c1fe10a4f109 16-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Add supp service notification test intent." into oc-dr1-dev
am: 327d466ab0

Change-Id: I4d17e2e3b24ccc65a58899c784d8c411aecd4001
327d466ab04fd9391e35415fb25d238b6ce1d32d 16-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Add supp service notification test intent." into oc-dr1-dev
9af6424827eb9e023e037dd5aefd229235aceddb 14-Jun-2017 Jeff Davidson <jpd@google.com> Fix double prompt when downloading profiles.

Currently, if a carrier app wants to download a profile, two consent
dialogs may be triggered:

1. One to deactivate the current SIM and activate the eSIM, as we
cannot check for calling permissions without the eSIM being active.

2. Another to prompt the user for permission if the current carrier is
different, to prevent a carrier from hijacking cellular service.

Since the dialog for 2 is stronger than 1 (an assumption we were
already leveraging), when an unprivileged app requests a download,
skip straight to the second prompt even if the eSIM isn't active. If
the user accepts the prompt, we assume it's okay to switch to the eSIM
first and move forward.

In addition, we pass the calling app package name so the prompt UI can
show details of the app requesting consent.

Fixes: 38049463
Test: TreeHugger + E2E verification
Change-Id: Iaeb33f8a88aec92f323d91586e45d4852bb7a489
uicc/EuiccController.java
uicc/EuiccOperation.java
14ee080761bab997f00f078b11aae53d3087360c 16-Jun-2017 nharold <nharold@google.com> Merge "Improve the Safety Checks on IccCardStatus.toString()" am: 613d20d763 am: 8540b880ab
am: 8201df919f

Change-Id: I7cbd3a153f2570e6d3ff47ab0263e2c634f6e071
8201df919fad4a1b6276049e40baf829ecfacca8 16-Jun-2017 nharold <nharold@google.com> Merge "Improve the Safety Checks on IccCardStatus.toString()" am: 613d20d763
am: 8540b880ab

Change-Id: I9aa806bd33bc14a05ab09d231b413ffb854d8827
613d20d763944f785f725b2f00e391de65364fdd 16-Jun-2017 nharold <nharold@google.com> Merge "Improve the Safety Checks on IccCardStatus.toString()"
a6c2b263ecae03d94abdc337c6e0c9e2b04b106e 16-Jun-2017 Brad Ebinger <breadley@google.com> Merge "Fix emergency call failure over IMS after boot" into oc-dr1-dev
am: 2a096a92e1

Change-Id: I86057265b04ed2e6857d1f0beaafa21e3f5ea0b7
2a096a92e18afceaf215ed6460265c3c03b4e706 16-Jun-2017 Brad Ebinger <breadley@google.com> Merge "Fix emergency call failure over IMS after boot" into oc-dr1-dev
f256f53a996bcedd9691589bcdde99f775f2cd1a 27-May-2017 Nathan Harold <nharold@google.com> Stubs for Keepalive API

Bug: 33277538
Test: tbd
Change-Id: I7c96e857419573e4c44c8264134c921e6766677e
adioIndication.java
adioResponse.java
37414e6f5ddbbb8468607484d49169ae4d6b2801 15-Jun-2017 Brad Ebinger <breadley@google.com> Fix emergency call failure over IMS after boot

With some recent changes to the ImsPhone, we now never go into
the STATE_POWER_OFF state. This was how the GsmCdmaPhone used
to verify that the ImsPhone was not ready to make calls, so
it was not falling back to CS in this small space of time
before the ImsService came up and instead failing to make the call.

This change fixes this issue in two ways:
1) Instead of looking for the STATE_POWER_OFF state, it will instead
check to see if the ImsService is up.
2) If the emergency call fails over IMS, then fallback to CS
automatically.

Bug: 62618800
Test: Place emergency call right after boot up
Change-Id: Ia290681983e995568d01e84fa81d38d4b986d9b0
smCdmaPhone.java
hone.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
ce3cd637db999e4824ca67140e39c8f54912deba 15-Jun-2017 Jeff Davidson <jpd@google.com> Merge "eUICC error code cleanup." into oc-dr1-dev
am: dab8042a14

Change-Id: I10e36ccb2502902d466476eb62cb6d8aeeab1c12
18c9f1353c592c40219a2767cc5700e1aca721db 15-Jun-2017 Jeff Davidson <jpd@google.com> Merge "Clear carrier privilege rules on SIM reset." into oc-dr1-dev
dab8042a148bdeb554922ca3fb7ab9e63a514242 15-Jun-2017 Jeff Davidson <jpd@google.com> Merge "eUICC error code cleanup." into oc-dr1-dev
721cfab81ecfe5c04c5383b76a6915b76cbd3d41 14-Jun-2017 Grace Chen <chengrace@google.com> Merge "Default CDMA subscription source to RUIM/SIM" into oc-dr1-dev
am: f02a530f22

Change-Id: I0f6bb467d7f1e6585a0bb86ccccdf8b755fe04fb
f02a530f22a5e9a3791af5829c05108320795094 14-Jun-2017 Grace Chen <chengrace@google.com> Merge "Default CDMA subscription source to RUIM/SIM" into oc-dr1-dev
93236d0b5a3cac040fd1176c8fd905b3dd055fab 14-Jun-2017 Ying Xu <yinxu@google.com> Merge "Add the NetworkScanRequestTracker" am: 9726d3cd2b am: a62a46aebc
am: f7074f882c

Change-Id: Ie72c21a575ac544bf3e3b54e7e5367b703c0c328
f7074f882cbc1c5558fc9428780abd14c923032f 14-Jun-2017 Ying Xu <yinxu@google.com> Merge "Add the NetworkScanRequestTracker" am: 9726d3cd2b
am: a62a46aebc

Change-Id: I3fe0c8c0e7196573ebaeee436217ca33ad429106
9726d3cd2b0a47472ef828433d3a26b43f2b6cc4 14-Jun-2017 Ying Xu <yinxu@google.com> Merge "Add the NetworkScanRequestTracker"
a3d457df8c935a07ff15aec2a4c89db42103c52d 14-Jun-2017 Brad Ebinger <breadley@google.com> Merge "Do not consider service state for video enablement." am: fc45138e7d
am: 674d415761

Change-Id: I81b1a04a784f24cfc76d5b9ebc2415b31060502a
fc45138e7d0e75392b0507b507fe185bfdfbc283 14-Jun-2017 Brad Ebinger <breadley@google.com> Merge "Do not consider service state for video enablement."
88082edcad470e1b06608ee0dea7d4fc49c3dfde 14-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Add test intent for supp service failures." into oc-dr1-dev
am: ac90512235

Change-Id: Ic74c6cba8edaa742400f9a94c16d76d74e036921
ac9051223568f80ad97a10a0a239079071d78d28 13-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Add test intent for supp service failures." into oc-dr1-dev
355768849842554efab09a53207aa7938546b79b 09-Jun-2017 Grace Chen <chengrace@google.com> Default CDMA subscription source to RUIM/SIM

Operators read CDMA subscription from RUIM/SIM now thus change
the default hardcoded preference everywhere. Add code clean-up to
make the default come from a single source, the Phone interface.

Additional rework proposed in http://b/62299272, but this corrects
immediate issue where CDMA SSM was defaulting to NV instead of RUIM
/SIM and caused CSIM subscription to not load and 'no sim' symptom
for many users.

Bug: 62143087
Test: None
Change-Id: I384cf6ac4d5fad54ee64edc3b95da4b799bd4d1b
honeInternalInterface.java
dma/CdmaSubscriptionSourceManager.java
8308ef9cac5c594f18a9421a138b86a90b529f0c 13-Jun-2017 Brad Ebinger <breadley@google.com> Merge "Fix issue that cannot accept third incoming IMS call" am: da0d192880
am: dd9a81c15a

Change-Id: Ibc72ee132ea9d3af81ec48e9027ffadc4a72d94f
bba05c4b26831155d5a2b55fb822762fc7f4153a 13-Jun-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Radio Interface changes to pass the encryption object, including the key,to the modem." am: a80b673848 am: 644da68619
am: fff7c4000d

Change-Id: I30efca9c2613fd47220dc89a12ffccfe07c3529b
fff7c4000d72d532b2738def64357455099bfbfd 13-Jun-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Radio Interface changes to pass the encryption object, including the key,to the modem." am: a80b673848
am: 644da68619

Change-Id: Ia73352906c817df3b7fc09d50184e406a3a8e794
84de7198887db7ba56c5cfd1d653033e7b4631a9 30-May-2017 yinxu <yinxu@google.com> Add the NetworkScanRequestTracker

NetworkScanRequestTracker is part of the new network scan API
implementaion, which stores all the live and pending network scans
and handles the multiplexing of multiple scans.

Test: Telephony sanity tests
Bug: 30954762
Change-Id: I2fd9825f0a5ce3a2fd341cf8d2d9480af81716bd
ommandsInterface.java
smCdmaPhone.java
etworkScanRequestTracker.java
honeInternalInterface.java
IL.java
msphone/ImsPhoneBase.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
ip/SipPhoneBase.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
da0d19288082d19b03fa36768a096a4ac257d7ed 13-Jun-2017 Brad Ebinger <breadley@google.com> Merge "Fix issue that cannot accept third incoming IMS call"
c704f5f31974646b763d0176bfdca8dd8167cc2d 25-May-2017 Dheeraj Shetty <dshetty@codeaurora.org> Do not consider service state for video enablement.

Do not check for STATE_IN_SERVICE to report that video feature is
enabled.

Test: Manual VT call
Bug: 62575792
Change-Id: Ic8ed5da9da3d256ca7a1ae2337f2de3643148557
Merged-In: Iee8649b3db83df967ecce0478bfea0804c7ae45a
hone.java
1820485524c45e9e39c0fda62673f04cedbda4e7 13-Jun-2017 Brad Ebinger <breadley@google.com> Merge "Do not consider service state for video enablement." into oc-dr1-dev
am: 20907db7ed

Change-Id: Iee8649b3db83df967ecce0478bfea0804c7ae45a
20907db7ed36311078d2be5fb9ea5dda14c8fdf6 13-Jun-2017 Brad Ebinger <breadley@google.com> Merge "Do not consider service state for video enablement." into oc-dr1-dev
05688f497c8dbb6703bacd9fc122eabc4b962197 17-Mar-2017 youhei yamahata <youhei.x.yamahata@sonymobile.com> Fix issue that cannot accept third incoming IMS call

When accepting third incoming IMS call with normal swipe action,
background call is disconnected first and then waiting call is switched
with foreground call - foreground call will be held accordingly.
However, background call is still in disconnecting state when calling
switchWaitingOrHoldingAndActive() and then switchingWithWaitingCall
flag is set to FALSE wrongly. This causes third incoming call cannot
be accepted.
Fix switchingWithWaitingCall to TRUE when background call is not alive.

Test: manual - Receive third incoming IMS call
Bug: 62462843

Change-Id: Iae220579e35b7c6e6333d9dcba7061535da88d19
Merged-In: I763660648d521aa856c252e66db30a32d749a8c7
msphone/ImsPhoneCallTracker.java
f6e9d537990f389a2a4e9bd6a039a5c5363a2da4 13-Jun-2017 Brad Ebinger <breadley@google.com> Merge "Fix issue that cannot accept third incoming IMS call" into oc-dr1-dev
am: 8f88fd103b

Change-Id: I763660648d521aa856c252e66db30a32d749a8c7
1d73da1c2f6f5b32cf82d1d5a34c0d06e85603c9 25-May-2017 Dheeraj Shetty <dshetty@codeaurora.org> Do not consider service state for video enablement.

Do not check for STATE_IN_SERVICE to report that video feature is
enabled.

Test: Manual VT call
Bug: 62575792
Change-Id: I6a8efddcf211f73c5bf3a60982626f27430d774f
hone.java
8f88fd103b025fa7ffe6a247b04fcf9a328b2c6a 13-Jun-2017 Brad Ebinger <breadley@google.com> Merge "Fix issue that cannot accept third incoming IMS call" into oc-dr1-dev
31e69b5efbc9b9a39183acce93a4c1b2e73b3006 15-May-2017 Jeff Davidson <jpd@google.com> eUICC error code cleanup.

Fixes: 38206601
Test: TreeHugger
Change-Id: I2305e4cb360adccc26483098070cf50890fee249
ubscriptionInfoUpdater.java
uicc/EuiccConnector.java
uicc/EuiccController.java
uicc/EuiccOperation.java
5dacc9df1d9293d0b693a94a1bea6686d5069850 13-Jun-2017 Jeff Davidson <jpd@google.com> Merge "Refresh subscription list on erase." into oc-dr1-dev
am: 289a4ed2be

Change-Id: I43aa5b8d35e28084652467ee26ad2a934cd1753e
b0e930ef63ee7bfa05b24d1afe2bbc656432df62 13-Jun-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Address IMSI privacy issues." am: b0303066ce
am: 067f0771a9

Change-Id: Ie25c75712f8b28ec2be9e07af466cc9e3404e0cf
289a4ed2be7629b52e21b0f5494a2a5c62953368 13-Jun-2017 Jeff Davidson <jpd@google.com> Merge "Refresh subscription list on erase." into oc-dr1-dev
9179967a8da4955d6d8c6e2bbc6293d4c451b942 21-May-2017 pkanwar <pkanwar@google.com> Radio Interface changes to pass the encryption object, including the
key,to the modem.

We will now pass the ImsiEncryptionInfo object which includes mnc/mcc.
BUG: 35606429
Test: manual

Change-Id: I1bcaf7de424ad6143587fa001b9ecb631009c463
ommandsInterface.java
IL.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
2429df650eebaa60b2beb76f35e2da1044f79aaf 21-Feb-2017 pkanwar <pkanwar@google.com> Address IMSI privacy issues.

Added getCarrierInfoForImsiEncryption and
setCarrierInfoForImsiEncryption methods.

CP from master

Bug: 35606429
Test: runtest --path ..ImsiEncryptionInfoTest.java
Change-Id: I1b1f31b0e74a4ed8fb04d6362face696dfa5d4bf
arrierInfoManager.java
smCdmaPhone.java
hone.java
honeInternalInterface.java
honeSubInfoController.java
d6cfc77a464b6ef2223dc35cfcf0db72ca8a51db 17-Mar-2017 youhei yamahata <youhei.x.yamahata@sonymobile.com> Fix issue that cannot accept third incoming IMS call

When accepting third incoming IMS call with normal swipe action,
background call is disconnected first and then waiting call is switched
with foreground call - foreground call will be held accordingly.
However, background call is still in disconnecting state when calling
switchWaitingOrHoldingAndActive() and then switchingWithWaitingCall
flag is set to FALSE wrongly. This causes third incoming call cannot
be accepted.
Fix switchingWithWaitingCall to TRUE when background call is not alive.

Test: manual - Receive third incoming IMS call
Bug: 62462843

Change-Id: Iae220579e35b7c6e6333d9dcba7061535da88d19
msphone/ImsPhoneCallTracker.java
07f740c0ed9d5f5e399d237541ca0966e02ed55f 12-Jun-2017 Jeff Davidson <jpd@google.com> Merge "Fix NPE in EuiccController." into oc-dr1-dev
am: 474e64b28f

Change-Id: Ic163fe46e799df6958e273c5a97d498661db3ff2
474e64b28fffa2dde0023cb3313c814959e1612e 12-Jun-2017 Jeff Davidson <jpd@google.com> Merge "Fix NPE in EuiccController." into oc-dr1-dev
ca8681a9be3daa77f8110f7a8aa8a62160b221e0 12-Jun-2017 yifan.bai <yifan.bai@spreadtrum.com> Fix Automatic time zone not working when no NITZ received.

When there is no NITZ time zone received from NW. Device will use unique
time zone by NW MCC Country ISO. In fixTimeZone method, if no NITZ time
zone received, saveNitzTimeZone method should not be called. Otherwise,
time zone will be fixed to system default time zone and cannot update by
Country ISO.

Test: Build pass.
Test: No NITZ received, time zone can be updated by NW MCC Country ISO.

Change-Id: I3e29f6c262825ea7a17915c988afec6d596d4570
erviceStateTracker.java
64849791287fa851449eca1ad04fa90307cceda7 12-Jun-2017 Jeff Davidson <jpd@google.com> Merge "Clear carrier privilege rules on SIM reset." am: 538289b3e3 am: a5001ed5f8
am: ce56627ccf

Change-Id: I97c787d52ab23391ba84074d745d5a545ce60668
ce56627ccf22e7fc0a437674a3a835c09210a902 12-Jun-2017 Jeff Davidson <jpd@google.com> Merge "Clear carrier privilege rules on SIM reset." am: 538289b3e3
am: a5001ed5f8

Change-Id: Ie338e2f1ae0306d7289ec23a81a090afcb0cf641
b7a997a45f3168878881726b0e418681e8424b11 21-Apr-2017 Jeff Davidson <jpd@google.com> Clear carrier privilege rules on SIM reset.

Synchronization blocks have been added for any reads of mCatService
and mCarrierPrivilegeRules since these are being nullified. There are
other thread-safety issues in this class which can be addressed in a
follow-up.

Includes other safe cleanup.

Bug: 33057511
Test: Switched carriers and verified rules were temporarily dropped
Change-Id: Id0fe6c9f5df025aa03b120968cd486e741c34ee9
Merged-In: Id0fe6c9f5df025aa03b120968cd486e741c34ee9
icc/UiccCard.java
538289b3e343b2db72cc87fccd4658d97569e29e 12-Jun-2017 Jeff Davidson <jpd@google.com> Merge "Clear carrier privilege rules on SIM reset."
31a32e2b2ed5cae4c22b3b05e637989f751b6b2f 11-Jun-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Radio Interface changes to pass the encryption object, including the key,to the modem."
11a6797d21640d1415c7126bf00c1af14fce8bf7 10-Jun-2017 Amit Mahajan <amitmahajan@google.com> Consider Service State OFF same as OUT OF SERVICE for combined regState am: c594cbe54e
am: 0b92ca4aec

Change-Id: I86c496aabf7fa0d717c975c8c35525b424da8933
ce3e7ebc170c9414cf5118e31bf8644e2dea1cd4 10-Jun-2017 Amit Mahajan <amitmahajan@google.com> Consider Service State OFF same as OUT OF SERVICE for combined regState
am: c594cbe54e

Change-Id: I04efe36b8c860b6bec966bbef3024d89ba0df614
0b92ca4aec00c0ac811f4433d73af796bea90af5 10-Jun-2017 Amit Mahajan <amitmahajan@google.com> Consider Service State OFF same as OUT OF SERVICE for combined regState
am: c594cbe54e

Change-Id: Idb1e08d665ce52cd01cbe772e93168731af0f7c3
c594cbe54ee6167696571c34a700ca7347f19f22 09-Jun-2017 Amit Mahajan <amitmahajan@google.com> Consider Service State OFF same as OUT OF SERVICE for combined regState

Test: manual
Bug: 37425222
Change-Id: I1afd552ff5156b96c6ec4946e8ffd42d85ad9ad7
erviceStateTracker.java
06cc9bcfe7f90e03b40c45060ae5727b7a0398fe 10-Jun-2017 Tyler Gunn <tgunn@google.com> Add test intent for supp service failures.

Test: This is a test harness, only a test harness.
Bug: 37952234
Change-Id: Id64670e152b4cbe31eab6c22db464f13713be395
elephonyTester.java
msphone/ImsPhoneBase.java
27590b4156bff85bcd8b68536216526d2dd029c7 10-Jun-2017 Jeff Davidson <jpd@google.com> Fix NPE in EuiccController.

getActiveSubscriptionInfoList() can return null - don't crash in this
case.

Change-Id: I160561f2240f02d1136964f59a694cfe3bff18c1
Test: TreeHugger / local verification
Fixes: 62493915
uicc/EuiccController.java
ac81b64921371fc508d1e6178863603990cef960 10-Jun-2017 Chen Xu <fionaxu@google.com> Merge "Optimize power for incoming SMS" am: 06dd990e49 am: 4a875aba4d
am: c164479ca0

Change-Id: Ifb00ac110d4e8c7aa18a8a3e1971c86decd0bad8
c164479ca0b14b438b5309cc5d9793bffabad0b9 10-Jun-2017 Chen Xu <fionaxu@google.com> Merge "Optimize power for incoming SMS" am: 06dd990e49
am: 4a875aba4d

Change-Id: I43fbbee83f3e86da377b996fc18f3d45eb7f514f
06dd990e49933895a33cd57fb2ad0084f0b260a2 10-Jun-2017 Chen Xu <fionaxu@google.com> Merge "Optimize power for incoming SMS"
3fe06d64dd289220cebdccb4af57631693cdab82 09-Jun-2017 Chen Xu <fionaxu@google.com> Merge "add an extra for rebroadcast of sim_state_change" into oc-dev am: 74db1a7727
am: b0d15a71b9

Change-Id: I2c24775d9f02fabdf4afb11163f54a7fefe4e7fa
1c8373b0dc6fb95e7fd9d6346141cef9a0fb8b18 09-Jun-2017 Chen Xu <fionaxu@google.com> Merge "add an extra for rebroadcast of sim_state_change" into oc-dev
am: 74db1a7727

Change-Id: I7cfcfe87525f24f2f102d61a737cdf7c5d748a8e
b0d15a71b9e5dc2f93365be1a1ecb386dc03730d 09-Jun-2017 Chen Xu <fionaxu@google.com> Merge "add an extra for rebroadcast of sim_state_change" into oc-dev
am: 74db1a7727

Change-Id: If8c27f7fc2465219815b8d68dd303b2d6a1d532b
74db1a77278b26d79bf5a2c3ac60f2efe963af8c 09-Jun-2017 Chen Xu <fionaxu@google.com> Merge "add an extra for rebroadcast of sim_state_change" into oc-dev
aa7a2a51e446acab39772ac30f149726cd20343b 09-Jun-2017 Amit Mahajan <amitmahajan@google.com> Merge "Allow broadcast receivers to receive DATA_SMS_RECEIVED_ACTION." into oc-dev
am: 6b47ea3736

Change-Id: I92c9c1b129c65a93fc60e196ff0c95928f37ff58
b25073bde2dde81496b18a544e36a5ba3d0a44a0 09-Jun-2017 Amit Mahajan <amitmahajan@google.com> Merge "Allow broadcast receivers to receive DATA_SMS_RECEIVED_ACTION." into oc-dev
am: 6b47ea3736

Change-Id: Ided9435309f0791995982eb1f13cab504b6d7a1e
6b47ea37369828be3499d3daac8693f4a4f3657e 09-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Allow broadcast receivers to receive DATA_SMS_RECEIVED_ACTION." into oc-dev
762dc28ec9f4dcdf701c3ba2351b4aa25b87920a 09-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Update ImsPhone to have default OUT_OF_SERVICE state" into oc-dr1-dev
257732fb4f37de9c87fb8190babc9a50b455b1a1 09-Jun-2017 Nathan Harold <nharold@google.com> Improve the Safety Checks on IccCardStatus.toString()

Tighter range checks in the toString() method to cross
validate the application array against the app indices.

Bug: 62459080
Test: none
Change-Id: I078315f5ea773eb117303cccfcedda06280fffab
icc/IccCardStatus.java
fe80f4088f1e04dd809d44547811279f26f47b28 23-May-2017 Jeff Davidson <jpd@google.com> Refresh subscription list on erase.

If the user erases the eSIM, that will naturally clear the profile
list, so ensure we refresh it.

Bug: 38483036
Test: TreeHugger
Change-Id: Ic69869a96c724e6ecb8821bb82ad5f2d1fb8c39f
uicc/EuiccController.java
74d69b0725425e23b5733c9110160cd4a27c9ac7 09-Jun-2017 fionaxu <fionaxu@google.com> add an extra for rebroadcast of sim_state_change

Bug: 62459330
Test: Manaual Test
Change-Id: Ib28e61906cc818d833175e756be729011a03603e
arrierActionAgent.java
ubscriptionInfoUpdater.java
9a761e72b18f7da4626fe04d07ca613748d636ca 08-Jun-2017 Nathan Harold <nharold@google.com> Merge "Clear calling identity in getCarrierImsPackage()" into oc-dev
am: 7c8a759e56

Change-Id: I7f38a9849b3ed8abff69d0a97f00fbe008cba176
7c8a759e56faa087d6fcc888d4317a8937b3b812 08-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Clear calling identity in getCarrierImsPackage()" into oc-dev
8e31d9711a72cd740b9d8c4155420ac20e4b9a3f 08-Jun-2017 Tyler Gunn <tgunn@google.com> Add supp service notification test intent.

Add new test intent used to manually trigger supp service notifications.
Since the call forwarded supp service notification is not something
that can be tested domestically, this test intent provides a means of
invoking the functionality.

Test: Test harness.
Bug: 33761801
Change-Id: Ic23a65c02e419587d1095d2c24b52df76fc14826
elephonyTester.java
5af320f02bb867a70b1e0c6392687f7bd0631ea9 21-May-2017 pkanwar <pkanwar@google.com> Radio Interface changes to pass the encryption object, including the
key,to the modem.

We will now pass the ImsiEncryptionInfo object which includes mnc/mcc.
BUG: 35606429
Test: manual

Change-Id: I1bcaf7de424ad6143587fa001b9ecb631009c463
ommandsInterface.java
IL.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
b741d6d3cfed602c8376c5069c9beed5c8c6ff72 08-Jun-2017 nharold <nharold@google.com> Merge "Clear calling identity in getCarrierImsPackage()" am: 4dbf14acf2
am: a46968e099

Change-Id: If8ff27dd16b3ba8576839ed4d93d4b957ed75310
1a37e7675e1012262899c66530ed8eb1615a2a5f 08-Jun-2017 Sooraj Sasindran <sasindran@google.com> Merge "Use Sydney timezone instead of LordHowe" into oc-dev
am: 13c50710be

Change-Id: Ic9dec2dbb919ddb32c386a933a13a6fd601fdc0c
f8f9bc4b11c53756a10cfd3305a22fe785bca9ad 08-Jun-2017 Sooraj Sasindran <sasindran@google.com> Merge "Use Sydney timezone instead of LordHowe" into oc-dev
am: 13c50710be

Change-Id: I8e7fc8d876a5f25615434a2b6c884eb6eb99c479
13c50710bee832b83ebf7dcd7cc6bf36d9fcfc82 08-Jun-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Use Sydney timezone instead of LordHowe" into oc-dev
dff5a4bb3bc1f473bfe5c492b130ba00d6891ebe 08-Jun-2017 Nathan Harold <nharold@google.com> Clear calling identity in getCarrierImsPackage()

When the calling package has SEND_SMS but not READ_PHONE_STATE
the check currently errors out. This clears the calling package
so that we can still query the CarrierConfig to see if there is
an ImsPackage that should be checked for a CarrierSms intercept.
CarrierConfig expects READ_PHONE_STATE to check keys.

Bug: 37570992
Test: manual
Change-Id: I56a8336f9ab1fe0ad33e0e304431df125bbdeeec
Merged-In: I56a8336f9ab1fe0ad33e0e304431df125bbdeeec
(cherry picked from commit 02f1fc594ae1bff8b5128760587f264b86491d33)
arrierSmsUtils.java
02f1fc594ae1bff8b5128760587f264b86491d33 08-Jun-2017 Nathan Harold <nharold@google.com> Clear calling identity in getCarrierImsPackage()

When the calling package has SEND_SMS but not READ_PHONE_STATE
the check currently errors out. This clears the calling package
so that we can still query the CarrierConfig to see if there is
an ImsPackage that should be checked for a CarrierSms intercept.
CarrierConfig expects READ_PHONE_STATE to check keys.

Bug: 37570992
Test: manual
Change-Id: I56a8336f9ab1fe0ad33e0e304431df125bbdeeec
arrierSmsUtils.java
9e69a0b57c9002f46f98e2fca2faa5e84cc7f544 07-Jun-2017 Sanket Padawe <sanketpadawe@google.com> Update strings for modem restricted state notifications.
am: b7c0a4bf21

Change-Id: I8d598177e44a0fcdda380bef2fc62362e38b3af5
4ecd0d816d08471e6b8cbd59391e0d2893f111a5 07-Jun-2017 Sanket Padawe <sanketpadawe@google.com> Update strings for modem restricted state notifications.
am: b7c0a4bf21

Change-Id: I270ed2a2f56a6668d166731ae9a13960cb683595
9105b51c068d6f6eec8c08215487512360ee02e9 07-Jun-2017 Sooraj Sasindran <sasindran@google.com> Use Sydney timezone instead of LordHowe

Use Sydney timezone instead of LordHowe as default timezone
in Australia

Bug=33228250
Test: Verified using the unit testing MccTable
Change-Id: I4cbef0d5469c47be432798f8e1a2bf2d9f913f71
ccTable.java
efa9c3486f43513f61edaadd46b72a479643e9c5 07-Jun-2017 Brad Ebinger <breadley@google.com> Update ImsPhone to have default OUT_OF_SERVICE state

ImsPhone only has the voice registration state POWER_OFF when
it is constructed. After it registers with IMS (or fails), it
moves to the STATE_IN_SERVICE and STATE_OUT_OF_SERVICE states.
There is no need to start it in the STATE_POWER_OFF voice
registration state and can instead be constructed in the
STATE_OUT_OF_SERVICE state.

Bug: 62114647
Test: Manual emergency call testing
Change-Id: I836548a460b6da70be9bf2807e4d791ee7724cc3
msphone/ImsPhone.java
fab72cdd47510766a6e6c1ebaa32d9a948e5bde1 21-Apr-2017 Jeff Davidson <jpd@google.com> Clear carrier privilege rules on SIM reset.

Synchronization blocks have been added for any reads of mCatService
and mCarrierPrivilegeRules since these are being nullified. There are
other thread-safety issues in this class which can be addressed in a
follow-up.

Includes other safe cleanup.

Bug: 33057511
Test: Switched carriers and verified rules were temporarily dropped
Change-Id: Id0fe6c9f5df025aa03b120968cd486e741c34ee9
icc/UiccCard.java
b7c0a4bf216f1060c2436094411b660aa3d9f8b4 07-Jun-2017 Sanket Padawe <sanketpadawe@google.com> Update strings for modem restricted state notifications.

Test: manual
Change-Id: Ie5941bdcafb867b75bb2362634bb0e55e796f7bd
Fix: 37377132
erviceStateTracker.java
06316b1ed59e6d2ad2d64677a81582c440f88e62 05-Jun-2017 Amit Mahajan <amitmahajan@google.com> Allow broadcast receivers to receive DATA_SMS_RECEIVED_ACTION.

Allow apps in the background to receive DATA_SMS_RECEIVED_ACTION as
that behavior is consistent with other SMS related broadcast intents.

Test: Basic telephony sanity
Bug: 62106654
Change-Id: Ic9e8aad77a2a5705fcd1269a23fbcab7016d32b7
nboundSmsHandler.java
c7b7b38d6dfacd936ed2b7c37d195f5a079c0b2c 03-Jun-2017 Tyler Gunn <tgunn@google.com> Post feature capability changes to handler.
am: 041b6e81c0

Change-Id: I67f9c3d47a18d40a1992ad2bb07d90564b280d68
e5e0e774623b252855ee3eb8889da5c25b0bec4a 03-Jun-2017 Brad Ebinger <breadley@google.com> Merge "Adds ACCESS_CLASS_BLOCKED DisconnectCause" am: 9f1c508070 am: cbf6f8cea8 am: 77d8226e04
am: dc2bdec455

Change-Id: I84e2c583cb2a1822e735c76a4eabee1c653548b2
dc2bdec455e91ad8a95d48cddeca04b6ff2f1d86 03-Jun-2017 Brad Ebinger <breadley@google.com> Merge "Adds ACCESS_CLASS_BLOCKED DisconnectCause" am: 9f1c508070 am: cbf6f8cea8
am: 77d8226e04

Change-Id: I591e7957f451bed4422474c80908f984f2264f2a
041b6e81c00ebc29af3bac1581a0d78d2c8fcf4b 27-May-2017 Tyler Gunn <tgunn@google.com> Post feature capability changes to handler.

Posting feature capability changes to the ImsPhoneCallTracker handler.
This removes potential race conditions when the Ims service posts a lot
of updates at the same time.

Test: Manual
Bug: 62076575
Merged-In: I464e6f16fce8d00925b9f633ddd1f015a183a9fb
Change-Id: I464e6f16fce8d00925b9f633ddd1f015a183a9fb
(cherry picked from commit bba4c2136d2665ca692c9fa9d55ca39b84a6a114)
msphone/ImsPhoneCallTracker.java
4d2b59a18c1f93903fc8bfaeadf922276eec394c 02-Jun-2017 Brad Ebinger <breadley@google.com> Adds ACCESS_CLASS_BLOCKED DisconnectCause

Routes ImsReasonInfo.ACCESS_CLASS_BLOCKED to
DisconnectCause.IMS_ACCESS_BLOCKED.

Bug: 33821263
Test: Build
Change-Id: Id2457e67ee9ae1326b52a9f00b2e97b09365b650
msphone/ImsPhoneCallTracker.java
c533755569adbb3179fc69075b6522030e447747 02-Jun-2017 Brad Ebinger <breadley@google.com> Merge "Don't return false if the Phone is GSM for ECBM"
44a0d1a64c90e36a2b246117023e7f915ccd5fff 02-Jun-2017 Jun Yin <junyin@google.com> Merge "Check aid against empty string for SIM_REFRESH" into oc-dev
4588457ea5560407e79994cf2234ed7100641eb8 01-Jun-2017 Brad Ebinger <breadley@google.com> Don't return false if the Phone is GSM for ECBM

ECBM can still be triggered on CDMA+LTE voice
RATs when there is no SIM and the phone camps
on a CDMA+LTE network. We should still be able
to get into ECBM in these cases.

This change removes the GSM only check for
isInEcm().

Bug: 62042256
Test: Build and run
Change-Id: I4f023339968631d2a34146f9ff1f5b4a58e1e656
smCdmaPhone.java
hone.java
msphone/ImsPhone.java
3274a7b67d977fe299b9bcf90c30e90a4995f820 02-Jun-2017 Jun Yin <junyin@google.com> Merge "Check aid against empty string for SIM_REFRESH" am: 1795d40121 am: 49d5c528ae am: e52cd042d0
am: 1d0ab0e6e4

Change-Id: Ia6402310a396bd0a0be3729e5d42c437e67500c0
1d0ab0e6e484974324b448ed3582e9554678a9c3 02-Jun-2017 Jun Yin <junyin@google.com> Merge "Check aid against empty string for SIM_REFRESH" am: 1795d40121 am: 49d5c528ae
am: e52cd042d0

Change-Id: Ib60d97fdfdac453999b68b2ba4e27295b175b80e
b9382d22a94f9f69a7f42522210420132784b1a1 01-Jun-2017 Jack Yu <jackyu@google.com> Made non-emergency cell broadcast intents implicit am: c54ff43b87
am: 4c797cc517

Change-Id: I4e0a8f0451b10d76db1782ad83358cda3f7da14b
4c797cc5179800c5833820328f94a68799ad4c9a 01-Jun-2017 Jack Yu <jackyu@google.com> Made non-emergency cell broadcast intents implicit
am: c54ff43b87

Change-Id: Ic0402e9de4af838115ae9d29bdcfe85a4db3989e
1a91fa934bd98fb6406a15442bb9d013d05ff0a2 01-Jun-2017 Jun Yin <junyin@google.com> Check aid against empty string for SIM_REFRESH

The new RIL in O changes all null strings to empty strings, but the code
in uicc only checks aid against null for SIM_REFRESH. This CL adds the
check against empty strings.

Bug: 34650917
Test: build
Change-Id: I4883def3b0dcf3f505941297d458a607db54f300
icc/IsimUiccRecords.java
icc/RuimRecords.java
icc/SIMRecords.java
icc/UiccCard.java
c54ff43b87bcc6f4a13d07b5713200f27aa7c984 01-Jun-2017 Jack Yu <jackyu@google.com> Made non-emergency cell broadcast intents implicit

This allows carriers to send non-emergency cell
broadcasts to the 3rd party apps.

Test: Telephony unit tests
bug: 62256244
Change-Id: Ie1120a77d228ca24cc619cdd661420a3aa132bc4
ellBroadcastHandler.java
09060cdf0c2519a8eb851e88c06e9b18fc69457e 01-Jun-2017 Jack Yu <jackyu@google.com> Merge "resolve merge conflicts of 8fd87b204 to oc-dev-plus-aosp" into oc-dev-plus-aosp
227b11608a010bde897878ef86453361a2700397 01-Jun-2017 Tyler Gunn <tgunn@google.com> Merge "Post feature capability changes to handler."
176c104f92fb2f53adb5cef7e2cf9152f04472e7 01-Jun-2017 Jun Yin <junyin@google.com> Check aid against empty string for SIM_REFRESH

The new RIL in O changes all null strings to empty strings, but the code
in uicc only checks aid against null for SIM_REFRESH. This CL adds the
check against empty strings.

Fixes: 34650917
Test: TreeHugger
Change-Id: I97cd400a47c640184a92fde71cb877317f418d71
icc/IsimUiccRecords.java
icc/RuimRecords.java
icc/SIMRecords.java
icc/UiccCard.java
a2106e0a068e2e22ae14c183f5c7a985be8a9cd0 01-Jun-2017 Chen Xu <fionaxu@google.com> Merge "migration voicemail settings to notificationChannel" into oc-dev am: 2355eb3b9d
am: 90818f0d28

Change-Id: I460ef901faf1c3784949f10f2b4ff1befdf8d463
90818f0d28c350d8123ced61ceb668ef9ff951be 01-Jun-2017 Chen Xu <fionaxu@google.com> Merge "migration voicemail settings to notificationChannel" into oc-dev
am: 2355eb3b9d

Change-Id: I08424649d0a6a6607f9b4d7df43cc5b586c09138
2355eb3b9dc59fe0a1241135bf2551276b970b73 01-Jun-2017 Chen Xu <fionaxu@google.com> Merge "migration voicemail settings to notificationChannel" into oc-dev
2c3cb1b917b6f498f268aa73d96b7b5d5e9fade8 01-Jun-2017 Jack Yu <jackyu@google.com> resolve merge conflicts of 8fd87b204 to oc-dev-plus-aosp

Test: I solemnly swear I didn't test this conflict resolution.
Change-Id: I1876737d4a5df891367b4b0365f922bf93741097
646c42d83c011d5d7cb4fe4ba5892b7aeb4abae1 31-May-2017 fionaxu <fionaxu@google.com> migration voicemail settings to notificationChannel

- create voice mail notification channel when sim loaded
- migrate voicemial notification settings if subId matches, otherwise
fallback to predefined channel settings

Bug:62100344
Test: Manual test:
1. enabled voicemail notification vibration on NYC build.
2. update to OC build with notification channel
3. make sure user preference is not lost during system update.

Change-Id: I877d7271072e3a34d171bcb5b780c99cdb308929
til/NotificationChannelController.java
til/VoicemailNotificationSettingsUtil.java
2f14f544d1623c6cb65eb6bc617e182431e4829a 27-May-2017 Jack Yu <jackyu@google.com> Added video calling data usage per-uid support

Now the VT call data usage will be counted under
current dialer's data usage as well as the total
device data usage.

Test: Manual
bug: 37671326

Merged-Id: Ic7a87bf816bb12f1be9d66ee9aafb54174df0235
Change-Id: Ic7a87bf816bb12f1be9d66ee9aafb54174df0235
hone.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
bba4c2136d2665ca692c9fa9d55ca39b84a6a114 27-May-2017 Tyler Gunn <tgunn@google.com> Post feature capability changes to handler.

Posting feature capability changes to the ImsPhoneCallTracker handler.
This removes potential race conditions when the Ims service posts a lot
of updates at the same time.

Test: Manual
Bug: 62076575
Change-Id: I464e6f16fce8d00925b9f633ddd1f015a183a9fb
msphone/ImsPhoneCallTracker.java
af9463371c42ea87046a583a58090b8daf55001d 31-May-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Added video calling data usage per-uid support"
0e9e0387678b3d3cd9694f342a8f40eeb7dbbdca 27-May-2017 Jack Yu <jackyu@google.com> Added video calling data usage per-uid support

Now the VT call data usage will be counted under
current dialer's data usage as well as the total
device data usage.

Test: Manual
bug: 37671326

Change-Id: Ic7a87bf816bb12f1be9d66ee9aafb54174df0235
hone.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
4a8d4a8413112c9fe720dcd9e519910ad8c5fb4f 26-May-2017 Qingxi Li <qingxi@google.com> Merge "Write eUICC provisioned bit after successful download."
446290e31328667735b670ddc5d5054e3c4fe8f2 26-May-2017 Brad Ebinger <breadley@google.com> Merge "Add IMEI_NOT_ACCEPTED error code for IMS" am: 772d7786db am: 5940fa8b82 am: 5f371e7686
am: be29747ffc

Change-Id: Ia716491230523c4c71e5557e67acf42a968ba537
be29747ffcf6287336e91f82d0806441bd131145 26-May-2017 Brad Ebinger <breadley@google.com> Merge "Add IMEI_NOT_ACCEPTED error code for IMS" am: 772d7786db am: 5940fa8b82
am: 5f371e7686

Change-Id: Ide8abb2d65b640cf5729b215ec20ce5813843290
772d7786dbe7dc1ce1a92551e38ab2abb9f4c719 26-May-2017 Brad Ebinger <breadley@google.com> Merge "Add IMEI_NOT_ACCEPTED error code for IMS"
1969564bd377c6a86ea92cfa3f1e4fb448e4c734 25-May-2017 Tyler Gunn <tgunn@google.com> Merge "IMS conference merge improvements." into oc-dev am: 9f4db346f6
am: ffa5d36d4a

Change-Id: I170ecd6c77ac0927f61e1b85b8d56e1c1a570cf7
ffa5d36d4a39431f2d99feae6ae2b7a4a0348345 25-May-2017 Tyler Gunn <tgunn@google.com> Merge "IMS conference merge improvements." into oc-dev
am: 9f4db346f6

Change-Id: Ie34eb191cbe1450a94dba2d31594fd58bcea2f13
9f4db346f6640922b0ac1186098062d166bf7f0d 25-May-2017 Tyler Gunn <tgunn@google.com> Merge "IMS conference merge improvements." into oc-dev
b6655ffd6acf1de460bb62fe4ce945053d711b2c 20-Apr-2017 Chaitanya Saggurthi <csaggurt@codeaurora.org> Optimize power for incoming SMS

- In the current implementation, a wakelock is acquired when SMS is
received in IdleState. The wakelock is released 3 seconds after
returning back to IdleState. This happens even during bootup when
there are no pending messages to be handled.

- Add a change to ensure that while booting up, the wakelock is
not held if there are no pending messages to be handled.

Test: manual - Send and receive SMS

Bug: 34801294

Change-Id: I30d9ac2ee312bac0cd720047037d9048b540ec3f
nboundSmsHandler.java
162f95f48551ff3501c07e5a1c413d86065a03f9 25-May-2017 Neil Fuller <nfuller@google.com> Merge "Handle removal of time_zones_by_country.xml" am: 18248510ef am: aac81d101e am: 9aa0d0a792
am: d71b08835f

Change-Id: Ib533b6f019b348f1e17d7ae96fbea3adf070e7be
d71b08835fbd63d4eaa49216191c96657b4a5276 25-May-2017 Neil Fuller <nfuller@google.com> Merge "Handle removal of time_zones_by_country.xml" am: 18248510ef am: aac81d101e
am: 9aa0d0a792

Change-Id: If02bc09e48c08d0ed32f09ffdb7c892e176eb0b3
18248510ef6bdb4f634ca420aef91662987bcfc3 25-May-2017 Neil Fuller <nfuller@google.com> Merge "Handle removal of time_zones_by_country.xml"
24c6419a0bb29d7704e2a2ba8d8e9b5e1aa83846 24-May-2017 Tyler Gunn <tgunn@google.com> Merge "Add more logging for USSD codes." into oc-dev am: 7752a99a50
am: 0fe6779887

Change-Id: I54db3fe1c0c69bfdbd079b680f1f913cd6da665d
0fe67798877981da51821c5eb90a759183257a45 24-May-2017 Tyler Gunn <tgunn@google.com> Merge "Add more logging for USSD codes." into oc-dev
am: 7752a99a50

Change-Id: I3d75d4eedc6cf4aaa204b23677ea0bf9155858ae
7752a99a508d07b2163b341aa4d4362b2b5fd62e 24-May-2017 Tyler Gunn <tgunn@google.com> Merge "Add more logging for USSD codes." into oc-dev
025e1e9346fdcf35c3b53d7b84f1aefa6cec0768 24-May-2017 Sandeep Gutta <sangutta@codeaurora.org> Read network notification delay config based on subId

Read config property "network_notification_delay_int" based on
current subId instead of default subId.

Bug: 62007201
Change-Id: Ibdd30aa06902cf9e434d60266c9e0b3c5e5edf23
arrierServiceStateTracker.java
52e43154b3422d464a7361c40e15012b843c8fc7 20-May-2017 Tyler Gunn <tgunn@google.com> IMS conference merge improvements.

1. Re-map ended by conference merge to "IMS_MERGED_SUCCESSFULLY".
This later gets translated to Telecom disconnect cause "OTHER".
This is helpful to ensure the InCall UI is able to recognize that a call
ended because of the fact it is joining a conference.
2. Send connection event when starting to merge two calls; this way the
InCall UI can suppress transient states when merging.
Note: I purposely only send "merge complete" when merge fails; that way
when the calls disconnect naturally at the end of the merge, the incall ui
still knows they're in a "merging" state.

Test: Manual
Bug: 37581781
Change-Id: I22abfbae470c7e67b6e6309f58c958820a697609
msphone/ImsPhoneCallTracker.java
b36f8c8ecb904d5cd6a073f09b6f3f17a90b7e63 24-May-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fixed file descriptor leak in telephony unit tests"
1fcb2fe44bf0cdb3623d781bf2a67c6f8dc43fb5 24-May-2017 Jeff Davidson <jpd@google.com> Merge "More robust ref counting in EuiccConnector."
61b5415c0c4655aea1a6dc0cb48d7a0e260e2a5d 24-May-2017 Jack Yu <jackyu@google.com> Fixed file descriptor leak in telephony unit tests am: ae6e8f99bd
am: 9848cbfdbe

Change-Id: Ia367d5c24636529043cc073d1bfd8aab9478aadb
9848cbfdbe7ec8fe3eeb9b488a90567e86c7e8cf 24-May-2017 Jack Yu <jackyu@google.com> Fixed file descriptor leak in telephony unit tests
am: ae6e8f99bd

Change-Id: Ice665b510922057b5940b08504c578b14d3587ab
16fb750132532b5d3012576fa52805e3546551f7 23-May-2017 Jack Yu <jackyu@google.com> Fixed file descriptor leak in telephony unit tests

The handler thread in SimulatedCommands was not closed after
each unit test run. Fixed by adding a dispose method to quit
the thread.

Also use quit() instead of quitSafely() for all thread quiting
because we don't care if the messages were dispatched or not
after the test. This can fix some messages sending to dead
threads non-harmful exceptions in the output debug messages.

Test: Telephony unit tests
bug: 29579544
Merged-In: I112e46b0147a1950046a35cd9ac2498560c6ee1b
Change-Id: I112e46b0147a1950046a35cd9ac2498560c6ee1b
est/SimulatedCommands.java
e3fa46eb1e14ac8306a770656e2feed286b5b143 24-May-2017 Shuo Qian <shuoq@google.com> Merge "Provide a machanism to override MVNO parameters below CarrierConfig"
fcb2abb3cde9c40b708b628ec21a92e6b2cf667b 23-May-2017 nharold <nharold@google.com> Merge "Change initial IccCardProxy Card State to UNKNOWN" am: d9f54a3182 am: a5a411712b am: aa3bc75927
am: 6f1f1d19aa

Change-Id: I641ef3fe9883fa96683141c82e4ba4fd7377f6d6
ae6e8f99bdb297f906d6dcdc0a385ba27eee47fd 23-May-2017 Jack Yu <jackyu@google.com> Fixed file descriptor leak in telephony unit tests

The handler thread in SimulatedCommands was not closed after
each unit test run. Fixed by adding a dispose method to quit
the thread.

Also use quit() instead of quitSafely() for all thread quiting
because we don't care if the messages were dispatched or not
after the test. This can fix some messages sending to dead
threads non-harmful exceptions in the output debug messages.

Test: Telephony unit tests
bug: 29579544
Change-Id: I112e46b0147a1950046a35cd9ac2498560c6ee1b
est/SimulatedCommands.java
6f1f1d19aa17b517a851db03c2238e1879b0f956 23-May-2017 nharold <nharold@google.com> Merge "Change initial IccCardProxy Card State to UNKNOWN" am: d9f54a3182 am: a5a411712b
am: aa3bc75927

Change-Id: I57b5376dcfb84068b32276bac46c3b7a2c6c8187
d9f54a31824c50b94b82b6e223037771aca902c9 23-May-2017 nharold <nharold@google.com> Merge "Change initial IccCardProxy Card State to UNKNOWN"
dc01f4f1aa0b4c292c6e4c72f42877898454ccea 16-May-2017 Jeff Davidson <jpd@google.com> More robust ref counting in EuiccConnector.

The current implementation has two holes:

-If the LPA crashes between the command being dispatched successfully
(a oneway IPC) and the callback being executed, the operation will
never be considered finished.

-The callbacks happen on a binder thread, whereas all other access to
the ref counter happens on the handler thread.

We address both of these by moving the callbacks to the state
machine's handler thread and by keeping track of all callbacks for all
pending commands. If the state machine is about to leave the connected
state, because the connection is now severed, we call all of these
callbacks (with a generic "service unavailable" error).

Fixes: 37480432
Test: TreeHugger + Test of a crashing LPA
Change-Id: Icc31317d43cffa28f386478f04f7dd99622eb3c9
uicc/EuiccConnector.java
fc4a5073696af908b9bbdbc9af26d5cf82af4f63 23-May-2017 Jack Yu <jackyu@google.com> Merge changes from topic 'iwlan_unit' am: 21def16364 am: 3e25fa7e22
am: 7f8a4febfe

Change-Id: I045f1524012051d6f6491e09b2d6713e9e461e1c
1773b5c39a3357a14b792d08cea887932dfc6d67 19-May-2017 Jack Yu <jackyu@google.com> Added IWLAN metered APN support

If the device is in IWLAN mode, when checking if the APN
type is metered, we read the settings from the IWLAN
metered APN list.

Test: Telephony unit tests
bug: 38304530
Merged-In: If845af29ddc65369a361d093347c70d8655a9f9d
Change-Id: If845af29ddc65369a361d093347c70d8655a9f9d
ataconnection/ApnSetting.java
ataconnection/DataConnection.java
ataconnection/DcTracker.java
5b58978562c11e704b42a745bda55d6319a9b0c8 22-May-2017 Tyler Gunn <tgunn@google.com> Add more logging for USSD codes.

Test: Manual
Bug: 37561464
Change-Id: I8bbb78865b4ca48977cb84a90d88b58920bb5643
allManager.java
smCdmaPhone.java
sm/GsmMmiCode.java
msphone/ImsPhone.java
msphone/ImsPhoneMmiCode.java
1944101e94c5f9f4baab8f0cf7b86812fcc06639 08-May-2017 Nathan Harold <nharold@google.com> Change initial IccCardProxy Card State to UNKNOWN

The IccCard state is an amalgamation of hardware and software
states. This change updates the behavior to clarify and expand
the usage of the UNKNOWN state as follows:
-The initial state of the IccCard is now UNKNOWN (was NOT_READY)
-When the RADIO state is UNAVAILABLE, an ABSENT card state is now
reported as UNKNOWN rather than NOT_READY
-If the IccCard is present, but the App is not loaded, the
SIM_STATE will now be considered NOT_READY rather than UNKNOWN.
This means that the card is present, but the App is not ready.

Bug: 38124100
Test: IccCardProxyTest
Change-Id: I152f789703d7f975f6392ee242da9efd50948a01
icc/IccCardProxy.java
50734be549285702de00295778b8c2a4360215a0 19-May-2017 Jack Yu <jackyu@google.com> Added IWLAN metered APN support

If the device is in IWLAN mode, when checking if the APN
type is metered, we read the settings from the IWLAN
metered APN list.

Test: Telephony unit tests
bug: 38304530
Change-Id: If845af29ddc65369a361d093347c70d8655a9f9d
ataconnection/ApnSetting.java
ataconnection/DataConnection.java
ataconnection/DcTracker.java
1f4fd861e2e79e3ae47a389aa2c4d5e33e537cd1 20-Apr-2017 sqian <shuoq@google.com> Provide a machanism to override MVNO parameters below CarrierConfig

- maintain fake variables of imsi, gid1, gid2, and spn in IccRecord,
and add them into toString() and dump()
- provide a machanism to override Imsi, gid1, gid2, and spn during
sim/ruim record loading
- refactor the usages of getIMSI(), getGid1(), getGid2(),
and getServiceProviderName()
- fix potential crash issue in SIMRecord

Test: Manual
Bug: 32591388
Change-Id: I6dde2c29ca2f5c1dc55807e244260891ace08838
icc/CarrierTestOverride.java
icc/IccRecords.java
icc/RuimRecords.java
icc/SIMRecords.java
4f62c3ddcc69bc8217e4794c73d38945e97380ee 20-May-2017 Jeff Davidson <jpd@google.com> Write eUICC provisioned bit after successful download.

Bug: 38460669
Test: Unit Test / TreeHugger
Change-Id: Id7a00283a1948879c78ccb5a5fb97410cfe9a122
uicc/EuiccController.java
c92c9085143cc80dfc0e36336325fc4945a95fcd 03-Apr-2017 Jack Yu <jackyu@google.com> Merged makeNetworkCapabilities and getCopyNetworkCapabilities

Merge two identical methods into getNetworkCapabilities. This
is the preliminary work for unmetered mms fix for b/30936226.

Test: build
bug: 30936226
Merged-In: I2e41dd1ecac03da12b47c843f1f10c500026aa28
Change-Id: I2e41dd1ecac03da12b47c843f1f10c500026aa28
ataconnection/DataConnection.java
ataconnection/DcAsyncChannel.java
d216b7bae3e2a8f59b02befaac05e5b05846188b 18-May-2017 Przemyslaw Szczepaniak <pszczepaniak@google.com> Fix for bad merge 5a68f376f to oc-dev-plus-aosp

Test: make
Change-Id: I025a69edd1c20e2d7e363ec6e3fb48538d36a97d
ataconnection/DataConnection.java
0980dc008fe80a8b8d4bb71cce8281738bfe5002 18-May-2017 Przemyslaw Szczepaniak <pszczepaniak@google.com> resolve merge conflicts of 5a68f376f to oc-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I95eb2450bc59eb1a3b95a130a6084b26be2316bd
cbd3dcc9f15247e8db08a6aba7da532e629139d3 18-May-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge changes from topic 'dataallow'

* changes:
Reverted data roaming leakage fix that causes side effect
Consolidated all data allow/disallow logic into one method
9a40cc3d4243fbb9c42f4f2f375f541b88aeb9a3 18-May-2017 Jack Yu <jackyu@google.com> Merge "Fixed unnecessary roaming off event triggered issue" am: e55bff3c80 am: 004a864f5a
am: c9b0ed448e

Change-Id: I46d8b088046b284f3a9c23fb3752e469eb58d031
e55bff3c80e679389f67f4e7eed9aa0644b2016c 18-May-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fixed unnecessary roaming off event triggered issue"
68b1e590bc5e9204076454d504053a3a6af443e0 11-May-2017 Jack Yu <jackyu@google.com> Reverted data roaming leakage fix that causes side effect

Reverted ag/753579 that causes tethering not working in some
corner cases.

Test: Telphony anity tests
bug: 33847610
Merged-In: I061a706c3ed6b3255e39a33d0efa0d2f32af3120
Change-Id: I061a706c3ed6b3255e39a33d0efa0d2f32af3120
ataconnection/DataConnection.java
fe4a960eef43178ab7284e8fd470d83a3b107427 02-May-2017 Jack Yu <jackyu@google.com> Consolidated all data allow/disallow logic into one method

Consolidated all data allow/disallow logic into one method
and got rid of the obsolete isDataPossible. This is the
preliminary work for checking if data is allowed just right
before data connection entering connected state.

Test: Telephony sanity tests and unit tests
bug: 33847610
Merged-In: Ida89d454d984f7f0e4af8b20739dc68c0512e63c
Change-Id: Ida89d454d984f7f0e4af8b20739dc68c0512e63c
efaultPhoneNotifier.java
hone.java
ataconnection/DataConnectionReasons.java
ataconnection/DataEnabledSettings.java
ataconnection/DcTracker.java
msphone/ImsPhoneBase.java
ip/SipPhoneBase.java
3957502d0348ced9c90e90140248db637127d172 11-May-2017 Jack Yu <jackyu@google.com> Fixed that APN context stuck in SCANNING state

1. When data retry fails at trySetupData, we should apply
FAILED state to the APN context otherwise it will be
in SCANNING state forever since we are not going to
schedule for the next retry.
2. When we get a new network request in applyNewState,
if the APN is in SCANNING state, we should trySetupData
immediately instead of waiting for the next retry,
which might still minutes/hours away from now.

Test: Telephony sanity tests
bug: 38113800
Merged-In: I6edd7555327f41ee713a256edfe641a41ca6f969
Change-Id: I6edd7555327f41ee713a256edfe641a41ca6f969
ataconnection/DcTracker.java
d1aead71990b31f495a14c6b998631edad3ad962 16-May-2017 Jack Yu <jackyu@google.com> Fixed unnecessary roaming off event triggered issue

ag/1489842 fixed an issue that when we are in roaming and
phone type suddenly switches, we didn't broadcast the
roaming off event and the previous roaming status is
tossed away. The fix ag/1489842 then always send the
roaming off status when phone type switches.

The new fix in this CL would be only broadcasting the
event when we need.

Test: Telephony sanity tests
bug: 37973830
Merged-In: I1cd1d027a7d56541422dc573ab2ecff1c6fde108
Change-Id: I1cd1d027a7d56541422dc573ab2ecff1c6fde108
erviceStateTracker.java
7553e003cea142cd1f095ff4df5ea83ca100f444 16-May-2017 Jack Yu <jackyu@google.com> Fixed unnecessary roaming off event triggered issue

ag/1489842 fixed an issue that when we are in roaming and
phone type suddenly switches, we didn't broadcast the
roaming off event and the previous roaming status is
tossed away. The fix ag/1489842 then always send the
roaming off status when phone type switches.

The new fix in this CL would be only broadcasting the
event when we need.

Test: Telephony sanity tests
bug: 37973830
Change-Id: I1cd1d027a7d56541422dc573ab2ecff1c6fde108
erviceStateTracker.java
3e9f9dbb819b1fb2ad6c0f68b00abb6fb518165c 23-Dec-2016 Mengjun Leng <mengju@codeaurora.org> Fix the roaming searching text display in standby screen

Display roaming searching text in the device when cdma subscription
source is NV. As per current implementation, ERI file is always loaded
ir-respective of NV or RUIM.

Bug: 38148764
Change-Id: Ic23a2038274fc978335df1e186d59ec99c8ef8fc
erviceStateTracker.java
868a6ecdc930b7d9330a0735fd617baf4af245f6 17-May-2017 Tyler Gunn <tgunn@google.com> Merge "Add unit tests for ImsVideoCallProviderWrapper." into oc-dev am: e5dfa472a3
am: e4242823a0

Change-Id: I59ffabfbbe3eb722cc2aaf3daa9c1930b509c96d
e4242823a0a30d601995ae2c01a391dfcc772b99 17-May-2017 Tyler Gunn <tgunn@google.com> Merge "Add unit tests for ImsVideoCallProviderWrapper." into oc-dev
am: e5dfa472a3

Change-Id: I3066f42420aa14a5721eb9f179fb7f83b40fba51
e5dfa472a3c4d982aba94403bb878cf3705d5f4a 17-May-2017 Tyler Gunn <tgunn@google.com> Merge "Add unit tests for ImsVideoCallProviderWrapper." into oc-dev
ac4bffc27a777250713d3012c13f3adbcfda1518 17-May-2017 Ying Xu <yinxu@google.com> Merge "resolve merge conflicts of 7ff23212f to oc-dev-plus-aosp" into oc-dev-plus-aosp
8927dc92060ba2a053ba9a34d6bb8b80e4b4d16f 26-Jul-2016 Srikanth Chintala <srikchin@codeaurora.org> Get default from CdmaSubscriptionSourceManager

Initialize mCdmaSubscriptionSource with value read from
CdmaSubscriptionSourceManager instead of assigning with
SUBSCRIPTION_SOURCE_UNKNOWN.
This is needed, since in a scenario where UE is powered in APM
and VoWifi PDP activation bieng attempted, getOperatorNumeric()
from phone object fails, since current logic in GsmCdmaPhone
allows read of operator numeric only when mCdmaSubscriptionSource
is not SUBSCRIPTION_SOURCE_UNKNOWN which subsequently results in
PDP activation failure.

Bug:38373601
Change-Id: I1c7e1d3b766dd5a84a790f7742c11f840fe22889
smCdmaPhone.java
58ee748aa5c83c2a1ede1ab7c580855c3943b646 17-May-2017 yinxu <yinxu@google.com> resolve merge conflicts of 7ff23212f to oc-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.

Merged-in: I71de3f1dc0790ca4b9a2b9a4827637cb337668e2
Change-Id: Ia6614337fc1d0db3981bdc0e57bd374a4144068c
515d3375a9780cb2a7cf5282919d210c6edfc7ea 17-May-2017 Amit Mahajan <amitmahajan@google.com> Merge "Fix setCdmaBroadcastConfig in RIL.java to include all categories." into oc-dev
am: fde4aeebff

Change-Id: Iecd039e0a9a43275afa13a2c8e7c497a25006f19
fde4aeebff219a68968477644fd1392e51080614 17-May-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fix setCdmaBroadcastConfig in RIL.java to include all categories." into oc-dev
c5c8dbead30a1c94a035c48912c8a20f6e7dbe0a 17-May-2017 Amit Mahajan <amitmahajan@google.com> Merge "Fix setCdmaBroadcastConfig in RIL.java to include all categories."
44ab7bd1883881c3d459296081405fb976f25210 17-May-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Address IMSI privacy issues."
ee880fb27778d7277816b539319c3d6d270ecca3 17-May-2017 Amit Mahajan <amitmahajan@google.com> Merge "Convert unsigned uint8 fields in RIL interface to unsigned int." into oc-dev am: 091fd22c9c
am: 4ccf19ce02

Change-Id: If072df8b2720762c3c35071ed3591597edba0c16
4ccf19ce02f4dd328e567022962f8a7b4fb94a13 17-May-2017 Amit Mahajan <amitmahajan@google.com> Merge "Convert unsigned uint8 fields in RIL interface to unsigned int." into oc-dev
am: 091fd22c9c

Change-Id: Ia05ae78edbf33fe32ebf4ddc7198cfa7a2c5f672
77fb08c7f694132e24732b07f0fac5c1c9559c0b 21-Feb-2017 pkanwar <pkanwar@google.com> Address IMSI privacy issues.

Added getCarrierInfoForImsiEncryption and
setCarrierInfoForImsiEncryption methods.

Bug: 35606429
Test: runtest --path ..ImsiEncryptionInfoTest.java
Change-Id: I1b1f31b0e74a4ed8fb04d6362face696dfa5d4bf
arrierInfoManager.java
smCdmaPhone.java
hone.java
honeInternalInterface.java
honeSubInfoController.java
152ec067149afef2e05216fe7137bd21c1584ff0 16-May-2017 Amit Mahajan <amitmahajan@google.com> Convert unsigned uint8 fields in RIL interface to unsigned int.

Conversion is via byte which loses the unsigned-ness by default.

Test: basic telephony sanity
Bug: 37911659
Change-Id: I39312e8c280450d68aff016d9c582e24ecc43a0c
IL.java
adioResponse.java
cb192e90e2692e094b8d9cef4e52c36af5777681 15-May-2017 Amit Mahajan <amitmahajan@google.com> Fix setCdmaBroadcastConfig in RIL.java to include all categories.

Also disable some flaky tests.

Test: manual
Bug: 38109424
Merged-in: I15a26a8f5134e34cc00e57161faca5924ab82a80
Change-Id: I15a26a8f5134e34cc00e57161faca5924ab82a80
IL.java
f90dc6160becbfee66c01439253811e13fdb7f63 17-May-2017 Ying Xu <yinxu@google.com> Merge "Add the new RIL requests to start/stop network scan"
c5c52a3994b46593db032a70285f5fde03f64c75 15-May-2017 Amit Mahajan <amitmahajan@google.com> Fix setCdmaBroadcastConfig in RIL.java to include all categories.

Also disable some flaky tests.

Test: manual
Bug: 38109424
Change-Id: I15a26a8f5134e34cc00e57161faca5924ab82a80
IL.java
9c3c297dba70b3d6764d3b3082392e37e6075a82 16-May-2017 Tyler Gunn <tgunn@google.com> Merge "Filter invalid handover requests." am: f30e41f366 am: b3e1336a17 am: 432dbfd2a4
am: 3a7a35d653

Change-Id: I0f230b6857135e2e4f970994a0eec992d088f51f
3a7a35d653db1251111afe4db7c658e92a2f8dff 16-May-2017 Tyler Gunn <tgunn@google.com> Merge "Filter invalid handover requests." am: f30e41f366 am: b3e1336a17
am: 432dbfd2a4

Change-Id: I10d69826b69baebd755a5408424f827e73a8f995
f30e41f366ec6bbe955941385728173448f38fe3 16-May-2017 Tyler Gunn <tgunn@google.com> Merge "Filter invalid handover requests."
c8c651f856047c6c761de788a14097600701cdab 21-Apr-2017 yinxu <yinxu@google.com> Add the new RIL requests to start/stop network scan

This CL defines the RIL API which will be used to start and stop the
network scan. The long-term goal is to support Subsecond Switching which
is separate from what this CL is doing.

Test: Telephony sanity tests
Bug: 30954762
Change-Id: I71de3f1dc0790ca4b9a2b9a4827637cb337668e2
(cherry picked from commit ffcdbea80c50d4911d52f61611722e446af72b66)
aseCommands.java
ommandsInterface.java
smCdmaPhone.java
honeInternalInterface.java
IL.java
adioIndication.java
adioResponse.java
msphone/ImsPhoneBase.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
ip/SipPhoneBase.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
f7cab9f4e8b612a0c2cea8f41261cb89147be6dd 16-May-2017 Grace Chen <chengrace@google.com> Merge "Support different SIM power states" am: f7ea390cc0 am: 69ee7f4e68
am: bcc9dc404a

Change-Id: I7c9ba95018674d97fd22c0998ea72298c219d993
f7ea390cc00379deb4e68380542a6977b051cd01 16-May-2017 Grace Chen <chengrace@google.com> Merge "Support different SIM power states"
19f7a93c6dc642457ae1c2ce4eab10a7abf97755 16-May-2017 Tyler Gunn <tgunn@google.com> Filter invalid handover requests.

Prevent sending connection events when the handover to/from states
an unknown radio technology.

Test: Manual
Bug: 37720358
Change-Id: I23a1fab1a1c3b9624bbae30d094567e6879ab212
msphone/ImsPhoneCallTracker.java
2d4f7c72eb95807a2235068dde9c4c98cda2f626 24-Mar-2017 Grace Chen <chengrace@google.com> Support different SIM power states

Test: Verify SIM power states
Bug: 35844036
Merged-In: I0d7b73d25f987f556d134d22cebe8c322acb1cc3
Change-Id: I0d7b73d25f987f556d134d22cebe8c322acb1cc3
ommandsInterface.java
hone.java
IL.java
adioResponse.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
8784f4e7ae91379d235ed65939b4101af3ca8213 11-May-2017 Tyler Gunn <tgunn@google.com> Add unit tests for ImsVideoCallProviderWrapper.

Specifically adding tests to ensure that the issue described in the bug
is handled correctly.

Test: Manual/unit
Bug: 35304446
Change-Id: I40fb4b7df15c55114bda506442e5efa0aefbd809
msphone/ImsPhoneCallTracker.java
70dd9a37ed0f87091d1682f97ed7c024ed0ffb0d 15-May-2017 Jack Yu <jackyu@google.com> Merge "Fixed that APN context stuck in SCANNING state" into oc-dev
am: 7695149121

Change-Id: Ie9864787c1f89d4a98f86d98f424281aeff93c3e
76951491211b8d29461008326f979e7b2b755083 15-May-2017 Jack Yu <jackyu@google.com> Merge "Fixed that APN context stuck in SCANNING state" into oc-dev
c31837b580bf21a0d25dd2f69fc37bbc84d63ada 15-May-2017 Jack Yu <jackyu@google.com> Merge "Fixed that APN context stuck in SCANNING state"
8f32416b4c5f5657e7ccf3a1ee031598a0203fd9 14-Apr-2017 Jeff Davidson <jpd@google.com> Implement remaining core eUICC APIs.

These APIs follow the template of the APIs which have already been
implemented, in general. Switch, delete, and update nickname take a
subscription ID and map this to an ICCID before passing it to the
EuiccService implementation.

This completes the baseline implementation as designed; any additional
APIs or tweaks to the APIs will be tracked as separate bugs.

Fixes: 33075886
Test: Build/boot/unit test
Change-Id: I98ad64fb70b8989d14f3f3b6f875e693258faf5d
uicc/EuiccConnector.java
uicc/EuiccController.java
uicc/EuiccOperation.java
dce529f00c52bedf4377ee5f7ae1b284fe6452be 09-Apr-2017 Jeff Davidson <jpd@google.com> Implement embedded subscription list APIs.

Listing embedded subscriptions is fairly simple - we just return all
subscriptions for which IS_EMBEDDED = 1. We expose these through two
new APIs which return subscriptions which are either active or
embedded; one API (for the LPA and other callers with permission)
returns all such subscriptions, and the other (for carrier apps)
returns only subscriptions accessible to the calling app.

The cache of embedded subscriptions is updated whenever the SIM state
becomes ABSENT, ERROR, or LOADED; whenever an API call happens which
impacts the list of subscriptions (like a download or a delete); or
whenever the LPA requests a refresh due to some data change.

To support this change, the update process now runs on a background
thread instead of the main thread, as IPCs can't be made from the main
thread without deadlocking, in general. (Note though that this
probably should have been done before as the update logic was still
reading from/writing to a SQLite-backed ContentProvider, and since the
phone process currently contains UI for settings).

The update process pulls all cached embedded subscriptions (omitting
non-removable ones if the update is for a removable eUICC), as well as
non-embedded subscriptions with matching IMSIs. Subscriptions are
matched with those returned by the LPA and updated; any other cached
subscription in the above list is "removed" by marking it as
IS_EMBEDDED = 0. (This is equivalent to what happens when a physical
SIM is removed).

For the nickname, we repurpose the existing DISPLAY_NAME field.
However, there are settings UIs which allow updating this field, which
means those updates will be clobbered every time the list is updated.
A follow-up CL will propagate updates to this field from Settings to
the stored nickname on the eUICC's profile so that they persist.

Bug: 35851809
Test: Unit tests; e2e tests switching back and forth between embedded
and removable eUICC.
Change-Id: Ie714c0f7fc1a9d147008a2598dfdeac865ba120c
honeFactory.java
ubscriptionController.java
ubscriptionInfoUpdater.java
uicc/EuiccConnector.java
uicc/EuiccController.java
5dd862588745a75c24e7922b5ed954e5c1ad2653 13-May-2017 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Map CODE_LOCAL_ENDED_BY_CONFERENCE_MERGE to NORMAL disconnect cause" into oc-dev am: ef2b6345c1
am: 3ab46f26e9

Change-Id: Ie7673aa5513f827b42a9f38f041dac0494bd1218
e8a0fdbb7b6734f2ff05d46f92cfafd44b525dd7 13-May-2017 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Set CDMA data roaming based on TSB58 roaming indicator if voice is not in service" into oc-dev
3ab46f26e923a90fcbf4f8cfc18f265d286e0b1c 13-May-2017 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Map CODE_LOCAL_ENDED_BY_CONFERENCE_MERGE to NORMAL disconnect cause" into oc-dev
am: ef2b6345c1

Change-Id: I36e2e227c13f2a92cdd082c054eabc91b619eb7c
96646cc3503377e2f515e71bd31775643c1b830b 13-May-2017 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Set isGsm flag based on currently camped voice and data RATs" into oc-dev
ef2b6345c1b136e4b24e8df23049a48f7e5dd12b 13-May-2017 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Map CODE_LOCAL_ENDED_BY_CONFERENCE_MERGE to NORMAL disconnect cause" into oc-dev
c56bc7eefe9c039091a77949d054efd9913a126c 13-May-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Log Telephony Event on receiving RIL_UNSOL_MODEM_RESTART"
0f70a4c00d7ddac31b444d86e49e9b76fa2e658d 11-May-2017 Jack Yu <jackyu@google.com> Fixed that APN context stuck in SCANNING state

1. When data retry fails at trySetupData, we should apply
FAILED state to the APN context otherwise it will be
in SCANNING state forever since we are not going to
schedule for the next retry.
2. When we get a new network request in applyNewState,
if the APN is in SCANNING state, we should trySetupData
immediately instead of waiting for the next retry,
which might still minutes/hours away from now.

Test: Telephony sanity tests
bug: 38113800
Merged-In: I6edd7555327f41ee713a256edfe641a41ca6f969
Change-Id: I6edd7555327f41ee713a256edfe641a41ca6f969
ataconnection/DcTracker.java
9d05263529e0aa7fd68f118ca19aecffa6963844 11-May-2017 Jack Yu <jackyu@google.com> Fixed that APN context stuck in SCANNING state

1. When data retry fails at trySetupData, we should apply
FAILED state to the APN context otherwise it will be
in SCANNING state forever since we are not going to
schedule for the next retry.
2. When we get a new network request in applyNewState,
if the APN is in SCANNING state, we should trySetupData
immediately instead of waiting for the next retry,
which might still minutes/hours away from now.

Test: Telephony sanity tests
bug: 38113800
Change-Id: I6edd7555327f41ee713a256edfe641a41ca6f969
ataconnection/DcTracker.java
a254eeb44db498919d658c5ed51ca53cb579011f 14-Sep-2016 Naveen Kalla <mrnaveen@google.com> Log Telephony Event on receiving RIL_UNSOL_MODEM_RESTART

RIL_UNSOL_MODEM_RESTART will be sent by vendor RILs when it detects
a modem restart along with the reason for restart which could be a
crash signature if the modem restarted due to a crash or a some
other string such as a user-initiated restart or AT command
initiated restart.

Test: Modified vendor RIL to send modem restart unsol message and
verified that the event is logged, added a test in TelephonyMetricsTest
and ensured all TelephonyMetricsTest tests pass

Test: Manual
Merged-In: I6bc045341be59ac45cc2a8dd83bdbb3748352c0d
Change-Id: I6bc045341be59ac45cc2a8dd83bdbb3748352c0d
IL.java
adioIndication.java
etrics/TelephonyEventBuilder.java
etrics/TelephonyMetrics.java
8c56ae46af25613291c8eed32cc28fc5d99166ba 12-May-2017 Ying Xu <yinxu@google.com> Merge "Add the new RIL requests to start/stop network scan"
79589cfabf5e7cdcb2ca1c0a3abb70e92fe30390 12-May-2017 Brad Ebinger <breadley@google.com> Merge "Reset IMS Capabilities when IMS disconnects" into oc-dev am: 2137cf9d5a
am: 4d121fe85c

Change-Id: I6df39446b29733bb66f7d294928216340072e812
f6c5adcdbcbb2da2d068f8589356ef4b5c5dd8d8 12-May-2017 Chen Xu <fionaxu@google.com> Merge "reset carrier actions on APM"
4d121fe85c9f2b7eaeeb008578fd2ff7b7c4f486 12-May-2017 Brad Ebinger <breadley@google.com> Merge "Reset IMS Capabilities when IMS disconnects" into oc-dev
am: 2137cf9d5a

Change-Id: I1062d0dacf96a6689ab1e6e24a0339aff4fbf875
2137cf9d5abc9ca548d6ac17f87af257ec57ac28 12-May-2017 Brad Ebinger <breadley@google.com> Merge "Reset IMS Capabilities when IMS disconnects" into oc-dev
3c21733e032c19182ec2ad5d8f7ca7c857106b64 12-May-2017 Chen Xu <fionaxu@google.com> Merge "reset carrier actions on APM" into oc-dev am: b6e4bc38fb
am: 7a47abba16

Change-Id: Icdc63c41a189af3234e9a422e948a495cb9dad15
7a47abba160e97d73320f900ac9665c737e3b681 12-May-2017 Chen Xu <fionaxu@google.com> Merge "reset carrier actions on APM" into oc-dev
am: b6e4bc38fb

Change-Id: I3df1db27826f07291572ac4f700cbb0bc7a7b886
b6e4bc38fb8f8a0790ff5308d776c76a20ba1829 12-May-2017 Chen Xu <fionaxu@google.com> Merge "reset carrier actions on APM" into oc-dev
faf4f5ac3c93bbe552ca4b3a3384a1df7ce8a4db 15-Mar-2017 Toshiya Ikenaga <toshiya.ikenaga@sonymobile.com> Add IMEI_NOT_ACCEPTED error code for IMS

Bug: 38256949
Change-Id: Ib14bd9f3e6b26db7c27170c56ec65e96c18abd67
msphone/ImsPhoneCallTracker.java
ca0cf6cf5a9c6377f4d975bcfb6535706dd82e85 12-May-2017 Amit Mahajan <amitmahajan@google.com> Merge "Parse response from hal even in case of error." into oc-dev am: bbd3a5e6a6
am: f50085e9c0

Change-Id: I825a4556476c933bf006f4c2833206e2e148ec46
f50085e9c042716770c692534f34bf620465fe9e 12-May-2017 Amit Mahajan <amitmahajan@google.com> Merge "Parse response from hal even in case of error." into oc-dev
am: bbd3a5e6a6

Change-Id: I25f970d5f6ebff98c7267a606c945369ec0d8878
ad1a62f4445d7b6ebfcf3dbe438aeee2705015c2 10-May-2017 fionaxu <fionaxu@google.com> reset carrier actions on APM

Bug: 37913717
Bug: 37850264
Test: Manual test. toggle APM
Test: runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/CarrierActionAgentTest.java
Merged-in: Ie2d4c453438c1cabb7576e4d1aa4e61adba43c5e
Change-Id: Ie2d4c453438c1cabb7576e4d1aa4e61adba43c5e
arrierActionAgent.java
afffe1b3e671ba002a5bf79a2f59ec8e6c8bd6a3 10-May-2017 fionaxu <fionaxu@google.com> reset carrier actions on APM

Bug: 37913717
Bug: 37850264
Test: Manual test. toggle APM
Test: runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/CarrierActionAgentTest.java
Change-Id: Ie2d4c453438c1cabb7576e4d1aa4e61adba43c5e
arrierActionAgent.java
ffcdbea80c50d4911d52f61611722e446af72b66 21-Apr-2017 yinxu <yinxu@google.com> Add the new RIL requests to start/stop network scan

This CL defines the RIL API which will be used to start and stop the
network scan. The long-term goal is to support Subsecond Switching which
is separate from what this CL is doing.

Test: Telephony sanity tests
Bug: 30954762
Change-Id: I71de3f1dc0790ca4b9a2b9a4827637cb337668e2
aseCommands.java
ommandsInterface.java
smCdmaPhone.java
honeInternalInterface.java
IL.java
adioIndication.java
adioResponse.java
msphone/ImsPhoneBase.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
ip/SipPhoneBase.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
bbd3a5e6a6fae2e26113fa568ecee396be4f4910 12-May-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Parse response from hal even in case of error." into oc-dev
1ac51f1ba08b1d21d7da4fb00cd6a6545dffcc81 06-May-2017 Jayachandran C <jayachandranc@google.com> Set isGsm flag based on currently camped voice and data RATs

Use currently camped RATs to determine isGsm the flag
instead of checking both phone type and camped RATs.

Test: Verified the signal bar for the following use cases
Idle:
- SRLTE (1x & LTE) mode
- hVoLTE mode
- 2G only, 3G preferred, LTE preferred
- Cellular and IWLAN registered

Voice calls:
- CS calls on 1x, GSM, UMTS for all possible voice, data RATs
- IMS calls on LTE and IWLAN for all possible voice, data RATs

Bug: 36644977
Change-Id: Ifd996a2c902c7238f7328a42f0401c8d626e89e4
erviceStateTracker.java
c52bd153339cb0f7fd317fbee70aa5c45a6c4404 07-May-2017 Jayachandran C <jayachandranc@google.com> Set CDMA data roaming based on TSB58 roaming indicator if voice is not in service

Existing implementation:
1. CDMA voiceRoaming is set based on regState and roaming indicator.
2. CDMA dataRoaming is set based on regState only.
3. CDMA dataRoaming is overwritten with voiceRoaming if voice is
in service.

Issue:
If voice is not in service then the CDMA dataRoaming set based on
regState alone could be incorrect because it didn't use roaming
indicator from modem.

Fix:
This change sets CDMA dataRoaming based on TSB58 roaming indicator
(similar to setting voiceRoaming) if voice is not service.

Note: As per VoiceRegStateResult from radio types.hal the TSB58
roaming indicator shall be sent if device is registered on a
CDMA or EVDO system.

Test: Forced device to Evdo only and verified roaming state
Bug: 37917767
Change-Id: I3cc7fff61cea296afe17215a33b1b4c80972db13
erviceStateTracker.java
9240572c00c2f5b0fe5d01864eaec7d541d08aa1 11-May-2017 Amit Mahajan <amitmahajan@google.com> Parse response from hal even in case of error.

Test: manual sim pin testing, basic telephony sanity
Bug: 37941868
Change-Id: I1a0b576c84ebb9bf4ac3de41538d148a1a043c05
adioResponse.java
d6adcf507cdd3e10fab019c9848733d006287e83 11-May-2017 Jayachandran C <jayachandranc@google.com> Map CODE_LOCAL_ENDED_BY_CONFERENCE_MERGE to NORMAL disconnect cause

This change also optimizes imports

Test: Following scenarios for VoLTE and CS call and
verified the cause sent in PreciseCallState.

1) Conference call merge
2) Conference call, one remote party ends the call
3) Conference call, all remote parties end the call
4) Conference call, hangup locally
5) Normal call and hangup locally
6) Normal call and remote party ends the call

Bug: 38225047
Change-Id: I7ea843683eebfa2e60683ddffd11995b426f0a12
msphone/ImsPhoneCallTracker.java
acdf176b6c94c194054d29747927b577d7201a44 11-May-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Reverted data roaming leakage fix that causes side effect"
e42cfa683ff072a421e9ffb1213f3230b05cdbf8 11-May-2017 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Convert NV reset type into ResetNvType defined in types.hal" into oc-dev am: 9c0e1cfdb5
am: 284131dd87

Change-Id: I9674f70bf6c76b00ef45c53341f5185d5b550ef6
a5633601dc5156f1a9d9269a70bff4bcd247a756 11-May-2017 Brad Ebinger <breadley@google.com> Merge "Notify ImsService Status Callbacks correctly" into oc-dev
am: 87056c26aa

Change-Id: If4b4a96bed12f47c2a7649835dfeaee455b37d81
284131dd87abe8e6947cf8d8c920397c2c2b3cdd 11-May-2017 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Convert NV reset type into ResetNvType defined in types.hal" into oc-dev
am: 9c0e1cfdb5

Change-Id: Id3c4d62e6a7e175eeac927a1032c13a1b5c82791
da22a565f99b02b0d92eaea7cd10aaa965878c27 11-May-2017 Jack Yu <jackyu@google.com> Reverted data roaming leakage fix that causes side effect

Reverted ag/753579 that causes tethering not working in some
corner cases.

Test: Telphony anity tests
bug: 33847610
Change-Id: I061a706c3ed6b3255e39a33d0efa0d2f32af3120
ataconnection/DataConnection.java
dfe5bb2f1bf6ef5fd08ad2323b68e63b7e3683e2 11-May-2017 Brad Ebinger <breadley@google.com> Merge "Notify ImsService Status Callbacks correctly"
21174cff5010593d3108c7bdfa31d7b657008ad0 11-May-2017 Brad Ebinger <breadley@google.com> Reset IMS Capabilities when IMS disconnects

When IMS deregisters, reset the IMS capabilities
to false so we do not accidently return the wrong
result for TelephonyManager.isVolteAvailable()
if the ImsService does not set the capabilities to
false before deregistering.

Test: Telephony Unit Tests
Bug: 36374918
Change-Id: I42b066f8a97770f23d71a0c646f384f7cbfdb57b
msphone/ImsPhoneCallTracker.java
87056c26aaca5063bd21e8d5acce229d34dc3840 10-May-2017 Brad Ebinger <breadley@google.com> Merge "Notify ImsService Status Callbacks correctly" into oc-dev
c0db1e7250b06593e376c3e2685f1a1ff858de81 10-May-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Notify ImsService Status Callbacks correctly"
9c0e1cfdb52c323d7aaf6a5de65c6c7d1a94cd7d 10-May-2017 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Convert NV reset type into ResetNvType defined in types.hal" into oc-dev
0501652b896273a98d3a38ba18a310518d40cab3 10-May-2017 Grace Chen <chengrace@google.com> Merge "Support different SIM power states"
4a7d0334904e23a94fcf6b3af86d90b253ca557c 10-May-2017 Jayachandran C <jayachandranc@google.com> Merge "Set CDMA data roaming based on TSB58 roaming indicator if voice is not in service" am: 5eb9330526 am: 3e332133d3 am: 4e46c7a531
am: 21728cfb19

Change-Id: I48081726720f143e9d81cd0cfc3515e3aca3ef4d
7ea982ee6335afae5b340b408064eda8264c9093 10-May-2017 Jeff Davidson <jpd@google.com> Merge "Fix EuiccControllerTest's dependency on activity manager internals."
e16769120c06f1ea7e4e22d85b39d7c33c925697 10-May-2017 Jayachandran C <jayachandranc@google.com> Convert NV reset type into ResetNvType defined in types.hal

Test: 1. Sprint OMADM execution and verified device camps on service
2. FDR on Marlin and verified vendor code receives resetType 3

Bug: 37849113
Bug: 38169447
Change-Id: Iaf66c6f29a09d83f3f8bef73b65a589ea4c5df03
IL.java
21728cfb19f8781a6d1414cb76ea91b2aff07ae6 10-May-2017 Jayachandran C <jayachandranc@google.com> Merge "Set CDMA data roaming based on TSB58 roaming indicator if voice is not in service" am: 5eb9330526 am: 3e332133d3
am: 4e46c7a531

Change-Id: I835fe7c7fe482e7c5620b86bbeeeb044f43cddf7
675f8030c8009ba482c3b3cd6065ae53f0851416 06-May-2017 Brad Ebinger <breadley@google.com> Notify ImsService Status Callbacks correctly

Adds support in the ImsServiceController for multiple
Feature listeners for one feature. Also adds support for
signaling the ImsFeature to remove the binder callback when
the feature is removed.

Stops Phone from listening to IMS_SERVUICE_UP/DOWN when
using the ImsResolver.

Bug: 38001858
Test: Unit Tests
Merged-In: I920605b32160fdce9fcd3b4c0100804d3590397f
Change-Id: I920605b32160fdce9fcd3b4c0100804d3590397f
hone.java
ms/ImsServiceController.java
7bccdcbcf8619b3629032481d456aefc4871fb81 06-May-2017 Brad Ebinger <breadley@google.com> Notify ImsService Status Callbacks correctly

Adds support in the ImsServiceController for multiple
Feature listeners for one feature. Also adds support for
signaling the ImsFeature to remove the binder callback when
the feature is removed.

Stops Phone from listening to IMS_SERVUICE_UP/DOWN when
using the ImsResolver.

Bug: 38001858
Test: Unit Tests
Merged-In: I920605b32160fdce9fcd3b4c0100804d3590397f
Change-Id: I920605b32160fdce9fcd3b4c0100804d3590397f
hone.java
ms/ImsServiceController.java
5eb933052638c91887d4c4d531311e2280779871 10-May-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Set CDMA data roaming based on TSB58 roaming indicator if voice is not in service"
fc59bf75ccaaa45fcf8b9895f219a01955b75413 10-May-2017 Jeff Davidson <jpd@google.com> Fix EuiccControllerTest's dependency on activity manager internals.

verifyIntentSent() can't directly verify a call to
PendingIntent#send() using Mockito as PendingIntent is final. The
previous solution to this mocked out the highest level part of
PendingIntent's implementation which isn't final, but this part is an
implementation detail that is subject to breakage, so depending on it
is brittle. Instead, we can stub out the call to send() manually and
capture/verify the inputs in the test.

Test: bit FrameworksTelephonyTests:com.android.internal.telephony.euicc.EuiccControllerTest
Change-Id: I79a2213a4edf12b3359ba7425006694362a57854
uicc/EuiccController.java
ac0cab0f86d3e22cbbbf58c87f3d1c67037fbd83 10-May-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Synchronize on mImsPhone to avoid NPE"
44ae5a46185f96ece6251126ee5eb4e0c266207a 10-May-2017 Nathan Harold <nharold@google.com> Merge "Force BSIC value to only one byte" into oc-dev
44111462899c8a98ada3e8224327de6e4489b83a 10-May-2017 Jayachandran C <jayachandranc@google.com> Merge "Set isGsm flag based on currently camped voice and data RATs" am: 48dc958700 am: 53f1d370df am: a6bf125b94
am: facd402931

Change-Id: I8e85a2345f23ab0015428cefb02b0183e505bd36
9c5ab0438ebd166bef6e17e3870ef81689044557 10-May-2017 Brad Ebinger <breadley@google.com> Merge "Fix that pending DTMF cannot be sent after SRVCC has occurred" am: 005b1b160a am: 4858d37593 am: df6d635829
am: a8af94456d

Change-Id: Ic02cfcdc7b59c30e3509fba966d2544f12a45b57
a1639db3e7ea78eb20087e5c3f6919600166d5c6 10-May-2017 Hall Liu <hallliu@google.com> Merge "Synchronize on mImsPhone to avoid NPE" into oc-dev am: d19f1391f9
am: 007c1c44ff

Change-Id: Id30a2ee2bb0d899593540171b130b42fa693f59f
2cc29ad2e7d99d1b91defd0a6378ddf2e0a80613 10-May-2017 Chen Xu <fionaxu@google.com> Merge "voicemail notification settings cleanup" into oc-dev am: c98bc02791
am: 93f5c0f696

Change-Id: I9dfab8a6f83143149efc53afa3cdcd1773523800
bb12e05ce14c6bbcc646dcf2bead1c9dde2f4ac2 10-May-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Register for EVENT_RESTRICTED_STATE_CHANGED irrespective of phone type." into oc-dev am: c5bfcf3351
am: 3367f94d74

Change-Id: I52aebc9fdbd4ed31f449a7d37d77c3ba2d349804
facd4029314f607227b8aedc77564d2de9d4ce46 09-May-2017 Jayachandran C <jayachandranc@google.com> Merge "Set isGsm flag based on currently camped voice and data RATs" am: 48dc958700 am: 53f1d370df
am: a6bf125b94

Change-Id: I8e9d50d6a43ebf3c7436d93bc595b391bfad5c88
a8af94456d60ac4ee9860598bebf9474167254f5 09-May-2017 Brad Ebinger <breadley@google.com> Merge "Fix that pending DTMF cannot be sent after SRVCC has occurred" am: 005b1b160a am: 4858d37593
am: df6d635829

Change-Id: Ib64f0e105c497680587feb185eb0c6f7cb2db396
007c1c44ff4691b7788a024aa6e536b50234da6f 09-May-2017 Hall Liu <hallliu@google.com> Merge "Synchronize on mImsPhone to avoid NPE" into oc-dev
am: d19f1391f9

Change-Id: I1b085c351a1b3adb3b82cb57804f0963750b3646
93f5c0f696627e48275df439abc5b81b82d47468 09-May-2017 Chen Xu <fionaxu@google.com> Merge "voicemail notification settings cleanup" into oc-dev
am: c98bc02791

Change-Id: I4084ef86f80d9ddf6d6f2eed00835a5ff285574b
3367f94d749d96c788b1712507152bb68400d437 09-May-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Register for EVENT_RESTRICTED_STATE_CHANGED irrespective of phone type." into oc-dev
am: c5bfcf3351

Change-Id: I9231b3c98d95d30fb527d7d94f4407de89401144
d19f1391f9ed5fb3275d5449ec2d252e745f3866 09-May-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Synchronize on mImsPhone to avoid NPE" into oc-dev
469d1d71c8cf6ca8df66ce8f3f736dfe244ea020 07-May-2017 Jayachandran C <jayachandranc@google.com> Set CDMA data roaming based on TSB58 roaming indicator if voice is not in service

Existing implementation:
1. CDMA voiceRoaming is set based on regState and roaming indicator.
2. CDMA dataRoaming is set based on regState only.
3. CDMA dataRoaming is overwritten with voiceRoaming if voice is
in service.

Issue:
If voice is not in service then the CDMA dataRoaming set based on
regState alone could be incorrect because it didn't use roaming
indicator from modem.

Fix:
This change sets CDMA dataRoaming based on TSB58 roaming indicator
(similar to setting voiceRoaming) if voice is not service.

Note: As per VoiceRegStateResult from radio types.hal the TSB58
roaming indicator shall be sent if device is registered on a
CDMA or EVDO system.

Test: Forced device to Evdo only and verified roaming state
Bug: 37917767
Change-Id: I3cc7fff61cea296afe17215a33b1b4c80972db13
erviceStateTracker.java
48dc9587005e68042b56549a59058f7926f124be 09-May-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Set isGsm flag based on currently camped voice and data RATs"
005b1b160acd6cccc7c66b077f1c8de74399a201 09-May-2017 Brad Ebinger <breadley@google.com> Merge "Fix that pending DTMF cannot be sent after SRVCC has occurred"
c98bc0279108fb47d57c5221914d620c3c6d0143 09-May-2017 Chen Xu <fionaxu@google.com> Merge "voicemail notification settings cleanup" into oc-dev
ed77f7847ae02b52a068cc4248987d1511328731 24-Mar-2017 Grace Chen <chengrace@google.com> Support different SIM power states

Test: Verify SIM power states
Bug: 35844036
Change-Id: I0d7b73d25f987f556d134d22cebe8c322acb1cc3
ommandsInterface.java
hone.java
IL.java
adioResponse.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
c5bfcf33515e51f4035eb51f658abbe81894b0c4 09-May-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Register for EVENT_RESTRICTED_STATE_CHANGED irrespective of phone type." into oc-dev
a18eb87506359758fb67899525d0737d98923b8d 04-May-2017 Sanket Padawe <sanketpadawe@google.com> Register for EVENT_RESTRICTED_STATE_CHANGED irrespective of phone type.

+ Removed some dead code as well.

Bug: 37377132
Test: manual
Change-Id: I6ddddc39e69e0850e838b6f3cf1bc4adda682281
erviceStateTracker.java
est/SimulatedCommands.java
93b31177bd64c8923bd0d7d3a272dc6b629704f9 06-May-2017 Nathan Harold <nharold@google.com> Remove Extraneous Dependency from DefaultPhoneNotifier am: 0706462663 am: 2cda2cd99a
am: d1be417bbd

Change-Id: I56dc18ab3b129c70a25cdaa6b4ec898652152b5e
0706462663b0d5f69171f29c4d793be8ad86bb3d 29-Apr-2017 Nathan Harold <nharold@google.com> Remove Extraneous Dependency from DefaultPhoneNotifier

This is a patch to Change-Id: I444548745cc7b08c406fec86eb6c9d6d1fc3001f
Bug: 33414487
Test: compilation

Change-Id: I64075d293df18e890ef298d6adb999e3d18ac73f
efaultPhoneNotifier.java
6f35339421d2b5dd61d94164140d746ea0fb3de6 25-Jan-2017 Nathan Harold <nharold@google.com> Remove newFromRil() function to a utility class

Remove a dependency on frameworks/opt from SmsMessage for CDMA

-Add SmsMessageConverter for CdmaSmsMessage's
-Convert RadioIndication and CdmaSmsCbTest to use the calls in
the new converter class

Bug: 33414487
Change-Id: I2f0029b3d6a5efd5c8740643ee78a13c8c4cbb2f
adioIndication.java
dma/SmsMessageConverter.java
04b5725727a8765b92873e1eee5cdf2a1979919f 14-Dec-2016 Nathan Harold <nharold@google.com> Port functions from DefaultPhoneNotifier to frameworks/base

-Moved these methods to new class PhoneConstantConversions
in frameworks/base.

-Updated references to point to the same methods in the new
location.

Bug: 33414487
Test: compilation
Change-Id: I444548745cc7b08c406fec86eb6c9d6d1fc3001f
efaultPhoneNotifier.java
cbc5162efce58ee600bc45fc8a650fb7b5054e38 24-Jan-2017 Nathan Harold <nharold@google.com> Move SMS_RECORD_LENGTH to SmsManager

Bug: 33414487
Change-Id: Ia57198d92330c35518a3054d63e4312c2328a733
ccSmsInterfaceManager.java
icc/IccConstants.java
703fe39c7d98227b32ef162a59880eaa86b8cc8d 14-Dec-2016 Nathan Harold <nharold@google.com> Move OTASP_* Consts from ServiceStateTracker to TelephonyManager

-Move the OTASP_* constants from SST
-Update references to those constants

Bug: 33414487
Change-Id: I1f7a8169ca21d7bc3ecd8d996b9f496a0f044662
smCdmaPhone.java
erviceStateTracker.java
ataconnection/DcTracker.java
cafb2c96c796c0f8147ff5fe828fef1fb5ca5339 26-Apr-2017 Nathan Harold <nharold@google.com> Move files from frameworks/opt/telephony to frameworks/base

Bug: 37688438
Test: compilation, boot on aosp_bullhead
Merged-In: Ida4fa5605934b02b780b7c0b31961e177e16e09d
Change-Id: Ida4fa5605934b02b780b7c0b31961e177e16e09d
ms7BitEncodingTranslator.java
msAddress.java
msApplication.java
msHeader.java
msMessageBase.java
dma/SmsMessage.java
dma/sms/BearerData.java
dma/sms/CdmaSmsAddress.java
dma/sms/CdmaSmsSubaddress.java
dma/sms/SmsEnvelope.java
dma/sms/UserData.java
dma/sms/package.html
sm/GsmSmsAddress.java
sm/GsmSmsCbMessage.java
sm/SmsBroadcastConfigInfo.java
sm/SmsCbConstants.java
sm/SmsCbHeader.java
sm/SmsMessage.java
icc/IccUtils.java
7e4e11bced13bead3bbe5303ea3c5532f812b3ca 06-May-2017 Brad Ebinger <breadley@google.com> Notify ImsService Status Callbacks correctly

Adds support in the ImsServiceController for multiple
Feature listeners for one feature. Also adds support for
signaling the ImsFeature to remove the binder callback when
the feature is removed.

Stops Phone from listening to IMS_SERVUICE_UP/DOWN when
using the ImsResolver.

Bug: 38001858
Test: Unit Tests
Change-Id: I920605b32160fdce9fcd3b4c0100804d3590397f
hone.java
ms/ImsServiceController.java
60b33a3d1cb255249cedb81b6d2f9e332d9640ec 06-May-2017 fionaxu <fionaxu@google.com> voicemail notification settings cleanup

- remove UI preference for voicemail notification ringtone & vibration
settings as they are not functioning with notification channel
introduced
- have a new Notification Preference under voicemailSettings which will
navigate to the system settings screen for that channel.
- modify telephonymanager API getVoiceMailRingToneUri and
isVoiceMailVibrationEnabled from sharedPreference to NotificationChannel
data.
- more cleanup work needed till next API bump for telephonyManager APIs
setVoicemailVibrationEnabled and setVoicemailRingToneUri

Bug: 37912316
Test: Manaul test
Change-Id: Ic28713c012672b991b8f131545c06e1dbfd6765f
til/NotificationChannelController.java
34310e958f52099ce3a2e74a8e3c4f631a241529 06-May-2017 Hall Liu <hallliu@google.com> Synchronize on mImsPhone to avoid NPE

During a disconnect, the binder thread from the IMS stack may set
mImsCall to null simulataneously with the main thread calling methods on
mImsCall after a null check. Adding synchronization to prevent an NPE.

Change-Id: Id7874e802d56ab7d3912c779dedd1cccdb923db6
Test: no deadlocks while calling
Fixes: 37945103
msphone/ImsPhoneConnection.java
c09bbf92d084275ba38b6a1167905614290facc3 06-May-2017 Jayachandran C <jayachandranc@google.com> Set isGsm flag based on currently camped voice and data RATs

Use currently camped RATs to determine isGsm the flag
instead of checking both phone type and camped RATs.

Test: Verified the signal bar for the following use cases
Idle:
- SRLTE (1x & LTE) mode
- hVoLTE mode
- 2G only, 3G preferred, LTE preferred
- Cellular and IWLAN registered

Voice calls:
- CS calls on 1x, GSM, UMTS for all possible voice, data RATs
- IMS calls on LTE and IWLAN for all possible voice, data RATs

Bug: 36644977
Change-Id: Ifd996a2c902c7238f7328a42f0401c8d626e89e4
erviceStateTracker.java
4a7b8ec0502a63fb67d7b4749b1ea96288f9baa6 06-May-2017 Hall Liu <hallliu@google.com> Synchronize on mImsPhone to avoid NPE

During a disconnect, the binder thread from the IMS stack may set
mImsCall to null simulataneously with the main thread calling methods on
mImsCall after a null check. Adding synchronization to prevent an NPE.

Change-Id: Id7874e802d56ab7d3912c779dedd1cccdb923db6
Fixes: 37945103
msphone/ImsPhoneConnection.java
c37861c9c9c44a208235dfe1acda2e545c3bb547 06-May-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Fix hidl conversion bug for setCallForward()" into oc-dev am: 0489acf318
am: 36bde4f21d

Change-Id: I7e95e0db6231a0facdb7a829627be28ed08cb047
36bde4f21db08d4172198c2bfdeda2ae395b9395 06-May-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Fix hidl conversion bug for setCallForward()" into oc-dev
am: 0489acf318

Change-Id: If8e8c464a7c778bd5f30b178e81a902fc1a184b2
0489acf31803a449ff75cd089ec25fe5dca5345b 06-May-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Fix hidl conversion bug for setCallForward()" into oc-dev
5d06f6a48e63540e8b83b6b5df3c71faf01ce868 05-May-2017 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Check for service state before dialing normal voice call in the CS pipe" am: 29a1acb54c am: c7a499712a am: 3a10a5bbfc
am: 20b42e3c57

Change-Id: I71bb4532eda2c4ceb3ecf7f14650b12884cb60f9
20b42e3c57cfe89a8b6d7fc1c5281cc87287c0af 05-May-2017 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Check for service state before dialing normal voice call in the CS pipe" am: 29a1acb54c am: c7a499712a
am: 3a10a5bbfc

Change-Id: If32e784c99fd8b34e56560a9e3219fc87a6a7f99
29a1acb54cd186f3e4f6d608ab32c5fb51a02c50 05-May-2017 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Check for service state before dialing normal voice call in the CS pipe"
8489fba4bf4086d89973231cd627ce5898f34b5c 05-May-2017 Sanket Padawe <sanketpadawe@google.com> Fix hidl conversion bug for setCallForward()

Test: manual
Change-Id: Iad9d1f219956470c9217fbee91637ec2f7e6460a
Fix: 37991478
IL.java
9fe501923c30ab8be944353cda2485a7a8872857 05-May-2017 Jack Yu <jackyu@google.com> Merge "Consolidated all data allow/disallow logic into one method"
99e00ea846baea00e54d9d8c61b457a22a282cb7 02-May-2017 Jack Yu <jackyu@google.com> Consolidated all data allow/disallow logic into one method

Consolidated all data allow/disallow logic into one method
and got rid of the obsolete isDataPossible. This is the
preliminary work for checking if data is allowed just right
before data connection entering connected state.

Test: Telephony sanity tests and unit tests
bug: 33847610
Change-Id: Ida89d454d984f7f0e4af8b20739dc68c0512e63c
efaultPhoneNotifier.java
hone.java
ataconnection/DataConnectionReasons.java
ataconnection/DataEnabledSettings.java
ataconnection/DcTracker.java
msphone/ImsPhoneBase.java
ip/SipPhoneBase.java
86f275d954a0b349fe773b56b1431928288e727e 04-May-2017 Jayachandran C <jayachandranc@google.com> Check for service state before dialing normal voice call in the CS pipe

1) Rename CallStateException ERROR_DISCONNECTED to ERROR_OUT_OF_SERVICE

2) Do not dial in the CS pipe if CS is out of service and PS is not in LTE.
TelephonyConnectionService#getTelephonyConnection() doesn't filter in
some cases (ex. CS is out of service and IMS registered for SMS only) so
added this check to filter dialing the normal voice call to modem.

3) If dial is not allowed then throw CallStateException ERROR_OUT_OF_SERVICE
which will trigger notifying user to enable VoWiFi if WFC is disabled,
WFC provisioned and connected to WiFi.

4) Optimized imports

Test: Dial voice and video calls for all the combinations of the following
- CS : No service, 1x, GSM, UMTS, LTE
- PS : No service, 1x, eHRPD, GSM, UMTS, LTE
- IMS : No service, SMS only, SMS&VT only, VoLTE
- WiFi: Connected, Disconnected
- WFC : Enabled, Disabled

Bug: 37405103
Change-Id: I0fb91e06aac99b1c4cf163c7b5858a694b40c91c
allStateException.java
smCdmaPhone.java
hone.java
192678e315acfaf79dc686de46024ea2177e4a7c 04-May-2017 Jack Yu <jackyu@google.com> Merge "Moved data retry handler from broadcast to message." am: e93090dc56 am: 8d7b49eb06
am: d80a6ed658

Change-Id: I933f021651f4161dde3d44cba9face0c91210631
3fda16e695a7e9d42bbbe8a437fe8442d618e2a6 04-May-2017 Brad Ebinger <breadley@google.com> Merge "Better handle MSIM DDS changed event" into oc-dev
075b42b3df4689734728fc89b00356d9c0da53bb 03-May-2017 Jack Yu <jackyu@google.com> Moved data retry handler from broadcast to message.

The broadcast handler onReceive implmentations should
only handle minimum works. Made this consistent with
other DcTracker broadcast handler.

Test: Manual tests, Telephony sanity tests, and unit tests
bug: 37413302
Merged-In: I01440289bd46beb87a03e751a455555ce5a757b2
Change-Id: I01440289bd46beb87a03e751a455555ce5a757b2
ataconnection/DcTracker.java
bd709de459456a799da59415b30bba6bb28bdfab 04-May-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Moved data retry handler from broadcast to message."
b894f536469b394e6a8caeca95abbc7a9b709ccd 04-May-2017 nharold <nharold@google.com> Merge "Force BSIC value to only one byte" am: 9ac5b7842c am: db80ddf204 am: a6c2bbd2bf
am: ff7d4a86c6

Change-Id: Ie776824091a432bbe2af7658b63c9a16506cd099
ff7d4a86c65e667f1532d03d633cdb8f9720ba65 04-May-2017 nharold <nharold@google.com> Merge "Force BSIC value to only one byte" am: 9ac5b7842c am: db80ddf204
am: a6c2bbd2bf

Change-Id: Ia47ff95eaeeed4958c798d311eb899cec1c24240
920b42160e170581c29fe50ed9b3adef1582b6bd 02-May-2017 Nathan Harold <nharold@google.com> Force BSIC value to only one byte

BSIC is being sign-extended when copied to a java integer.
Truncate the length keeping the magnitude of the lowest byte.

Bug: 37787893
Test: compilation
Change-Id: I7807be3321e9c90f23351549c86ebe03dc239d80
(cherry picked from commit b808a31b9b0b5104b4ff32860c7ff9d52c12a7c8)
IL.java
9ac5b7842c06f73fd97bc28e3562329a3814b5f1 04-May-2017 nharold <nharold@google.com> Merge "Force BSIC value to only one byte"
ec581c0b21b5da662b9fe60a8212a66196a9f05c 18-Apr-2017 Brad Ebinger <breadley@google.com> Better handle MSIM DDS changed event

On DSDS MSIM devices, when Default Data Subscription event
is received, the ImsService may choose to switch which
Slot ID is active.

This change better handles that switch and removes a
crash that was happening due to
ImsServiceProxy#getFeatureStatus getting called
circularly.

Bug: 37361882
Test: Run Telephony unit test
Merged-In: If0f2e3c90de378421bc17d029bf1e6a3ced6bb34
Merged-In: I2cfef49f833e330289f172bae7e422f5afa5fc40
Change-Id: If61332d8c2d4dacb96d27d706abac6afc612749b
ms/ImsServiceController.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
cf1cdf3dbf9b4ac7743fe1580de1e05098539256 04-May-2017 Tyler Gunn <tgunn@google.com> Merge "Fix issues with MMI/USSD codes." into oc-dev
am: cc051eeaf0

Change-Id: I0b26448d3ff79c8ae6e5f6d6fd175a4bc30185b5
cc051eeaf0796ce87e5dde90756bce1629eda5a5 04-May-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fix issues with MMI/USSD codes." into oc-dev
3526fa3d06053e3702dccb7e02ca982c63c1bd4a 04-May-2017 Chen Xu <fionaxu@google.com> Merge "fix crash from carriersignalAgent under sip call" into oc-dev am: 91b7e82453
am: 84cbe25474

Change-Id: Icafc413644774727faaee5aa9ff2365e65c08441
84cbe2547453e8c04f4538391be08ce14010c8d7 04-May-2017 Chen Xu <fionaxu@google.com> Merge "fix crash from carriersignalAgent under sip call" into oc-dev
am: 91b7e82453

Change-Id: Id0cd5d2917da9e157d4d8bf5f1889adc46fb7fa3
91b7e82453a09d4b36b193ec6180c02b5154fce8 04-May-2017 Chen Xu <fionaxu@google.com> Merge "fix crash from carriersignalAgent under sip call" into oc-dev
1b5f54fb47d8e101f001ead4f062f83dc1d634af 03-May-2017 fionaxu <fionaxu@google.com> fix crash from carriersignalAgent under sip call

Bug: 37917990
Test: Manual test with sip call
Change-Id: Ia6d74928655d60d35062e6a8e920788759d99efd
Merged-in: Ia6d74928655d60d35062e6a8e920788759d99efd
arrierSignalAgent.java
d2569726c9c5a93c852ec6ddd5ca80c760845061 03-May-2017 fionaxu <fionaxu@google.com> fix crash from carriersignalAgent under sip call

Bug: 37917990
Test: Manual test with sip call
Change-Id: Ia6d74928655d60d35062e6a8e920788759d99efd
arrierSignalAgent.java
e10a3af2a3a21ebf0b3de0ba319aaa940fd6d5bb 03-May-2017 Jack Yu <jackyu@google.com> Moved data retry handler from broadcast to message.

The broadcast handler onReceive implmentations should
only handle minimum works. Made this consistent with
other DcTracker broadcast handler.

Test: Manual tests, Telephony sanity tests, and unit tests
bug: 37413302
Change-Id: I01440289bd46beb87a03e751a455555ce5a757b2
ataconnection/DcTracker.java
3509863b44b54c02efe071c0cd64403003a29b7f 03-May-2017 Sooraj Sasindran <sasindran@google.com> Merge "Do not log pin and puk" into oc-dev am: 64c0a81f1b
am: 83954336ea

Change-Id: Ia00c9af707e177d95ae589db8e904d86e2198f66
83954336ea79211c66e333c73249e08307a680b2 03-May-2017 Sooraj Sasindran <sasindran@google.com> Merge "Do not log pin and puk" into oc-dev
am: 64c0a81f1b

Change-Id: I95d9609fe29d0423c42aa42de78546cede104078
64c0a81f1b18c575f24896cd709e104a212aab4b 03-May-2017 Sooraj Sasindran <sasindran@google.com> Merge "Do not log pin and puk" into oc-dev
0f3e27e5b77a3ce3756987592dc3335155e49ede 03-May-2017 Chen Xu <fionaxu@google.com> Merge "support locale change for notification channels" into oc-dev am: f3f52f5cd1
am: fe19b40a85

Change-Id: I7a3bbd2af5f5b19ff1110a87723cd47159141a35
fe19b40a852817a184130c09b0fd9b3652c83bea 03-May-2017 Chen Xu <fionaxu@google.com> Merge "support locale change for notification channels" into oc-dev
am: f3f52f5cd1

Change-Id: I06a3f5dc5b7adf3cba186e80a77e7c1d24bdedaa
f3f52f5cd1946dfa0c13433b991ef73fbb2a5bdc 03-May-2017 Chen Xu <fionaxu@google.com> Merge "support locale change for notification channels" into oc-dev
231379c494dc7274ff97037c593c7e7b88d320d6 28-Apr-2017 Sooraj Sasindran <sasindran@google.com> Do not log pin and puk

Do not log pin and puk

Bug=37707781

Test: verified logs are not coming
Change-Id: I7ef94b4ad809db4eb679ee2a022379bd779cf6ef
IL.java
7c29cabeb38ae8cb4f5764c2dc0a768de22d2f92 02-May-2017 fionaxu <fionaxu@google.com> support locale change for notification channels

- create all notification channels when phone process started to provide
an consistent UX experience
- support locale changes

Test: Manual test with different languages
Bug: 37911731
Change-Id: Ib2d2bb27d307a3570923ca176f7d02f0c1985a43
arrierServiceStateTracker.java
nboundSmsHandler.java
honeFactory.java
erviceStateTracker.java
msphone/ImsPhone.java
til/NotificationChannelController.java
til/TelephonyNotificationBuilder.java
b808a31b9b0b5104b4ff32860c7ff9d52c12a7c8 02-May-2017 Nathan Harold <nharold@google.com> Force BSIC value to only one byte

BSIC is being sign-extended when copied to a java integer.
Truncate the length keeping the magnitude of the lowest byte.

Bug: 37787893
Test: compilation
Change-Id: I7807be3321e9c90f23351549c86ebe03dc239d80
IL.java
729861d46e85c2c5c5b5480655daa4eb211bda9b 01-May-2017 Malcolm Chen <refuhoo@google.com> Move intents ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, ACTION_DEFAULT_SUBSCRIPTION_CHANGED and EXTRA_SUBSCRIPTION_INDEX from Intent class to SubscriptionManager class. am: d17f611fd1
am: 850d084cb7

Change-Id: I1e9983647820a92870b517e91c7d28a389728fd4
850d084cb7029bd93cccb3a61e930dd3e2099ead 01-May-2017 Malcolm Chen <refuhoo@google.com> Move intents ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, ACTION_DEFAULT_SUBSCRIPTION_CHANGED and EXTRA_SUBSCRIPTION_INDEX from Intent class to SubscriptionManager class.
am: d17f611fd1

Change-Id: Iafcf8f862c4fa81de4cec7def7ed06236465130d
feefaf43d83ee53c9f9798206a387448f233f7a9 26-Apr-2017 Tyler Gunn <tgunn@google.com> Fix issues with MMI/USSD codes.

There a few issues here:
1. The queuing of MMI codes for handUssdRequest was not working properly.
I have removed it in favor of returning an error if there is an ongoing
MMI code. The functionality was pretty broken and despite my efforts I
could not sort all of it out well enough to be confident that it could be
fixed.
2. There was no attempt to retry handleUssdRequest calls on IMS.
3. There was a missing fallback to CS for regular MMI requests.

Test: Manual
Bug: 37484804
Merged-In: I8b2ed5ed9c29cdf95532096d60487656946b4cc0
Change-Id: I8b2ed5ed9c29cdf95532096d60487656946b4cc0
(cherry picked from commit 3aa9ed7d17a6b8401d71d9e09dce873038ec6b28)
smCdmaPhone.java
hone.java
honeInternalInterface.java
sm/GsmMmiCode.java
msphone/ImsPhone.java
msphone/ImsPhoneMmiCode.java
5ce98bab0b30aa859f87bcbc035cf6a3347881b1 29-Apr-2017 Tyler Gunn <tgunn@google.com> Merge "Fix issues with MMI/USSD codes."
d17f611fd1d45ef9daee5a0032dbd158add584f1 25-Apr-2017 Malcolm Chen <refuhoo@google.com> Move intents ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED,
ACTION_DEFAULT_SUBSCRIPTION_CHANGED and EXTRA_SUBSCRIPTION_INDEX
from Intent class to SubscriptionManager class.

Bug: 37497166
Test: Manual
Change-Id: Ifeedf974328cd3d839d7f66bf41a91c479d66316
ubscriptionController.java
3aa9ed7d17a6b8401d71d9e09dce873038ec6b28 26-Apr-2017 Tyler Gunn <tgunn@google.com> Fix issues with MMI/USSD codes.

There a few issues here:
1. The queuing of MMI codes for handUssdRequest was not working properly.
I have removed it in favor of returning an error if there is an ongoing
MMI code. The functionality was pretty broken and despite my efforts I
could not sort all of it out well enough to be confident that it could be
fixed.
2. There was no attempt to retry handleUssdRequest calls on IMS.
3. There was a missing fallback to CS for regular MMI requests.

Test: Manual
Bug: 37484804
Change-Id: I8b2ed5ed9c29cdf95532096d60487656946b4cc0
smCdmaPhone.java
hone.java
honeInternalInterface.java
sm/GsmMmiCode.java
msphone/ImsPhone.java
msphone/ImsPhoneMmiCode.java
0219341c06c04ba7bde63d0d1b5b43bbd08bb4a4 31-Mar-2017 Neil Fuller <nfuller@google.com> Handle removal of time_zones_by_country.xml

The time_zones_by_country.xml file has been replaced
by a file that can be updated outside of an OTA and
can be accessed via libcore.util.TimeZoneFinder.

This change includes refactorings that result
and keeps this code from using ICU types to avoid
confusion.

Bug: 25338903
Test: Ran CtsUtilTestCases
Change-Id: I699b4e7420e8d7e61ee68ec96552ab3144c9bab2
erviceStateTracker.java
3c107a1a54e3bdb9e1565a5671eb6e813bb29a23 28-Apr-2017 fionaxu <fionaxu@google.com> Merge "new carrier signal/action on carrier action reset" am: d2f008d15e am: 6ab7e41549 am: 9efcc38583
am: fe54774dee

Change-Id: I2da162d75365a151e89287c8fa960d0cc1d6b462
fe54774dee2248858e2c71821f2c2aabe9b0102b 28-Apr-2017 fionaxu <fionaxu@google.com> Merge "new carrier signal/action on carrier action reset" am: d2f008d15e am: 6ab7e41549
am: 9efcc38583

Change-Id: I1d17e8b4394c429a0e3c05bdc14ec3fd1aec81bf
48d4becf3fdd55969324de2c8c6178fe73794908 27-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "new carrier signal/action on carrier action reset" into oc-dev
559cb6775176b80b229870d30e4854388bb7270a 27-Apr-2017 fionaxu <fionaxu@google.com> new carrier signal/action on carrier action reset

notify carrier apps on carrier action reset, usually when sim loaded
or sim absent. only sent those reset signals to configured carrier apps
carrier apps could reply on this new intent instead of sim_state_changed
to avoid unnecessary wake-ups, for example an VZW app might be awake
even under AT&T due to the general SIM_STATE_CHANGED broadcast.

Bug: 34626476
Test: Manual test on TMO and READY/ZIP SIM
Change-Id: Icc8bd843ddaccd3a96950831c45ff6825fb0cc9e
Merged-in: Icc8bd843ddaccd3a96950831c45ff6825fb0cc9e
arrierActionAgent.java
arrierSignalAgent.java
3af7e4423bbb56fba5b468e5952f699b1d214d10 27-Apr-2017 pkanwar <pkanwar@google.com> resolve merge conflicts of f4c4446e3 to oc-dev-plus-aosp

Change-Id: I7fd44d7bf106331a2a79a1ac4a2718c85abcdb73
Test: manual
BUG: 35606429
4c9ca958d2ecb645d643d08c65f931e255138d71 27-Apr-2017 fionaxu <fionaxu@google.com> new carrier signal/action on carrier action reset

notify carrier apps on carrier action reset, usually when sim loaded
or sim absent. only sent those reset signals to configured carrier apps
carrier apps could reply on this new intent instead of sim_state_changed
to avoid unnecessary wake-ups, for example an VZW app might be awake
even under AT&T due to the general SIM_STATE_CHANGED broadcast.

Bug: 34626476
Test: Manual test on TMO and READY/ZIP SIM
Change-Id: Icc8bd843ddaccd3a96950831c45ff6825fb0cc9e
arrierActionAgent.java
arrierSignalAgent.java
4a6d165ee43bdc59858b08f24ab303c5f73a81e4 27-Apr-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Radio Interface changes to allow the modem to query the framework for the key."
ffc9ed99c900a45a43f34eb92f5c314d16c3f843 27-Apr-2017 Brad Ebinger <breadley@google.com> Merge "Better handle MSIM DDS changed event" am: 651b458247 am: 938f7da814 am: 2671fd3818
am: 8715dba91d

Change-Id: If0f2e3c90de378421bc17d029bf1e6a3ced6bb34
8715dba91d55cb76ed8406305fca56df0f4f5f5a 27-Apr-2017 Brad Ebinger <breadley@google.com> Merge "Better handle MSIM DDS changed event" am: 651b458247 am: 938f7da814
am: 2671fd3818

Change-Id: I2cfef49f833e330289f172bae7e422f5afa5fc40
651b458247c7f27f730b3e3e6f70bd7004cabe78 27-Apr-2017 Brad Ebinger <breadley@google.com> Merge "Better handle MSIM DDS changed event"
3dd2f4b1d5d89bb2e785df8e6ede6bf25937b0bd 16-Mar-2017 pkanwar <pkanwar@google.com> Radio Interface changes to allow the modem to query the framework
for the key.

This CL adds the 1.1 version of the HAL interface. It also introduces
support for 2 new messags:

1. setCarrierInfoForImsiEncryption
2. carrierInfoForImsiEncryption

BUG: 35606429
Change-Id: I312ec08ffd1ff84ab5bb53047862f74eb95be470
Test: manual
Merged-In: Id76b9c21df88c3dc8b201c6400e999688d5bdc3e
aseCommands.java
ommandsInterface.java
IL.java
adioIndication.java
adioResponse.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
737f18c4b761bad9b2e6874f2b7ac55fe7827343 27-Apr-2017 Julia Reynolds <juliacr@google.com> Merge "Notification method renames." into oc-dev am: 2b6ca68c33
am: a730300988

Change-Id: I29e777c88fbf84161ce25456085139ca8230df6b
a7303009889a91178203a07e27a82d56630a3ed3 27-Apr-2017 Julia Reynolds <juliacr@google.com> Merge "Notification method renames." into oc-dev
am: 2b6ca68c33

Change-Id: I8620e625bfca578abc5684d74d0a7e964075331a
c673608d7a634b4760bf4f7dbbb86869de447117 27-Apr-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Radio Interface changes to get the public key."
e5d195404d66c60c1f35e9ac900768d86c2956a6 16-Mar-2017 pkanwar <pkanwar@google.com> Radio Interface changes to get the public key.

This CL adds the 1.1 version of the HAL interface. It also introduces
support for 2 new messags:

1. setCarrierInfoForImsiEncryption
2. carrierInfoForImsiEncryption

BUG: 35606429
Test: manual
Change-Id: Id76b9c21df88c3dc8b201c6400e999688d5bdc3e
aseCommands.java
ommandsInterface.java
IL.java
adioIndication.java
adioResponse.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
116de2129cd4460a117e14058068d1073e89fbcb 26-Apr-2017 Shuo Qian <shuoq@google.com> Merge "Add SharedPreference information in TelephonyDebugService dumpsys"
601e3e6f323f55a48f787ca05133afda9c344ba0 26-Apr-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Create Public API which exposes if the device is in a state where simultaneous voice and data are possible."
db873e7ef051d6c4462bdb367c3cbc17ce619fb4 25-Apr-2017 Chen Xu <fionaxu@google.com> Merge "Send Filtered VVM SMS to telephony with phone account handle"
5de5ed316baf3ff3d7d58ac8c6d882fe1949d426 18-Apr-2017 Brad Ebinger <breadley@google.com> Better handle MSIM DDS changed event

On DSDS MSIM devices, when Default Data Subscription event
is received, the ImsService may choose to switch which
Slot ID is active.

This change better handles that switch and removes a
crash that was happening due to
ImsServiceProxy#getFeatureStatus getting called
circularly.

Bug: 37361882
Test: Run Telephony unit test
Change-Id: If61332d8c2d4dacb96d27d706abac6afc612749b
ms/ImsServiceController.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
9f914cd7cf06eea3e5140d454e21c3c49f8f522d 19-Jan-2017 pkanwar <pkanwar@google.com> Create Public API which exposes if the device is in a state where
simultaneous voice and data are possible.

BUG: 32912296
Test: Not required.
Change-Id: I4c2e21e9f2abcbeae63cd4235d802649c1208630
Merged-In: I4c2e21e9f2abcbeae63cd4235d802649c1208630
hone.java
e61d1f807a6503bee79cf83379efdd804a26c194 25-Apr-2017 Julia Reynolds <juliacr@google.com> Notification method renames.

Test: make
Bug: 37672218
Change-Id: I35abef5f015454c553fd0e06eaa221bb76ce41e7
nboundSmsHandler.java
msphone/ImsPhone.java
til/TelephonyNotificationBuilder.java
7a9b640ed1ef153a9df46ba6959a49b6a85a643e 18-Apr-2017 shuoq <shuoq@google.com> Add SharedPreference information in TelephonyDebugService dumpsys

Test: Mannual
Bug: 32342371
Change-Id: Ic34812b8a562a8aa3d26ab19e97cd9e4b9364d6d
honeFactory.java
465d44cd9327f84ca5ac7d877afb784f339facfb 25-Apr-2017 Ajay Dudani <adudani@google.com> Merge "Use non-wakeable alarm for data-stall alarm." into oc-dev am: c8f9bd9462
am: 299fbb98ae

Change-Id: I21e8ca5a4d3e223f0a882a7ee19fdf91b4232485
299fbb98aee74446c9fa5ac3aae44775abe17064 25-Apr-2017 Ajay Dudani <adudani@google.com> Merge "Use non-wakeable alarm for data-stall alarm." into oc-dev
am: c8f9bd9462

Change-Id: I225f750faf5e28f125d1faa890e284c8ce2525ab
3cea0ec980dc88677c15f41f59efec45444547cd 23-Dec-2016 Ta-wei Yen <twyen@google.com> Send Filtered VVM SMS to telephony with phone account handle

This follows the public VisualVoicemailService using the
PhoneAccountHandle as account key instead of subId, and uses
VisualVoicmailSms to wrap the SMS content.

Also, previous design of the filter sent the broadcast directly to the
VVM client, which was always telephony. After this CL it will always
send to telephony which will relay it to the client.

Test: CTS tests in follow up CL
Change-Id: I45a3d276af9cb6f9509586f05fc8fc600e074c6b
Merged-in: I45a3d276af9cb6f9509586f05fc8fc600e074c6b
isualVoicemailSmsFilter.java
f1e3a33902cabb8c68e5e41b99dc7a5dfdde8390 25-Apr-2017 Hall Liu <hallliu@google.com> Merge "Pipe through RTT signaling to IMS" am: 8ba24b2509 am: 38c7e5f08e am: e8d752ef61
am: ccccc1d2a5

Change-Id: I45bd34072f79ed0eef289503293d8ca29a157c48
ccccc1d2a5733d3cd295c8112d34a8d9dbbf38d9 25-Apr-2017 Hall Liu <hallliu@google.com> Merge "Pipe through RTT signaling to IMS" am: 8ba24b2509 am: 38c7e5f08e
am: e8d752ef61

Change-Id: I3bedff2865073e344107f691ce949e0a9523beea
8ba24b2509eb393450d028de786724b81903949b 25-Apr-2017 Hall Liu <hallliu@google.com> Merge "Pipe through RTT signaling to IMS"
7f121b4aa6286f3a413ef68097912fb4b5e3641d 15-Oct-2016 pkanwar <pkanwar@google.com> Provide an API to make USSD calls and read the responses.

Test: will be added in a subsequent CL.
Bug: 30973910
Change-Id: I0d826eaadd1bd5a0c23cfad651c0423f7b7cc5f6
Merged-In: I0d826eaadd1bd5a0c23cfad651c0423f7b7cc5f6
smCdmaPhone.java
miCode.java
honeInternalInterface.java
dma/CdmaMmiCode.java
sm/GsmMmiCode.java
msphone/ImsPhone.java
msphone/ImsPhoneMmiCode.java
ip/SipPhoneBase.java
128f3f36854fe183a6dd4d9917906b4723dd234f 22-Apr-2017 Ajay Dudani <adudani@google.com> Use non-wakeable alarm for data-stall alarm.

Previous behavior with use of ELAPSED_REALTIME_WAKEUP would wake up
the device for data stall check if device is in sleep state.

It should be safe to defer data stall check until device wakes up
from sleep. Update to use ELAPSED_REALTIME instead.

Bug: 36221436
Test: Compile test.
Change-Id: I057214c655910aedf4c87cba45a041e527047ac9
ataconnection/DcTracker.java
c3e8312bb5f52362d22850e008c80d9974434e10 21-Apr-2017 Chen Xu <fionaxu@google.com> Merge "telephony service support notification channel" into oc-dev am: 720a8cd3b0
am: d073e9341e

Change-Id: Icff261564ed3096be168e0a0abb4ef6b7b4b1bb1
d073e9341e903a4bdcac59e0c8b3ab5f517c992c 21-Apr-2017 Chen Xu <fionaxu@google.com> Merge "telephony service support notification channel" into oc-dev
am: 720a8cd3b0

Change-Id: I5cd818eb50a28dbe16a5f43a0f4ca5660a2ecfef
720a8cd3b063ddc255480f9c716b15dabeafbda5 21-Apr-2017 Chen Xu <fionaxu@google.com> Merge "telephony service support notification channel" into oc-dev
a788c0936e2ec52b8b28eb887babb5923611297e 21-Apr-2017 Jack Yu <jackyu@google.com> Fixed crash in data connection

Need to check if mConnectionParams is null before
accessing it.

bug: 30936226
Test: manual
Merged-In: Ia3ec371b40f6c53f988897f5cb6f1099f415b94f
Change-Id: Ia3ec371b40f6c53f988897f5cb6f1099f415b94f
ataconnection/DataConnection.java
382549c1d125c7bc98d70896a56eef4c33c51e15 21-Apr-2017 Jack Yu <jackyu@google.com> Fixed crash in data connection am: 5325b6786c
am: c04826599c

Change-Id: Iee1239b4f6af29549651b1ea75ce08944db66182
c04826599cfc0e9b4c14b13b000e6f891341b451 21-Apr-2017 Jack Yu <jackyu@google.com> Fixed crash in data connection
am: 5325b6786c

Change-Id: Ib00c116b575013c9cf91317d9079362bd6fa8286
5325b6786ca1092644cefc11b2991f1e8e5671a3 21-Apr-2017 Jack Yu <jackyu@google.com> Fixed crash in data connection

Need to check if mConnectionParams is null before
accessing it.

bug: 30936226
Test: manual
Change-Id: Ia3ec371b40f6c53f988897f5cb6f1099f415b94f
ataconnection/DataConnection.java
4b433b3e0a0c0df2d5996d17d55e4b2b0ba166ae 21-Apr-2017 Jordan Liu <jminjie@google.com> Merge "Use SubscriptionId instead of SubId"
13ff522d752715d856bd4068d39a769cd0d54a24 20-Apr-2017 fionaxu <fionaxu@google.com> telephony service support notification channel

Bug: 37475310
Test: Manual Test
Change-Id: Idb7697337dfd02a2fbb0ff7f3b1a3f69582c7f2e
arrierServiceStateTracker.java
nboundSmsHandler.java
erviceStateTracker.java
msphone/ImsPhone.java
til/TelephonyNotificationBuilder.java
382a0e04e66db5f3d71fcf7010b7bacfde2e3626 21-Apr-2017 Meng Wang <mewan@google.com> Merge "Fix log: RIL_REQUEST_SET_ALLOWED_CARRIERS" am: d96a7a9f56 am: 2a5348d5d7 am: 7ebd809ec3
am: e3bf9059b6

Change-Id: Ia765addd586af62e00fb81e0c46f0fec5e8874df
e3bf9059b67bfa450e7b2a072fe484c203c0a803 21-Apr-2017 Meng Wang <mewan@google.com> Merge "Fix log: RIL_REQUEST_SET_ALLOWED_CARRIERS" am: d96a7a9f56 am: 2a5348d5d7
am: 7ebd809ec3

Change-Id: I4d1f0a749db37b8717f6dedacfa94953203af527
d96a7a9f5630af874ac596425c6f2dbb8b6bd31d 21-Apr-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fix log: RIL_REQUEST_SET_ALLOWED_CARRIERS"
1b0205b0309bb340a121278f6c5bb2284a747090 21-Apr-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Added unmetered use only data connection support"
bc79eb66b7e7f30178ef0cbfb9e9fb4d5c4a300d 11-Apr-2017 Jack Yu <jackyu@google.com> Added unmetered use only data connection support

If a data network is brought up while data is turned off because
the request APN is unmetered, when data is enabled again, this data
network needs to be torn down so a full capable data network can
be re-established.

Test: Unit tests
bug: 30936226
Merged-In: Ia233c80fa14980713bfe66bef61f1c6f4a8c1c0d
Change-Id: Ia233c80fa14980713bfe66bef61f1c6f4a8c1c0d
ataconnection/DataConnection.java
ataconnection/DataEnabledSettings.java
ataconnection/DcAsyncChannel.java
ataconnection/DcTracker.java
7da45184895effa779365916e573ef7a19534251 18-Apr-2017 Jack Yu <jackyu@google.com> Fixed roaming related issues

1. the data enable check will be performed in trySetupData so
there is no need to add additional check in onRoamingOff and
onRoamingOn.

2. Do not trigger set initial attach apn and set data profile
in onRoamingOn (revert this behavior back to N-MR2).

3. Renamed getDataOnRoamingEnabled to getDataRoamingEnabled
for consistency.

bug: 30936226, 37280015
Test: Telephony sanity tests

Merged-In: I30ce763468b3068ecd80ab2a6a313b6284016909
Change-Id: I30ce763468b3068ecd80ab2a6a313b6284016909
smCdmaPhone.java
ataconnection/DcTracker.java
c44f210ef34041272408b54dac748407809aa7dc 21-Apr-2017 Jack Yu <jackyu@google.com> Merge "Added unmetered use only data connection support" into oc-dev am: 415ef1f12d
am: 99ffe32986

Change-Id: Ife1c11ec7b1c06a50f73dc06dcef75225c814ec3
99ffe32986c575b597d882b97a8aa8060d7b71fb 21-Apr-2017 Jack Yu <jackyu@google.com> Merge "Added unmetered use only data connection support" into oc-dev
am: 415ef1f12d

Change-Id: I359f64cd3afdc92fc6196a71ffa9e914488823c0
415ef1f12d0f3f3ce8ca2dcc9265e5aaca584e8e 21-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Added unmetered use only data connection support" into oc-dev
94ab6ca2d0e8805436081cbf4414f5427309042a 21-Apr-2017 Jack Yu <jackyu@google.com> Merge "Fixed roaming related issues" into oc-dev am: 7611bfd8b0
am: 8cef8336af

Change-Id: I6e15ab8e4d22d27683930fd9c2ab79705ea801ff
120d52b890d9ec9993747a31b199694ba2c0b7a2 11-Apr-2017 Jack Yu <jackyu@google.com> Added unmetered use only data connection support

If a data network is brought up while data is turned off because
the request APN is unmetered, when data is enabled again, this data
network needs to be torn down so a full capable data network can
be re-established.

Test: Unit tests
bug: 30936226
Change-Id: Ia233c80fa14980713bfe66bef61f1c6f4a8c1c0d
ataconnection/DataConnection.java
ataconnection/DataEnabledSettings.java
ataconnection/DcAsyncChannel.java
ataconnection/DcTracker.java
8cef8336af87aaa50eb1c5c87257affd05362654 21-Apr-2017 Jack Yu <jackyu@google.com> Merge "Fixed roaming related issues" into oc-dev
am: 7611bfd8b0

Change-Id: I83d2d1b1108767325093b5f6618fd3e712a2aa91
7611bfd8b0ddaeec732213deaee25d0fdf115583 21-Apr-2017 Jack Yu <jackyu@google.com> Merge "Fixed roaming related issues" into oc-dev
ab557c984221e625c388be90334e023f202d8d16 20-Apr-2017 Jordan Liu <jminjie@google.com> Use SubscriptionId instead of SubId

Rename the methods and arguments in ServiceStateTable to use
SubscriptionId instead of SubId.

Fixes: 35766624
Test: Existing unit tests pass
Change-Id: Ic837535b431c19d952e065b742d678152afafd57
Merged-In: Ic837535b431c19d952e065b742d678152afafd57
erviceStateTracker.java
f0471a2cefa879e89b31a48f0ff6617503a07ed6 20-Apr-2017 Jordan Liu <jminjie@google.com> Use SubscriptionId instead of SubId am: f2aa53cc95
am: b80333a80d

Change-Id: I3cef71557518d37e1c1751bd323ec4981533f43f
b80333a80d7fffefcabe5b2c3889dc199f41ea5a 20-Apr-2017 Jordan Liu <jminjie@google.com> Use SubscriptionId instead of SubId
am: f2aa53cc95

Change-Id: I73a8a9b8433bbdb31a53ace7f6ce281bd1f8ab31
f2aa53cc9508ad86a9bb79188dddf68ce43fcccd 19-Apr-2017 Jordan Liu <jminjie@google.com> Use SubscriptionId instead of SubId

Use the renamed methods in ServiceStateTable which refer to
SubscriptionId instead of SubId.

Change-Id: Ic837535b431c19d952e065b742d678152afafd57
Fixes: 35766624
Test: Existing unit tests pass
erviceStateTracker.java
e240e9e8f8ae0e9c0aebae3a860653c1dba08495 19-Apr-2017 Meng Wang <mewan@google.com> Fix log: RIL_REQUEST_SET_ALLOWED_CARRIERS

Test: make
Change-Id: Ie9069401a8808884e9e992fe51645da0b873899a
IL.java
fa88fc1de20ddb819975d78c98e4c0d6b27e225a 22-Mar-2017 Hall Liu <hallliu@google.com> Pipe through RTT signaling to IMS

Add plumbing to transmit RTT signaling to the IMS layer. Also add a
thread for reading/writing to the RttTextStream for communication
with the in-call app. Also implement batching and throttling to
ensure proper text throughput rates.

Bug: 34203619
Test: unit tests added
Change-Id: Icbc05130778449a3447bbad19ad0a3ebb6389a53
onnection.java
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
msphone/ImsRttTextHandler.java
5b83d07ba19e20cf2811824cc2bed96953d1134d 18-Apr-2017 Jack Yu <jackyu@google.com> Fixed roaming related issues

1. the data enable check will be performed in trySetupData so
there is no need to add additional check in onRoamingOff and
onRoamingOn.

2. Do not trigger set initial attach apn and set data profile
in onRoamingOn (revert this behavior back to N-MR2).

3. Renamed getDataOnRoamingEnabled to getDataRoamingEnabled
for consistency.

bug: 30936226, 37280015
Test: Telephony sanity tests

Change-Id: I30ce763468b3068ecd80ab2a6a313b6284016909
smCdmaPhone.java
ataconnection/DcTracker.java
6d5d8e285b4119309fd26bbe60600be4d8f09846 18-Apr-2017 Sooraj Sasindran <sasindran@google.com> Merge "Convert null string to """ into oc-dev
am: 8769a9192e

Change-Id: Iefe8bda2af9fdcd388f0db4412c097a65d59790d
8769a9192edf69f16c1aff20eba8a5b8da7fbad4 18-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Convert null string to """ into oc-dev
ef65fdd066722e023d39d7eb476457a30db619b3 18-Apr-2017 Chen Xu <fionaxu@google.com> Merge "stop polling service state when shutting down"
3c1dc9340364a06f557cfd1ea5f4f9da0894e6a7 18-Apr-2017 Chen Xu <fionaxu@google.com> Merge "stop polling service state when shutting down" into oc-dev am: c18827fa4b
am: 14d56b2d4c

Change-Id: I8c7f17e97f6101c60e0918f219d66ebc9b8e5d69
14d56b2d4c5863478452c6f3523cfc90a029edb0 18-Apr-2017 Chen Xu <fionaxu@google.com> Merge "stop polling service state when shutting down" into oc-dev
am: c18827fa4b

Change-Id: Id19334afba8ec922d895f49ab32727321ec4a03e
c18827fa4b9f313686187d298429faf862165613 18-Apr-2017 Chen Xu <fionaxu@google.com> Merge "stop polling service state when shutting down" into oc-dev
a5b70e4dc179942acc958d650bab1017be443e14 13-Apr-2017 Sooraj Sasindran <sasindran@google.com> Convert null string to ""

Convert null string to "" for call forward API

Bug=36634641
Test: verified that call fording can be disabled
Change-Id: I2ad7d3cd74765377d20936b34da177b17aedb231
(cherry picked from commit 01f650b0c580c22a42651e08bdd042c0d5b6c0fd)
IL.java
4c868ea2c7d7efaa7c6739f87f10df59d4ef5633 18-Apr-2017 Chen Xu <fionaxu@google.com> Merge "group multi-part message by 3gppswappush" into oc-dev am: 84f770a289
am: 45df38289b

Change-Id: Iae5a7a522b1871f41c16c32e272ea008ebd6a248
45df38289b3e9291b252c542f62d4f426f7fafbc 18-Apr-2017 Chen Xu <fionaxu@google.com> Merge "group multi-part message by 3gppswappush" into oc-dev
am: 84f770a289

Change-Id: I65a265c102879cc98ce3252afe3e61a9add513de
84f770a289b8754c0a0705b5eac48fbf9531b377 18-Apr-2017 Chen Xu <fionaxu@google.com> Merge "group multi-part message by 3gppswappush" into oc-dev
1ff5736eccec44883b896e343e9a165e4da10286 12-Apr-2017 fionaxu <fionaxu@google.com> stop polling service state when shutting down

if pollServiceState is modem triggered, we will keep polling state even
radio is off. This will cause "No service" and "No SIM card" hangs here
for a while during the power off sequence.

Bug: 34359617
Test: Manual
Change-Id: I5b9369601ca11b03223e22dabd60672130bea26c
Merged-in: I9a6f0412bdf7dd67316ce982834a7ad43054f7f4
erviceStateTracker.java
464512ea937be13f08d0e1ca8e1467487c786e83 03-Apr-2017 fionaxu <fionaxu@google.com> group multi-part message by 3gppswappush

If a device only receives part of long SMS from the network,
and then at some time later received another WAP push with
the same msg_id & message_count, device should not try to
combine them as the same message, otherwise it will trigger
out of boundary crash since sequence numbers for concatenated
messages start at 1 and the exception is CDMA WAP PDU messages,
which use a 0-based index. Fix is trying to group long message
by message_count, message_id, address and 3gpp2wap.

Bug: 29773532
Test: runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
Merged-in: I18d80f6bad2541e63211b9d61be63d17d817773d

Change-Id: I12b4998da08c5cd72a9a6953af524d6ac2b63d7a
nboundSmsHandler.java
nboundSmsTracker.java
msBroadcastUndelivered.java
b409fe99dce0d786807a19e73114734f8d493e09 18-Apr-2017 Meng Wang <mewan@google.com> Merge "Fix dump: dump mSpnOverride value" am: df40b13130 am: 91ab0551a1 am: ce2e715743
am: f2561a85ab

Change-Id: Ieac92d8fc1abc6ea132427109b63d21c734f34d8
f2561a85abecc964530ff8f2518fc49163dc1708 17-Apr-2017 Meng Wang <mewan@google.com> Merge "Fix dump: dump mSpnOverride value" am: df40b13130 am: 91ab0551a1
am: ce2e715743

Change-Id: Ifcc6a121f24ee975a8655029fab87562c9e03d93
df40b13130f3f662ff575f715d3ce1163a4587d2 17-Apr-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fix dump: dump mSpnOverride value"
c15c46e2220f4a466d67bc040a1c675776ad28d4 17-Apr-2017 Jordan Liu <jminjie@google.com> ServiceStateTracker notifies via ContentProvider
am: b675e5561c

Change-Id: I0a26e83ebc47af2985e3d43ad969d50cdd826e43
e35b0a78f08a9c0600723ef50d1428ab714c5370 17-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Implement eUICC error resolution."
450d7f0d799d349b07b69d2cb18ab20790eaa35c 12-Apr-2017 fionaxu <fionaxu@google.com> stop polling service state when shutting down

if pollServiceState is modem triggered, we will keep polling state even
radio is off. This will cause "No service" and "No SIM card" hangs here
for a while during the power off sequence.

Bug: 34359617
Test: Manual
Change-Id: I9a6f0412bdf7dd67316ce982834a7ad43054f7f4
erviceStateTracker.java
127f80d989b0717b1ac8df2079b000b24a462c39 17-Apr-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "ServiceStateTracker notifies via ContentProvider"
b675e5561c0971f54aad6349709d886408dc02ad 08-Mar-2017 Jordan Liu <jminjie@google.com> ServiceStateTracker notifies via ContentProvider

ServiceStateTracker inserts updated ServiceStates into the provider.
Telephony.ServiceStateTable contains helper functions and constants for
interfacing with the ServiceStateProvider.

Also update ContextFixture so the unit tests doesn't fail when trying to
use the service-state authority

Bug: 33756364
Test: runtest --path ServiceStateTrackerTest
Change-Id: I6b07b54f803765bba4c014474926a825113ac952
Merged-In: I6b07b54f803765bba4c014474926a825113ac952
erviceStateTracker.java
2286c7e03cecdcc375686196f79ec94d61051804 17-Apr-2017 Meng Wang <mewan@google.com> Fix dump: dump mSpnOverride value

Bug: 37422095
Test: make
Change-Id: Ia349cebb2530e6fe4eda71c86d7942a9e2fffec2
icc/SIMRecords.java
3ba9f4659bfb7820623a997e6ebd12bb0f251e73 17-Apr-2017 Jordan Liu <jminjie@google.com> Merge "ServiceStateTracker notifies via ContentProvider"
0f2369d0b6601040838d081196d017a3529b341a 15-Apr-2017 Meng Wang <mewan@google.com> Merge "Supress SIM_STATE_UNKNOWN when not PERSOSUBSTATE_SIM_NETWORK" into oc-dev am: 35bbf2ba17
am: 570e21f30c

Change-Id: Ib53457abf567188e6a5c03ad79845b5c1b01263e
570e21f30c16b042b0a3bccbc0117ff2269a0cce 15-Apr-2017 Meng Wang <mewan@google.com> Merge "Supress SIM_STATE_UNKNOWN when not PERSOSUBSTATE_SIM_NETWORK" into oc-dev
am: 35bbf2ba17

Change-Id: I660882d32dd00a9bdfe97d1058b9ac0bd377f781
35bbf2ba1791a878d893839ac765eb03621ad54c 15-Apr-2017 Meng Wang <mewan@google.com> Merge "Supress SIM_STATE_UNKNOWN when not PERSOSUBSTATE_SIM_NETWORK" into oc-dev
98ddd3bea3eb6a1416887aedac8f59c16c119080 08-Mar-2017 Jordan Liu <jminjie@google.com> ServiceStateTracker notifies via ContentProvider

ServiceStateTracker inserts updated ServiceStates into the provider.
Telephony.ServiceStateTable contains helper functions and constants for
interfacing with the ServiceStateProvider.

Also update ContextFixture so the unit tests doesn't fail when trying to
use the service-state authority

Bug: 33756364
Test: runtest --path ServiceStateTrackerTest
Change-Id: I6b07b54f803765bba4c014474926a825113ac952
erviceStateTracker.java
342c772a1be6d749956ed3654a48adaee4a5a761 15-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Switch to using StringNetworkSpecifier." into oc-dev
06e5810ac27691d00267a63c3087360f24054e26 08-Mar-2017 Jordan Liu <jminjie@google.com> ServiceStateTracker notifies via ContentProvider

ServiceStateTracker inserts updated ServiceStates into the provider.
Telephony.ServiceStateTable contains helper functions and constants for
interfacing with the ServiceStateProvider.

Also update ContextFixture so the unit tests doesn't fail when trying to
use the service-state authority

Bug: 33756364
Test: runtest --path ServiceStateTrackerTest
Change-Id: I6b07b54f803765bba4c014474926a825113ac952
Merged-In: I6b07b54f803765bba4c014474926a825113ac952
erviceStateTracker.java
5cd848197143bb9823b593f7971b3fee040ddf83 14-Apr-2017 Amit Mahajan <amitmahajan@google.com> Merge "Allow broadcast receivers to receive SMS_REJECTED_ACTION." into oc-dev am: 83753f7381
am: f480abc865

Change-Id: Ie74f6269da8dc6b6720cbbb01c2047bed17a81e8
f480abc86519a735096e3c54670d7404f8049840 14-Apr-2017 Amit Mahajan <amitmahajan@google.com> Merge "Allow broadcast receivers to receive SMS_REJECTED_ACTION." into oc-dev
am: 83753f7381

Change-Id: I5a18968620c013ccfb33ca4468fc3ae82521df85
83753f7381ff124cb90a97df1a657fbee42da90e 14-Apr-2017 Amit Mahajan <amitmahajan@google.com> Merge "Allow broadcast receivers to receive SMS_REJECTED_ACTION." into oc-dev
26c3198e70345a70e5dfa8ee422c7c4e60916cbe 31-May-2016 Lorenzo Colitti <lorenzo@google.com> Switch to using StringNetworkSpecifier.

Bug: 27533960
Test: unit tests
Change-Id: Ic763178bb1d85e9ec1734953415a416e3216fd40
Merged-In: I85c575d620970063a396af06d84080a2cceb4293
Merged-In: Ie59fbfc49b07496057973a3279d6b9ef5bb9d4bd
honeSwitcher.java
ataconnection/DataConnection.java
ataconnection/TelephonyNetworkFactory.java
86e12ecd9492a908e614b22d3b52d9087fb418b3 14-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Convert null string to """
01f650b0c580c22a42651e08bdd042c0d5b6c0fd 13-Apr-2017 Sooraj Sasindran <sasindran@google.com> Convert null string to ""

Convert null string to "" for call forward API

Bug=36634641
Test: verified that call fording can be disabled
Change-Id: I2ad7d3cd74765377d20936b34da177b17aedb231
IL.java
80c5a22a62e3ca73a17836681e6eb2e6fbf9d7fc 13-Apr-2017 Amit Mahajan <amitmahajan@google.com> Allow broadcast receivers to receive SMS_REJECTED_ACTION.

Allow apps in the background to receive SMS_REJECTED_ACTION as
that behavior is consistent with SMS_RECEIVED_ACTION. Both
intents should eventually be deprecated, but for now keeping
behavior same for both.

Test: Basic telephony sanity
Bug: 37156623
Change-Id: Iad19510998e1e88f8e09f2763fa98b7355af4dee
nboundSmsHandler.java
a73ad5fb61f00b9ae8de20102ff251eccfb3d70c 13-Apr-2017 Lorenzo Colitti <lorenzo@google.com> Merge "Switch to using StringNetworkSpecifier." am: 03dab3d717 am: f04e68ccf8 am: 9ce086e64c
am: 7f4b1e085b

Change-Id: Ie59fbfc49b07496057973a3279d6b9ef5bb9d4bd
7f4b1e085bafac04ba5fd828e5d72ec561543b34 13-Apr-2017 Lorenzo Colitti <lorenzo@google.com> Merge "Switch to using StringNetworkSpecifier." am: 03dab3d717 am: f04e68ccf8
am: 9ce086e64c

Change-Id: I85c575d620970063a396af06d84080a2cceb4293
468e5725d5fcc44672c074e166e8ce05e8e9a151 13-Apr-2017 Shuo Qian <shuoq@google.com> ECBM SystemProperty cleanup

- add a 'set' method in phone.java, and use it to set ECBM system property
and mIsPhoneInEcmState variable
- use isInEcm() method in the phone.java to read mIsPhoneInEcmState

Change-Id: Ie3882d1e9285904a17def68993987ae0549941a7
Test: manual
Bug: 30361624
smCdmaCallTracker.java
smCdmaPhone.java
hone.java
dma/CdmaSMSDispatcher.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
03dab3d717bb5bdd7730436dd8c6a24d6d7f6802 13-Apr-2017 Lorenzo Colitti <lorenzo@google.com> Merge "Switch to using StringNetworkSpecifier."
bd1c6b195f74ab548bc84b2dce61db4ff852d534 13-Apr-2017 Shuo Qian <shuoq@google.com> Merge "ECBM SystemProperty cleanup" am: 36c8c93def am: fc753c9958 am: 3ede2787fc
am: c66107288c

Change-Id: Id8de37d225ae5597a0be34d2f93f8de5e7c59158
96a2614e0c1c28b2cbcface64bf26e7daf406873 13-Apr-2017 Amit Mahajan <amitmahajan@google.com> Merge "Add p2 option in OpenLogicalChannel" into oc-dev
c66107288cf6ab415f242b51664644934c7e9c24 12-Apr-2017 Shuo Qian <shuoq@google.com> Merge "ECBM SystemProperty cleanup" am: 36c8c93def am: fc753c9958
am: 3ede2787fc

Change-Id: Ie8122c3deb2a3c879a659a8ebc14949f8fcc996c
36c8c93defe2ac3a3ccb329a8c8b1e5de0e9bce3 12-Apr-2017 Shuo Qian <shuoq@google.com> Merge "ECBM SystemProperty cleanup"
66173d51abb0d726eb9910c096166db4a4422a8e 12-Apr-2017 Meng Wang <mewan@google.com> Merge "Supress SIM_STATE_UNKNOWN when not PERSOSUBSTATE_SIM_NETWORK" am: c1b980a10c am: 6e4d493e95 am: d2575e7518
am: 49bd9dc005

Change-Id: Ie65171f68d5e2e691d7f359a734b8ef711bcae30
49bd9dc005b2801465f3a30e3684a01fe4fdf206 12-Apr-2017 Meng Wang <mewan@google.com> Merge "Supress SIM_STATE_UNKNOWN when not PERSOSUBSTATE_SIM_NETWORK" am: c1b980a10c am: 6e4d493e95
am: d2575e7518

Change-Id: Ic34499408b75829eb8f00cde5186a28bc39ab794
f74b493e52ae8e3eba4ce9e15d36157701c340a6 11-Apr-2017 Meng Wang <mewan@google.com> Supress SIM_STATE_UNKNOWN when not PERSOSUBSTATE_SIM_NETWORK

During APPSTATE_SUBSCRIPTION_PERSO, we don't know if SIM locked or not
before PERSOSUBSTATE_SIM_NETWORK. Setting SIM state UNKNOWN on
APPSTATE_SUBSCRIPTION_PERSO with other substate introduces uncessary SIM
state transition. It's OK to just keep the last SIM state (NOT_READY,for
example, the initial state during phone bootup).

Also fixed import.

Bug: 37240275
Test: make
Test: unlocked Verizon SIM bootup state sequence is: NOT_READY -> READY
-> IMSI -> LOADED. UNKNOWN is gone.
Change-Id: I89d479a51c81fe25713f3694f640e2eead1888cd
(cherry-pick of https://android-review.googlesource.com/#/c/369890/)
icc/IccCardProxy.java
c1b980a10c516bc73372425cdd48d91d6f1f4cb0 12-Apr-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Supress SIM_STATE_UNKNOWN when not PERSOSUBSTATE_SIM_NETWORK"
0ab6d8cd2c1fe45825361556a3f7d1c4b65d29eb 12-Apr-2017 Chen Xu <fionaxu@google.com> Merge "fix CTS failure for getNeighboringCellInfo" into oc-dev am: b42bed234e
am: 4b77bcac35

Change-Id: I1be7c64d00f80e9f14c2504ebd69cad5da6671c8
4b77bcac357021cd36b084a938b9f0e43ecec35d 12-Apr-2017 Chen Xu <fionaxu@google.com> Merge "fix CTS failure for getNeighboringCellInfo" into oc-dev
am: b42bed234e

Change-Id: I8985741669c3713c3428d935cd4ee8fbb29ebedb
b42bed234ee2a90a612a2532843ada85d394179d 12-Apr-2017 Chen Xu <fionaxu@google.com> Merge "fix CTS failure for getNeighboringCellInfo" into oc-dev
c6676c9a97efb78950c8f71ca7330d0bb4b24efd 03-Dec-2015 Ajay Nambi <anambi@codeaurora.org> Add p2 option in OpenLogicalChannel

- Adding support for P2 parameter
- Needed to support OMAPI 3.0 defined
by SIM Alliance

Test: Basic telephony sanity
Bug: 27360148
Change-Id: I51ab0821f84dca8fff90c912ebbfc9f1129dcbe5
ommandsInterface.java
IL.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
icc/UiccCard.java
icc/UiccCarrierPrivilegeRules.java
icc/UiccPkcs15.java
cac0df1fc03131cfeaa622cb5f40c7cce28c15dd 12-Apr-2017 Ta-wei Yen <twyen@google.com> Merge "Relax VVM originating number matching" into oc-dev am: 8e8c1ccb57
am: 55e3d762c1

Change-Id: Ifb712ae23a6abba1676b65c550ea108386642a16
55e3d762c1676158a8956249793347e9c3384336 12-Apr-2017 Ta-wei Yen <twyen@google.com> Merge "Relax VVM originating number matching" into oc-dev
am: 8e8c1ccb57

Change-Id: I613559b41401d8e1b4dcae66258f47d6b6f5a28a
8e8c1ccb57c69a9d2c481a36128717d06b73f176 12-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Relax VVM originating number matching" into oc-dev
f97f0535c2793c0f662a83fa6458f9d3241bd904 03-Apr-2017 fionaxu <fionaxu@google.com> group multi-part message by 3gppswappush

If a device only receives part of long SMS from the network,
and then at some time later received another WAP push with
the same msg_id & message_count, device should not try to
combine them as the same message, otherwise it will trigger
out of boundary crash since sequence numbers for concatenated
messages start at 1 and the exception is CDMA WAP PDU messages,
which use a 0-based index. Fix is trying to group long message
by message_count, message_id, address and 3gpp2wap.

Bug: 29773532
Test: runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/gsm/GsmInboundSmsHandlerTest.java
Change-Id: I18d80f6bad2541e63211b9d61be63d17d817773d
nboundSmsHandler.java
nboundSmsTracker.java
msBroadcastUndelivered.java
77d3034a4b7d5bb2ab2a5fd5b3e1722bf9009374 13-Jan-2017 shuoq <shuoq@google.com> ECBM SystemProperty cleanup

- add a 'set' method in phone.java, and use it to set ECBM system property
and mIsPhoneInEcmState variable
- use isInEcm() method in the phone.java to read mIsPhoneInEcmState

Test: manual
Bug: 30361624
Change-Id: Ib073915ea87ec2245ea568a6635f78be3141c226
smCdmaCallTracker.java
smCdmaPhone.java
hone.java
dma/CdmaSMSDispatcher.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
d12dc11590dc798482b6196e6ad577571bd3e720 11-Apr-2017 Amit Mahajan <amitmahajan@google.com> Merge "Add p2 option in OpenLogicalChannel" am: f2f9ab98b5 am: d9a5a3043f am: 324cc64040
am: f08f17c461

Change-Id: I53f3eac84a75c72591a1731c4fb32279170e2b9e
f08f17c461c97ca1a35396de604f8e3217e43c35 11-Apr-2017 Amit Mahajan <amitmahajan@google.com> Merge "Add p2 option in OpenLogicalChannel" am: f2f9ab98b5 am: d9a5a3043f
am: 324cc64040

Change-Id: I0e57976887f3eab6fc2d6dbd1311c6bb5eee58c8
f2f9ab98b535c1f267a152660e29dc37c7948d5f 11-Apr-2017 Amit Mahajan <amitmahajan@google.com> Merge "Add p2 option in OpenLogicalChannel"
953d76b6865b1f76c6fadbbd69898fe064b6c157 07-Apr-2017 Jeff Davidson <jpd@google.com> Implement eUICC error resolution.

When an operation fails with an error that the user can resolve, we
encapsulate the operation + failure in an EuiccOperation object. The
app can run the LUI to resolve the error, at which point the LUI calls
continueOperation with the original EuiccOperation and the result of
the resolution.

The resolution intent is a PendingIntent and thus the EuiccOperation
extra is safe from tampering - it is impossible to override an extra
on a PendingIntent belonging to another app.

Bug: 33075886
Test: Unit tests and manual verification using test LPA
Change-Id: I369e643efd522773d174e5ade8ebff4b8139f6d5
uicc/EuiccConnector.java
uicc/EuiccController.java
uicc/EuiccOperation.java
213c303a7e9398426ca99e680f7e361a4b154e26 11-Apr-2017 Jack Yu <jackyu@google.com> Merge "Merged makeNetworkCapabilities and getCopyNetworkCapabilities" into oc-dev am: 1a4f9e5f59
am: db6dfe8861

Change-Id: Ieeb0a233e26b25816559710fd49b20a5982ecec4
6a9b806333c1c633a97bd2da4ce1ae4d091a9d56 11-Apr-2017 Meng Wang <mewan@google.com> Supress SIM_STATE_UNKNOWN when not PERSOSUBSTATE_SIM_NETWORK

During APPSTATE_SUBSCRIPTION_PERSO, we don't know if SIM locked or not
before PERSOSUBSTATE_SIM_NETWORK. Setting SIM state UNKNOWN on
APPSTATE_SUBSCRIPTION_PERSO with other substate introduces uncessary SIM
state transition. It's OK to just keep the last SIM state (NOT_READY,for
example, the initial state during phone bootup).

Also fixed import.

Test: make
Change-Id: I89d479a51c81fe25713f3694f640e2eead1888cd
icc/IccCardProxy.java
db6dfe88616fa69b8dfac5e210a07437080a0176 11-Apr-2017 Jack Yu <jackyu@google.com> Merge "Merged makeNetworkCapabilities and getCopyNetworkCapabilities" into oc-dev
am: 1a4f9e5f59

Change-Id: If430bd727f615c3229e706be22720b069d2cc98a
1a4f9e5f59ddadcce94a358011966209bc28c5ca 11-Apr-2017 Jack Yu <jackyu@google.com> Merge "Merged makeNetworkCapabilities and getCopyNetworkCapabilities" into oc-dev
f486d010a5d9677afda526b88023fabbf3dd32d7 11-Apr-2017 Ta-wei Yen <twyen@google.com> Relax VVM originating number matching

The visual voicemail client can restrict the originating number for
VVM SMS to reduce false positives. The matching criteria used to be
exact match, which is too strict. Especially on CTS tests where
the formatting of the number cannot be controlled.

In this CL PhoneNumberUtils.compare() is used instead, which will
ignore formatting and country codes.

Bug: 37106950
Test: CTS android.telephony.cts.VisualVoicemailServiceTest
Change-Id: I2d28a3718b1a87f8618d171d71a08809763b9715
isualVoicemailSmsFilter.java
447f1b35d518ab3049c22956b66fa76019e0bba2 11-Apr-2017 fionaxu <fionaxu@google.com> fix CTS failure for getNeighboringCellInfo

Some telephony APIs will hungs without sending result back
to the callers on Wifi-only devices. fix is returning the
asyncresult back to callers.

Test: run cts -c android.telephony.cts.CtsTelephonyTestCases
Bug:36369978
Change-Id: I729ad3c2e5a03c627d1261f4963887babca31fd7
IL.java
41aade68b587dbac468b2ef62bff222f8dbd97b3 10-Apr-2017 Jack Yu <jackyu@google.com> Merge "Hold on data-stall recovery logic during voice call on other sub." am: 0de1aba19a am: a8c3f57a09 am: 510dbdade9
am: fa93a6319e

Change-Id: I88d7b577cd461767fdb4943a7c6f57686f0b85c1
828a110000eca870560ead99186d5727e96e64f8 07-Jun-2016 Sandeep Gutta <sangutta@codeaurora.org> Hold on data-stall recovery logic during voice call on other sub.

- Data stall may get falsely triggered if there is a voice call on
other sub and data is dormant on current data subscription.
- As part of recovery, telephony may bring-down the PDP or even reset
the modem.
- Do not proceed the data-stall logic if there is an active voice
call on any of the subscriptions.

Merged-In: I135f012c549bf8a2a32d14de05b2d49b62eb4d1b
Change-Id: I135f012c549bf8a2a32d14de05b2d49b62eb4d1b
Bug: 34760370
Test: Manual
ataconnection/DcTracker.java
fa93a6319efbb03c321951a4af6e221a68e1dbe9 10-Apr-2017 Jack Yu <jackyu@google.com> Merge "Hold on data-stall recovery logic during voice call on other sub." am: 0de1aba19a am: a8c3f57a09
am: 510dbdade9

Change-Id: Ib763877c65399e79166d500a5dafcbd7558e1bf3
785c6ecfc7809abc64117609cd326b159c10d65b 10-Apr-2017 Jeff Davidson <jpd@google.com> Merge "Allow carrier-privileged apps to download profiles."
6a2a21bfafb716f2eebdef6eb32d30c3df845bf3 07-Jun-2016 Sandeep Gutta <sangutta@codeaurora.org> Hold on data-stall recovery logic during voice call on other sub.

- Data stall may get falsely triggered if there is a voice call on
other sub and data is dormant on current data subscription.
- As part of recovery, telephony may bring-down the PDP or even reset
the modem.
- Do not proceed the data-stall logic if there is an active voice
call on any of the subscriptions.

Change-Id: I135f012c549bf8a2a32d14de05b2d49b62eb4d1b
Bug: 34760370
Test: Manual
ataconnection/DcTracker.java
08d3d312d13c3194d8434aeb8c92ea220f4d0e2c 04-Apr-2017 Jeff Davidson <jpd@google.com> Allow carrier-privileged apps to download profiles.

If an app without the privileged permission requests a profile
download, the metadata is fetched from the LPA (which now includes
UiccAccessRules[]). If that profile whitelists the calling app, we
permit the download.

We also check the carrier privileges of the current profile and
require user consent if the current app doesn't have it, to prevent a
silent switch from one carrier to a different one. This check is not
fully implemented yet - the carrier privilege check is using the
profile instead of the metadata, since the SubscriptionManager changes
to store the current profile's metadata are not yet implemented, and
the resolution flows are not yet implemented. These will be addressed
in follow-ups.

Bug: 33075886
Test: Unit tests
Change-Id: Ia3db683932945bfc668f42ebf28a586d7a5805af
uicc/EuiccController.java
bab87b029944524ba02e8f640e6f428215cce9ca 10-Apr-2017 Amit Mahajan <amitmahajan@google.com> Merge "Use internal namespace for STK intents." into oc-dev am: 76e7c5973d
am: 0e50603681

Change-Id: I5e82b110826dbbe11f5b9ce9c12ac9d4cbd9b689
0e5060368115ee2ef39041fe78b344ed3377efd3 10-Apr-2017 Amit Mahajan <amitmahajan@google.com> Merge "Use internal namespace for STK intents." into oc-dev
am: 76e7c5973d

Change-Id: I44fe203d55571dc0379f4fb4d9c337d183c9c524
76e7c5973d3d4c5c4c0fed4fddbab72b0b4f66e4 10-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Use internal namespace for STK intents." into oc-dev
2adc3534791aa1b9b24478c90fa5ce730a49853d 07-Apr-2017 Chen Xu <fionaxu@google.com> Merge "remove deprecated API sendDialerCode" into oc-dev am: f0dfcc5fb3
am: 5a03013037

Change-Id: Ib2562dfafe9d57da4544b2a58b6bac942de10e75
5a03013037b0eb9310371c27ce49d2ca2ef0141c 07-Apr-2017 Chen Xu <fionaxu@google.com> Merge "remove deprecated API sendDialerCode" into oc-dev
am: f0dfcc5fb3

Change-Id: I3e9e71acaa09d0e0d06ec5f0e389899f7e92dd69
f0dfcc5fb3378d0cbcfab7c2c97c8d9f1e7d1763 07-Apr-2017 Chen Xu <fionaxu@google.com> Merge "remove deprecated API sendDialerCode" into oc-dev
cbd31113dd5bd815cbddaa374573d9254b3de35b 06-Apr-2017 Amit Mahajan <amitmahajan@google.com> Use internal namespace for STK intents.

Test: none
Bug: 36976577
Change-Id: I3f59c061f075b4b6978960f79034478fe87d9916
at/AppInterface.java
b24093047930443f067628be575f3da743294ff3 31-May-2016 Lorenzo Colitti <lorenzo@google.com> Switch to using StringNetworkSpecifier.

Bug: 27533960
Test: unit tests
Change-Id: Ic763178bb1d85e9ec1734953415a416e3216fd40
honeSwitcher.java
ataconnection/DataConnection.java
ataconnection/TelephonyNetworkFactory.java
606cb716e62998ea9813deeb858c45dd4ac5470e 28-Mar-2017 Amit Mahajan <amitmahajan@google.com> Change radio related service names to slot1, slot2, slot3...

Test: Basic telephony sanity
Bug: 36570718
Merged-in: I425a78717fdd30d837ea7d8459192574afc75969
Change-Id: I425a78717fdd30d837ea7d8459192574afc75969
IL.java
4871be71e6998356b49411aebc8c57ec2d54226f 28-Mar-2017 Amit Mahajan <amitmahajan@google.com> Change radio related service names to slot1, slot2, slot3...

Test: Basic telephony sanity
Bug: 36570718
Merged-in: I425a78717fdd30d837ea7d8459192574afc75969
Change-Id: I425a78717fdd30d837ea7d8459192574afc75969
IL.java
10d75a759b897da1077e3aa21ced4c46698c5552 03-Dec-2015 Ajay Nambi <anambi@codeaurora.org> Add p2 option in OpenLogicalChannel

- Adding support for P2 parameter
- Needed to support OMAPI 3.0 defined
by SIM Alliance

Bug: 27360148
Change-Id: I51ab0821f84dca8fff90c912ebbfc9f1129dcbe5
ommandsInterface.java
IL.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
icc/UiccCard.java
icc/UiccCarrierPrivilegeRules.java
icc/UiccPkcs15.java
d8841226ac3a70e387839055dc4e2ee4826341bf 05-Apr-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Change radio related service names to slot1, slot2, slot3..."
caaf755b27069523d301f516cd8814ce5f8f2d48 28-Mar-2017 Amit Mahajan <amitmahajan@google.com> Change radio related service names to slot1, slot2, slot3...

Test: Basic telephony sanity
Bug: 36570718
Merged-in: I425a78717fdd30d837ea7d8459192574afc75969
Change-Id: I425a78717fdd30d837ea7d8459192574afc75969
IL.java
49fa8252307d4f387a549b87977a5ea86821159b 04-Apr-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Add new extra as per CDD for ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED."
3f570079960951f0f18960b5ecea41fb35ccd4ad 04-Apr-2017 Sanket Padawe <sanketpadawe@google.com> Add new extra as per CDD for ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED.

Bug: 36572866
Test: manual
Change-Id: Ie41a6401a19118533cd857e2b72546ec26dc17df
Merged-in: Ie41a6401a19118533cd857e2b72546ec26dc17df
ubscriptionController.java
8f0499b0975c5cb3124a94f3510fe95cd49fe6fb 04-Apr-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Add new extra as per CDD for ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED." into oc-dev am: 211f45b222
am: 156aa9c184

Change-Id: I9ec68e4f81448799eddc6bfa9dd0e8bec51160dd
156aa9c184e9b0c3342c5f8345e63c7df54c1f42 04-Apr-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Add new extra as per CDD for ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED." into oc-dev
am: 211f45b222

Change-Id: I2414b88acc5a4310b8295ab0244a84a10fc02b17
211f45b222576a2c45ccb48c90d2306c4c9570a1 04-Apr-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Add new extra as per CDD for ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED." into oc-dev
2fbf974ff8207eccc54c2dbde8c1962c4d468541 03-Apr-2017 Sanket Padawe <sanketpadawe@google.com> Add new extra as per CDD for ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED.

Bug: 36572866
Test: manual
Change-Id: Ie41a6401a19118533cd857e2b72546ec26dc17df
ubscriptionController.java
54c11ae1a5062891b442a01915646d3b0b450a5f 03-Apr-2017 Jeff Davidson <jpd@google.com> Merge "Squashed merge of master-sim into master."
2391192fcef7064960a376462ac3de7339284068 03-Apr-2017 Jack Yu <jackyu@google.com> Merge "Revert the change to fix the failed unit test cases" into oc-dev am: 1f49be0574
am: 4c1c0a3d96

Change-Id: I90c48e8b567caf63919c1b0fb7e9976ecd262ed1
4c1c0a3d96e03c3a467232cdb12e850f52d64335 03-Apr-2017 Jack Yu <jackyu@google.com> Merge "Revert the change to fix the failed unit test cases" into oc-dev
am: 1f49be0574

Change-Id: I18ef35b3e08e927bbd329a125f9e49b37c518ba6
1f49be0574e06b0dda7d8c451f699b3a0acd764a 03-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Revert the change to fix the failed unit test cases" into oc-dev
40774db975e77b9b628d34b7a6ab145574c9d0bb 03-Apr-2017 Ajay Nambi <anambi@codeaurora.org> Merge "Uicc: Fix NullPointerException issue after turn on airplane mode" am: 625a17656e am: a5b403d00d am: 0394486ef4
am: ca2294d04a

Change-Id: I9da5032eaabd1db2af767b74b79200be4a37f16d
ca2294d04af2fc5b864c880e5c3a6bde8f3a96ff 03-Apr-2017 Ajay Nambi <anambi@codeaurora.org> Merge "Uicc: Fix NullPointerException issue after turn on airplane mode" am: 625a17656e am: a5b403d00d
am: 0394486ef4

Change-Id: Ia1e6a4240d66e9bd306e116c497038616877da39
6289b21a3b9f0214a862878096384d8ce90a572c 03-Apr-2017 Jack Yu <jackyu@google.com> Merged makeNetworkCapabilities and getCopyNetworkCapabilities

Merge two identical methods into getNetworkCapabilities. This
is the preliminary work for unmetered mms fix for b/30936226.

Test: build
bug: 30936226
Change-Id: I2e41dd1ecac03da12b47c843f1f10c500026aa28
ataconnection/DataConnection.java
ataconnection/DcAsyncChannel.java
a5b403d00d532fd639a4fa2e83bb51e276ac3f2c 03-Apr-2017 Ajay Nambi <anambi@codeaurora.org> Merge "Uicc: Fix NullPointerException issue after turn on airplane mode"
am: 625a17656e

Change-Id: I93f592863affc52afb64ef934ad7567cf9a10c12
625a17656eaf6fc44d4bb8c38515bd1f8354cb4c 03-Apr-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Uicc: Fix NullPointerException issue after turn on airplane mode"
7bee80c76598a9ac08f06a190f1e8f5a3c39cf55 03-Apr-2017 Chad Brubaker <cbrubaker@google.com> Merge "Track rename of READ_PHONE_NUMBERS" into oc-dev am: cc96f78a46
am: 9b66f1a8fd

Change-Id: I8ab14f04d5497551710a277a9c8a1c191d2dd933
9b66f1a8fd56b0d6275a83cfc07018dca1ef0153 03-Apr-2017 Chad Brubaker <cbrubaker@google.com> Merge "Track rename of READ_PHONE_NUMBERS" into oc-dev
am: cc96f78a46

Change-Id: I431279023a1a1505599633e181b991a0a3904711
cc96f78a46ecfb64ca44e6017592a83589c9c09a 03-Apr-2017 Chad Brubaker <cbrubaker@google.com> Merge "Track rename of READ_PHONE_NUMBERS" into oc-dev
277a5a2aae73ef0233fffc350f3829aee779899f 01-Mar-2017 Jeff Davidson <jpd@google.com> Squashed merge of master-sim into master.

Includes the following commits:

==

Add stub implementation of EuiccController.

This class will provide the backing implementation for EuiccManager.

The service is only initialized if the eUICC hardware feature is
defined. This provides a simple gate to turn on/off the feature during
development.

==

Initial implementation of EuiccConnector.

EuiccConnector is a state machine responsible for finding and
connecting to, and then dispatching commands to the system
EuiccService implementation.

==

Update references to UiccAccessRule in UiccCarrierPrivilegeRules.

AccessRule is being moved to frameworks/base/telephony so that it can
be used to transfer access rules between an EuiccService
implementation and the platform.

==

Implementation of getEid() command.

Adds unit tests of command dispatch and bind lingering.

Also fixes a bug in ContextFixture that prevented bindService from
working when the Intent specified a component name but not a package
name.

==

Generalize EuiccConnector's resolution to work for activities.

Overall, resolving the active EuiccService implementation and
resolving the active Activity for a particular LUI intent action are
quite similar - both perform the same permission check on the app and
the activity/service declaration and require a priority. So we can
generalize the existing service lookup method to work for LUI
activities as well, and make this a utility method accessible to other
callers.

Also tweak the priority definition to use the more standard
android:priority instead of our own custom metadata. This reduces the
API surface and also ensures some sane behavior (like unbundled APK
updates not being able to adjust priorities without the OEM updating
the copy in /system in an OTA).

==

Euicc implementations for getting metadata and downloading.

These are fully implemented except for the following, which will be
handled as separate follow-up pieces:

-Carrier privilege checks (the privileged permission is currently a
strict requirement for the download API; this will be relaxed later
per the method spec)
-Resolution of user-resolvable errors

==

Test: TreeHugger
Change-Id: Ide3d81fdbdccff4573d58220fc2c603a7b9de5c4
honeFactory.java
uicc/EuiccConnector.java
uicc/EuiccController.java
icc/UiccCarrierPrivilegeRules.java
ecb75ffc91e7036ae87c5f0488fa871d4e079922 01-Apr-2017 Jack Yu <jackyu@google.com> Revert the change to fix the failed unit test cases

Also fixed some typos.

Test: telephony unit tests
bug: 29579544
Change-Id: Ia7e867c5f1723f528ed543e7da3a5254ae7b7729
ataconnection/DataConnection.java
ataconnection/DcTracker.java
e5a941797ef29712d98784a7a8e4e16760f5f6cf 21-Jan-2016 Ajay Nambi <anambi@codeaurora.org> Uicc: Fix NullPointerException issue after turn on airplane mode

Response may be cleared when SimRecord is reset,so check if it is
null before using response.

Fix issue with deletion of contacts with "=".

Fix issue for deletion of contacts with "=" in name,
as it would return 3 strings instead of 2 as expected.
Use overloaded split method to return 2 strings instead
to resolve the issue.

Bug:35026607
Change-Id: Ia20a646cb10bd15136de900df7177ca0bac4e465
ccProvider.java
icc/AdnRecordCache.java
94bd0070cafe3010f03df14fe514c0deda135d3f 01-Apr-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Allowed broadcast receivers to receive SMS intents" into oc-dev
4046c629e5cd75fd23f5860c1abe8f071535394b 01-Apr-2017 Jack Yu <jackyu@google.com> Merge "Call set initial attach apn when roaming status changes"
am: 46837417d8

Change-Id: I267cb1c248002c7aa51d46512fdf43b3e2e2d927
75b32b9d88fed8df52a18601ea7f2f85a66a395e 01-Apr-2017 Jack Yu <jackyu@google.com> Call set initial attach apn when roaming status changes am: 5533ba5e04
am: fe1b308904

Change-Id: Ie90aa366f2801bbf0149c6ee2bdf1b021ae133b3
f153a7fd5a715dfb36367f2b4ed542b4f580002a 31-Mar-2017 Jack Yu <jackyu@google.com> Call set initial attach apn when roaming status changes

This is needed for the old modem (RIL version <15) which only
accepts one protocol based on the roaming condition. In that
case we need to call set initial attach apn again so the
correct protocol can be passed down to the modem.

Test: Telephony sanity tests and unit tests
bug: 35210742
Merged-In: I5e88a61a1cc69d22ed319e598050509341833d7d
Change-Id: I5e88a61a1cc69d22ed319e598050509341833d7d
ataconnection/DcTracker.java
fe1b308904fb231b66ee9d05a6fabe662e75e62f 01-Apr-2017 Jack Yu <jackyu@google.com> Call set initial attach apn when roaming status changes
am: 5533ba5e04

Change-Id: I9c716743430631c86b098e109e3d280e762757b8
9926e1c287aa7f31be075527f10810c876ef4f81 22-Mar-2017 Junda Liu <junda@google.com> Allowed broadcast receivers to receive SMS intents

Allow apps in the background to receive WAP_PUSH_RECEIVED_ACTION
and SMS_RECEIVED_ACTION. Carrier privisioning client may depend on
WAP push messages to start or phone number verification app may
depend on sms received intents.

Bug: 36492080
Test: Telephony sanity tests
Merged-In: I720dd12f1987a7e9ebafabaebe2857517f58da9b
Change-Id: I720dd12f1987a7e9ebafabaebe2857517f58da9b
nboundSmsHandler.java
8d7d3c147056c43635182e6215d78671809a73e8 01-Apr-2017 Junda Liu <junda@google.com> Merge "Allowed broadcast receivers to receive SMS intents" am: 4e8bd83818 am: 4a2bd3eb19 am: 3c3fc8a90d
am: 5f95092105

Change-Id: I5ac4c58ae1e583018a315195aa015e8bddff61d5
5f950921056e9d3084d1573947634adefa43e11e 01-Apr-2017 Junda Liu <junda@google.com> Merge "Allowed broadcast receivers to receive SMS intents" am: 4e8bd83818 am: 4a2bd3eb19
am: 3c3fc8a90d

Change-Id: Id2ad9dcb9bdf71656d51a90817374d54ae601626
4a2bd3eb1925b370d78c054a77887e556bdd2b10 01-Apr-2017 Junda Liu <junda@google.com> Merge "Allowed broadcast receivers to receive SMS intents"
am: 4e8bd83818

Change-Id: I516c65e1a70aa51faa72f895a45f33c662249c3d
4e8bd838184b768673327b6385707940c2034174 01-Apr-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Allowed broadcast receivers to receive SMS intents"
5533ba5e0461e7f6e5d6f3f41828107a12e5b021 31-Mar-2017 Jack Yu <jackyu@google.com> Call set initial attach apn when roaming status changes

This is needed for the old modem (RIL version <15) which only
accepts one protocol based on the roaming condition. In that
case we need to call set initial attach apn again so the
correct protocol can be passed down to the modem.

Test: Telephony sanity tests and unit tests
bug: 35210742
Change-Id: I5e88a61a1cc69d22ed319e598050509341833d7d
ataconnection/DcTracker.java
008255dbfbb65c91b7004b11257450fb4bcaf162 22-Mar-2017 Junda Liu <junda@google.com> Allowed broadcast receivers to receive SMS intents

Allow apps in the background to receive WAP_PUSH_RECEIVED_ACTION
and SMS_RECEIVED_ACTION. Carrier privisioning client may depend on
WAP push messages to start or phone number verification app may
depend on sms received intents.

Bug: 36492080
Test: Telephony sanity tests
Change-Id: I720dd12f1987a7e9ebafabaebe2857517f58da9b
nboundSmsHandler.java
fbb61184658ea525170cf6dd9c8741972e696ec4 31-Mar-2017 Shuo Qian <shuoq@google.com> Merge "Remove duplicate 'Time logs:' and 'Time zone Logs:' in the dumpsys" into oc-dev am: cc348d6cbb
am: c7cfd691e1

Change-Id: I38a892f1357547e2e1b9f7487ea6590f29ae1786
c7cfd691e10fa3604673ae350bbfd89556bccee9 31-Mar-2017 Shuo Qian <shuoq@google.com> Merge "Remove duplicate 'Time logs:' and 'Time zone Logs:' in the dumpsys" into oc-dev
am: cc348d6cbb

Change-Id: Icd381310cdd532c1821612fdd1dadd761a365193
cc348d6cbb3d9187799eb550e8c3bb83ce94dd89 31-Mar-2017 Shuo Qian <shuoq@google.com> Merge "Remove duplicate 'Time logs:' and 'Time zone Logs:' in the dumpsys" into oc-dev
afdd28c8d1f84b7be96988c0a5f84dd18ee2277d 31-Mar-2017 Amit Mahajan <amitmahajan@google.com> Merge "Change radio related service names to slot1, slot2, slot3..."
11d160879b0667d8e0dcde0fcef5a48536de6139 31-Mar-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Disable voice call barring notification for VZN."
am: 6f7c1e1674

Change-Id: I518aa3f7e10fbd410a10d0b9ec80c20da0b55b6c
c6fac8fa4dce63f7c43280a732f81bcf5d03891f 23-Mar-2017 fionaxu <fionaxu@google.com> remove deprecated API sendDialerCode

Bug: 35767402
Test: run cts -m CtsPermissionTestCases -t
android.permission.cts.TelephonyManagerPermissionTest

Change-Id: I4a496ac335255ba6397b7f9261ba1a16c0534b85
hone.java
9cd0d0b1e3e568d0a7f1184367d10d25d51605cf 31-Mar-2017 Chad Brubaker <cbrubaker@google.com> Track rename of READ_PHONE_NUMBERS

Bug: 35853790
Test: See framework CL
Change-Id: Ic74c1b1f085268a51a9555aaa6406c5112c98d4e
honeSubInfoController.java
6f7c1e167422ce4a9a81169634484abf2ebd0b25 31-Mar-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Disable voice call barring notification for VZN."
19001b7796f062272c5a826b26eda6af6b7ed764 31-Mar-2017 shuoq <shuoq@google.com> Remove duplicate 'Time logs:' and 'Time zone Logs:' in the dumpsys

Bug: 36686977
Test: Manual
Change-Id: I920aeb28df7456f4c5b07495bb8c63638634ef37
erviceStateTracker.java
48126ef8f933e1a29c01595b9bdc754b0e8f9df3 31-Mar-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Correct NPE when active call is disconnected." into oc-dev
b58e31529792af3716defe7a516c9e09ecfc0176 29-Mar-2017 Sanket Padawe <sanketpadawe@google.com> Disable voice call barring notification for VZN.

Test: Manual
Bug: 31490566
Change-Id: I729a7da49d5379d0559653a1d702881979bc6711
Merged-in: I729a7da49d5379d0559653a1d702881979bc6711
erviceStateTracker.java
96afde9f7d9f6c6f6fbc10215309963af30b1b42 30-Mar-2017 Tyler Gunn <tgunn@google.com> Correct NPE when active call is disconnected.

Its possible for an active call to be disconnected, in which case it has
no ImsCall. This causes a NPE in the "shouldDisconnect..." logic.

Test: Manual
Bug: 36777742
Merged-In: I4b4a3564143c60df811ba9f6040ca073e49f7487
Change-Id: I00cba85d426aedbbb46251528953b314f4f5dc35
msphone/ImsPhoneCallTracker.java
69970f6330fa2765393a12a034c6f297d3d63023 30-Mar-2017 Tyler Gunn <tgunn@google.com> Merge "Correct NPE when active call is disconnected." am: 209afa9d10 am: a68ef155d6
am: 350d36d05c

Change-Id: I72f8edaff9070a127ed2786c56c4846d80322c4a
a68ef155d644c91e80b12a6ba4b91ea92d0b993e 30-Mar-2017 Tyler Gunn <tgunn@google.com> Merge "Correct NPE when active call is disconnected."
am: 209afa9d10

Change-Id: I5885d8d1aef37869a762626bfe8faab9b40ae956
209afa9d10d741fc68de7075ebc94c869b003d74 30-Mar-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Correct NPE when active call is disconnected."
9ebf0b81917444c5d813453edf216d5e474d8252 30-Mar-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Disable voice call barring notification for VZN." into oc-dev
am: 0a17ddf132

Change-Id: I81d4e54ed245df7e5c8f6a51bb87d7cc4477f0f1
0a17ddf132b97c9601d8c7b4ad12317811eed63f 30-Mar-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Disable voice call barring notification for VZN." into oc-dev
f63e74c2cceb025ee348b21c644909691b149eac 28-Mar-2017 Amit Mahajan <amitmahajan@google.com> Change radio related service names to slot1, slot2, slot3...

Test: Basic telephony sanity
Bug: 36570718
Change-Id: I425a78717fdd30d837ea7d8459192574afc75969
IL.java
ab6002ccd4f0b15e6d1b747f0c3273722664414a 30-Mar-2017 Tyler Gunn <tgunn@google.com> Correct NPE when active call is disconnected.

Its possible for an active call to be disconnected, in which case it has
no ImsCall. This causes a NPE in the "shouldDisconnect..." logic.

Test: Manual
Bug: 36777742
Change-Id: I00cba85d426aedbbb46251528953b314f4f5dc35
msphone/ImsPhoneCallTracker.java
022a5af455c8456952726ed906efeb47ce895550 29-Mar-2017 Sanket Padawe <sanketpadawe@google.com> Disable voice call barring notification for VZN.

Test: Manual
Bug: 31490566
Change-Id: I729a7da49d5379d0559653a1d702881979bc6711
erviceStateTracker.java
e4bcca76930fe6d001552ac6d444f7d9c572aa46 30-Mar-2017 Ta-wei Yen <twyen@google.com> Merge "Allow port and originating number to be specified for VVM SMS" into oc-dev
am: d90bd83153

Change-Id: Ie65b991e8918fb151024ecd0f5d2a1120e713937
0edbd687e3e1daae9f732b2f4874f42b43d3c21e 30-Mar-2017 Ta-wei Yen <twyen@google.com> Merge "Allow UTF-8 data SMS to be filtered as VVM SMS" into oc-dev
am: bb6b3d8149

Change-Id: I2120b3d3494d825e2547341afe681edcc6ce2563
d90bd83153068e9a77aacab98ad7da101ccb44be 30-Mar-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Allow port and originating number to be specified for VVM SMS" into oc-dev
2c7d91b6698aeb2d43236e6089d197924df836fd 29-Mar-2017 Jack Yu <jackyu@google.com> Merge "Cleanup connections for APNs that are not connected" am: f1b8382550 am: 7b4e8c310e
am: efbb240c49

Change-Id: I0bedeff164b94a54701ac092ee4e8cd9dab4f40f
7b4e8c310e27ced6f3cd0359b6f8feffd8c301ad 29-Mar-2017 Jack Yu <jackyu@google.com> Merge "Cleanup connections for APNs that are not connected"
am: f1b8382550

Change-Id: I1e3e3a1254b71b601b86d794ece6111caf27d593
f1b8382550162ba72506cdecdc861181608ad11c 29-Mar-2017 Jack Yu <jackyu@google.com> Merge "Cleanup connections for APNs that are not connected"
a6db15590a22000a92d72102ba98b92f608458f3 09-Mar-2017 Ta-wei Yen <twyen@google.com> Allow port and originating number to be specified for VVM SMS

This CL allows the VisualVoicemailService to ignore SMS not from the
designated number or to the designated port.

The VVM SMS filer can be configured to allow only SMS from certain
number or to certain port to be considered as a VVM SMS.
For numbers if the list is not empty, the originating number must be
an exact match to one of the numbers in the list.
For port it can be exact port, any data SMS port, or anything
(default).

Change-Id: I3d4aa34a342ba93d23841c07cbda2c2806f89dc4
Fixes: 36075510
Test: VisualVoicemailSmsFilterTest
CTS VisualVoicemailServiceTest
isualVoicemailSmsFilter.java
1309a4c037ecb17af0fa9a4818a8a064582b4e96 28-Mar-2017 Jack Yu <jackyu@google.com> Merge "Fixed failed unit test cases"
am: bf43973b8b

Change-Id: Ic8b5e2a73c00cfddeeddd35ab803252dda548c59
cb1bba5583fde914e458b41c1544f0e078160ef2 27-Mar-2017 Jack Yu <jackyu@google.com> Fixed failed unit test cases

The unit test case testSimError starts to fail due to the
recent CL https://android-review.googlesource.com/#/c/330668/
Fixed by adding slot id validation.

Test: runtest -x SubscriptionInfoUpdaterTest.java
bug: 29579544
Merged-In: Ie3aeeae37fc923c2d6a5e381591626245bec6132
Change-Id: Ie3aeeae37fc923c2d6a5e381591626245bec6132
ubscriptionInfoUpdater.java
264b2081477f901786e80c28686f9eb5765ce38d 10-Mar-2017 Ta-wei Yen <twyen@google.com> Allow UTF-8 data SMS to be filtered as VVM SMS

The OMTP visual voicemail specification does not specify what the
VVM SMS is.

Previouly only data SMS that is encoded with the Data Coding Scheme
GSM 7bit or UCS2 can be recognized. These format cannot be sent with
SmsManager.sendDataMessage() and prevents CTS testing.

This CL will attempt to decode the 8bit binary DCS userdata as a UTF-8
string. This format can be sent with sendDataMessage()

Fixes: 33397325
Fixes: 36075510
Test: CTS VisualVoicemailServiceTest

Change-Id: I81aa2993d43d1a39e1192d02828a4d982475441f
isualVoicemailSmsFilter.java
160da80fac7a5f314db0b196cc451b0e28c91a73 28-Mar-2017 Sanket Padawe <sanketpadawe@google.com> String changes for Voice/Data/Emergency services blocked.
am: 333c7cb30d

Change-Id: I2fbc8317d7b1b3f960cf9f9deda0e3232cd92119
832d28a4c3135bc501cef5ec5fae0b5a1811c534 28-Mar-2017 Sanket Padawe <sanketpadawe@google.com> Merge "String changes for Voice/Data/Emergency services blocked."
am: fdd42a7696

Change-Id: I00919c6925db0704bcc28200372f6eb0bc5ad007
333c7cb30dfaceac2a775274a29b144b9ff2f46f 27-Mar-2017 Sanket Padawe <sanketpadawe@google.com> String changes for Voice/Data/Emergency services blocked.

Bug: 31490566
Change-Id: Ic73e235fb4c412b5041ee03bc96de3b168ef741e
(cherry picked from commit 75ddc0cd156fd3c551dc8750df7ff6f09caaf30f)
Merged-in: Ic73e235fb4c412b5041ee03bc96de3b168ef741e
erviceStateTracker.java
fdd42a76962239e7c74a37cd3dfd02e9a0a756d5 28-Mar-2017 Sanket Padawe <sanketpadawe@google.com> Merge "String changes for Voice/Data/Emergency services blocked."
aa1736ba9cdaa721d1881e6faf5c4209efeeaa6d 28-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Include subaddress information for connection address" am: 005d0cc72f am: edd41a1d62
am: f74abbd51e

Change-Id: I38a6991e6d19956e5b8a1c636565ec2cc75efbf1
edd41a1d624d30e23aad6f9a2f60dc1f137f5af1 28-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Include subaddress information for connection address"
am: 005d0cc72f

Change-Id: I79a4626cea57291bf18ee4e7058aeab9807e8d16
005d0cc72ff800bc3ea66bf97b0c95acc0322e70 28-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Include subaddress information for connection address"
a3a42b1c8427971badfe59d2ff67af528e54a3d3 27-Mar-2017 Sanket Padawe <sanketpadawe@google.com> String changes for Voice/Data/Emergency services blocked.

Bug: 31490566
Change-Id: Ic73e235fb4c412b5041ee03bc96de3b168ef741e
Merged-in: Ic73e235fb4c412b5041ee03bc96de3b168ef741e
erviceStateTracker.java
9db4884401d436d0796138f9190079df310cee95 20-Oct-2015 Sukanya Rajkhowa <srajkh@codeaurora.org> Cleanup connections for APNs that are not connected

- After a network is disabled via releaseNetwork, ConnectivityService
tears down the data connection
- However, for APNs that are in Connecting, Failed or Retry state,
ConnectivityService will not do that because the NetworkAgent
is created only when a DataConnection goes into Active State. As
a result, even if the client release the network request, the
corresponding data connection is not torn down
- Take care of this case by explicitly tearing down the data connection

Test: Telephony sanity tests. QC tested with MMS app.
bug: 34756779
Change-Id: I87f286cb8b5fe5c6a33e8c5cf53da7bca8d7aa2b
ataconnection/DcTracker.java
74c8509aede6fe748904e75c156049b4f1ba5e28 17-May-2016 Hanada Masafumi <masafumi.x.hanada@sonymobile.com> Include subaddress information for connection address

In case of outgoing call with subaddress, subaddress information is
neither displayed in InCallUI nor stored in call log. This modifies
to include subaddress information in those cases.

- Override getOrigDialString to get number which can include subaddress

Bug: 29087454
Change-Id: I45884d98a3832542a6991df13de74b80c5806bd6
smCdmaConnection.java
msphone/ImsPhoneConnection.java
50a1a2054c4e2dd1c6e0793f3eb05e705ed90d01 28-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Null check IMS calls in shouldDisconnectActiveCallOnAnswer" am: b40f09bceb am: 84835fe2d6
am: 431f50d7e0

Change-Id: Id8db8b06e41d7d2de0329ebd3ea473e56fce8b01
84835fe2d63f03997011ed6f3cddda691971fc3d 28-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Null check IMS calls in shouldDisconnectActiveCallOnAnswer"
am: b40f09bceb

Change-Id: I72faeab21453a11a3c2a6ef8096aebd3b9814e44
b40f09bceb76d597ba7d189538a6c078e5af9477 28-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Null check IMS calls in shouldDisconnectActiveCallOnAnswer"
079d18be2f2dff2f452c07f4da6381f3f4c29116 28-Mar-2017 Jack Yu <jackyu@google.com> Merge "Fixed failed unit tests"
am: 669f790a27

Change-Id: Ifbd785416e1fe650d629e32a411631404a358444
1315bca1ab34a1b087bd146f73999ff7cc04f380 27-Mar-2017 Jack Yu <jackyu@google.com> Fixed failed unit test cases

The unit test case testSimError starts to fail due to the
recent CL https://android-review.googlesource.com/#/c/330668/
Fixed by adding slot id validation.

Test: runtest -x SubscriptionInfoUpdaterTest.java
bug: 29579544
Change-Id: Ie3aeeae37fc923c2d6a5e381591626245bec6132
ubscriptionInfoUpdater.java
f26712775d7a6401526831e02ff0bbea3f7aef22 27-Mar-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fixed failed unit tests"
6bfad8034f8262da897f454fbe2ecc9f042a6090 25-Mar-2017 Jack Yu <jackyu@google.com> Fixed failed unit tests

Test: runtest --path frameworks/opt/telephony/tests/telephonytests/
bug: 29579544

Merged-In: Ib53a4e7fee5dee1f305303bfbd914e31cdd2ab71
Change-Id: Ib53a4e7fee5dee1f305303bfbd914e31cdd2ab71
ellBroadcastHandler.java
onnection.java
smCdmaConnection.java
cef2ab5e676f7a8187e5cddaa1d2547b13f48f39 25-Mar-2017 Jack Yu <jackyu@google.com> Fixed failed unit tests

Test: runtest --path frameworks/opt/telephony/tests/telephonytests/
bug: 29579544
Change-Id: Ib53a4e7fee5dee1f305303bfbd914e31cdd2ab71
ellBroadcastHandler.java
onnection.java
smCdmaConnection.java
9691e6c87facfff6ffcbfdea9fe0fe4bff53f75c 25-Mar-2017 Amit Mahajan <amitmahajan@google.com> Merge "Increment radio proxy cookie when service is dead." am: fe88f5e66c am: c46c6c5379
am: fc7362b75e

Change-Id: I0fc0c65d48bb7ecb4a7f9156ae6fccc7db7db2e1
c46c6c53795dd298546f101205dfe436943b9f1c 25-Mar-2017 Amit Mahajan <amitmahajan@google.com> Merge "Increment radio proxy cookie when service is dead."
am: fe88f5e66c

Change-Id: I2b5657570590afe9e7e09bf214c92b3981606338
fe88f5e66c3ed8da5c4263d0cd5f6a57fe69fbc5 25-Mar-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Increment radio proxy cookie when service is dead."
c1ea1a9188b1273dac819e75c7af6a74dc12d649 25-Mar-2017 Sandeep Gutta <sangutta@codeaurora.org> Merge "MSIM: Fix subId creation issue when one of inserted SIM card state is ERROR" am: bc5ef4faf0 am: 3cdff517a6
am: 75c74e36a8

Change-Id: Ia96426248353a759d9d69bc3dca044392b5b4d6b
3cdff517a6945ba9754f92f791913c79fade9456 25-Mar-2017 Sandeep Gutta <sangutta@codeaurora.org> Merge "MSIM: Fix subId creation issue when one of inserted SIM card state is ERROR"
am: bc5ef4faf0

Change-Id: I107843b4a461f7702877e733abd7c05f78d51496
bc5ef4faf0a3e35a69940b94eacbe2a0bfa32e2f 25-Mar-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "MSIM: Fix subId creation issue when one of inserted SIM card state is ERROR"
c9c763417554f30c4fa51d3285a9a19893ecd399 24-Mar-2017 Amit Mahajan <amitmahajan@google.com> Increment radio proxy cookie when service is dead.

This is to avoid trying to get service constantly and have
delays between attempts as intended.

Test: Basic telephony sanity
Bug: 36599399
Change-Id: I6926c67ba9ae84f9841ef7b0b88d5e340201dc20
IL.java
26d16a3dd393152416682a04d3bd5d6013f28240 24-Mar-2017 Amit Mahajan <amitmahajan@google.com> resolve merge conflicts of 3ed74f4b6 to stage-aosp-master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Id6c90fa0f3b8821ac3e786ebc22e7aa5ac22cfad
3ed74f4b66af45c2529600833815cc19892950f2 24-Mar-2017 Amit Mahajan <amitmahajan@google.com> Merge "Unit test fixes. Most failures were due to new mockito."
a02cff1d80d5a87e77d7481545ba39882625fc98 24-Mar-2017 Jack Yu <jackyu@google.com> Merge "Deprecated getDeviceId and added getMeid and getImei"
am: 1cb7194eb1

Change-Id: I60ee1e9ab067f237ad86cb8ca054c273f3396c1a
1cb7194eb17e3a7cf58797cf574f06a0004a15fd 24-Mar-2017 Jack Yu <jackyu@google.com> Merge "Deprecated getDeviceId and added getMeid and getImei"
a4bbfb8fea56dade509614bf053a5024e909b7e8 24-Mar-2017 Jack Yu <jackyu@google.com> Merge "Deprecated getDeviceId and added getMeid and getImei"
9066c65d4f8be608c640ad12d25e347b0d789fb6 24-Mar-2017 Jeff Davidson <jpd@google.com> Merge "Fix minor issues in UiccCarrierPrivilegeRules."
ef0bc097e5b63282e9ebd24aabf7f893938a30dd 24-Mar-2017 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Clear mAutoAttachOnCreation on Radio Off, Radio Unavailable or SIM not ready" am: 35f4675016 am: fcb14f5fcb
am: ac7ca0f9ef

Change-Id: If029c5c7966a5f062d0d4e9554abcd9f73e463e8
fcb14f5fcb4970876a11547eb42214578bc6796c 24-Mar-2017 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Clear mAutoAttachOnCreation on Radio Off, Radio Unavailable or SIM not ready"
am: 35f4675016

Change-Id: Ia9574b39e40c23163936f9021d3464a504292a04
35f4675016d3b396c85f0fe6b2b1c9f8d505ce84 24-Mar-2017 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Clear mAutoAttachOnCreation on Radio Off, Radio Unavailable or SIM not ready"
7444a9e9a16749d4653e6038ec81d06f65d0eb85 23-Mar-2017 Jeff Davidson <jpd@google.com> Fix minor issues in UiccCarrierPrivilegeRules.

Cleans up incorrect indentation/line lengths and resolves compiler
warnings around unnecessary boxing and identical catch blocks.

Test: Will verify with TreeHugger
Change-Id: I00b7abe6b9cf3bfcb9bd0936a1bba0b273ec9a40
icc/UiccCarrierPrivilegeRules.java
bd57f801aaa65822f3d8e3dce38a71b989d80763 23-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Revert "Speculative DISCONNECTING fix for ImsPhoneCallTracker"" am: 0a72d2beed am: ab44afee43
am: 9dea9c86d0

Change-Id: I5f9f13c959b2f868e8feb5e55871edaae54fa984
27f264967959b223631ce3a28d61075d90b01b87 16-Mar-2017 Jack Yu <jackyu@google.com> Deprecated getDeviceId and added getMeid and getImei

Added two new public APIs getMeid and getImei. Deprecated the exisintg
getDeviceId API because it can't return a constant id when phone type
changes.

Test: CTS and manual
bug: 34233620, 10831289

Merged-In: If3b87f071e1e38d19008bdea3d7401802d72f5ad
Change-Id: If3b87f071e1e38d19008bdea3d7401802d72f5ad
smCdmaPhone.java
2a6f16b0f3b954fa122f0b22b0d821f83b0a810f 16-Mar-2017 Jack Yu <jackyu@google.com> Deprecated getDeviceId and added getMeid and getImei

Added two new public APIs getMeid and getImei. Deprecated the exisintg
getDeviceId API because it can't return a constant id when phone type
changes.

Test: CTS and manual
bug: 34233620, 10831289

Change-Id: If3b87f071e1e38d19008bdea3d7401802d72f5ad
smCdmaPhone.java
7e1fba5b0d8ab3815fdbd1e66f22ca3ab7decb83 22-Mar-2017 Jayachandran C <jayachandranc@google.com> Clear mAutoAttachOnCreation on Radio Off, Radio Unavailable or SIM not ready

mAutoAttachOnCreation allows data call for nwTypeChanged after
airplane mode toggle or radio reset but before modem actaully
registers on service. This causes data leak on roaming networks
for shorter time even though data roaming is disabled.

Bug: 31266202
Change-Id: Ia83146a0dafd9e2967d3e99829eea0ec08218b8a
ataconnection/DcTracker.java
ab44afee431edea51e30394c6273c0f6be969974 23-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Revert "Speculative DISCONNECTING fix for ImsPhoneCallTracker""
am: 0a72d2beed

Change-Id: I954b95b8eb08e9696300020ab551940a87c384b1
50a6eae6fb10462b1edb12cc30cb9701ca18a212 23-Mar-2017 Brad Ebinger <breadley@google.com> Null check IMS calls in shouldDisconnectActiveCallOnAnswer

Adds a check to shouldDisconnectActiveCallOnAnswer to
ensure that the active IMS call and incoming IMS call
are non-null. This can happen in cases when the
ImsPhoneCallTracker moves into a bad state.

Bug: 36273870
Test: Telephony Unit Tests
Change-Id: Ia31bb8cc6e425b63f836e8244bb3919d10c50731
msphone/ImsPhoneCallTracker.java
0a72d2beed54113c7e0f732664808831809615ad 23-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Revert "Speculative DISCONNECTING fix for ImsPhoneCallTracker""
e3d52a2907069912542e34c00c2090290e262587 23-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Notification for MM reject cause code"
bb52b2b0e473e162a04fdb46b75e71d3e7daa68b 08-Mar-2017 manabu.x.fujiwara <manabu.x.fujiwara@sonymobile.com> Notification for MM reject cause code

Display notification when UE fails to register network with specific
reject cause code. The notification includes specific strings and icon.
Since some carriers require, this feature is needed.

Test: manual with simulated RIL
Bug: 28923693
Merged-In: I95d5d768b6daa49a59d34e2af8cb1d225362f0a8
Change-Id: I95d5d768b6daa49a59d34e2af8cb1d225362f0a8
erviceStateTracker.java
ec01321c0ce4f6fba81b496ecd96c60832bd4329 23-Mar-2017 manabu.x.fujiwara <manabu.x.fujiwara@sonymobile.com> Notification for MM reject cause code am: 689189c6dd
am: ae57ff7c2b

Change-Id: I60b14f555603495f84e3cd33b28460788eebd810
4f47ce14d99a68077f3570a7f3304be50a4a10a7 23-Mar-2017 Brad Ebinger <breadley@google.com> Revert "Speculative DISCONNECTING fix for ImsPhoneCallTracker"

This reverts commit 9f13848d600c0782a5bcb3b1d2d7dca5dca35005.

Looks to be causing issues where ImsPhoneCallTracker
state is out of sync with ImsService

Bug: 36273870
Change-Id: Id3cfbdc007c561f886adffd16def76dac553ac27
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
689189c6ddcd6b61e35f779f53fa0e18016622cf 08-Mar-2017 manabu.x.fujiwara <manabu.x.fujiwara@sonymobile.com> Notification for MM reject cause code

Display notification when UE fails to register network with specific
reject cause code. The notification includes specific strings and icon.
Since some carriers require, this feature is needed.

Test: manual with simulated RIL
Bug: 28923693
Merged-In: I95d5d768b6daa49a59d34e2af8cb1d225362f0a8
Change-Id: I95d5d768b6daa49a59d34e2af8cb1d225362f0a8
erviceStateTracker.java
4485c77df50c9161e791442cbb8476cc27a36758 23-Mar-2017 Chen Xu <fionaxu@google.com> Merge "sendDialerCode API review"
a9c03ba25d8a26ae732f6bbd2dac9297348008c7 23-Mar-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Change 'idx' to 'index' for SubscriptionManager api."
am: 5b18fad29a

Change-Id: Icad67550539e3f8210ce669489c3a4c476e2c06e
5b18fad29a4a3c2bc7f620a0bc7d6b5718a363d0 22-Mar-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Change 'idx' to 'index' for SubscriptionManager api."
f08861c3ac56492435b775d5f28063b67419eb9a 22-Mar-2017 Jack Yu <jackyu@google.com> Merge "Invalid call forwarding indicator status check" am: fa3049fdfa am: 918d0cdfa2
am: 9b4145269f

Change-Id: I699fb202b85c9ac59ce4533d478f1dea45cbd154
879784906e68ed6b9bfd4edc03d0908303943fbd 22-Mar-2017 Chen Xu <fionaxu@google.com> Merge "reset carrier actions on sim loaded" am: 2328077d0b am: 461848ed06
am: fb7ed3da2d

Change-Id: I3c6b90ba6250983655dd281e8e9a4632ce4afa1c
918d0cdfa287218038aaff6fa15b125f5ca5bb7e 22-Mar-2017 Jack Yu <jackyu@google.com> Merge "Invalid call forwarding indicator status check"
am: fa3049fdfa

Change-Id: Ibd45fa7b81db530deac2782833f2172f87df5b4b
461848ed065109ca6c35b44cbfb5ac987f216e29 22-Mar-2017 Chen Xu <fionaxu@google.com> Merge "reset carrier actions on sim loaded"
am: 2328077d0b

Change-Id: If962acdc29aa07e7164bca9ce71c6149ca33412e
fa3049fdfac244c12bd3d8d6f53a16155e2b3b1d 22-Mar-2017 Jack Yu <jackyu@google.com> Merge "Invalid call forwarding indicator status check"
2328077d0bea9ad9cbc68f1d6dd1ca3bb9c559aa 22-Mar-2017 Chen Xu <fionaxu@google.com> Merge "reset carrier actions on sim loaded"
bfcfdd8280df7d1b72df130215819ec5a67e60ef 22-Mar-2017 Amit Mahajan <amitmahajan@google.com> Merge "Add missing handling for RIL_UNSOL_ON_SS." am: d110bd5bfa am: b50de137d3
am: 281e24a34a

Change-Id: Ib8f7f07c9ca79b6d87e1a3281585a9cfc1c7e19c
b50de137d3d1620087a8a79e5b20301216c5e552 22-Mar-2017 Amit Mahajan <amitmahajan@google.com> Merge "Add missing handling for RIL_UNSOL_ON_SS."
am: d110bd5bfa

Change-Id: Id4dfd44ca4a36454f8a1352742c31760f7d88716
d110bd5bfa3e369aaff1a0b69e065ce6a17db39b 22-Mar-2017 Amit Mahajan <amitmahajan@google.com> Merge "Add missing handling for RIL_UNSOL_ON_SS."
25a3c285d05854ca44813bdd6b8f28a7ff063649 22-Mar-2017 Amit Mahajan <amitmahajan@google.com> Add missing handling for RIL_UNSOL_ON_SS.

Test: none
Bug: 32020264
Change-Id: I5d3429765ca90dda9dac656599ae9d0296ea5401
adioIndication.java
2c47a73b1e191593ec03cc5d5569584d735c8f00 22-Mar-2017 Amit Mahajan <amitmahajan@google.com> Merge "Remove rild sockets."
am: 4f6584f665

Change-Id: Ice9ddee78663683b25f7adffd75ea90f0275020f
0052fac58baf644fd8024449966b08195fdce98e 22-Mar-2017 Amit Mahajan <amitmahajan@google.com> Merge "Unit test fixes. Most failures were due to new mockito."
4f6584f66575a50f2ed7cb77676f1d40183b8a51 22-Mar-2017 Amit Mahajan <amitmahajan@google.com> Merge "Remove rild sockets."
b1fdcf01045090315c5b91d7539007d79f34c9ec 21-Mar-2017 Amit Mahajan <amitmahajan@google.com> Unit test fixes. Most failures were due to new mockito.

Test: runtest --path frameworks/opt/telephony/tests/telephonytests/
Bug: 29579544
Change-Id: Ic228cd7dfc4d8913411a459520d7b7bf71a66d98
msphone/ImsPhoneConnection.java
f87876483d4ef762a8cd46307aec37e5c2907ef7 21-Mar-2017 fionaxu <fionaxu@google.com> reset carrier actions on sim loaded

There are some use cases where carriers activate SIM's data service by
updating EF files with an ICC refresh event. Slightly different from hot
sim swap, this might not go through the complete SIM loading procedure
and won't recreate any new Icc Record as well.
- Move carrier action reset to recordsLoaded event handler which handles
both ICC refresh and hot sim swap.
- refactor carrier action reset from individual modules to carrier
action agent

Bug: 36154348
Test: Manual
Change-Id: I7af8b1d956ba7dfa1efdc8858b49903f24382dbe
arrierActionAgent.java
ataconnection/DcTracker.java
37800d3cdb300fca83462d95221a05bbef21a951 21-Mar-2017 Amit Mahajan <amitmahajan@google.com> Unit test fixes. Most failures were due to new mockito.

Test: runtest --path frameworks/opt/telephony/tests/telephonytests/
Bug: 29579544
Merged-in: Ic228cd7dfc4d8913411a459520d7b7bf71a66d98
Change-Id: Ic228cd7dfc4d8913411a459520d7b7bf71a66d98
msphone/ImsPhoneConnection.java
5ba0180a0acd5042e0a8588547da7a0f306a985c 22-Mar-2017 Amit Mahajan <amitmahajan@google.com> Merge "Remove rild sockets."
a37dfbea8d3bfd483c2b5aac6c25cc519a186b49 15-Mar-2017 Amit Mahajan <amitmahajan@google.com> Remove rild sockets.

Test: Basic telephony sanity
Bug: 32020264
Merged-in: I80407542719bfdba91f5a74329c76491d41fbe04
Change-Id: I80407542719bfdba91f5a74329c76491d41fbe04
IL.java
5f757746ffcbc8d5ae718adf5f45abee6a5cc43d 17-Mar-2017 Sanket Padawe <sanketpadawe@google.com> Change 'idx' to 'index' for SubscriptionManager api.

Bug: 35767068
Test: No build failure on update.
Change-Id: I56977b047512100d5fbe7eb8eb2df8aa1f773b8b
Merged-in: I56977b047512100d5fbe7eb8eb2df8aa1f773b8b
ubscriptionController.java
ubscriptionInfoUpdater.java
at/CatService.java
ms/ImsResolver.java
icc/IccCardProxy.java
1c714787542d6643f1a06d328220adc341f3db7f 21-Mar-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Change 'idx' to 'index' for SubscriptionManager api."
82e8da62fe3f83f29d834636b8da5ce6803204e3 21-Mar-2017 Sanket Padawe <sanketpadawe@google.com> Change 'idx' to 'index' for SubscriptionManager api.

Bug: 35767068
Test: No build failure on update.
Change-Id: I56977b047512100d5fbe7eb8eb2df8aa1f773b8b
ubscriptionController.java
ubscriptionInfoUpdater.java
at/CatService.java
ms/ImsResolver.java
icc/IccCardProxy.java
e7e3b2c9d247a5615a3a3c986fcd7f5b72933edb 21-Mar-2017 Jack Yu <jackyu@google.com> Merge "Added ETWS primary message default message support"
am: 44000fe846

Change-Id: I2e3dc247b0a5f59f91cdbf67190d9c1872a3be02
44000fe8462034b80e37ddef05c7889f80b0227f 21-Mar-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Added ETWS primary message default message support"
b981e2a5e11f64db549abcf6ec8c498eaaf56984 18-Mar-2017 Jack Yu <jackyu@google.com> Added ETWS primary message default message support

ETWS primary message does not contain messagy body. We used
to use hardcoded "ETWS" as the body, which is not easy for
end users to understand what happened. Added the built-in
default messages provided by Japanese government guideline
for earthquake, Tsunami, test, and other channels support to
enhance the user experience.

Test: manual
bug: 33595007
Merged-In: I0bd0a6655bc4a327124b2a145fa3892c177c4fdb
Change-Id: I0bd0a6655bc4a327124b2a145fa3892c177c4fdb
sm/GsmCellBroadcastHandler.java
sm/GsmSmsCbMessage.java
c26b219758314e06934dbd4e2af8fc57a0637a4c 18-Mar-2017 Jack Yu <jackyu@google.com> Added ETWS primary message default message support

ETWS primary message does not contain messagy body. We used
to use hardcoded "ETWS" as the body, which is not easy for
end users to understand what happened. Added the built-in
default messages provided by Japanese government guideline
for earthquake, Tsunami, test, and other channels support to
enhance the user experience.

Test: manual
bug: 33595007
Change-Id: I0bd0a6655bc4a327124b2a145fa3892c177c4fdb
sm/GsmCellBroadcastHandler.java
3a5f1ded53b1b8d07fedcd80806b853c43565ea6 21-Mar-2017 Jack Yu <jackyu@google.com> Merge "Fixed device crash on automation setup" am: 152f41bd17 am: 2ab4e34173
am: 98659cea20

Change-Id: I78701b1fbddff0ba11c2df19b58680b6ff2134c7
2ab4e341733a0db45021e64f71ce867d5c7401e6 21-Mar-2017 Jack Yu <jackyu@google.com> Merge "Fixed device crash on automation setup"
am: 152f41bd17

Change-Id: Icbb557d155f9e51c0bf77f2cfe2037d83b47a750
0d9b3d744534df7ee3792fdd84454176536590e6 15-Mar-2017 Amit Mahajan <amitmahajan@google.com> Remove rild sockets.

Test: Basic telephony sanity
Bug: 32020264
Change-Id: I80407542719bfdba91f5a74329c76491d41fbe04
IL.java
f09715e703608ffd4a143f665c70ed59818a9429 20-Mar-2017 Jack Yu <jackyu@google.com> Fixed device crash on automation setup

This is a regression introduced by
https://android-review.googlesource.com/#/c/342381/
Sending the broadcast intent twice (extra one is for sl4a) causes
EVENT_BROADCAST_COMPLETE got sent twice, which brought the wake lock
state machine into the bad state.

Fixed by changing the first result receiver to null so only one
EVENT_BROADCAST_COMPLETE will be broadcasted.

Test: Telephony sanity tests
bug: 36107224
Change-Id: I02b4b4b9fa7a3106ad83e0200cf1e6dc5924c771
ellBroadcastHandler.java
3ef828485c160fd7e82b82869e0ebcb802cdcf23 17-Mar-2017 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Pass cause and precise call fail causes for IMS calls" am: 93fc20f26f am: 639962772f
am: 67aad17aa0

Change-Id: Ied70bdb4e757bd7e22c38b98bc7711fe513a34ba
639962772f21769143e606bf60a38ceae545c13b 17-Mar-2017 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Pass cause and precise call fail causes for IMS calls"
am: 93fc20f26f

Change-Id: I7441017dda3232db9f6633ce7a21bba5ded9a53e
93fc20f26f57b3c7dae541125a2ddebdce80dea4 17-Mar-2017 Jayachandran Chinnakkannu <jayachandranc@google.com> Merge "Pass cause and precise call fail causes for IMS calls"
222bd9d64068a23f5470561655ca4dbd2359eece 12-Mar-2017 Jayachandran C <jayachandranc@google.com> Pass cause and precise call fail causes for IMS calls

Bug: 35609963
Change-Id: I7955a246b89e8dfd8a4b21ab9c8c4203b569c0a4
msphone/ImsPhoneBase.java
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
ca9f50fa11f1f911b2911eb7cae7d7232fc31b8e 16-Mar-2017 Brad Ebinger <breadley@google.com> resolve merge conflicts of 6b0d9a09f to stage-aosp-master am: a2793ccd4f
am: fd9bb1fd3e

Change-Id: I8ae467f9ad2a405632ddc6d06db9f96c5b7d454b
a2793ccd4f2256ee6ee7a6c90381f5666a0b9538 16-Mar-2017 Brad Ebinger <breadley@google.com> resolve merge conflicts of 6b0d9a09f to stage-aosp-master

Change-Id: Ic406e5468690f8a6e771a77c921dd49718f76b21
6b0d9a09f9ff59f8a99ab98e79b0ea2e1a222030 16-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Added configuration for VT downgrade/tear down when data disabled"
782c44d28a8944478b6906aa5c86a14ffd0e63db 15-Nov-2016 Jack Yu <jackyu@google.com> Added configuration for VT downgrade/tear down when data disabled

Added a new flag that allows carriers to ignore data disabled
(e.g. data reaches limit or user disables data) so VT calls
will not be downgraded/torn down and VT service will not be
disabled.

bug: 32880745
Merged-In: I977f1aa511c59f32446b4a76de3c6da54500adc1
Change-Id: I977f1aa511c59f32446b4a76de3c6da54500adc1
msphone/ImsPhoneCallTracker.java
cdf57730baf00d41fe71643182e52d62d42b2d32 16-Mar-2017 Sooraj Sasindran <sasindran@google.com> Merge "Support Signal Strength Offset"
am: 9b85480ed9

Change-Id: Ia3f727f2af17d6530358ce9d80a1ef0632dfaac1
4ebf8eb0ab85a4e32a5512ba1620cdbb7b8f950f 16-Mar-2017 Sooraj Sasindran <sasindran@google.com> Merge "Support Signal Strength Offset"
22a3ce4867486001dde9196c676092b1638ae982 09-Mar-2017 Sooraj Sasindran <sasindran@google.com> Support Signal Strength Offset

Feature to offset the lte rsrp for
higher frequency lte bands.

Test: Verified on device that signal bars increased
bug=30628343

Merged-In: Ia056cca2ca1ef3c63f033e4d0dad7f0603a3bb1c
Change-Id: Ia056cca2ca1ef3c63f033e4d0dad7f0603a3bb1c
erviceStateTracker.java
032185111767053a3e34aa94e868363570ae0de8 09-Mar-2017 Sooraj Sasindran <sasindran@google.com> Support Signal Strength Offset

Feature to offset the lte rsrp for
higher frequency lte bands.

Test: Verified on device that signal bars increased
bug=30628343

Merged-In: Ia056cca2ca1ef3c63f033e4d0dad7f0603a3bb1c
Change-Id: Ia056cca2ca1ef3c63f033e4d0dad7f0603a3bb1c
erviceStateTracker.java
6d7d11a3e01672d3f02efb701b4d17408c845f87 15-Mar-2017 Tony Mak <tonymak@google.com> Merge "Track the calling user id in SmsTracker" am: 9fb0d53bab am: 980f5b85dc
am: 702ca5d849

Change-Id: I536f89438b8890c0f1e3d4124188b9e3a768b50c
980f5b85dcb226b6a5cc2e1f8f49691ea20738df 15-Mar-2017 Tony Mak <tonymak@google.com> Merge "Track the calling user id in SmsTracker"
am: 9fb0d53bab

Change-Id: Ib74b7f0cebc21841c6bf2ab08a0a9a3a0eec0c9d
9fb0d53bab3ed7355cfbe2937d9b0aa89c224ce9 15-Mar-2017 Tony Mak <tonymak@google.com> Merge "Track the calling user id in SmsTracker"
32cc74b9ec7397e995f4e2275315c6f79d1e43fd 10-Mar-2017 Tony Mak <tonymak@google.com> Track the calling user id in SmsTracker

Store the calling user id in SmsTracker, and consume it throughout
SmsDispatcher.

Test: SmsManager.sendTextMessage in user 0 is working
Test: SmsManager.sendTextMessage in work profile is working
(Make sure the app is not installed in user 0).

Fix: 35590739

Change-Id: I396880fe33bd0db05f7952dec6234def98f6b916
MSDispatcher.java
6d4244906f6e902de4ab4cd12a7f21df54bcab6d 14-Mar-2017 Maurice Lam <yukl@google.com> Merge "Allow fallback translated languages in MccTable"
am: 20312ddd96

Change-Id: Iaf53e730f478c01982d2741c40d3ceb020c94db0
3e55f0a3266f2b721aca29562427cb324a932122 16-Nov-2016 Maurice Lam <yukl@google.com> Allow fallback translated languages in MccTable

When choosing a fallback locale, if that locale is marked as
"translated" by LocaleStore, return that locale. This is true if a
locale itself has translations, or another locale with the same
language and script that is translated.

For example if the user inserts a Canadian SIM, previously it will
fallback to en-US since the system doesn't have translations for
en-CA. But since Android N users are allowed to select locale
English (Canada), which the framework will find suitable fallback
translation when resolving resources. So with this change, if the
user inserts a Canadian SIM, getLocaleFromMcc will now return en-CA.

Test: Run MccTableTest (via adb shell am instrument)
Bug: 31395257
Change-Id: I7f74bc2ed14efb9ce5594dbf563c76e2d5b353da
ccTable.java
306d8da3bd4bb4af30f4dc31092673681b034774 07-Mar-2017 fionaxu <fionaxu@google.com> sendDialerCode API review

address the feeback from API review:
throw exception rather than a boolean return
throw Security exception for permission issue and
non-default dailer app.
throw invalidStateException if telephonyServie unavaialble.

remove secret code detection logic

Change-Id: Ia5b88749d420e9d49f2236a70c1919c6c825866b
hone.java
706ae424054a74a8d258d569f19dbe9bdaa78bdb 14-Mar-2017 Maurice Lam <yukl@google.com> Merge "Allow fallback translated languages in MccTable"
ffd723f178cf830e3cd533303b99cf09f6573f45 14-Mar-2017 Jack Yu <jackyu@google.com> Merge "Removed the deprecated screen state API" am: ff8c0eb673 am: 138dbcd141
am: 5565a9ade0

Change-Id: I74268078119650fdcba7adb5ea2bf59949d28367
138dbcd14164fb6a6921cd379a3817f1ba1c3c73 14-Mar-2017 Jack Yu <jackyu@google.com> Merge "Removed the deprecated screen state API"
am: ff8c0eb673

Change-Id: I33bbd6334e468ab49d605a3143112516fff443e9
d2ad36f2c489f630e2077bbaae29194cae923863 13-Mar-2017 Jack Yu <jackyu@google.com> Removed the deprecated screen state API

The screen state API was deprecated on O and should
not be added into the radio interace.

Test: Telephony sanity tests
bug: 32223897
Change-Id: I6651224779399d7c33a3675ac8cc3ca004bcd549
adioResponse.java
facd4fc3a41e020459107d10f694f910bc575d1d 13-Mar-2017 Amit Mahajan <amitmahajan@google.com> Merge "Change to not send error response twice." am: 10a430b59c am: f3983ed4f9
am: e4257b591a

Change-Id: I312632bd84e3219e91c3baed9159be794f261096
f3983ed4f92299f110696868e537340698319a60 13-Mar-2017 Amit Mahajan <amitmahajan@google.com> Merge "Change to not send error response twice."
am: 10a430b59c

Change-Id: Ie365b5d6a75443d496e2ee302bceb0edc5af7da4
10a430b59c66785e9abd12697c933a38ad62cdea 13-Mar-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Change to not send error response twice."
31b75658d525fec94c58bfcf74f881f2a27a6fa6 10-Mar-2017 Sandeep Gutta <sangutta@codeaurora.org> Merge "Fix phone process crash due to stale data processing." am: 6e2e2c1d6a am: fbbb45db70
am: bd40e81b9a

Change-Id: I909fa3fd42dde6c984209ba461e0eec360b165ae
fbbb45db705fa82c1ad18c6096b9bc7c23b177d3 10-Mar-2017 Sandeep Gutta <sangutta@codeaurora.org> Merge "Fix phone process crash due to stale data processing."
am: 6e2e2c1d6a

Change-Id: I8b991e22de0b5c29b9d978c6e3f1331a74359873
6e2e2c1d6ada91a2ffc26f7c40e7624d99462cdf 10-Mar-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fix phone process crash due to stale data processing."
14009be9dc7f52a92cb6d3c195058c9ee120239c 04-Jul-2016 Sandeep Gutta <sangutta@codeaurora.org> Fix phone process crash due to stale data processing.

Due to successive power down and power up happening in
quick successions, CommandParamsFactory is processing
the older data even after CatService is disposed, resulting
in the phone process crash.

Fix: Add a null check for icon loader in CommandParamsFactory
to avoid the crash.
Test: verified no crash.

Bug: 30928365
Change-Id: Ia011cec83f53e764d2c201dd0bd588eb5a4c7e89
at/CommandParamsFactory.java
215b151f52a250fd5e6d525792e0c4a1dbdf904e 10-Mar-2017 Sooraj Sasindran <sasindran@google.com> Merge "Use tac and ci as lac and cid for LTE" am: 995e90e58b am: 8b075e719b
am: 7cdecadae4

Change-Id: I0310395b98c7d1bd7dd5285b0a81a94d29eff0ca
8b075e719b531e63b8bb62e65edac2f530e7f346 10-Mar-2017 Sooraj Sasindran <sasindran@google.com> Merge "Use tac and ci as lac and cid for LTE"
am: 995e90e58b

Change-Id: I3ce8719f7f0105ddee1f6b4c9821eac86df1c3d1
995e90e58b431279745d8891447690ebce292165 10-Mar-2017 Sooraj Sasindran <sasindran@google.com> Merge "Use tac and ci as lac and cid for LTE"
b1438f640c98e884f47109e9c9fc4a52fb0aa4ef 10-Mar-2017 Amit Mahajan <amitmahajan@google.com> Change to not send error response twice.

resetProxyAndRequestList() sends the error response.
Also includes fixes for OemHookProxy handling when service dies.

Test: Basic telephony sanity
Bug: 35910123
Change-Id: I23d4b3495523ba0a5bc5fe619b525a2d1fbba5f4
IL.java
f0a18f43eed9a21df7fbeabe36aa9a35362a06ac 10-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Disable a phone number log for user build" am: 58046e21d7 am: 7ca693cd1f
am: 4052128b60

Change-Id: I452f19d4b640f0505662b4cfd2ccc6c9cd1fc082
6d9628336250dfaf430ef69939ab0d2bd8d366db 09-Mar-2017 Amit Mahajan <amitmahajan@google.com> Merge "Initialize CallForwardInfo correctly." am: 579e3ca02d am: 48ea88541d
am: afe2aed0c7

Change-Id: I09f406bd7434e1c32aa7b20960a6be925822a3f4
7ca693cd1f4af5700e95b38c53eff8b73d237c5d 09-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Disable a phone number log for user build"
am: 58046e21d7

Change-Id: I86a10997b063328b9b5e92cc07f031abb0a291a4
58046e21d7487f14762543fbb1733936bb493567 09-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Disable a phone number log for user build"
48ea88541d2de816be0e04fc01ed1074cb2e598e 09-Mar-2017 Amit Mahajan <amitmahajan@google.com> Merge "Initialize CallForwardInfo correctly."
am: 579e3ca02d

Change-Id: I9c0c3efd2cf6a3473ba50de2bb1dc9d60c8d8826
579e3ca02dce7463c74e62150fbef94f20674c81 09-Mar-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Initialize CallForwardInfo correctly."
c95d8bc1e6b66ea9f9a3459f17f34dffd0bae927 09-Mar-2017 Amit Mahajan <amitmahajan@google.com> Initialize CallForwardInfo correctly.

Test: *#21# on AT&T shows response
Bug: 35330178
Change-Id: I624f7799d1289dca41dfd56870bbbd7b0cbee48a
adioResponse.java
b84f81fc061a131de05815a7b35d3e17adfc785a 09-Mar-2017 Adrian Salido <salidoa@google.com> Merge "Revert "Get rid of RIL version."" am: 6514905475 am: cd7b721ab6
am: c39906967f

Change-Id: I55dac4d7ee85fb890d8b08c22ffe6bf7c8835cb3
cd7b721ab6d4631fc899add2b64da08bcbccc080 09-Mar-2017 Adrian Salido <salidoa@google.com> Merge "Revert "Get rid of RIL version.""
am: 6514905475

Change-Id: I14f1c448e55cedfb09f7af2e73daffd8d5ca1e5d
6514905475910fe5bbabc98e237b0ee61377a0f2 09-Mar-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Revert "Get rid of RIL version.""
9e9476e236db1d3f43c73b8adb8a8a4823b747f1 07-Mar-2017 Sooraj Sasindran <sasindran@google.com> Use tac and ci as lac and cid for LTE

In case of LTE, use ci and tac as cid and lac.
Convert ril registration state to ServiceState
registration state.

Test: verified unit tests.
verified on device that device reports
registration correctly
Bug=32223344
Change-Id: I556914dc17dae3842048fc574e5554ef26264720
erviceStateTracker.java
a56f405d3006b1d8378b5f7757a5613b75fa8fb4 09-Mar-2017 Adrian Salido <salidoa@google.com> Revert "Get rid of RIL version."

This reverts commit 81ea341d2deb767cbd1de2f356296ad92e951c52.

Bug: 36018228
Change-Id: Iee0410f197c2869e2bdefcaaae51e7ef215cdff1
aseCommands.java
ommandsInterface.java
smCdmaPhone.java
hone.java
IL.java
adioIndication.java
erviceStateTracker.java
ataconnection/DataConnection.java
ataconnection/DcController.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
740377f47409db3d2415f918566844bce6f4e0c9 08-Mar-2017 Joachim Sauer <jsauer@google.com> Merge "Change Czech Republic to Czechia" am: d6d57139c6 am: e9add841a9
am: 38cba8a0fc

Change-Id: I1c22eb2b24f78685bd9603a6332dc581757e1239
62fb50afb1dcb708f0a41d4d295a843dbe226c0e 08-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Makes some updates to the ImsService Rebind process" am: ff78a98356 am: 680888a9e6
am: f423e81078

Change-Id: I4d07daf2a9c8ccd01af1ea7994d4316432c64562
e9add841a96969e93a0ec79ca24e62e10ec98304 08-Mar-2017 Joachim Sauer <jsauer@google.com> Merge "Change Czech Republic to Czechia"
am: d6d57139c6

Change-Id: Ibed6118f29f1f26c9d41d7084c4e6b8ca088ca1e
d6d57139c6d2274d6ac12cf7e65baf4bbc7961f7 08-Mar-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Change Czech Republic to Czechia"
680888a9e66e8bc221495d972487e56fefcf5d59 08-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Makes some updates to the ImsService Rebind process"
am: ff78a98356

Change-Id: If7c3ea006d99a488188cffc63c490eab09bac577
ff78a983564ba7012db3279b29ed1d1b148dce68 08-Mar-2017 Brad Ebinger <breadley@google.com> Merge "Makes some updates to the ImsService Rebind process"
eaa777fb15d5c5c90fc3b302f409f89e9199011c 08-Mar-2017 Joachim Sauer <jsauer@google.com> Change Czech Republic to Czechia

This commit only contains changes to comments.

Bug: 34964100
Test: m buildcheck
Change-Id: I0e8ab86c613ba647545da288da0078f785fdc1f1
ccTable.java
0342fbc2098362a63a750950460bf589362a9071 08-Mar-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Wait for CS Call End Reason before finishing the call session"
a45e44d8e8b517cc952cc3912df5b29fd3d84afc 16-Nov-2016 Maurice Lam <yukl@google.com> Allow fallback translated languages in MccTable

When choosing a fallback locale, if that locale is marked as
"translated" by LocaleStore, return that locale. This is true if a
locale itself has translations, or another locale with the same
language and script that is translated.

For example if the user inserts a Canadian SIM, previously it will
fallback to en-US since the system doesn't have translations for
en-CA. But since Android N users are allowed to select locale
English (Canada), which the framework will find suitable fallback
translation when resolving resources. So with this change, if the
user inserts a Canadian SIM, getLocaleFromMcc will now return en-CA.

Test: Run MccTableTest (via adb shell am instrument)
Bug: 31395257
Change-Id: I7f74bc2ed14efb9ce5594dbf563c76e2d5b353da
ccTable.java
9b561871509dbf7c844d9eecb5949a80cbbfbb10 05-Mar-2017 Naveen Kalla <mrnaveen@google.com> Wait for CS Call End Reason before finishing the call session

For CS Calls, Phone state changes to IDLE as soon as call ends
but the disconnect reason is received after that. Wait for
the call end reason for all the calls before finishing the
call session. Enhance the print message with call session
information when TelephonyMetrics are dumped

Test: Make CS Calls and check logs to make sure call session
is finished after Call End reason is obtained in
TelephonyMetrics. Run "adb shell dumpsys activity service
TelephonyDebugService --metrics" and ensure that the
dump contains calls session information (call states and
end reason)

Change-Id: I3e88b52ed170bc1fde04965ad87192ed6c5143ff
etrics/InProgressCallSession.java
etrics/TelephonyMetrics.java
cf02c922f2a154ef906a707ddeac7f048f5f4e5b 07-Mar-2017 Jack Yu <jackyu@google.com> Merge "Fixed database not closed after use" am: a8b56a378b am: 8928b4bb62
am: 89aa950f86

Change-Id: I910b6d98618a85351654c91e3fc07e981aa3dd67
8928b4bb62d14e9d2681e7d8b62ce352b3c21f09 07-Mar-2017 Jack Yu <jackyu@google.com> Merge "Fixed database not closed after use"
am: a8b56a378b

Change-Id: Ibdc403e9a504dc6a3cc2627bb8e064138a8ab2a8
a8b56a378b98f10351d6b314299f2c80b788714c 07-Mar-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fixed database not closed after use"
88af2faa587867c0525338e60352fdb5a462bd61 07-Mar-2017 Amit Mahajan <amitmahajan@google.com> Merge "Delete unused code." am: 223446daad am: b13048d245
am: a628440ba2

Change-Id: Ib4a08493df401d99bdb70dc712bb176bafa5b9bb
b13048d2456808b46abb770fa16c502a96c00682 07-Mar-2017 Amit Mahajan <amitmahajan@google.com> Merge "Delete unused code."
am: 223446daad

Change-Id: I225ff7c59f08c93259816f2595ed58b96cb5b305
89af85683702e7ba36310ad2cc685bf4b94416c0 07-Mar-2017 Jack Yu <jackyu@google.com> Merge "Fixed enableLocationUpdates crash" am: 663db0d09b am: 66b6faeae1
am: e243c82c68

Change-Id: I28c7194f55cd01c6bbd11b5d2038d08b86e47f51
66b6faeae1fff18617f7e29cdc7387395023a088 07-Mar-2017 Jack Yu <jackyu@google.com> Merge "Fixed enableLocationUpdates crash"
am: 663db0d09b

Change-Id: Ic9e7a4dfdac9d19cee4ca2b3c4a9b5c9783cc092
ef5867a3d255d46160d21af3a2140ca58227c4e5 05-Mar-2017 Jack Yu <jackyu@google.com> Fixed database not closed after use

Test: Telephony sanity tests
bug:

Change-Id: Ifb8f058bef78810ad21c038a1abc97e3be2f0713
bpcdUtils.java
223446daada7f8ca95ae066fa1570b830d4f509a 07-Mar-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Delete unused code."
663db0d09bd9c1348adf6fc984a65320fc72f41e 06-Mar-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fixed enableLocationUpdates crash"
eb2b3468f808fc5e8ebeee7bdfa12fc20be50e2c 06-Mar-2017 Umashankar Godachi <umasha@codeaurora.org> Merge "Read the voice message count properly" am: f131beed5f am: df760f5d0b
am: f2416f6134

Change-Id: I545d840ab7938f922c0c266afb75da46ac36014d
df760f5d0badb4767c3edf3cb863e50b6a5f9cd0 06-Mar-2017 Umashankar Godachi <umasha@codeaurora.org> Merge "Read the voice message count properly"
am: f131beed5f

Change-Id: Ic94440abc9b0c60885ddc0e822fb2bbc5ffc863c
f131beed5fe048131f13842e909f52fb35375615 06-Mar-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Read the voice message count properly"
49c99113d77ca6f34f6a0c9d3e0049cddd3e754e 05-Mar-2017 Jack Yu <jackyu@google.com> Fixed enableLocationUpdates crash

1. The EVENT_GET_LOC_DONE handler dit not handle the
new voice registration response properly. This is a
regression introduced in ag/1907337.

2. Make ServiceStateTracker unit tests passed again!
Fixed a regression introduced by the Trebel change ag/1750738.
Return value of EVENT_RESTRICTED_STATE_CHANGED now is an integer
instead of an integer array.

Test: Telephony sanity tests
bug: 35980759
Change-Id: Idcacc4c891950913172be00daa966e7eb5be7fa6
erviceStateTracker.java
est/SimulatedCommands.java
f0e497e8cf789cf47bd60a68ac12e5e22dbbe855 06-Dec-2016 Shunta Sakai <shunta.sakai@sonymobile.com> Disable a phone number log for user build

A phone number is privacy data. Therefore, it should be prevented
from logging in user build.

Co-Author: xuegang.x.liu <xuegang.x.liu@sonymobile.com>
Co-Author: kei.x.ueda <kei.x.ueda@sonymobile.com>

Test: manual - checked log
Bug: 34582911
Change-Id: Ia1d33d43cf69de8b429ea243d988e275d81f1062
sm/GsmMmiCode.java
ip/SipPhone.java
bbbaa0bd5130c4c49495c1b88de10bd7b64f6ed3 05-Mar-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Handle empty operator numeric." am: 181b377f25 am: 0171e812db
am: 6f19586d20

Change-Id: I1c1718ef1c2f20b2a9d2bb1301304880dd59227e
0171e812dbc4f8dcbc551b5a407c04d73b1e8e8b 05-Mar-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Handle empty operator numeric."
am: 181b377f25

Change-Id: Ia32a2be20cc541d85b7c4daffa21e2a6efb55c3e
181b377f258cec9272cec505c35f9cb36c34ec35 05-Mar-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Handle empty operator numeric."
d71af3fb18a6bf51e6aa346849c968fad511d610 04-Mar-2017 Amit Mahajan <amitmahajan@google.com> Delete unused code.

Also merged RILSender and RilHandler into a single Handler.

Test: Basic telephony sanity
Bug: 32020264
Change-Id: Ibe00dc25a5c6370ac6f25c9d140545b51e5f1c9d
IL.java
091c17e62f5f0fbdfd3e564a23b237ffffe26bbb 04-Mar-2017 Amit Mahajan <amitmahajan@google.com> Merge changes I61f19621,I70faef33 am: ef4062e157 am: 26c10b1d02
am: b33edcb0e0

Change-Id: I7d8cac4e04a8546e95bb2d19521ffb63b5bd2c06
26c10b1d02ae46c0bd255ab1962100bafee21498 04-Mar-2017 Amit Mahajan <amitmahajan@google.com> Merge changes I61f19621,I70faef33
am: ef4062e157

Change-Id: Iea4856878a41d2cd2489a49c8d08251d06130aa8
47762cbaaf1d3cc8da2fd51351fe9d110d0d9a09 04-Mar-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Set radio state to unavailable when rild crashes."
2eff094e05c29be584f896de73e7abf7631ac6b7 04-Mar-2017 Amit Mahajan <amitmahajan@google.com> resolve merge conflicts of 274a51709 to stage-aosp-master

Change-Id: I2aa6445600eed502738f578494dc8a8a73ec4d18
ef4062e1573d29e11d42b1ca1b57f77e1dba8475 04-Mar-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge changes I61f19621,I70faef33

* changes:
Get rid of RIL version.
Set radio state to unavailable when rild crashes.
274a5170953d958c62579fb853241e4d82fee7b7 04-Mar-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Remove duplicate pollStateDone functions."
95f1d81c64c9ea6cce86cf73a2664d18cbd3e157 03-Mar-2017 Nathan Harold <nharold@google.com> Merge changes from topic 'sms-file-refactor'

* changes:
Remove newFromRil() function to a utility class
Move SMS_RECORD_LENGTH to SmsManager
Add the frameworks/services dependency to frameworks/opt
Move OTASP_* Consts from ServiceStateTracker to TelephonyManager
Port functions from DefaultPhoneNotifier to frameworks/base
Removing files that have been migrated to frameworks/base
75a34bca6e996289e3ad200ab545aa154d2fba58 03-Mar-2017 Amit Mahajan <amitmahajan@google.com> Set radio state to unavailable when rild crashes.

This is to match earlier implementation.

Test: Basic telephony sanity
Bug: 32020264
Change-Id: I70faef332fd2df2bd2354b9d9ed5d120089e9399
IL.java
81ea341d2deb767cbd1de2f356296ad92e951c52 03-Mar-2017 Amit Mahajan <amitmahajan@google.com> Get rid of RIL version.

Test: Basic telephony sanity
Bug: 32020264
Change-Id: I61f19621dd86622faecca77c4dadf3ced81e9c21
aseCommands.java
ommandsInterface.java
smCdmaPhone.java
hone.java
IL.java
adioIndication.java
erviceStateTracker.java
ataconnection/DataConnection.java
ataconnection/DcController.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
3892b551e367b72f5eeee1d7c780b2075d604e8b 03-Mar-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Remove duplicate pollStateDone functions."
b53ad908c84ffe4fc7c88b58ec682f1dbcd34bd3 03-Mar-2017 Brad Ebinger <breadley@google.com> Makes some updates to the ImsService Rebind process

Test: Unit Tests
Change-Id: I9fdbfad045267bae98d1a50336d7e05c5cea0996
ms/ImsServiceController.java
4db5becf54dd7b3c9068f5579940c02db949303b 03-Mar-2017 Amit Mahajan <amitmahajan@google.com> Set radio state to unavailable when rild crashes.

This is to match earlier implementation.

Test: Basic telephony sanity
Bug: 32020264
Change-Id: I70faef332fd2df2bd2354b9d9ed5d120089e9399
IL.java
787056594ad38a5e2be27f211fcb702cfd7529b5 03-Mar-2017 Amit Mahajan <amitmahajan@google.com> Remove duplicate pollStateDone functions.

Test: Basic telephony sanity
Bug: 28299251
Merged-in: I74a096bdc22db59749afe6baa06abe046c3d5242
Change-Id: I735f223dea6659d75a6bc3739affa6f81b45a9e4
erviceStateTracker.java
860e4208de4ad4e5992e281a6a9317d69b06af86 03-Mar-2017 Amit Mahajan <amitmahajan@google.com> Remove duplicate pollStateDone functions.

Test: Basic telephony sanity
Bug: 28299251
Change-Id: I74a096bdc22db59749afe6baa06abe046c3d5242
erviceStateTracker.java
f7dc5ac00bf6b0a82ba7ba5711d394191392eb15 25-Jan-2017 Nathan Harold <nharold@google.com> Remove newFromRil() function to a utility class

Remove a dependency on frameworks/opt from SmsMessage for CDMA

-Add SmsMessageConverter for CdmaSmsMessage's
-Convert RadioIndication and CdmaSmsCbTest to use the calls in
the new converter class

Bug: 33414487
Change-Id: I2f0029b3d6a5efd5c8740643ee78a13c8c4cbb2f
adioIndication.java
dma/SmsMessageConverter.java
444c570f0beab900e6c45f4270ab52c46a4c2d7f 24-Jan-2017 Nathan Harold <nharold@google.com> Move SMS_RECORD_LENGTH to SmsManager

Bug: 33414487
Change-Id: Ia57198d92330c35518a3054d63e4312c2328a733
ccSmsInterfaceManager.java
icc/IccConstants.java
6432c2f4a4f438b72fa0d4b51d5098b179935868 14-Dec-2016 Nathan Harold <nharold@google.com> Move OTASP_* Consts from ServiceStateTracker to TelephonyManager

-Move the OTASP_* constants from SST
-Update references to those constants

Bug: 33414487
Change-Id: I1f7a8169ca21d7bc3ecd8d996b9f496a0f044662
smCdmaPhone.java
erviceStateTracker.java
ataconnection/DcTracker.java
aa577d3b49f32ce6c5e7956da662056ca765031f 14-Dec-2016 Nathan Harold <nharold@google.com> Port functions from DefaultPhoneNotifier to frameworks/base

-Moved these methods to new class PhoneConstantConversions
in frameworks/base.

-Updated references to point to the same methods in the new
location.

Bug: 33414487
Test: compilation
Change-Id: I444548745cc7b08c406fec86eb6c9d6d1fc3001f
efaultPhoneNotifier.java
e237f9dfb5947b4dc63baabf3f71c20d0685143c 13-Dec-2016 Nathan Harold <nharold@google.com> Removing files that have been migrated to frameworks/base

Bug: 33414487
Test: none
Change-Id: I077ad327e0a77dca6b19fd361217585145924070
ms7BitEncodingTranslator.java
msAddress.java
msApplication.java
msHeader.java
msMessageBase.java
dma/SmsMessage.java
dma/sms/BearerData.java
dma/sms/CdmaSmsAddress.java
dma/sms/CdmaSmsSubaddress.java
dma/sms/SmsEnvelope.java
dma/sms/UserData.java
dma/sms/package.html
sm/GsmSmsAddress.java
sm/GsmSmsCbMessage.java
sm/SmsBroadcastConfigInfo.java
sm/SmsCbConstants.java
sm/SmsCbHeader.java
sm/SmsMessage.java
icc/IccUtils.java
9dcc396e330a36b0b216984d03ddf0ff19ce7702 03-Mar-2017 Jack Yu <jackyu@google.com> Merge "Added remote display support" am: 4a777d19ca am: f3b69501ad
am: 5b5d131a5c

Change-Id: I653318f927fea480beaf8f44182dbfff279478a7
f3b69501adb55d376852687c6d3c7c8fc527c1b1 03-Mar-2017 Jack Yu <jackyu@google.com> Merge "Added remote display support"
am: 4a777d19ca

Change-Id: Ie8f712258a3f8231d9d347ef517bfe82ef673beb
f15cc290d7fb870ed5a1c7a0824bf6177f234f62 02-Mar-2017 Jack Yu <jackyu@google.com> Added remote display support

If one of the logical screens (e.g. Android auto, wifi display,
HDMI display, wifi display, etc...) is on, then behave like
the main screen is on. This will ehnance the user experience on
Android auto or Chromcasting from the phone.

Test: Telephony sanity tests
bug: 20125037
Change-Id: I3ecf9d4504a50eac5cbe2cb22b512953cb78a7f7
eviceStateMonitor.java
addd3f7d2f082a2d4ee54bb011d53dfdde09c23b 02-Mar-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fixed that the device crashes when receiving data sms"
6a9915465544d6a4ccbd9fcae3c0049c1d176a02 02-Mar-2017 Jack Yu <jackyu@google.com> Merge "Added device state monitor"
am: 442a1aa29c

Change-Id: Ib89768a88380cfc4d33bbaa81acdea509e647f2a
50b941e59787a21dd2d4f3d25d700538efb9abc5 18-Feb-2017 Jack Yu <jackyu@google.com> Added device state monitor

Added DeviceStateMonitor to replace the legacy screen state RIL
API. Instead of sending the screen state to the modem, the new
device state monitor can explicitly turn on/off the unsolicited
response from the modem based on difference scenarios (e.g.
tethering, charging, screen state). It also sends more device
state to the modem including charging state, power saving state,
and low data expected state.

Note that in order to support the old vendor RIL, framework will
still invoke the legacy screen state API to ensure the best
user experience on those devices.

Test: Manual. Unit tests.
bug: 32223897, 20125037, 28294587

Merged-In: I76ce307bde1d3160af2ac44a57f101e4cafc7ae4
Change-Id: I76ce307bde1d3160af2ac44a57f101e4cafc7ae4
aseCommands.java
ommandsInterface.java
eviceStateMonitor.java
smCdmaPhone.java
IL.java
adioIndication.java
adioResponse.java
elephonyComponentFactory.java
ataconnection/DcTracker.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
baecdb610b30a5d4b35345f8fc63fcbc2133c149 18-Feb-2017 Jack Yu <jackyu@google.com> Added device state monitor

Added DeviceStateMonitor to replace the legacy screen state RIL
API. Instead of sending the screen state to the modem, the new
device state monitor can explicitly turn on/off the unsolicited
response from the modem based on difference scenarios (e.g.
tethering, charging, screen state). It also sends more device
state to the modem including charging state, power saving state,
and low data expected state.

Note that in order to support the old vendor RIL, framework will
still invoke the legacy screen state API to ensure the best
user experience on those devices.

Test: Manual. Unit tests.
bug: 32223897, 20125037, 28294587
Change-Id: I76ce307bde1d3160af2ac44a57f101e4cafc7ae4
aseCommands.java
ommandsInterface.java
eviceStateMonitor.java
smCdmaPhone.java
IL.java
adioIndication.java
adioResponse.java
elephonyComponentFactory.java
ataconnection/DcTracker.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
47ed02c9854ba2e0c800faf98135a457594d5ad6 02-Mar-2017 Nathan Harold <nharold@google.com> Merge commit '42aeea381' into stage_aosp_master am: 0c78a3ec49
am: 75d93fd700

Change-Id: I4f93a22f109ae2bca5a04b852b3b1268b532efff
f1a9bb3a4fc7bee8240102a59c3d0cd51849919f 01-Mar-2017 Nathan Harold <nharold@google.com> Merge commit 'e8c4db8df' into goog/master

Change-Id: I8cef3789a083743041081c3024ecd122c5ce5016
0c78a3ec49cc1d03d8f6023c448194bae126610e 01-Mar-2017 Nathan Harold <nharold@google.com> Merge commit '42aeea381' into stage_aosp_master
d073e5d664ee8d460e2d0f4126f483ec2511b65f 01-Mar-2017 Nathan Harold <nharold@google.com> Merge commit '66c563051' into stage-aosp-master

Change-Id: Ib87e83edc8c12744914f5b3d8b43a6bd4eaf69eb
735c91f2ce73a93c9bbb93435d532557ab69134b 01-Mar-2017 Jack Yu <jackyu@google.com> Fixed that the device crashes when receiving data sms

handleSmsReceivedIntent only handles SMS_DELIVER_ACTION.
When data SMS arrives, it crashes inside handleSmsReceivedIntent
due to log.wtf. Moved the handling function inside normal
SMS handling section.

The crash was newly introduced by ag/1646046.

Test: Telephony sanity tests
bug: 35841838
Change-Id: I8611c9242b7201bafa64018503361f1f8b48236f
nboundSmsHandler.java
42aeea3813607882e9fea1b3ff7e248c4866206a 01-Mar-2017 nharold <nharold@google.com> Merge changes from topic 'query-fplmn-sync'

* changes:
Add support for querying Forbidden PLMNs
Update file formatting for SIMRecords.java
0f27c56b454d25e1fd8da273620ca39c41b0fc98 01-Mar-2017 ashastry <ashastry@google.com> Merge "Permit privileged system apps to send SMS without persisting." am: 98399f06c9 am: 50650f64dc
am: 648b911c35

Change-Id: I8ca4c6590ec367faf249389f52409263e7160bf4
50650f64dc11908880322fcb5d2b78f8ccac5cac 01-Mar-2017 ashastry <ashastry@google.com> Merge "Permit privileged system apps to send SMS without persisting."
am: 98399f06c9

Change-Id: I134fc7066e48d36da6ada55b2912ca4d85a08b03
98399f06c9fbec5099adb3a8de824592fd8ee0e5 01-Mar-2017 ashastry <ashastry@google.com> Merge "Permit privileged system apps to send SMS without persisting."
c2b233c11c93770833e68bff755524595f7a23d5 01-Mar-2017 Sooraj Sasindran <sasindran@google.com> Merge "Handle update in Data and Voice registration state"
am: 9ca49a5dec

Change-Id: I3489c4e63bab051f135b5371f2b8c16d93f0d4a5
9ca49a5decf733b4ea10b46baca8e697d3d4b79d 01-Mar-2017 Sooraj Sasindran <sasindran@google.com> Merge "Handle update in Data and Voice registration state"
b3d35514c79ef1549b49dc7f6749b0e6672fc202 01-Mar-2017 Tyler Gunn <tgunn@google.com> Merge "Support for detection of international call while on WFC only."
am: 3320f824a7

Change-Id: If1bd8144926ee73f4f49fd5865de4d081419e094
3320f824a738f5c083d9940b6a77fcf8f993c476 01-Mar-2017 Tyler Gunn <tgunn@google.com> Merge "Support for detection of international call while on WFC only."
d031c581c1f338ad0eba124f5bd8073b04ac4faa 14-Feb-2017 Sooraj Sasindran <sasindran@google.com> Handle update in Data and Voice registration state

Handle RIL interface update in data registration state
and voice registration state.

Test: Tested with updated QCRIL

new RILJ logs on different rats are as follows

02-27 10:22:48.489 D/RILJ ( 1483): [4169]< DATA_REGISTRATION_STATE
{.regState = REG_HOME, .rat = 14, .reasonDataDenied = -1, .maxDataCalls
= 20, .cellIdentity = {.cellInfoType = LTE, .cellIdentityGsm = [],
.cellIdentityWcdma = [], .cellIdentityCdma = [], .cellIdentityLte =
[{.mcc = -1, .mnc = -1, .ci = 56, .pci = 135, .tac = 13826, .earfcn =
-1}], .cellIdentityTdscdma = []}} [SUB0]

02-27 10:22:48.463 D/RILJ ( 1483): [4166]< VOICE_REGISTRATION_STATE
{.regState = REG_HOME, .rat = 14, .cssSupported = true,
.roamingIndicator = 1, .systemIsInPrl = -1, .defaultRoamingIndicator =
-1, .reasonForDenial = 0, .cellIdentity = {.cellInfoType = LTE,
.cellIdentityGsm = [], .cellIdentityWcdma = [], .cellIdentityCdma = [],
.cellIdentityLte = [{.mcc = -1, .mnc = -1, .ci = 56, .pci = -1, .tac =
-1, .earfcn = -1}], .cellIdentityTdscdma = []}} [SUB

02-27 11:13:16.138 D/RILJ ( 2110): [3992]< DATA_REGISTRATION_STATE
{.regState = REG_ROAMING, .rat = 13, .reasonDataDenied = -1,
.maxDataCalls = 20, .cellIdentity = {.cellInfoType = CDMA,
.cellIdentityGsm = [], .cellIdentityWcdma = [], .cellIdentityCdma =
[{.networkId = -1, .systemId = -1, .baseStationId = -1, .longitude = -1,
.latitude = -1}], .cellIdentityLte = [], .cellIdentityTdscdma = []}}
[SUB0]

02-27 11:13:16.136 D/RILJ ( 2110): [3993]< VOICE_REGISTRATION_STATE
{.regState = NOT_REG_MT_SEARCHING_OP, .rat = 0, .cssSupported = false,
.roamingIndicator = 64, .systemIsInPrl = 1, .defaultRoamingIndicator =
-1, .reasonForDenial = 0, .cellIdentity = {.cellInfoType = 0x0,
.cellIdentityGsm = [], .cellIdentityWcdma = [], .cellIdentityCdma = [],
.cellIdentityLte = [], .cellIdentityTdscdma = []}} [SUB0]

02-27 11:23:21.875 D/RILJ ( 2104): [4058]< VOICE_REGISTRATION_STATE
{.regState = REG_ROAMING, .rat = 6, .cssSupported = false,
.roamingIndicator = 64, .systemIsInPrl = 1, .defaultRoamingIndicator =
-1, .reasonForDenial = 0, .cellIdentity = {.cellInfoType = CDMA,
.cellIdentityGsm = [], .cellIdentityWcdma = [], .cellIdentityCdma =
[{.networkId = 54, .systemId = 4, .baseStationId = 7155, .longitude =
2147483647, .latitude = 0}], .cellIdentityLte = [], .cellIdentityTdscdma
= []}} [SUB0]

02-27 11:29:36.774 D/RILJ ( 2157): [3925]< VOICE_REGISTRATION_STATE
{.regState = REG_HOME, .rat = 16, .cssSupported = false,
.roamingIndicator = 1, .systemIsInPrl = -1, .defaultRoamingIndicator =
-1, .reasonForDenial = 0, .cellIdentity = {.cellInfoType = GSM,
.cellIdentityGsm = [{.mcc = -1, .mnc = -1, .lac = 8, .cid = 0, .arfcn =
-1, .bsic = -1}], .cellIdentityWcdma = [], .cellIdentityCdma = [],
.cellIdentityLte = [], .cellIdentityTdscdma = []}} [SUB0]

02-27 11:29:36.768 D/RILJ ( 2157): [3924]< DATA_REGISTRATION_STATE
{.regState = REG_HOME, .rat = 2, .reasonDataDenied = -1, .maxDataCalls =
20, .cellIdentity = {.cellInfoType = GSM, .cellIdentityGsm = [{.mcc =
-1, .mnc = -1, .lac = 8, .cid = 0, .arfcn = -1, .bsic = -1}],
.cellIdentityWcdma = [], .cellIdentityCdma = [], .cellIdentityLte = [],
.cellIdentityTdscdma = []}} [SUB0]

Bug=32223344
Merged-In: I1e4470a93131119a75bfd9ec39db7e3c48f8d849
Change-Id: I1e4470a93131119a75bfd9ec39db7e3c48f8d849
adioResponse.java
erviceStateTracker.java
11cb63b1966838a971828f1915823e7106bd7fe8 05-Apr-2016 Sandeep Gutta <sangutta@codeaurora.org> MSIM: Fix flex map related issues

1. Send FINISH with failure status if any of the
START request fails.

2. When set radio cap request timeout happens, to cleanup
ongoing transcation ProxyController sends FINISH with
failure status, while sending FINISH reuqests it
generates a new session id, but the generated new
session id is not updated in global variable and because
of that the FINISH response is ignored.
To fix this update the generated new session id in
global variable and reset the RAF status counter to 0.

3. While sending FINISH pass new RAF/modem Uuid
if overall request is success.

Test: performed flex map sanity
Bug: 28382997
Change-Id: Ibc8f5ed14616b4c5fe5694fe2717ce75704e4bf8
roxyController.java
9c8771b512391634af8c65fa3b58039ed9a9b5bd 14-Feb-2017 Sooraj Sasindran <sasindran@google.com> Handle update in Data and Voice registration state

Handle RIL interface update in data registration state
and voice registration state.

Test: Tested with updated QCRIL

new RILJ logs on different rats are as follows

02-27 10:22:48.489 D/RILJ ( 1483): [4169]< DATA_REGISTRATION_STATE
{.regState = REG_HOME, .rat = 14, .reasonDataDenied = -1, .maxDataCalls
= 20, .cellIdentity = {.cellInfoType = LTE, .cellIdentityGsm = [],
.cellIdentityWcdma = [], .cellIdentityCdma = [], .cellIdentityLte =
[{.mcc = -1, .mnc = -1, .ci = 56, .pci = 135, .tac = 13826, .earfcn =
-1}], .cellIdentityTdscdma = []}} [SUB0]

02-27 10:22:48.463 D/RILJ ( 1483): [4166]< VOICE_REGISTRATION_STATE
{.regState = REG_HOME, .rat = 14, .cssSupported = true,
.roamingIndicator = 1, .systemIsInPrl = -1, .defaultRoamingIndicator =
-1, .reasonForDenial = 0, .cellIdentity = {.cellInfoType = LTE,
.cellIdentityGsm = [], .cellIdentityWcdma = [], .cellIdentityCdma = [],
.cellIdentityLte = [{.mcc = -1, .mnc = -1, .ci = 56, .pci = -1, .tac =
-1, .earfcn = -1}], .cellIdentityTdscdma = []}} [SUB

02-27 11:13:16.138 D/RILJ ( 2110): [3992]< DATA_REGISTRATION_STATE
{.regState = REG_ROAMING, .rat = 13, .reasonDataDenied = -1,
.maxDataCalls = 20, .cellIdentity = {.cellInfoType = CDMA,
.cellIdentityGsm = [], .cellIdentityWcdma = [], .cellIdentityCdma =
[{.networkId = -1, .systemId = -1, .baseStationId = -1, .longitude = -1,
.latitude = -1}], .cellIdentityLte = [], .cellIdentityTdscdma = []}}
[SUB0]

02-27 11:13:16.136 D/RILJ ( 2110): [3993]< VOICE_REGISTRATION_STATE
{.regState = NOT_REG_MT_SEARCHING_OP, .rat = 0, .cssSupported = false,
.roamingIndicator = 64, .systemIsInPrl = 1, .defaultRoamingIndicator =
-1, .reasonForDenial = 0, .cellIdentity = {.cellInfoType = 0x0,
.cellIdentityGsm = [], .cellIdentityWcdma = [], .cellIdentityCdma = [],
.cellIdentityLte = [], .cellIdentityTdscdma = []}} [SUB0]

02-27 11:23:21.875 D/RILJ ( 2104): [4058]< VOICE_REGISTRATION_STATE
{.regState = REG_ROAMING, .rat = 6, .cssSupported = false,
.roamingIndicator = 64, .systemIsInPrl = 1, .defaultRoamingIndicator =
-1, .reasonForDenial = 0, .cellIdentity = {.cellInfoType = CDMA,
.cellIdentityGsm = [], .cellIdentityWcdma = [], .cellIdentityCdma =
[{.networkId = 54, .systemId = 4, .baseStationId = 7155, .longitude =
2147483647, .latitude = 0}], .cellIdentityLte = [], .cellIdentityTdscdma
= []}} [SUB0]

02-27 11:29:36.774 D/RILJ ( 2157): [3925]< VOICE_REGISTRATION_STATE
{.regState = REG_HOME, .rat = 16, .cssSupported = false,
.roamingIndicator = 1, .systemIsInPrl = -1, .defaultRoamingIndicator =
-1, .reasonForDenial = 0, .cellIdentity = {.cellInfoType = GSM,
.cellIdentityGsm = [{.mcc = -1, .mnc = -1, .lac = 8, .cid = 0, .arfcn =
-1, .bsic = -1}], .cellIdentityWcdma = [], .cellIdentityCdma = [],
.cellIdentityLte = [], .cellIdentityTdscdma = []}} [SUB0]

02-27 11:29:36.768 D/RILJ ( 2157): [3924]< DATA_REGISTRATION_STATE
{.regState = REG_HOME, .rat = 2, .reasonDataDenied = -1, .maxDataCalls =
20, .cellIdentity = {.cellInfoType = GSM, .cellIdentityGsm = [{.mcc =
-1, .mnc = -1, .lac = 8, .cid = 0, .arfcn = -1, .bsic = -1}],
.cellIdentityWcdma = [], .cellIdentityCdma = [], .cellIdentityLte = [],
.cellIdentityTdscdma = []}} [SUB0]

Bug=32223344
Merged-In: I1e4470a93131119a75bfd9ec39db7e3c48f8d849
Change-Id: I1e4470a93131119a75bfd9ec39db7e3c48f8d849
adioResponse.java
erviceStateTracker.java
70241c533c2afa505b13257b6b22c0abfcc44d27 27-Feb-2017 Tyler Gunn <tgunn@google.com> Support for detection of international call while on WFC only.

Adding new method to detect scenario where we are on WFC only and attempt
to make an international call.

Test: Manual, unit
Bug: 33272455
Merged-In: I5d83710a67b0ebf40df29df87456d92af9bff08b
Change-Id: I5d83710a67b0ebf40df29df87456d92af9bff08b
smCdmaPhone.java
c8a47f0c3169a5d2e274603f67bd643233ba5692 28-Feb-2017 Jack Yu <jackyu@google.com> resolve merge conflicts of d565da4e5 to stage-aosp-master

Test: Telephony sanity tests
Change-Id: I677bdc469d4440a68e9b51ab2329c6606cdb206f
d565da4e5832bf84ba5de5a9a06e04e6f13c4529 28-Feb-2017 Jack Yu <jackyu@google.com> Merge "Data call refactoring and hidlization"
3543fcced1bb54bee2e07480dd7f9846f3af526f 28-Feb-2017 Jack Yu <jackyu@google.com> Merge "Data call refactoring and hidlization"
d998341fb997fb145db8c41838c2699b2bb84151 27-Feb-2017 Tyler Gunn <tgunn@google.com> Support for detection of international call while on WFC only.

Adding new method to detect scenario where we are on WFC only and attempt
to make an international call.

Test: Manual, unit
Bug: 33272455
Change-Id: I5d83710a67b0ebf40df29df87456d92af9bff08b
smCdmaPhone.java
caecd75617c11d33e000c4d90f8a6557c5b2de7e 13-Feb-2017 Jack Yu <jackyu@google.com> Data call refactoring and hidlization

Support the new HIDL interface for data call APIs.
The affacted APIs are RIL_REQUEST_SETUP_DATA_CALL,
RIL_REQUEST_SET_DATA_PROFILE, RIL_REQUEST_SET_INITIAL_ATTACH_APN
More parameters are passing down to the modem to address
some issues we had earlier.

bug: 32224135, 30173958, 33561503, 30282096, 32020264
Test: Telephony sanity tests, unit tests

Merged-In: I239baa144bcee413f67e77c6b79b4ae5278077e8
Change-Id: I239baa144bcee413f67e77c6b79b4ae5278077e8
ommandsInterface.java
IL.java
adioIndication.java
adioResponse.java
ataconnection/ApnSetting.java
ataconnection/DataCallResponse.java
ataconnection/DataConnection.java
ataconnection/DataProfile.java
ataconnection/DcTracker.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
abf5bc82a09d1f93c3cabc85403f3b74ef53a40b 15-Nov-2016 Nathan Harold <nharold@google.com> Add support for querying Forbidden PLMNs

Bug: 32277497
Test: Verified API using multiple SIMs
Change-Id: I5dbb6976ed6d50146992342ec085f28d2043200a
icc/IccRecords.java
icc/SIMRecords.java
66c563051901951db72dad5270d521634e225162 23-Jan-2017 Nathan Harold <nharold@google.com> Update file formatting for SIMRecords.java

Bug: 32277497
Test: compilation (non-functional change)
Change-Id: I2bf697e58117b3d83f62bd448b5b2ffd03523265
icc/SIMRecords.java
8e9d1e601dce62cd0328701d7054e03db24727c7 13-Feb-2017 Jack Yu <jackyu@google.com> Data call refactoring and hidlization

Support the new HIDL interface for data call APIs.
The affacted APIs are RIL_REQUEST_SETUP_DATA_CALL,
RIL_REQUEST_SET_DATA_PROFILE, RIL_REQUEST_SET_INITIAL_ATTACH_APN
More parameters are passing down to the modem to address some
issues we had earlier.

bug: 32224135, 30173958, 33561503, 30282096, 32020264
Test: Telephony sanity tests, unit tests

Change-Id: I239baa144bcee413f67e77c6b79b4ae5278077e8
ommandsInterface.java
IL.java
adioIndication.java
adioResponse.java
ataconnection/ApnSetting.java
ataconnection/DataCallResponse.java
ataconnection/DataConnection.java
ataconnection/DataProfile.java
ataconnection/DcTracker.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
f227e48ac97c3f9fc037b1fb5f29aded3adac752 27-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "Use empty string instead of null in setAllowedCarriers" am: fe403e0ca0 am: a072f7c311
am: fbd822979d

Change-Id: Ib77cae396dbe58fac9d2c70a393ddd3e43f1947f
a072f7c31186e0572e0ee4c19940134426870dce 27-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "Use empty string instead of null in setAllowedCarriers"
am: fe403e0ca0

Change-Id: I782275868d499b6919e1b4b573e8e8b5ad7b9819
9f18938b5f973c5f6bb4409bf8941e0801c565ea 27-Feb-2017 Amit Mahajan <amitmahajan@google.com> Use empty string instead of null in setAllowedCarriers

Test: Basic telephony sanity
Bug: 35374455
Change-Id: I59360e17836da540499aabdc9eee0401569aa726
IL.java
70a1faa4483f634263be87c5069b3300de87d7d0 26-Feb-2017 Yoshiaki Naka <yoshiaki.naka@sonymobile.com> Merge "Unreliable number(255) for voice message count should not be provided" am: 619d1c0381 am: 31ed7fa873
am: 4421431085

Change-Id: Ie45bb72045f90b393ca0ffc2f14fc7eb7b692b49
31ed7fa87346039ae0e8c1d0a987cb1c1bb15a13 26-Feb-2017 Yoshiaki Naka <yoshiaki.naka@sonymobile.com> Merge "Unreliable number(255) for voice message count should not be provided"
am: 619d1c0381

Change-Id: I490a836b89be85bd1f745b2754a7b32ba3ca34c7
619d1c03814bdd46a7a5a5b11bc3221b8c6b63b7 26-Feb-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Unreliable number(255) for voice message count should not be provided"
6906708692eacbe6f59ed97b7d9f0c5140b94474 23-Feb-2017 Jack Yu <jackyu@google.com> Send CMAS broadcast to additional package

This is for sl4a automation to receive CMAS messages
broadcasdt. The automation should inject the settings
through 'adb settings'.

Test: manual
bug: 34393649
Merged-In: I88b0a568183b9701712e5071a6692e5d1ce08c7d
Change-Id: I88b0a568183b9701712e5071a6692e5d1ce08c7d
ellBroadcastHandler.java
dma/CdmaServiceCategoryProgramHandler.java
574370b40552e9c1f5aa5f7e8afb011c3c457520 25-Feb-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Send CMAS broadcast to additional package"
8468f6071ad6bee6f4955a983b4e07b437f0c7c6 25-Feb-2017 Jack Yu <jackyu@google.com> Merge "Send CMAS broadcast to additional package"
23780679ea855b9797a696698c07476cba29c458 24-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "Mark oemhook related APIs @Deprecated." am: 029e267869 am: 586a14818a
am: 9a68b386ae

Change-Id: I95fbe9b984a11f4fafd6e9e70318f200885d8a57
586a14818a0bda949a8c25d1a6f07d623e39f634 24-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "Mark oemhook related APIs @Deprecated."
am: 029e267869

Change-Id: I6b382a8b9082da41bddc19849ecb06cdb46d2e48
029e267869b4d40cbaec2c1a1ee756eea5ad5681 24-Feb-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Mark oemhook related APIs @Deprecated."
a700124bf726680fe96675ab7f558e524fc024c9 14-Feb-2017 Abhijith Shastry <ashastry@google.com> Permit privileged system apps to send SMS without persisting.

The system app needs to have MODIFY_PHONE_STATE permission.

BUG: 35325136
Test: API visibility change, Manual
Change-Id: Ic9242972a211c90378c183c3abf95672c2816ac7
ccSmsInterfaceManager.java
4b9edae9820978691082673e51798c793833ad25 15-Jul-2016 Umashankar Godachi <umasha@codeaurora.org> Read the voice message count properly

When Voice message count is available from
EF, do not read from preference.

Bug: 35025528
Change-Id: Id87ed25f7f912674e405e92b44a5140cd4b29cf7
smCdmaPhone.java
icc/IccRecords.java
icc/SIMRecords.java
17ed6547ba2bba79da66024c2cf41a4647a1dabc 24-Feb-2017 Amit Mahajan <amitmahajan@google.com> resolve merge conflicts of a9a08b122 to stage-aosp-master

Change-Id: I4bb424981bd67e0d848875b758cde346c3abaccb
a9a08b122c45e2c287e5e62c6824503a2e6916dd 24-Feb-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Merge the pollStateDone functions for GSM, CDMA and CDMA-LTE"
252459db4495ac41719866035698ae9af152298c 23-Feb-2017 Jack Yu <jackyu@google.com> Send CMAS broadcast to additional package

This is for sl4a automation to receive CMAS messages
broadcasdt. The automation should inject the settings
through 'adb settings'.

Test: manual
bug: 34393649
Merged-In: I88b0a568183b9701712e5071a6692e5d1ce08c7d
Change-Id: I88b0a568183b9701712e5071a6692e5d1ce08c7d
ellBroadcastHandler.java
dma/CdmaServiceCategoryProgramHandler.java
cfc9c7cb6f33c7df5264d77eb21f79c9f14b62af 23-Feb-2017 Jack Yu <jackyu@google.com> Send CMAS broadcast to additional package

This is for sl4a automation to receive CMAS messages
broadcasdt. The automation should inject the settings
through 'adb settings'.

Test: manual
bug: 34393649
Change-Id: I88b0a568183b9701712e5071a6692e5d1ce08c7d
ellBroadcastHandler.java
dma/CdmaServiceCategoryProgramHandler.java
2255613f8548afe1cc7212ca46e281618ad38de8 24-Feb-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Merge the pollStateDone functions for GSM, CDMA and CDMA-LTE"
33008595ff12ae06cde0d592f7901cbd5eba944e 23-Feb-2017 Amit Mahajan <amitmahajan@google.com> Mark oemhook related APIs @Deprecated.

Test: none
Bug: 34344851
Change-Id: I0c16377d078cdf00af8efc784dd4e2e1f607995b
hone.java
00d07390d528c48d80033542f1d03f9305d0b0db 24-Feb-2017 Sanket Padawe <sanketpadawe@google.com> Merge commit '96140f71f60a923f66c6fd16e43a870b910e2919' into manual_merge_96140f71f am: b65c1431d4
am: a245431235

Change-Id: If3d941598de316736f225c681ac21c6bf7ced0cc
3b80171056751d3681ad1fe876f4e4e99bfdeb67 22-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge the pollStateDone functions for GSM, CDMA and CDMA-LTE

Test: Basic telephony sanity
Bug: 28299251
Merged-in: I0a1a11623c1c27fe3449cf48f26982d7551cf6c2
Change-Id: I0a1a11623c1c27fe3449cf48f26982d7551cf6c2
erviceStateTracker.java
f948bef6da929a054f035243f5abb03c1de02b01 22-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge the pollStateDone functions for GSM, CDMA and CDMA-LTE

Test: Basic telephony sanity
Bug: 28299251
Change-Id: I0a1a11623c1c27fe3449cf48f26982d7551cf6c2
erviceStateTracker.java
b65c1431d4ff52c552b1f6721dec1169a389795c 24-Feb-2017 Sanket Padawe <sanketpadawe@google.com> Merge commit '96140f71f60a923f66c6fd16e43a870b910e2919' into manual_merge_96140f71f

Test: build
Change-Id: Ic19481e3cf4d65273cd15a26e1da0177f0a83870
a9f4cab95235ce60c66cda06185f698bdb88bd32 12-Oct-2016 Sanket Padawe <sanketpadawe@google.com> Add more debugging logs for NITZ in dumpsys output.

Test: Basic log printing.
Bug: 31946097
Change-Id: I5103d7abe48a9e254fd92a2143ab705029f4e872
Merged-in: I5103d7abe48a9e254fd92a2143ab705029f4e872
erviceStateTracker.java
12419e8e09902972736b3d63cd6f11ff0fb1801b 23-Feb-2017 Sanket Padawe <sanketpadawe@google.com> Add more debugging logs for NITZ in dumpsys output.

Test: Basic log printing.
Bug: 31946097
Change-Id: I5103d7abe48a9e254fd92a2143ab705029f4e872
erviceStateTracker.java
6be70ef71d977023a8188b1811c3ec47fae4f998 23-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "OemHook client implementation."
am: 4a9210e94a

Change-Id: I4cd489ad9915baf5a09624ab0ccbf33de001d835
72c0d812e2e53b35c09ee9bfffe04779636678a3 14-Feb-2017 Amit Mahajan <amitmahajan@google.com> OemHook client implementation.

Test: Basic telephony sanity
Bug: 32020264
Bug: 34344851
Merged-in: I7383da9245cc68d80eaebf27ebd26404d2d29f9f
Change-Id: I7383da9245cc68d80eaebf27ebd26404d2d29f9f
emHookIndication.java
emHookResponse.java
IL.java
adioIndication.java
adioResponse.java
dea9970dacca0d85f46abf1273dd813ebdb22582 23-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "OemHook client implementation."
66e168eea2050d167319bbe9c9d1ce2b783b04e8 23-Feb-2017 Jack Yu <jackyu@google.com> Merge "Telephony: Use data and voice states for SPN" am: c6d068613e am: df85c4727f
am: c6dcf3652f

Change-Id: I37513d081c8ec468330542aeaba06571de0a92b3
df85c4727f748d02929b58c4a88e2aeef111f4a6 23-Feb-2017 Jack Yu <jackyu@google.com> Merge "Telephony: Use data and voice states for SPN"
am: c6d068613e

Change-Id: I857eb99f10a4b24372c058d1174719d6e8600559
c6d068613e1d187f448a9df3675458bd9740b5ad 23-Feb-2017 Jack Yu <jackyu@google.com> Merge "Telephony: Use data and voice states for SPN"
aa7cf220ec39b8ccd7e36f02a4ec0ff988df94ae 15-Sep-2016 Shiva Kishore Tekale <shivakishore@codeaurora.org> Telephony: Use data and voice states for SPN

SPN display text is based on both voice service state
and data service state.
Eg - Voice service state is OOS and data service state
is IN_SERVICE. In such cases, both regStates need to be
considered to determine what to show in UI for SPN.
Fix the wrong CDMA carrier text in expanded status bar.
After updating operator, the expanded status bar will
update SPN
For GSM, SPN is "no service" if service is out of service.
For CDMA, SPN is CDMA carrier. Check current service
state whether out of service, if yes, display "no service"
instead of SPN.

bug: 22640459
Test: manual
Change-Id: Ic46ac0c7e3af51a380bb2db5d71a71bf9595c2ec
erviceStateTracker.java
db053b8d8756c0687530a9dcf7881ba2473b41fc 23-Feb-2017 Brad Ebinger <breadley@google.com> Merge "Adds logic to display UI if call forwarding is not enabled on 3gpp"
f5865983b0be60ad2ab177ec37e57ffedfd20ac7 14-Feb-2017 Amit Mahajan <amitmahajan@google.com> OemHook client implementation.

Test: Basic telephony sanity
Bug: 32020264
Bug: 34344851
Change-Id: I7383da9245cc68d80eaebf27ebd26404d2d29f9f
emHookIndication.java
emHookResponse.java
IL.java
adioIndication.java
adioResponse.java
3f2266930ede30ac5ec7aeef531a28a82e88ef5f 22-Feb-2017 Jack Yu <jackyu@google.com> Merge "Added telephony manager set sim power state API"
am: 0f6e1a01fd

Change-Id: I589b24d3dc62581d375db74c245e0e62bf83b2b3
0f6e1a01fd14a00baafc0bab4af5dfc3ade9ddbf 22-Feb-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Added telephony manager set sim power state API"
9f46a2d6da07accb988ebaf68a6206c43753704a 22-Feb-2017 ashastry <ashastry@google.com> Merge "Permit IMS app to send single part SMS messages." am: 0c93776eb5 am: 782ba29f41
am: 35d6227b89

Change-Id: I9228617194efff5987cb834e9d0acec2c0c794a8
782ba29f4119a41ca846b2f013e69cd8a1b5bbf8 22-Feb-2017 ashastry <ashastry@google.com> Merge "Permit IMS app to send single part SMS messages."
am: 0c93776eb5

Change-Id: I86970d664971fbe541996d61bed0ed6259594a4d
0c93776eb5e61696bd69beed8d9d04a2096709e3 22-Feb-2017 ashastry <ashastry@google.com> Merge "Permit IMS app to send single part SMS messages."
80c5e9ebdd895a58b045f8782a1738de9542ec94 22-Feb-2017 Jack Yu <jackyu@google.com> Merge "Added telephony manager set sim power state API"
750cea57d86fe5f7eac0dd04f95c255c4eb3dba2 21-Feb-2017 Brad Ebinger <breadley@google.com> Merge "Remove Session ID from ImsService APIs that are not used" am: 3fe31f7fe8 am: 14b00f95e2
am: 94f2eb99a6

Change-Id: If008f945c9d78485a872390a4bd75f1c24e8bfa0
14b00f95e21a7cab72bfa18d9ef906a287bf6de2 21-Feb-2017 Brad Ebinger <breadley@google.com> Merge "Remove Session ID from ImsService APIs that are not used"
am: 3fe31f7fe8

Change-Id: I1ca31ed55c46a51ef8630995259f68db94cc860b
9138b3d666a359abe1068ad75bc67265f3bded7e 17-Feb-2017 Jack Yu <jackyu@google.com> Added telephony manager set sim power state API

The new API can be used to power up/down the SIM. This is equivalent
to inserting and removing the card.

Test: Telephony sanity tests
bug: 32224755
Merged-In: I16488c12ef648bd884123b02b9f07394d8fbaa49
Change-Id: I16488c12ef648bd884123b02b9f07394d8fbaa49
hone.java
msphone/ImsPhoneCommandInterface.java
f3b307e72a52216c336b45b5f6cc208eee7e77a0 17-Feb-2017 Jack Yu <jackyu@google.com> Added telephony manager set sim power state API

The new API can be used to power up/down the SIM. This is equivalent
to inserting and removing the card.

Test: Telephony sanity tests
bug: 32224755
Change-Id: I16488c12ef648bd884123b02b9f07394d8fbaa49
hone.java
msphone/ImsPhoneCommandInterface.java
532c5ffb1d1ba6a3d642a21c107fd578ae64ef1c 14-Feb-2017 Abhijith Shastry <ashastry@google.com> Permit IMS app to send single part SMS messages.

BUG: 29899506
Test: Manual testing
Change-Id: I2b1c3062e72e746f15064be11591c4e203a94f00
ccSmsInterfaceManager.java
d8c6d59607f963be65bb78f92c44194a78b66108 17-Feb-2017 Brad Ebinger <breadley@google.com> Remove Session ID from ImsService APIs that are not used

1) Remove session ID from ImsService APIs that do not need them.
2) Change logging in ImsResolver to be less verbose.

Test: Manual
Change-Id: Ifaa3daf6d78ef5dae873b3c5e48be60a5cf79836
ms/ImsResolver.java
msphone/ImsPhoneCallTracker.java
9e6c4eda9fbce36f7edf8b5fc0aff9ac7d220d46 17-Feb-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Add missed check for setAllowedCarriers api." am: 43dd2bb743 am: da551843c3
am: 446f57f939

Change-Id: I5385a6e068c79602ab66590919d74c4e2adfeb73
da551843c3498444991a434c854566f8079ba0c7 17-Feb-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Add missed check for setAllowedCarriers api."
am: 43dd2bb743

Change-Id: I0372c9d7cca3c4d3699e6076b72b896a7336a450
43dd2bb743f0a14fc27e2fce83555d8d09280774 17-Feb-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Add missed check for setAllowedCarriers api."
1a25e132f5aaed6f523834b3ef9d9529db5e5ce3 17-Feb-2017 Brad Ebinger <breadley@google.com> resolve merge conflicts of 87ee8a1b2 to nyc-mr2-dev-plus-aosp

Change-Id: Ic783c5e7d21a9945cde5e6692f8dec785e5572e1
80524b63204efdf513078211586724f7be9b4ca0 17-Feb-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Modifications to support ImsResolver and adds Tests"
3953d6e1205524261e887cea2b283d05213e61c1 17-Feb-2017 Sanket Padawe <sanketpadawe@google.com> Add missed check for setAllowedCarriers api.

Test: Checked passing null carriers list.
Bug: 35468257
Change-Id: I9861e9ee4360dc2f37995211dba88ea83e1ed86b
IL.java
a92b6b97b60b6e5453431e68b925b6f4bc3dbcc6 17-Feb-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Modifications to support ImsResolver and adds Tests"
5277a26052554dd3aaba466eed4881502c266dd5 17-Feb-2017 Jack Yu <jackyu@google.com> Merge "Added the new RIL request to set SIM power state" am: 93c4fc94b3 am: 39419415ba
am: 7434a63d74

Change-Id: I5e1cd785303bd40681fcf7886892351859a9a423
7434a63d747490151779053fbf65bc6f335fd309 17-Feb-2017 Jack Yu <jackyu@google.com> Merge "Added the new RIL request to set SIM power state" am: 93c4fc94b3
am: 39419415ba

Change-Id: I229dd17c188f28419bfabd9a1994c4420478e9d3
93c4fc94b3850d0f1ed5cb4ff64d904f8d624ee8 17-Feb-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Added the new RIL request to set SIM power state"
9a09c9062784bfc697a39755ba3bc9fd5698ea65 16-Feb-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Added the new RIL request to set SIM power state"
0b258ef391446b24698e95a4be1b54f31863f370 16-Feb-2017 Meng Wang <mewan@google.com> Merge "Don't dial non-emergency CS voice call in airplane mode" into nyc-mr2-dev am: d837aaa36e
am: 479f68ea8e

Change-Id: I89c88af51fe388c85ab4805fb318ac896dd2750e
479f68ea8e7c0ce6feca3957bf931fd766b63e61 16-Feb-2017 Meng Wang <mewan@google.com> Merge "Don't dial non-emergency CS voice call in airplane mode" into nyc-mr2-dev
am: d837aaa36e

Change-Id: I65a5659f78d73531cb752c0141750f756266e627
d837aaa36e95db77932c76114cf55aa3e3c27876 16-Feb-2017 Meng Wang <mewan@google.com> Merge "Don't dial non-emergency CS voice call in airplane mode" into nyc-mr2-dev
4a424775eab77d5f9a805ef56eca2e526038f0a1 25-Jan-2017 Brad Ebinger <breadley@google.com> Modifications to support ImsResolver and adds Tests

1) Adds unit tests for ImsService and related classes.
2) Modifies the ImsPhoneCallTracker to support the new ImsResolver.
3) Modifies the ImsServiceController to relay ImsService status callbacks.

Test: Unit Tests added
Merged-In: Ibcb001ce13e0bcc21f02deede64f7ee8f1549e59
Change-Id: Ibcb001ce13e0bcc21f02deede64f7ee8f1549e59
hone.java
honeFactory.java
ms/ImsServiceController.java
msphone/ImsPhoneCallTracker.java
7152d901c51e288759259ae3e482bb5fe1c23173 25-Jan-2017 Brad Ebinger <breadley@google.com> Modifications to support ImsResolver and adds Tests

1) Adds unit tests for ImsService and related classes.
2) Modifies the ImsPhoneCallTracker to support the new ImsResolver.
3) Modifies the ImsServiceController to relay ImsService status callbacks.

Test: Unit Tests added
Change-Id: Ibcb001ce13e0bcc21f02deede64f7ee8f1549e59
hone.java
honeFactory.java
ms/ImsServiceController.java
msphone/ImsPhoneCallTracker.java
16ebf27f93b3c8c5aaf4aa6a169a63a2dae5f436 14-Feb-2017 Meng Wang <mewan@google.com> Don't dial non-emergency CS voice call in airplane mode

Added a new CallStateException error code ERROR_POWER_OFF

Bug: 28709116
Change-Id: Ia63196d5e8c051a91da3e2a7e60ac605dccf8344
allStateException.java
smCdmaPhone.java
df97820b2db85a96b3d87e9968c1898ece1e6736 16-Feb-2017 Jack Yu <jackyu@google.com> Added the new RIL request to set SIM power state

The new RIL request for powering up/down the SIM card.

Test: Telephony sanity tests
bug: 32224755
Merged-In: I71d07e39a07ee4c1ea877adf188955aeb5a70793
Change-Id: I71d07e39a07ee4c1ea877adf188955aeb5a70793
ommandsInterface.java
IL.java
adioResponse.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
99607db1bc0f46e73f39d5379c590b8bcb4bf947 16-Feb-2017 Jack Yu <jackyu@google.com> Added the new RIL request to set SIM power state

The new RIL request for powering up/down the SIM card.

Test: Telephony sanity tests
bug: 32224755
Change-Id: I71d07e39a07ee4c1ea877adf188955aeb5a70793
ommandsInterface.java
IL.java
adioResponse.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
fbd8d9ed705a9de6aca60c0e70357859a8e0ccc3 16-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "Do not call getService() on wifi-only device." am: 48a17d6b56 am: 030b3bfa9f am: 245cd7bf5a
am: 6843698e83

Change-Id: Idb2c1caa0687aeaff413b1e5c57926690ec11449
6843698e835e7844bbe91ff7fbbe9bc87329efdf 16-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "Do not call getService() on wifi-only device." am: 48a17d6b56 am: 030b3bfa9f
am: 245cd7bf5a

Change-Id: Ic334546bf9e2a15a67e7f95333b7309e369937fe
245cd7bf5af98a450fa1bc0237d26dfd8d3a3e1e 16-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "Do not call getService() on wifi-only device." am: 48a17d6b56
am: 030b3bfa9f

Change-Id: I9519ac3790c9dd009ae6a75fa55888f4b7918c47
48a17d6b568b9841448cc22326f49701971cb8ac 16-Feb-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Do not call getService() on wifi-only device."
0ef065b1f452063d6f5ad717d8d90f059ffcd6ec 15-Feb-2017 Amit Mahajan <amitmahajan@google.com> Do not call getService() on wifi-only device.

Test: none
Bug: 35355251
Change-Id: If5b0cf2c04c21103849bf24b21ad71a79214e986
IL.java
8431a0ed52216b39364c0ca846f981cbd04c626f 26-Nov-2014 takaaki.x.yashiro <takaaki.x.yashiro@sonymobile.com> Fix that pending DTMF cannot be sent after SRVCC has occurred

The pause dial information is not moved to GsmCdmaConnection
from ImsPhoneConnection when the SRVCC has occurred.
Therefore, it is not possible to send the pending DTMF
after the SRVCC has occurred.

Test: manual
Bug: 35367717

Change-Id: I28f68767a3c5ca2ba65e8eff7e124021bcb0f3cd
onnection.java
085e797ba8ea0f7718d9c700d4cc5a6c75c1993f 15-Feb-2017 Youhan Wang <youhanw@google.com> Merge "Handle OPERATOR_DETERMINED_BARRING failure." into nyc-mr2-dev am: 122fcb16b3
am: da746841d8

Change-Id: Ie13abb4730c8d3aec9d2e5cf0ab39a42e306184f
da746841d8cc4f588156110313bf2e6a4766d5fe 15-Feb-2017 Youhan Wang <youhanw@google.com> Merge "Handle OPERATOR_DETERMINED_BARRING failure." into nyc-mr2-dev
am: 122fcb16b3

Change-Id: Ifa1c38979bee675caf1aab9681d676da4309f411
122fcb16b359b96480db21ad26a21900c51562af 15-Feb-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Handle OPERATOR_DETERMINED_BARRING failure." into nyc-mr2-dev
e9382711a69df42919f9cf301784be0651f9dc45 14-Feb-2017 Youhan Wang <youhanw@google.com> Handle OPERATOR_DETERMINED_BARRING failure.

1. Added CALL_FAIL_OPERATOR_DETERMINED_BARRING to CallFailCause.
2. Handle Mapping logic to regard CALL_FAIL_OPERATOR_DETERMINED_BARRING
as same as CALL_BARRED.

Bug:35184262
Change-Id: Iae68b94abfd3ec5800a50218623d092c743cc267
allFailCause.java
smCdmaConnection.java
421d485ae09dedc9efe3cd04f0ff3bb50c9cf592 14-Feb-2017 Christopher Tate <ctate@google.com> Send telephony *_SUBSCRIPTION_CHANGED broadcasts to manifest receivers

Bug 35318995

Change-Id: If989ee246e8d3597adcbdbb773a7a3337cb9d0a5
ubscriptionController.java
8933e7db960d1adc530bd66467bce7a4f87a2dd6 14-Feb-2017 Erik Wolsheimer <ewol@google.com> Prevent phone process crashing on bad params to TelephonyTester am: e465c97904 am: 3c000d9131
am: 69667eab47

Change-Id: I5abbe3d728f39d343528efe6bfc19658d2185c4c
69667eab47f0c889a639cea908f66b6ba42456eb 14-Feb-2017 Erik Wolsheimer <ewol@google.com> Prevent phone process crashing on bad params to TelephonyTester am: e465c97904
am: 3c000d9131

Change-Id: Idf83b9eccd7c4119156b63854b2829ab269f8ed3
3c000d91315799f0f4442d5aa8fea91f1ef00804 14-Feb-2017 Erik Wolsheimer <ewol@google.com> Prevent phone process crashing on bad params to TelephonyTester
am: e465c97904

Change-Id: I1ab377af76f41e187719081ff0829790d279e490
f45c0ee61f0917898d4c1e898a46f43c92cb75fc 14-Feb-2017 Erik Wolsheimer <ewol@google.com> Prevent phone process crashing on bad params to TelephonyTester
am: e465c97904

Change-Id: Ib492ba77555a761ebcc2d1f7089b122136d954a2
e774e6d4ec1984186062c08b5f2a6fc8bc3a91c5 14-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "Fix to handle error in getRadioCapability() correctly." am: 8caf74e5c3 am: a55cdd86fa am: 79e658b7f9
am: e81655df23

Change-Id: I7e1810e3063fd01d9626f436966ddec477032eb8
e81655df2399c4c41dd7cace2b94c3eeae1f4124 14-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "Fix to handle error in getRadioCapability() correctly." am: 8caf74e5c3 am: a55cdd86fa
am: 79e658b7f9

Change-Id: Idc6b2fd475fbd0c0dc40c673ecf0b67bb2b5e8af
79e658b7f9e8f54b183adf2b94dd7e9250680f8b 14-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "Fix to handle error in getRadioCapability() correctly." am: 8caf74e5c3
am: a55cdd86fa

Change-Id: Ided861af39465398cda0897f4689fdc407ca3d47
8caf74e5c33ed28dcae4ec8dd78bd7e2c83294e5 14-Feb-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fix to handle error in getRadioCapability() correctly."
d13303bf1b4caa896b343982e6bbcc2f13b16b18 14-Feb-2017 Chen Xu <fionaxu@google.com> Merge "add SimActivationTracker for voice/data act state" am: 246494c141 am: e44432224c
am: 10405c3e20

Change-Id: I468b79bb6c63b53d871ec9ba1f5327312a08c20c
10405c3e20de86a7a315be71dded2b908c663861 14-Feb-2017 Chen Xu <fionaxu@google.com> Merge "add SimActivationTracker for voice/data act state" am: 246494c141
am: e44432224c

Change-Id: I0035daadeb4436309d1b9ba1ddee17cb78a5722a
246494c14154d93989dc622a0e6a2ed623fdaceb 14-Feb-2017 Chen Xu <fionaxu@google.com> Merge "add SimActivationTracker for voice/data act state"
6f75943d15075631cd775a6efe6ff114334ebabd 13-Feb-2017 Amit Mahajan <amitmahajan@google.com> Fix to handle error in getRadioCapability() correctly.

Test: Basic telephony sanity
Bug: 32020264
Change-Id: I241f9264b114dbdd0d99ba192213beb46dbde244
adioResponse.java
8731e19d9241b13b4ec081cc45483f14cbd21d56 13-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "Client (framework) side HAL changes for RIL solicited responses - 2" am: a929fd2527 am: ac8e9ddade
am: ff31314219

Change-Id: Ia39fd7a27d579bdfcdaa79284aaecdb82455176d
ff31314219045adce134fb0e3e2f57dd75661df6 13-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "Client (framework) side HAL changes for RIL solicited responses - 2" am: a929fd2527
am: ac8e9ddade

Change-Id: Icf692878d50fbc9d109e003d8be8e0b10d0301d6
b9eb17185ff4a547c23628423cb43cef1fdcd453 13-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "Client (framework) side HAL changes for RIL solicited responses." am: b3fa27360b am: 18da34f372
am: 76bbecef7a

Change-Id: Idca01fcbd85c687fc44cd8b323cbc11de1f74c70
76bbecef7a8f0bef43e82f8622be1f2f92dfee3b 13-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "Client (framework) side HAL changes for RIL solicited responses." am: b3fa27360b
am: 18da34f372

Change-Id: Ifb33baba58b1bdd378495417e7ebf6186320179b
9be7c26f29b4ba23409a197220063595cc80664d 01-Feb-2017 Amit Mahajan <amitmahajan@google.com> Client (framework) side HAL changes for RIL solicited responses - 2

Test: Basic telephony sanity
Bug: 32020264
Change-Id: Ib2e70b94b401b8ab3e8968134e4dd20ec29ab989
smCdmaPhone.java
IL.java
adioResponse.java
ataconnection/DataConnection.java
d8fe3ba2e6fbc96e80609f694cb0031ef40371e4 10-Feb-2017 Amit Mahajan <amitmahajan@google.com> Client (framework) side HAL changes for RIL solicited responses.

Bug: 32020264
Merged-in: Ib72f2443fb0580092e0f8560a40d3fb9b182887e
Change-Id: Ib72f2443fb0580092e0f8560a40d3fb9b182887e
smCdmaPhone.java
IL.java
adioIndication.java
adioResponse.java
ee7aab0fa45794ea0bd074c36259d25713ea7930 14-Nov-2016 fionaxu <fionaxu@google.com> add SimActivationTracker for voice/data act state

- new activationtracker module to keep track of states
- interact with notifier/phoneStateListeners
- add unit test for simActivationTracker

Bug: 31061369

Test: runtest --path frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/SimActivationTrackerTest.java

Merged-in: CHANGE-ID I1d12901a3aafd2e02337febeff6ebca4ee86d674
Change-Id: I4a4ad0f36a575fedd530a70e654a9fd58c092dc0
efaultPhoneNotifier.java
hone.java
honeNotifier.java
imActivationTracker.java
elephonyComponentFactory.java
9af99511111eeb5e9930185dc44259502811e3b6 14-Nov-2016 fionaxu <fionaxu@google.com> add SimActivationTracker for voice/data act state

- new activationtracker module to keep track of states
- interact with notifier/phoneStateListeners
- add unit test for simActivationTracker

Bug: 31061369

Test: runtest --path frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/SimActivationTrackerTest.java
Change-Id: I1d12901a3aafd2e02337febeff6ebca4ee86d674
efaultPhoneNotifier.java
hone.java
honeNotifier.java
imActivationTracker.java
elephonyComponentFactory.java
6211ab1faf3ef7c845193831887cb4a31207f0f8 10-Feb-2017 Sanket Padawe <sanketpadawe@google.com> Merge commit '6411f5f988c0c7342e39438c90e490e2c188914c' into manual_merge_6411f5f98

Resolve Conflicts.

Change-Id: I6eb2fd4b2d70c333a620b9737a234943e8143d3e
6411f5f988c0c7342e39438c90e490e2c188914c 10-Feb-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Convert ril java to HIDL client (patch 2)." am: 8b9bce4717
am: 0ada119e32

Change-Id: I1ac062638a655077160247940fa0cb33dbf797ca
3b51aec7f0eca9a2b7af7fdf605ae7bf9d9c5f4a 10-Feb-2017 Sanket Padawe <sanketpadawe@google.com> Convert ril java to HIDL client (patch 2).

Test: Basic telephony sanity. Phone calls/sms/data. FI sanity.
Bug: 32020264
Change-Id: Ied031180a8fab9a2b7062dfcf38ebf5cb90a990e
Merged-in: Ied031180a8fab9a2b7062dfcf38ebf5cb90a990e
IL.java
adioResponse.java
844208f3a7871eaeaca35a3f2b039841b4597410 10-Feb-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Existing APN profile is incorrectly getting merged"
522fc0602d60895881b33243030dd40d5778e4a9 01-Feb-2017 Amit Mahajan <amitmahajan@google.com> Client (framework) side HAL changes for RIL solicited responses - 2

Test: Basic telephony sanity
Bug: 32020264
Change-Id: Ib2e70b94b401b8ab3e8968134e4dd20ec29ab989
smCdmaPhone.java
IL.java
adioResponse.java
ataconnection/DataConnection.java
d68532c28d5ef62205f919961547d0eadefbcbb8 10-Feb-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Revert "Revert "Client (framework) side HAL changes for RIL solicited responses."""
81edb1b04bb44a18ddb5927db672b62105db2239 10-Feb-2017 Sooraj Sasindran <sasindran@google.com> Correct the wakelock count while attributing for a request
am: 655f0dcca6

Change-Id: I0a5efd31d4a0dc986051f70f2c627d29d81133e7
0b0cc77567c31c3bc3691d001b18f79300e1a4f3 10-Feb-2017 Sooraj Sasindran <sasindran@google.com> Expose api to retrieve wakelock information per client
am: 4a39e21efe

Change-Id: I9dbf0b2355887edee8e48c713a25c1c3eed96a5a
2212954fda22dbf372d64c292ee0e02c5800fdb0 10-Feb-2017 Naveen Kalla <mrnaveen@google.com> Attribute wakelocks held by RIL to clients
am: 0b1f9e9741

Change-Id: I8b18f531ab3c7acc864c694c52f47902f90dd10c
a46dc426a10a9d3c95cca80a80d9c0759459cb4f 10-Feb-2017 Amit Mahajan <amitmahajan@google.com> Revert "Revert "Client (framework) side HAL changes for RIL solicited responses.""

This reverts commit 71173a876ff48d65e013f0a92e920d90fa7a26c7.

Bug: 32020264
Change-Id: Ib72f2443fb0580092e0f8560a40d3fb9b182887e
smCdmaPhone.java
IL.java
adioIndication.java
adioResponse.java
655f0dcca67e481dfb61b7988408b9734594c852 29-Sep-2016 Sooraj Sasindran <sasindran@google.com> Correct the wakelock count while attributing for a request

Correct the wakelock count when a request response is received and
corresponding wakelock count is decremented.

Account for wakelock timeout during which wakelock is released and
all corresponding clients are released from the clientTracker.

Test: Through logs confirmed that the wakelock decrement is happening
correctly

BUG=31798717

Merged-In: Iec6ba6d8060620915c704b5086d18a776073b10c
Change-Id: Iec6ba6d8060620915c704b5086d18a776073b10c
IL.java
4a39e21efe21028b97aa0545702f5c405cc44cf4 18-Jul-2016 Sooraj Sasindran <sasindran@google.com> Expose api to retrieve wakelock information per client

Expose api to retrieve wakelock information per client
Provide calling package name in cell info apis

Test: Through logs confirmed that the wakelock decrement is happening
correctly
BUG=31041780
Merged-In: Id8ca0006478212c006a103b83fb720532e9c0fab
Change-Id: Id8ca0006478212c006a103b83fb720532e9c0fab
lientWakelockAccountant.java
lientWakelockTracker.java
ommandsInterface.java
smCdmaPhone.java
hone.java
honeInternalInterface.java
IL.java
erviceStateTracker.java
msphone/ImsPhoneBase.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
ip/SipPhoneBase.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
0b1f9e9741e7a006c0e79a28e32d59ac90e570e4 11-Jul-2016 Naveen Kalla <mrnaveen@google.com> Attribute wakelocks held by RIL to clients

Telephony services are requested by applications and other
services in the Android framework. Attribute the wakelock
held time to the applications and services that requested
the particular operation.

If multiple clients are requesting for a service at the same
time, divide the time equally between all the requests

Test: Through logs confirmed that the wakelock decrement is happening
correctly
BUG=31041780
Merged-In: Id5521809d5a4324c1bd9dc229a743033886b35a3
Change-Id: Id5521809d5a4324c1bd9dc229a743033886b35a3
lientWakelockAccountant.java
lientWakelockTracker.java
IL.java
ilWakelockInfo.java
3ca46e47a43504ea95d4daf18705468f91f23f70 10-Dec-2016 Brad Ebinger <breadley@google.com> Adds logic to display UI if call forwarding is not enabled on 3gpp

If call forwarding is configured to not be allowed while roaming
on a 3gpp network by a carrier, we will now display descriptive
UI to the user indicating the problem if an MMI code fails.

Test: Manual
Bug: 30106345
Merged-In: I9626dea3546518bb81ea0ef9af647e37f6f2165d
Change-Id: I9626dea3546518bb81ea0ef9af647e37f6f2165d
smCdmaPhone.java
sm/GsmMmiCode.java
1d48bb69f2c9b1aac7b1c8d77b460b1b7a3efb7f 29-Sep-2016 Sooraj Sasindran <sasindran@google.com> Correct the wakelock count while attributing for a request

Correct the wakelock count when a request response is received and
corresponding wakelock count is decremented.

Account for wakelock timeout during which wakelock is released and
all corresponding clients are released from the clientTracker.

Test: Through logs confirmed that the wakelock decrement is happening
correctly

BUG=31798717

Merged-In: Iec6ba6d8060620915c704b5086d18a776073b10c
Change-Id: Iec6ba6d8060620915c704b5086d18a776073b10c
IL.java
8b38cd985149b459969dd2ac9e8013d852dc6760 18-Jul-2016 Sooraj Sasindran <sasindran@google.com> Expose api to retrieve wakelock information per client

Expose api to retrieve wakelock information per client
Provide calling package name in cell info apis

Test: Through logs confirmed that the wakelock decrement is happening
correctly
BUG=31041780
Merged-In: Id8ca0006478212c006a103b83fb720532e9c0fab
Change-Id: Id8ca0006478212c006a103b83fb720532e9c0fab
lientWakelockAccountant.java
lientWakelockTracker.java
ommandsInterface.java
smCdmaPhone.java
hone.java
honeInternalInterface.java
IL.java
erviceStateTracker.java
msphone/ImsPhoneBase.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
ip/SipPhoneBase.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
75af4b9279ca2582d16f69586d5cc09cfc91e746 11-Jul-2016 Naveen Kalla <mrnaveen@google.com> Attribute wakelocks held by RIL to clients

Telephony services are requested by applications and other
services in the Android framework. Attribute the wakelock
held time to the applications and services that requested
the particular operation.

If multiple clients are requesting for a service at the same
time, divide the time equally between all the requests

Test: Through logs confirmed that the wakelock decrement is happening
correctly
BUG=31041780
Merged-In: Id5521809d5a4324c1bd9dc229a743033886b35a3
Change-Id: Id5521809d5a4324c1bd9dc229a743033886b35a3
lientWakelockAccountant.java
lientWakelockTracker.java
IL.java
ilWakelockInfo.java
e465c979041310a5e5edc83e36a02e2788e2ee00 09-Feb-2017 Erik Wolsheimer <ewol@google.com> Prevent phone process crashing on bad params to TelephonyTester

BUG: 35128562
Change-Id: I4231b2507cd6e2e98be53a5409f98417964648d3
elephonyTester.java
c155d3aebf2244d9f8182e19998d59a274997809 30-Dec-2016 Sanket Padawe <sanketpadawe@google.com> Convert ril java to HIDL client (patch 2).

Test: Basic telephony sanity. Phone calls/sms/data. No asserts with FI.
Bug: 32020264
Change-Id: Ib02984794f4a7dc37e49652af64b9cb97f1358e6
IL.java
adioResponse.java
d396bd69cadbcbf3d441762e679dc6fc09f08aee 08-Feb-2017 Brad Ebinger <breadley@google.com> Merge "Speculative DISCONNECTING fix for ImsPhoneCallTracker" am: d4da840894 am: 6987ff9218 am: 6495916087
am: 29adbf007f

Change-Id: Icc7f807590e4bb2e0ab2559e414b53141affe357
29adbf007f1051716492cb3a1a96690ba6c08240 08-Feb-2017 Brad Ebinger <breadley@google.com> Merge "Speculative DISCONNECTING fix for ImsPhoneCallTracker" am: d4da840894 am: 6987ff9218
am: 6495916087

Change-Id: I11683bc6742f8cd8459c5e07ab70fc228c7f6936
6495916087ff91f138938edaa57bba6716656417 08-Feb-2017 Brad Ebinger <breadley@google.com> Merge "Speculative DISCONNECTING fix for ImsPhoneCallTracker" am: d4da840894
am: 6987ff9218

Change-Id: I3a42d1d97a251b3b742fab44e85bb5d7543c83c0
d4da840894402abef7298723da4456d1fa9c8768 08-Feb-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Speculative DISCONNECTING fix for ImsPhoneCallTracker"
b134570b4cf8f621764afdc4721ac7e11137c49f 08-Feb-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Revert "Convert ril java to HIDL client (patch 2).""
ec74eadb5b861ea72da132c4ae38ef7870178336 08-Feb-2017 Sanket Padawe <sanketpadawe@google.com> Revert "Convert ril java to HIDL client (patch 2)."

This reverts commit 5fbc7580aaf80e31de81ed1dde4437451d822102.

Bug: 35104859
Change-Id: I8effa9c1df3282aa995ce8ad6992d4074a593f9d
IL.java
adioResponse.java
f0fd031aa715f23f40d1db0794efcc8e9105cf3d 08-Feb-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Revert "Client (framework) side HAL changes for RIL solicited responses.""
71173a876ff48d65e013f0a92e920d90fa7a26c7 08-Feb-2017 Sanket Padawe <sanketpadawe@google.com> Revert "Client (framework) side HAL changes for RIL solicited responses."

This reverts commit 58ebf98e4f31ee719973bbd1b8797b2a78fa1438.

Bug: 35104859
Change-Id: I69957985048e2dd45ffa6d413f579cb06405baa9
smCdmaPhone.java
IL.java
adioIndication.java
adioResponse.java
3985803315c1a8febebf88907e4ea21472857a73 08-Feb-2017 amreddy <amreddy@google.com> Merge "Enable SMS interception for CarrierIms Package." am: aad6457b37 am: cef899a100 am: dc586aec2d
am: 371d020774

Change-Id: I6b725daa1e61a4416045cf37e0d4c213fc2db4dc
371d0207748707b92b523ca062c9415f9a16dac6 08-Feb-2017 amreddy <amreddy@google.com> Merge "Enable SMS interception for CarrierIms Package." am: aad6457b37 am: cef899a100
am: dc586aec2d

Change-Id: If464203b889ad71d8a8e40924895dc4637cfdc60
dc586aec2dbff9eeb1207860c6a8231733da199e 08-Feb-2017 amreddy <amreddy@google.com> Merge "Enable SMS interception for CarrierIms Package." am: aad6457b37
am: cef899a100

Change-Id: Ia38a6e26335fca92eaf38f3335c5f236ae8c7219
aad6457b3709171a6922f9e66fc725a75ded6425 08-Feb-2017 amreddy <amreddy@google.com> Merge "Enable SMS interception for CarrierIms Package."
055adfbf731fb951f34b62ccca3c39800626e0bd 03-Feb-2017 pkanwar <pkanwar@google.com> Existing APN profile is incorrectly getting merged

Added more fields protocol and roaming protocol to the primary key.

Bug: 28757188
Test: No tests

Change-Id: I1ddae7bec1967fc7596a766c17edd3cc5c40be4d
ataconnection/DcTracker.java
58ebf98e4f31ee719973bbd1b8797b2a78fa1438 31-Jan-2017 Amit Mahajan <amitmahajan@google.com> Client (framework) side HAL changes for RIL solicited responses.

Test: Basic telephony sanity
Bug: 32020264
Change-Id: I6c830fb5dcf43676d00a6a8e52aa7b4b8562eebe
smCdmaPhone.java
IL.java
adioIndication.java
adioResponse.java
9f13848d600c0782a5bcb3b1d2d7dca5dca35005 07-Feb-2017 Brad Ebinger <breadley@google.com> Speculative DISCONNECTING fix for ImsPhoneCallTracker

There is an issue occuring that causes an ImsPhoneConnection to
be left in the ImsPhoneCall without ever being cleaned up. This
causes the ImsPhoneCall never move into the IDLE state and blocks
new outgoing calls from being made.

Through speculation and code observation, it looks as though
this case may happen when the ImsService never responds to a
terminate request and telephony never receives the onDisconnect
callback. This change adds a new timeout that will expire after
some time and verify that the ImsPhoneConnection did indeed
eventually disconnect. If it did not, then we can assume that
the modem is not still tracking the call and we can call
onDisconnect ourselves.

Bug: 35012199
Test: Manual
Change-Id: I288d2950cd245ed6e40dd364e68d739a7d122d6c
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
85895f093a0901ee8b8abc722c74e4736bc57c31 07-Feb-2017 Jack Yu <jackyu@google.com> Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged" am: e78ea42459 am: e29cc8fd5f
am: d0d5b29f03

Change-Id: I3fc134ad6e3d37f2482fc1055525f4f703713f27
d0d5b29f033252fdf133098fc727f58919037915 07-Feb-2017 Jack Yu <jackyu@google.com> Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged" am: e78ea42459
am: e29cc8fd5f

Change-Id: Ib82544780ebebd8b096bfdc152131bc4fb01becb
3ee34d91d7fd951400e85a1da209ec3b753f7f7f 07-Feb-2017 Nathan Harold <nharold@google.com> [DO NOT MERGE] Best-Effort Load of Potentially-Large SIM Records
am: e871dc6e5e

Change-Id: I662cea238dbc2015752b27195aa7fa5cefd482e0
4256e499c8e1e0a07998dcaf1f3aa127b693fc42 01-Feb-2017 Madhusudhan R. Adupala <amreddy@google.com> Enable SMS interception for CarrierIms Package.

Enable the interception of SMS by apps that are built onto
the system and are currently bound by the ImsResolver
for a particular subscription.

Bug: 29899506
Test: Manually verified

Change-Id: I0ca04b169d94df04ac6e18201384fc13da91a069
arrierServicesSmsFilter.java
ccSmsInterfaceManager.java
nboundSmsHandler.java
MSDispatcher.java
6509576d8eb86664d1b5383a1b637e00748e807e 24-Jan-2017 Jack Yu <jackyu@google.com> Renamed voiceNetworkStateChanged and dataNetworkStateChanged

The misleading voiceNetworkStateChanged should be renamed
to networkStateChanged to reflect either voice or data
network changes will trigger this indication.
And dataNetworkStateChanged should be renamed to
dataCallListChanged as well.

Test: telephony sanity test
Merged-In: I5839efc3bdaf137310238790221c8ba93794bde3
Change-Id: I5839efc3bdaf137310238790221c8ba93794bde3
aseCommands.java
ommandsInterface.java
IL.java
adioIndication.java
adioResponse.java
erviceStateTracker.java
ataconnection/DcController.java
ataconnection/DcTracker.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
5fbc7580aaf80e31de81ed1dde4437451d822102 30-Dec-2016 Sanket Padawe <sanketpadawe@google.com> Convert ril java to HIDL client (patch 2).

Test: Basic telephony sanity. Phone calls/sms/data
Bug: 32020264
Change-Id: Ied031180a8fab9a2b7062dfcf38ebf5cb90a990e
IL.java
adioResponse.java
d9dfb973e81b8dbc6489a4d0bc9f73198c2fd3c8 08-Jun-2016 Srikanth Chintala <srikchin@codeaurora.org> Handle empty operator numeric.

This fix is to handle the exception for
empty operatornumeric.

Test: manual - checked sanity
Change-Id: I25eb79da3a23f8368efe95e737f0641ceb2aa4de
icc/IccCardProxy.java
54392a35b00b5c5b20cc7cfaf2c6ae59a9d78fa1 04-Feb-2017 Jack Yu <jackyu@google.com> Merge "Renamed voiceNetworkStateChanged and dataNetworkStateChanged"
79f2a645c5f638dd7af899757d50581063013cd0 03-Feb-2017 Tyler Gunn <tgunn@google.com> resolve merge conflicts of 58d671b9b to nyc-mr2-dev-plus-aosp

Test: Fix build.
Change-Id: I7e1d6754a8a060b4ca34de187c2c8bc607559f4c
58d671b9bd94f0397a89f9bc80a8f47cc6f6ad7b 03-Feb-2017 Tyler Gunn <tgunn@google.com> Merge "Add support for wildcard reason code remapping." am: b86e45584b
am: c43670f920

Change-Id: I88aeef9faeccbc4566ad45ef63e8546928f6ba78
b86e45584b45fba35834bdca04c7935c5c464d81 03-Feb-2017 Tyler Gunn <tgunn@google.com> Merge "Add support for wildcard reason code remapping."
4558536154e496ea917b343e496ed64c94250873 30-Jan-2017 Tyler Gunn <tgunn@google.com> Add support for wildcard reason code remapping.

The KEY_IMS_REASONINFO_MAPPING_STRING_ARRAY carrier config supports
remapping a from code and string reason to a new ims reason code.
Adding support for the from code being specified as a wildcard.
In practice we've ended up seeing the modem report a range of
"from codes". However, the message itself is definitely unique.

Test: Manual, unit
Merged-In: Ibfcfe8229b224f61d732b62e69b14126f2075916
Bug: 32571209
Change-Id: Ibfcfe8229b224f61d732b62e69b14126f2075916
msphone/ImsPhoneCallTracker.java
aed3107f7735394f1a08f7a03749f4788012571d 30-Jan-2017 Tyler Gunn <tgunn@google.com> Add support for wildcard reason code remapping.

The KEY_IMS_REASONINFO_MAPPING_STRING_ARRAY carrier config supports
remapping a from code and string reason to a new ims reason code.
Adding support for the from code being specified as a wildcard.
In practice we've ended up seeing the modem report a range of
"from codes". However, the message itself is definitely unique.

Test: Manual, unit
Bug: 32571209
Change-Id: Ibfcfe8229b224f61d732b62e69b14126f2075916
msphone/ImsPhoneCallTracker.java
e871dc6e5e4408d5eca489d2550b6a553a3e958c 03-Feb-2017 Nathan Harold <nharold@google.com> [DO NOT MERGE] Best-Effort Load of Potentially-Large SIM Records

Because we have at least one SIM in the field that has a massive
OPLMNw/ACT Record of 700 entries (3.5kB), some messaging
pipelines cannot handle these record sizes and the errors are
preventing the SIM load procedure from being completed.
To work around this, because these records are informational, they
will now load as part of SIM refresh, but that procedure will be
best-effort.

Bug: 34095124
Test: Manually verified with TMO and CT SIMs
Change-Id: I87eb84386a7e8094f3a0493f01ee8dc928864dc2
(cherry picked from commit f15ee16d1f9c325346a002a44b793a2a914ead9e)
icc/SIMRecords.java
6049c20e119c40e7eb2ef848562290366e6bb87a 03-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "Exception and death notification handling for IRadio." am: dcb00ab854 am: 3e2e7d0f94
am: 796704cfdb

Change-Id: I3c8f517dfb3391e1098627881a9157b754c659a9
fa42b5c3abd29a327e2b4f122ecb4e10c4e2a82c 03-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "Client (framework) side HAL changes for RIL unsolicited responses - 3" am: b80f5a097a am: 0f86052bca
am: edc6b766cb

Change-Id: I1643af0ee923265d0c42251256509230fe2b322d
796704cfdb8289189fb9a5219f084980ba14d460 03-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "Exception and death notification handling for IRadio." am: dcb00ab854
am: 3e2e7d0f94

Change-Id: I408e2932c660a4f433a104e6f6788cdbf9187f87
edc6b766cbfbf56402fb487dd8b1b4b597b81335 03-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "Client (framework) side HAL changes for RIL unsolicited responses - 3" am: b80f5a097a
am: 0f86052bca

Change-Id: I2b6416b30132bd4c88622c6202b3bebd50bb8d81
dcb00ab854232ab64eed7cce51c306fc3f2939b8 03-Feb-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Exception and death notification handling for IRadio."
b80f5a097a30cf5d401c9e95ff6159a2022063e0 03-Feb-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Client (framework) side HAL changes for RIL unsolicited responses - 3"
bb58dbd0dfc9593b0b44faee853c8b8fec6cbb2a 03-Feb-2017 Nathan Harold <nharold@google.com> Merge "Disable Logspam in PlmnActRecord" am: 9c374cb385 am: 351d9797bc am: d420cf955a
am: 8923c7cdde

Change-Id: I06d9f15781e5ad1041d3d01a30a813fe5fa36b3b
8923c7cdde53312a2e178b234dbab9a26a1f5395 03-Feb-2017 Nathan Harold <nharold@google.com> Merge "Disable Logspam in PlmnActRecord" am: 9c374cb385 am: 351d9797bc
am: d420cf955a

Change-Id: Ia08e3f862fa3b73567aca0acaccac473f8b8dede
d420cf955a765d46cbfb67b03df4098e91c9f54f 03-Feb-2017 Nathan Harold <nharold@google.com> Merge "Disable Logspam in PlmnActRecord" am: 9c374cb385
am: 351d9797bc

Change-Id: I226dcf8254405f952e3d7ab9f3547088259502e7
9c374cb3850abf30b382d83a7ed8cdb709cd5cde 03-Feb-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Disable Logspam in PlmnActRecord"
263a2d422e10b6d0584ed68df2462b9bd7a937b3 20-Jan-2017 Amit Mahajan <amitmahajan@google.com> Exception and death notification handling for IRadio.

Test: Basic telephony sanity
Bug: 32020264
Merged-in: Id0ea4ca839cf67d3810bdec91814199005e03794
Change-Id: Id0ea4ca839cf67d3810bdec91814199005e03794
IL.java
fefc3e3357cc9c18aa83757690c18d0ae7852c46 03-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "Client (framework) side HAL changes for RIL unsolicited responses - 2" am: 0fccef72e7 am: e7deddef94
am: ab8807ebbd

Change-Id: I08abba3ff8eade0c51c0d1f6cc4dcd94b6b8b50a
bbd09384056d7761e09e9ccaded65bdaeb769ebb 05-Jan-2017 Amit Mahajan <amitmahajan@google.com> Client (framework) side HAL changes for RIL unsolicited responses - 3

Test: Basic telephony sanity (voice call, sms, data, APM)
Bug: 32020264
Merged-in: I0e29c592c56b4ca2937fe54ac61bbc7057253ad8
Change-Id: I0e29c592c56b4ca2937fe54ac61bbc7057253ad8
IL.java
adioIndication.java
ab8807ebbd03bdcff4fcdd50edf2b639b763ddae 03-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "Client (framework) side HAL changes for RIL unsolicited responses - 2" am: 0fccef72e7
am: e7deddef94

Change-Id: I8f5b593372f4e865e3fe029ec1c7b736d2b6eb0f
0fccef72e7cae20cb3132ce73ef4582f271c2470 03-Feb-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Client (framework) side HAL changes for RIL unsolicited responses - 2"
7234fdc7598466b831f024074002802e53901bd5 03-Feb-2017 Nathan Harold <nharold@google.com> Disable Logspam in PlmnActRecord

Bug: 34950968
Test: sim load
Change-Id: Id403eb06985a1eda60b2324cb696adde3d7c64bb
icc/PlmnActRecord.java
4258279ca0832ea497bdf613559c98282e73b03a 03-Feb-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fix build breakage. writeRilDial() does not need to be called." into nyc-mr2-dev-plus-aosp
fcba278e62ca918cc95e946e1da1706ed4ef7ffd 03-Feb-2017 Amit Mahajan <amitmahajan@google.com> Fix build breakage. writeRilDial() does not need to be called.

Change-Id: I39c8039804bbc810adfe5fa5026e70f4414aa49b
IL.java
29827f46aeefe96af9abe0eae06ab5c31ffdf716 02-Feb-2017 Amit Mahajan <amitmahajan@google.com> Client (framework) side HAL changes for RIL unsolicited responses. am: 7c9f625c8b am: 001971111b
am: 68d5937623

Change-Id: I615864809de427609c9130dfe4601ea9803e4235
d7d2e3d3b0fb917fb70a3ac3ad0cd361a4be8868 02-Feb-2017 Amit Mahajan <amitmahajan@google.com> resolve merge conflicts of cab8ee3f8 to nyc-mr2-dev-plus-aosp

Change-Id: I2db7f196a4e13cf3ac7635e84e1bdd6bc86b6650
68d59376236949180e2f0cc3639b237af589e446 02-Feb-2017 Amit Mahajan <amitmahajan@google.com> Client (framework) side HAL changes for RIL unsolicited responses. am: 7c9f625c8b
am: 001971111b

Change-Id: I394838af835d7dcd2dacd579d8bd80e07eeea7d8
cab8ee3f84e6007d1a7d1d792c61475ecc867e3b 02-Feb-2017 Sanket Padawe <sanketpadawe@google.com> Convert RIL java side to HIDL client. am: 13b2867e7d
am: da29b524da

Change-Id: I08079e3ae7f1887a7994681bc76e927bd8abaf8a
001971111b41eda87fe79bf58d114e0a15d949a9 02-Feb-2017 Amit Mahajan <amitmahajan@google.com> Client (framework) side HAL changes for RIL unsolicited responses.
am: 7c9f625c8b

Change-Id: I460bfc0279d4e8ef7c361f50166d3909e7b87bec
da29b524da6d6ad8bdb3a20957e030b64f2bf35f 02-Feb-2017 Sanket Padawe <sanketpadawe@google.com> Convert RIL java side to HIDL client.
am: 13b2867e7d

Change-Id: Iaf218a4400363e7c936a40609e107839abc25dd4
32809ed40d5383c9c4ccd2725987fa3881780829 02-Feb-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge changes from topics 'RADIO HAL 4', 'RADIO HAL 3'

* changes:
Client (framework) side HAL changes for RIL unsolicited responses.
Convert RIL java side to HIDL client.
37a3e51d244774ba156a88cf101432b62c8a42a3 24-Jan-2017 Jack Yu <jackyu@google.com> Renamed voiceNetworkStateChanged and dataNetworkStateChanged

The misleading voiceNetworkStateChanged should be renamed
to networkStateChanged to reflect either voice or data
network changes will trigger this indication.
And dataNetworkStateChanged should be renamed to
dataCallListChanged as well.

Test: Build
Change-Id: I5839efc3bdaf137310238790221c8ba93794bde3
aseCommands.java
ommandsInterface.java
IL.java
adioIndication.java
adioResponse.java
erviceStateTracker.java
ataconnection/DcController.java
ataconnection/DcTracker.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
5f853dbfcb3bf57d1fedddebf2c12caf1abc298a 29-Dec-2016 Amit Mahajan <amitmahajan@google.com> Client (framework) side HAL changes for RIL unsolicited responses - 2

Test: Basic telephony sanity (voice call, sms, data, APM)
Bug: 32020264
Merged-in: Id58f2b24ca035a81695382210ea54656509afb00
Change-Id: Id58f2b24ca035a81695382210ea54656509afb00
IL.java
adioIndication.java
erviceStateTracker.java
dma/CdmaInformationRecords.java
7c9f625c8bb16eb6917b239152dbfd508bebd80b 19-Dec-2016 Amit Mahajan <amitmahajan@google.com> Client (framework) side HAL changes for RIL unsolicited responses.

Test: Basic telephony sanity (voice call, sms, data, APM)
Bug: 32020264
Merged-in: I94300f56cd46bdad81271cb44113bcc72591394f
Change-Id: I94300f56cd46bdad81271cb44113bcc72591394f
IL.java
adioIndication.java
dma/SmsMessage.java
sm/GsmSMSDispatcher.java
sm/SmsMessage.java
icc/SIMRecords.java
13b2867e7d74a0234735502c4f922a281c8b0438 16-Dec-2016 Sanket Padawe <sanketpadawe@google.com> Convert RIL java side to HIDL client.

Test: Basic telephony sanity tests (voice calls, data, sms, APM).
Bug: 32020264
Merged-in: I62aac69193563250107c55ced74bc5aa4ea0b5d4
Change-Id: I62aac69193563250107c55ced74bc5aa4ea0b5d4
IL.java
adioIndication.java
adioResponse.java
fb68b65a88cef22254c84353bcb4b260cedaffa1 02-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "Adding simple radio service and callbacks." am: 0fa386c527 am: 1960c84a8b
am: 6525c6f46d

Change-Id: I168a05d766af5776ab2890ac542ec713553c91df
6525c6f46d91714c480d1c71ae9b173b6afa3ebc 02-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "Adding simple radio service and callbacks." am: 0fa386c527
am: 1960c84a8b

Change-Id: Ie2f4af08fbf9a84bdfc72ff16361a17d6df75e46
0fa386c52762f4f948d108c2aac53e98da3f1452 02-Feb-2017 Amit Mahajan <amitmahajan@google.com> Merge "Adding simple radio service and callbacks."
bd32b245ea49fa5ac3da89975febec4b47b9e440 02-Feb-2017 Sandeep Gutta <sangutta@codeaurora.org> MSIM: Fix subId creation issue when one of inserted SIM card state is ERROR

On Dual SIM device, if one slot has one valid SIM card and another
SIM slot inserted with a ERROR SIM card, subId not getting added
for valid SIM.
The reason for this is, SubscriptionInfoUpdater.java is waiting for
ICCID on slot where card state reported as ERROR.

To resolve this issue, assign IccId to empty string when card state ERROR.

Test: Manual

Change-Id: I98156e19c69126c4c98f3800d922e7ec97c07cac
ubscriptionInfoUpdater.java
8fd6554e494efa5dfd29139997865f1824c48157 01-Feb-2017 Brad Ebinger <breadley@google.com> Merge "Adds permission granting to ImsResolver" am: 51b3661b79 am: 73e0e66518 am: 67cdca1534
am: 455d55c7cd

Change-Id: Ib38e6614a6ed6fce2e1471b9c7ef58d5c9e245b1
455d55c7cdbd48e7d8f60d9d6ee020910b05319e 01-Feb-2017 Brad Ebinger <breadley@google.com> Merge "Adds permission granting to ImsResolver" am: 51b3661b79 am: 73e0e66518
am: 67cdca1534

Change-Id: Ic8d60ae4916a62da7e71b85b3554de92900bf6a7
67cdca15344a6177929da3994e11dfe7898b9216 01-Feb-2017 Brad Ebinger <breadley@google.com> Merge "Adds permission granting to ImsResolver" am: 51b3661b79
am: 73e0e66518

Change-Id: I1614781cff6cc1b7c4d6c5114b74198217f913eb
246295a9ce6d2ae2613ff95b3e85ea1c0406d164 25-Aug-2016 Amit Mahajan <amitmahajan@google.com> Adding simple radio service and callbacks.

Test: Sanity tests by telephony test team.
Bug: 32020264
Change-Id: I70552a681006ec46c901bdafb9d346c559ba5ec9
IL.java
adioIndication.java
adioResponse.java
51b3661b7966e819052126e7260a060da7a7e994 01-Feb-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Adds permission granting to ImsResolver"
cd83a69e949526c13a0da734f6abcbe2281b9662 31-Jan-2017 Jeff Davidson <jpd@google.com> Merge "Linger the carrier service binding when privileges drop." am: f7d420da34 am: b782ae5811 am: a2b366dc38
am: 8a6d7844d6

Change-Id: Ibb44c4d9f958f86348766a716dcdc476a736e477
8a6d7844d6c6e7f1eefcd3b32878df5983dc58b5 31-Jan-2017 Jeff Davidson <jpd@google.com> Merge "Linger the carrier service binding when privileges drop." am: f7d420da34 am: b782ae5811
am: a2b366dc38

Change-Id: I6e021b4f4db573093bfe9f705771dbcd391738c4
a2b366dc38d3f504a5c6feb4fae2679f62faabd5 31-Jan-2017 Jeff Davidson <jpd@google.com> Merge "Linger the carrier service binding when privileges drop." am: f7d420da34
am: b782ae5811

Change-Id: I2593fd2ecc7855b29cdc7e4a1099752ef1e32de8
f7d420da34ad0404c34da51c7a7a10a41708db31 31-Jan-2017 Jeff Davidson <jpd@google.com> Merge "Linger the carrier service binding when privileges drop."
4f91e48fbbf1b484a110c8518f18a64ba9f36c5b 31-Jan-2017 ashastry <ashastry@google.com> Merge "Unit tests for carrier SMS filtering." am: fe6f1e7591 am: 6a2f17eef2 am: 93b9da1a22
am: 7c219ea278

Change-Id: If87d72d862e4e172388f89a064c94a9f92332583
7c219ea278172c589951496e5c11e59f12dc99ec 31-Jan-2017 ashastry <ashastry@google.com> Merge "Unit tests for carrier SMS filtering." am: fe6f1e7591 am: 6a2f17eef2
am: 93b9da1a22

Change-Id: I1fb9861d190c7cd5c4722b6058a485681b8b4993
93b9da1a229b4c3f0c7f96db1f1d7f37da1b65ee 31-Jan-2017 ashastry <ashastry@google.com> Merge "Unit tests for carrier SMS filtering." am: fe6f1e7591
am: 6a2f17eef2

Change-Id: I30c01bdc12508db0e976670ea9093d4d208ea58d
fe6f1e759182c31cd574ff7778265e6a8dfc4886 31-Jan-2017 ashastry <ashastry@google.com> Merge "Unit tests for carrier SMS filtering."
054de658b5c0c53d1a48eadeef97c96e3a323b02 24-Jan-2017 Brad Ebinger <breadley@google.com> Adds permission granting to ImsResolver

Uses new @hide PackageManager API to grant permissions to
ImsServices that they need for their IMS stacks.

Test: Run telephony unit tests for ImsResolver/ImsServiceController
Bug: 32460405
Change-Id: If54ce1a47ab2d3c3ababcdf8328e99499518d4f5
ms/ImsServiceController.java
0939bc77ff1626e7204c00edbd5486d9744e888d 21-Jan-2017 Hall Liu <hallliu@google.com> Properly route the SET_CALL_FORWARD_DONE message

In ImsPhone, the message indicating that call forwarding was set was
being directed straight to ImsPhoneMmiCode instead of routing through
the handler in ImsPhone, which caused the call forwarding notification
to never get set. This sends the proper message to ImsPhone first, which
will put up the call forwarding notification.

Change-Id: I5d06a0bad6e2bf368817ec623905f4a16e06d358
Fix: 34185152
Test: manual (to test on US carriers, force useImsForUt in GsmCdmaPhone)
msphone/ImsPhone.java
311e8950a8e2662422d999c5bda4f90cca7bf39a 26-Jan-2017 Abhijith Shastry <ashastry@google.com> Unit tests for carrier SMS filtering.

BUG: 29899506
Test: Unit test-only CL.
Change-Id: I62f036202331d6e0a5933460d5010f3681609a7e
arrierServicesSmsFilter.java
ddf21679143b9af9cf92dc1d9e20073e9a6e2152 25-Jan-2017 fionaxu <fionaxu@google.com> add an API for sending secret dialer code

Telephony provides an public API for sending secret
dialer code with the format of *#*#code*#*#.
This API only sent out broadcast for the default dialer app
and is backgound-check compliant.

Bug:33753947
Test: Manual
Change-Id: I955f981bec2b74e18c711dfbed71c1bc746f76ce
hone.java
5d85d978c6bb9790813b28abb9f88fb92ec5e10c 28-Jan-2017 Brad Ebinger <breadley@google.com> Integrates ImsResolver into telephony am: 0b425ecbf1 am: 6be51fb111
am: 931807da5a

Change-Id: Idca1e195a65276c8300e83955e4e97fda25b626b
931807da5aed6c4967bcd4a28dae75b6db73bf52 28-Jan-2017 Brad Ebinger <breadley@google.com> Integrates ImsResolver into telephony am: 0b425ecbf1
am: 6be51fb111

Change-Id: I52fd43c314da5173a29f5c41b19dd66aed074198
6be51fb111e20d08b88af94d980f2f91f51dc24c 28-Jan-2017 Brad Ebinger <breadley@google.com> Integrates ImsResolver into telephony
am: 0b425ecbf1

Change-Id: Iac85a7045e53ce187f4894cd727b0c9fb0c32d62
84869eee05b3f4582d1b9a15e75862ad80243fe1 27-Jan-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Integrates ImsResolver into telephony"
92545464c47273c4d309a7473cd3aaeec764acec 07-Jan-2017 Jeff Davidson <jpd@google.com> Linger the carrier service binding when privileges drop.

If, when rebinding, no app has carrier privileges, but a binding is
active, instead of immediately unbinding, we schedule an unbind in 30
seconds. During that time period, if any other app comes up with
carrier privileges, the scheduled task is cancelled and the binding is
immediately dropped. If the same app and component regains carrier
privileges, the scheduled task is canceled and the binding left alive.

This keeps the binding alive through temporary blips in carrier
privileges. Note that apart from foreground status, the binding itself
profers no additional privileges or abilities onto the bound
application.

Bug: 33057511
Test: Remove/reinsert SIM before/after 30 seconds, disabling carrier
app entirely.
Change-Id: Ice194fe6ce58f1372369b1799d4d20bd5304f684
arrierServiceBindHelper.java
0b425ecbf192b9c897f128702c5a6a7a68b4e9fa 24-Jan-2017 Brad Ebinger <breadley@google.com> Integrates ImsResolver into telephony

This change integrates ImsResolver into the PhoneFactory.

Test: Manual
Merged-In: Idcb1a421aa40c33b22dcdca24a13b7ef0c2efab3
Change-Id: Idcb1a421aa40c33b22dcdca24a13b7ef0c2efab3
honeFactory.java
8647593466a4cbc47fe13706aaa3e922ef624385 24-Jan-2017 fionaxu <fionaxu@google.com> fix multi-part sms issue

- sending multi-part SMS via Email was broken in NYC since we are using display
originating address to group multi-part messages.
- In a common case, only the fist SMS comes with the right email
displaying address, thus fails to group sms together.
- Fix is keep using originating_address to aggregate Multi-part SMS and introduce a new column:
display_address in the raw table to check blocking addresses for both
phone number and email address

Bug: 34118154
Test: Manual & telephony unit tests
Change-Id: Iaf8d1692f5e12b155578acd646cc244035dde774
Merged-In: CHANGE-ID Ibd902e5ccbad34c0e1e97d7c699258dc4d2c867a
nboundSmsHandler.java
nboundSmsTracker.java
msBroadcastUndelivered.java
elephonyComponentFactory.java
dma/CdmaInboundSmsHandler.java
85c65bbc1e3614c52193dbc640ff3acb170e7607 27-Jan-2017 Brad Ebinger <breadley@google.com> Merge "Integrates ImsResolver into telephony"
361fd7439d65b54b9b064942bc2050f86ab4823b 27-Jan-2017 Chen Xu <fionaxu@google.com> Merge "fix multi-part sms issue" am: 8144860281 am: 832eea3d3f am: a19b7cb3d5
am: ee43b8b912

Change-Id: I163d06a0db6200f2275c7be431630d831350ec3d
ee43b8b91201f686ea3a76b300f5aa1b9d6f9f2c 27-Jan-2017 Chen Xu <fionaxu@google.com> Merge "fix multi-part sms issue" am: 8144860281 am: 832eea3d3f
am: a19b7cb3d5

Change-Id: Ia208800fd3f3f938c7033c7826b102251209e775
a19b7cb3d500628f2259d34e66201cd3214a3f40 27-Jan-2017 Chen Xu <fionaxu@google.com> Merge "fix multi-part sms issue" am: 8144860281
am: 832eea3d3f

Change-Id: Ie1f2e73821257283d4b9f01529ce31979f5db905
814486028125b55b02be0e5053893e10d7d10441 27-Jan-2017 Chen Xu <fionaxu@google.com> Merge "fix multi-part sms issue"
af7bc32573007f2ea1185fc5cb4f3980e1ff1304 24-Jan-2017 fionaxu <fionaxu@google.com> fix multi-part sms issue

- sending multi-part SMS via Email was broken in NYC since we are using display
originating address to group multi-part messages.
- In a common case, only the fist SMS comes with the right email
displaying address, thus fails to group sms together.
- Fix is keep using originating_address to aggregate Multi-part SMS and introduce a new column:
display_address in the raw table to check blocking addresses for both
phone number and email address

Bug: 34118154
Test: Manual & telephony unit tests
Change-Id: Ibd902e5ccbad34c0e1e97d7c699258dc4d2c867a
nboundSmsHandler.java
nboundSmsTracker.java
msBroadcastUndelivered.java
elephonyComponentFactory.java
dma/CdmaInboundSmsHandler.java
c45522de9e50e039fedf6117a210c55aa9ebc547 26-Jan-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fixed failing unit test cases"
5470a3b34b58cd7a5ce0bde9820b2f5f64bc5820 24-Jan-2017 Brad Ebinger <breadley@google.com> Integrates ImsResolver into telephony

This change integrates ImsResolver into the PhoneFactory.

Test: Manual
Change-Id: Idcb1a421aa40c33b22dcdca24a13b7ef0c2efab3
honeFactory.java
4d996ec6fd773746febfe7ec4c870d5b1c046f48 26-Jan-2017 Nathan Harold <nharold@google.com> Merge "Match CarrierMessagingService and CarrierImsService" am: a1d94118bc am: 5a529a9a77 am: f3c3b848d3
am: 42fda89aea

Change-Id: Ib1d0845c0af7275a826bd5b57020bd42be26c0a8
42fda89aeaef87ed48509bee87f6fc23a7c9e8bf 26-Jan-2017 Nathan Harold <nharold@google.com> Merge "Match CarrierMessagingService and CarrierImsService" am: a1d94118bc am: 5a529a9a77
am: f3c3b848d3

Change-Id: I1952986b8338013c15a682c47ee3241a94f837c9
f3c3b848d3a430b6de9b32c3fe3e32771c517869 26-Jan-2017 Nathan Harold <nharold@google.com> Merge "Match CarrierMessagingService and CarrierImsService" am: a1d94118bc
am: 5a529a9a77

Change-Id: If782d6964039d50bc6f6d5ac0323b82362c6cc3f
6d124e21230ca889129618e74c138ab664c48448 26-Jan-2017 Jack Yu <jackyu@google.com> Fixed failing unit test cases

Some were caused by HIDL changes.
One is caused by Log.wtf crashes the process.

Test: Telephony unit tests
Change-Id: I1102794b2809237a6602bdc1d5ea65f64f6b9cce
ilWakelockInfo.java
est/SimulatedCommands.java
301fd941329066cb4ac85571af69977bb82abdf4 21-Jan-2017 Nathan Harold <nharold@google.com> Match CarrierMessagingService and CarrierImsService

This CL provides a method to check for a match between the current
CarrierImsService (override) and CarrierMessagingService.

Bug: tbd
Test: ¯\_(ツ)_/¯
Change-Id: I9d028c5aa08bad025b44a906bd6188813a646284
arrierSmsUtils.java
8c96c15423b1fc5c3a7fa4072e174559aa4ed77d 26-Jan-2017 Jack Yu <jackyu@google.com> Moved SIM_FULL_ACTION into an explicit intent am: b6e1d01eff am: 3112399d0c am: 714d53dad7
am: 2020dffd4c

Change-Id: I5a9ccc1ab12faeb6df06842bed78b94089cd0d58
2020dffd4c85a41d9c6be429a7fa379fff06a376 26-Jan-2017 Jack Yu <jackyu@google.com> Moved SIM_FULL_ACTION into an explicit intent am: b6e1d01eff am: 3112399d0c
am: 714d53dad7

Change-Id: I4c9d4fe3333bc9251c2d4011974e664cd34e2c19
714d53dad7b412b2406cad38594689dc78c444c3 26-Jan-2017 Jack Yu <jackyu@google.com> Moved SIM_FULL_ACTION into an explicit intent am: b6e1d01eff
am: 3112399d0c

Change-Id: I80a6af4d78decd37ad9a9769fcee6c218d2c29f1
3112399d0c6b6b3ae42fdfe94347f7ef06d9fc84 26-Jan-2017 Jack Yu <jackyu@google.com> Moved SIM_FULL_ACTION into an explicit intent
am: b6e1d01eff

Change-Id: Ia9651251e6ac3cdf730daf2aca6ad5ad7f7761fd
ac85d8d16ae22785b7b4a360f992505aaacb45cb 26-Jan-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Moved SIM_FULL_ACTION into an explicit intent"
8b7136492dcdc635535bb7ed5ff4c10d41d146e4 26-Jan-2017 Brad Ebinger <breadley@google.com> Merge "Introduces ImsResolver and ImsServiceController Classes" am: 31ee2c0cd0 am: 0cc2f8ae4d am: b86770d0aa
am: 49c60a3d0e

Change-Id: Ida53ed9a1c891054d67f6d5f03899ffa1d14f75b
49c60a3d0efff4c75ad0603a9445dd3fe7ca5512 26-Jan-2017 Brad Ebinger <breadley@google.com> Merge "Introduces ImsResolver and ImsServiceController Classes" am: 31ee2c0cd0 am: 0cc2f8ae4d
am: b86770d0aa

Change-Id: I343954579fd6dfcf01a4d2504dbc3f8c8248f0ae
b86770d0aab5ee4bd7f3cfd7094e5b20d7fabb84 26-Jan-2017 Brad Ebinger <breadley@google.com> Merge "Introduces ImsResolver and ImsServiceController Classes" am: 31ee2c0cd0
am: 0cc2f8ae4d

Change-Id: I958baefc1932177f4ac2985ecde489478199ef58
31ee2c0cd0e727370a8570342cd4e37045d723b4 26-Jan-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Introduces ImsResolver and ImsServiceController Classes"
afc90b46b06dff397647bf63b00051c5c1ee6dee 26-Jan-2017 ashastry <ashastry@google.com> Merge "Refactor CarrierServicesSmsFilter to enable parallel filtering." am: 73ab9b1b3f am: 2b0c822d96 am: 0ea2e8af38
am: 20d6406af6

Change-Id: I62fb2595b7bc3e0aa5ac8d6c9ae5d16a12939bec
20d6406af601c803dbfd011dc24ec8cf371a28cd 26-Jan-2017 ashastry <ashastry@google.com> Merge "Refactor CarrierServicesSmsFilter to enable parallel filtering." am: 73ab9b1b3f am: 2b0c822d96
am: 0ea2e8af38

Change-Id: Icfc989d1695054db6ee7b425fc40f48f08271299
0ea2e8af38e6a11c32891597053a8db2c89dcd07 26-Jan-2017 ashastry <ashastry@google.com> Merge "Refactor CarrierServicesSmsFilter to enable parallel filtering." am: 73ab9b1b3f
am: 2b0c822d96

Change-Id: I7a8623624758b7dd9065e2b5511e5306659a5f2e
73ab9b1b3f43a3699ed87e9718d7d3771dec98d2 26-Jan-2017 ashastry <ashastry@google.com> Merge "Refactor CarrierServicesSmsFilter to enable parallel filtering."
b6e1d01effda7b82b6b539c053f812031cfbbcf1 19-Jan-2017 Jack Yu <jackyu@google.com> Moved SIM_FULL_ACTION into an explicit intent

From now on SIM_FULL_ACTION will only be sent to
the default SMS application.

Test: manual
bug: 33783447
Change-Id: I81b6aaff35dc33356a00b72fa59c84488dd02afe
msApplication.java
msStorageMonitor.java
ebe7395407ab7a006daec0bb797557b9ad76fc52 23-Jan-2017 Brad Ebinger <breadley@google.com> Introduces ImsResolver and ImsServiceController Classes

First part in a series of changes to refactor IMS APIs and allow
multiple ImsServices to be managed based on device and carrier
configurations. This change includes:
1) Introduces the ImsResolver class, which caches the apps
defining an ImsService in their manifest. It then updates
which ImsServices it is bound to by monitoring package changes
and changes to the Carrier Configuration.
2) Introduces the ImsServiceController class, which manages
the binding to an ImsService as well as control changes to
the features that the ImsService supports.

Test: Adds unit tests
Bug: 30290416
Change-Id: Id5bb341903bcf03cf340a8552ad3a75e8409c494
ms/ImsResolver.java
ms/ImsServiceController.java
52349040513722c5c50d627e6ff75d475fce5755 25-Jan-2017 ashastry <ashastry@google.com> Merge "Add a TODO for checking IMS app for SMS sending." am: b5bba95152 am: 3289a7315a am: e43655285a
am: b99f5bdf01

Change-Id: Ica8d29bfc8a95a0a3eb82189a298f3d8be93949f
b99f5bdf013a33ae2c5225fe3d321507dac358da 25-Jan-2017 ashastry <ashastry@google.com> Merge "Add a TODO for checking IMS app for SMS sending." am: b5bba95152 am: 3289a7315a
am: e43655285a

Change-Id: Ibc11be00dcbeff5c926fa8bd66399a6f3ed5dd1c
e43655285adeecea407cc8871d38824985f6f29d 25-Jan-2017 ashastry <ashastry@google.com> Merge "Add a TODO for checking IMS app for SMS sending." am: b5bba95152
am: 3289a7315a

Change-Id: I6a922cc58beeafb32ddf2e0d447e03dc90ab0705
96f2245d927c81fcd348bace3bc417bd0f91fb33 25-Jan-2017 Abhijith Shastry <ashastry@google.com> Add a TODO for checking IMS app for SMS sending.

BUG: 29899506
Test: Comment only, no code change.
Change-Id: I81746cee8a6da5b4fd40dd0b47ec313093d69f5c
MSDispatcher.java
263425004dd8e788802a0a0fdd0f6747f7ac6fc7 24-Jan-2017 Pankaj Kanwar <pkanwar@google.com> Merge "Create Public API which exposes if the device is in a state where simultaneous voice and data are possible."
fd7ad6fa6ed0e7dc6bf185e6a16bf684695f9d59 24-Jan-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fixed typos"
830fd512e13552f2077fed57bc726412a691e9fc 24-Jan-2017 Amit Mahajan <amitmahajan@google.com> Merge "Exception and death notification handling for IRadio."
1fe42aab232f53e3cc84092b2b8ca80c5ae6c652 24-Jan-2017 ashastry <ashastry@google.com> Merge "Move Carrier filter to a separate class." am: b87ef28c7d am: 01561e6a15 am: 106f12ce00
am: 59591d0ebe

Change-Id: I85ed50d41a712a9f66241c9f6c3f56e4ed946bef
59591d0ebe0022c813787082015b5ae3ae6d4dba 24-Jan-2017 ashastry <ashastry@google.com> Merge "Move Carrier filter to a separate class." am: b87ef28c7d am: 01561e6a15
am: 106f12ce00

Change-Id: I247344aa9061b59ced84f931af5df332bf23652f
99462ddf1fa86f86b283507ddddbd576c5d3b6bb 23-Jan-2017 Abhijith Shastry <ashastry@google.com> Refactor CarrierServicesSmsFilter to enable parallel filtering.

BUG: 29899506
Test: refactoring CL. Existing unit tests still pass.
Change-Id: Ib6c0c61ffb2e2029a0ba44f6cf6945ed1c23e26f
arrierServicesSmsFilter.java
106f12ce006b3319c7fe029c8e726bf5ba0b17f5 24-Jan-2017 ashastry <ashastry@google.com> Merge "Move Carrier filter to a separate class." am: b87ef28c7d
am: 01561e6a15

Change-Id: I48a1e2cab4081c7ed0ce25ca15c3516db3bc19cf
b87ef28c7d59e780280d331366a431910a13cc01 24-Jan-2017 ashastry <ashastry@google.com> Merge "Move Carrier filter to a separate class."
b83528485c4fc93aa5dbaf557bb81a5bdcd0564c 21-Jan-2017 Jack Yu <jackyu@google.com> Fixed typos

Just fixed some typos

Test: Build
Change-Id: I1ea1f43dae44fcece5805d3e15d650cfd2fdbf8b
IL.java
adioIndication.java
d2311f99c68915b758b2c36329a11238b8dc9076 21-Jan-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Collect telephony metrics for CS Calls."
2e18f22412ed3aa197006173a16c921a2ab93645 21-Jan-2017 Hall Liu <hallliu@google.com> Merge "Properly route the SET_CALL_FORWARD_DONE message" am: 8968d3e048 am: f6ffb59f58 am: a55042d993
am: 1aaad6145b

Change-Id: I0d9a5670cfa3fc58edb51725f9cd6aa311401337
bdaed78d68d889a024c90ca5e48a2297074247bc 02-Dec-2016 Naveen Kalla <mrnaveen@google.com> Collect telephony metrics for CS Calls.

Log Dial, Hangup and CS Call state changes in telephony.

Bug: 32885463
Test: Make circuit-switched calls on the pixel device and
check the logs. Run telephony unit tests
Change-Id: I0191f30a691bb0496600cba608387b06e7b3d6dd
smCdmaCallTracker.java
IL.java
etrics/CallSessionEventBuilder.java
etrics/TelephonyMetrics.java
1aaad6145b79db0f9035808617f73db33272881e 21-Jan-2017 Hall Liu <hallliu@google.com> Merge "Properly route the SET_CALL_FORWARD_DONE message" am: 8968d3e048 am: f6ffb59f58
am: a55042d993

Change-Id: I7199c540251fadfd4b080cc5fae1f633540658ef
a55042d9937b97751f3354bc56be0da5adcba038 21-Jan-2017 Hall Liu <hallliu@google.com> Merge "Properly route the SET_CALL_FORWARD_DONE message" am: 8968d3e048
am: f6ffb59f58

Change-Id: Ia5f44b288642615266d29ea62fd05f450a7fa061
8968d3e04861f4db547627096f48aac90391df34 21-Jan-2017 Hall Liu <hallliu@google.com> Merge "Properly route the SET_CALL_FORWARD_DONE message"
d68f4b1a9e4067853c0b50b19afa51a681fa3c8f 19-Jan-2017 pkanwar <pkanwar@google.com> Create Public API which exposes if the device is in a state where
simultaneous voice and data are possible.

BUG: 32912296
Test: Not required.
Change-Id: I4c2e21e9f2abcbeae63cd4235d802649c1208630
hone.java
0012abc0db410ba41a198fc5bbcaae77b60ace51 20-Jan-2017 Amit Mahajan <amitmahajan@google.com> Exception and death notification handling for IRadio.

Test: Basic telephony sanity
Bug: 32020264
Change-Id: Id0ea4ca839cf67d3810bdec91814199005e03794
IL.java
d48adf544475a1d20c0a349aa97664b71de0318b 20-Jan-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "resolve merge conflicts of e8bc7318a to nyc-mr2-dev-plus-aosp" into nyc-mr2-dev-plus-aosp
5c108985d4207a21a615b8e5bd07473e4fc2e543 20-Jan-2017 Naveen Kalla <mrnaveen@google.com> resolve merge conflicts of e8bc7318a to nyc-mr2-dev-plus-aosp

Test: Build verification

Change-Id: I47c872a999652597345ca63bfcce0dd1c7a9c412
a62c62005d63ac5a70a38245c30cde71f6a0d304 20-Jan-2017 Polina Bondarenko <pbond@google.com> Merge "ril: add a checkNotNull for setAllowedCarriers params." am: 73c5e76a86 am: 1b4b9f7ed2
am: 2a966eb69c

Change-Id: I2a14e979194476231210a0136f2da2819ceda8b5
2a966eb69c16bd2c0341f2dc5c827000480b4ca1 20-Jan-2017 Polina Bondarenko <pbond@google.com> Merge "ril: add a checkNotNull for setAllowedCarriers params." am: 73c5e76a86
am: 1b4b9f7ed2

Change-Id: I9f525f8ed1a419ecd852304a5d04926ffa92e220
73c5e76a8664a9a8dffce41ffcace2c2bf6bae83 20-Jan-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "ril: add a checkNotNull for setAllowedCarriers params."
710bbef96c22f919186c66cea26da81c4d927e90 19-Jan-2017 Polina Bondarenko <pbond@google.com> ril: add a checkNotNull for setAllowedCarriers params.

Bug: 33480084
Test: compile

Change-Id: I7db463588b01f4ad3b377f4c1dcc9f63063121b1
Merged-In: I7db463588b01f4ad3b377f4c1dcc9f63063121b1
IL.java
6c5bb64c1fc0b45eb506826919fcac7ee021de36 20-Jan-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "ril: add a checkNotNull for setAllowedCarriers params."
e8bc7318a99df70227294bfffadb883fe10f3225 02-Dec-2016 Naveen Kalla <mrnaveen@google.com> DO NOT MERGE: Collect telephony metrics for CS Calls.

Log Dial, Hangup and CS Call state changes in telephony.

Bug: 32885463
Change-Id: I0191f30a691bb0496600cba608387b06e7b3d6dd
smCdmaCallTracker.java
IL.java
etrics/CallSessionEventBuilder.java
etrics/TelephonyMetrics.java
5ecf50e3983045c077ed9e07af53cf7d42b6f8cd 19-Jan-2017 Polina Bondarenko <pbond@google.com> ril: add a checkNotNull for setAllowedCarriers params.

Bug: 33480084
Test: compile
Change-Id: I7db463588b01f4ad3b377f4c1dcc9f63063121b1
IL.java
24a6ae7b3e80fd5df4bdbcabffef1c1430eb99f6 20-Jan-2017 Chen Xu <fionaxu@google.com> Merge "Initial change on carrier signal filtering" am: 8f7acaf827 am: d175fa577a
am: 80e9159964

Change-Id: I05f5cc9fd8a6474cd2f417d7f4951615ff57ad10
80e91599641d4611d65b51a80c7c7bb16a20344d 20-Jan-2017 Chen Xu <fionaxu@google.com> Merge "Initial change on carrier signal filtering" am: 8f7acaf827
am: d175fa577a

Change-Id: I8fcd89f484b53411aeda79c16b12595cd1232224
74da2b4a09ab735c7538cf1610fa302135c4ec1b 19-Jan-2017 Abhijith Shastry <ashastry@google.com> Move Carrier filter to a separate class.

This will enable adding an IMS filter.

Bug: 29899506
Change-Id: I33c22a6b1a74352557d3d79930561448a2acef23
Test: refactoring CL. Existing unit tests still pass.
arrierServicesSmsFilter.java
nboundSmsHandler.java
45d8da68e22b5e74de0526b2c4f7d9644f73ac94 20-Jan-2017 Chen Xu <fionaxu@google.com> Merge "Initial change on carrier signal filtering"
b2f4c9d1564e9f49ecf2b11097730d3a8889da96 20-Jan-2017 Hall Liu <hallliu@google.com> Properly route the SET_CALL_FORWARD_DONE message

In ImsPhone, the message indicating that call forwarding was set was
being directed straight to ImsPhoneMmiCode instead of routing through
the handler in ImsPhone, which caused the call forwarding notification
to never get set. This sends the proper message to ImsPhone first, which
will put up the call forwarding notification.

Change-Id: I5d06a0bad6e2bf368817ec623905f4a16e06d358
Fix: 34185152
Test: manual (to test on US carriers, force useImsForUt in GsmCdmaPhone)
msphone/ImsPhone.java
b5771d36210a751e6ec916556ad0f20fcb9b4288 18-Nov-2016 fionaxu <fionaxu@google.com> Initial change on carrier signal filtering

- support new carrier configs with two signal list per carrier app
- support new broadcast mechanism to comply with background-check restriction on O.
- add carrier action agent for dispatching carrier actions

Bug: 30958215
Test: runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/CarrierSignalAgentTest
Change-Id: Ibf7496bdb1ba8c85384da0b667a5610a52b45d80
Merged-In: CHANGE-ID I4e9e2f56e991e9d6753f8d7e877add5ada595972
arrierActionAgent.java
arrierSignalAgent.java
hone.java
erviceStateTracker.java
elephonyComponentFactory.java
ataconnection/DataConnection.java
ataconnection/DcTracker.java
6a7fb078d1cacba7cf2e83b71242bb5c4c27c975 18-Nov-2016 fionaxu <fionaxu@google.com> Initial change on carrier signal filtering

- support new carrier configs with two signal list per carrier app
- support new broadcast mechanism to comply with background-check restriction on O.
- add carrier action agent for dispatching carrier actions

Bug: 30958215
Test: runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/CarrierSignalAgentTest

Change-Id: I4e9e2f56e991e9d6753f8d7e877add5ada595972
arrierActionAgent.java
arrierSignalAgent.java
hone.java
erviceStateTracker.java
elephonyComponentFactory.java
ataconnection/DataConnection.java
ataconnection/DcTracker.java
173f6b862ac39e12d4230413fb767f8ae4fd91de 06-Dec-2016 Wei Huang <wei.x.huang@sonymobile.com> DO NOT MERGE Fix : Reconnection not triggered when APN changed

When APN is changed, connections whose ApnSetting change will be cleaned
up. However, as ApnSetting#equals doesn't check mmsPort, username and
password, connection will not be cleaned up even if user changes them.
To fix the issue, add logic to check them and also introduced test case
to prevent same failure in the future.

Bug: 30207789 31172711
Test: Telephony unit test
Change-Id: I4ac75ebac1755a42c4e88da60b059874ea9f693c
(cherry picked from commit dae587b5bb307972b71baa760799948219e3081b)
ataconnection/ApnSetting.java
690c2fcad7d48d160b06ae0d0b531e84d51d253b 18-Jan-2017 Tamas Berghammer <tberghammer@google.com> DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
am: a2dc503a98

Change-Id: Icaef683a5cbea238ad3dbb7b2695a349e7612712
72eca0cede307c8ac8546ac419ddaf2f1c3e32e4 18-Jan-2017 Tamas Berghammer <tberghammer@google.com> Merge "DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"" into nyc-mr1-dev-plus-aosp
a2dc503a98b1a399328994c9010683c33bcf6bca 18-Jan-2017 Tamas Berghammer <tberghammer@google.com> DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"

This reverts commit ac3e61c9cb50ea674704430c770389a61c7d19b6.

Change-Id: Iad4b8e7e9375d8f15fe091503045fee74330f806
IL.java
msApplication.java
msphone/ImsPhoneCallTracker.java
etrics/CallSessionEventBuilder.java
etrics/InProgressCallSession.java
etrics/InProgressSmsSession.java
etrics/SmsSessionEventBuilder.java
etrics/TelephonyEventBuilder.java
etrics/TelephonyMetrics.java
543dac701ed560a8eb69d1a01a56723561c3bbdc 18-Jan-2017 Tamas Berghammer <tberghammer@google.com> Update package names to work with the proto3 compiler
am: ac3e61c9cb

Change-Id: I9b535aa7e88bd4ff5289bf283bc0c169ac92fb6d
181251084a6c78818b29d4a8fa815bf96444635e 18-Jan-2017 Tamas Berghammer <tberghammer@google.com> Merge "Update package names to work with the proto3 compiler" into nyc-mr1-dev-plus-aosp
21c9e33b0a3e19ee70ddf0301469f4c58b57d14c 05-Jan-2017 Amit Mahajan <amitmahajan@google.com> Client (framework) side HAL changes for RIL unsolicited responses - 3

Test: Basic telephony sanity (voice call, sms, data, APM)
Bug: 32020264
Change-Id: I0e29c592c56b4ca2937fe54ac61bbc7057253ad8
IL.java
adioIndication.java
8fef426fd45393631987dbf54ad5233fd7b9dfde 29-Dec-2016 Amit Mahajan <amitmahajan@google.com> Client (framework) side HAL changes for RIL unsolicited responses - 2

Test: Basic telephony sanity (voice call, sms, data, APM)
Bug: 32020264
Change-Id: Id58f2b24ca035a81695382210ea54656509afb00
IL.java
adioIndication.java
erviceStateTracker.java
dma/CdmaInformationRecords.java
aa488daf836be0e80e1f9a4e9bd458b9da74bdcd 13-Jan-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Client (framework) side HAL changes for RIL unsolicited responses."
28374365ab472ce7eee6b1a7eb671f976aca9ef7 12-Jan-2017 Jack Yu <jackyu@google.com> Merge "Unregister data enabled changed listener on default phone" am: 989070554a am: 602e5a193d am: b2a2cf5dd0
am: f9e44ef552

Change-Id: I1f1e569dc54ce9ab80c7f39038ff4b2fcdb889be
f9e44ef5524b1d67393455ae3f96ab9b4f2ad34a 12-Jan-2017 Jack Yu <jackyu@google.com> Merge "Unregister data enabled changed listener on default phone" am: 989070554a am: 602e5a193d
am: b2a2cf5dd0

Change-Id: I46308b5a1dbae258c3dad9d28b592284b65bc526
b2a2cf5dd0eb67931318cba5228a88d41a774b29 12-Jan-2017 Jack Yu <jackyu@google.com> Merge "Unregister data enabled changed listener on default phone" am: 989070554a
am: 602e5a193d

Change-Id: Icd5a56d59be5b653852fdc329efe1ce5488dcd17
989070554ae553f65bcdab8af0b837acf1238dab 12-Jan-2017 Jack Yu <jackyu@google.com> Merge "Unregister data enabled changed listener on default phone"
4bc5403c30c3ae8e1ead452733ce9923c786431f 12-Jan-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Convert RIL java side to HIDL client."
e7c29ee85e324289d247d6e28a8c1a216c3658c4 19-Dec-2016 Amit Mahajan <amitmahajan@google.com> Client (framework) side HAL changes for RIL unsolicited responses.

Test: WIP
Bug: 32020264
Change-Id: I94300f56cd46bdad81271cb44113bcc72591394f
IL.java
adioIndication.java
dma/SmsMessage.java
sm/GsmSMSDispatcher.java
sm/SmsMessage.java
icc/SIMRecords.java
d60a877c59822d2157b8af86f2c3834b04011051 16-Dec-2016 Sanket Padawe <sanketpadawe@google.com> Convert RIL java side to HIDL client.

Test: Basic telephony sanity tests (voice calls, data, sms, APM).
Bug: 32020264
Change-Id: I62aac69193563250107c55ced74bc5aa4ea0b5d4
IL.java
adioIndication.java
adioResponse.java
d2c46a7e08af8f56c0f2112a78969d3d647cfa03 23-Nov-2016 Jiazeng Tian <jiazeng.tian@sonymobile.com> Unregister data enabled changed listener on default phone

[Description]
"com.android.phone" process crash after ACTION_IMS_SERVICE_DOWN
is sent out when ImsPhone is ready.

[Root cause]
When ACTION_IMS_SERVICE_DOWN is sent out, ImsPhone is disposed
and ImsPhoneCallTracker unregisters data enabled changed listener
in DcTracker from instance of ImsPhone but ImsPhone has no
object of DcTracker(i.e. null) then NullPointerException
has been happend.

[Solution]
When ImsPhoneCallTracker unregisters the listener, it refers
to default GsmCdmaPhone which it has an object of DcTracker

NOTE:
When ImsPhoneCallTracker registers the listener, it already refer
to default GsmCdmaPhone.

Test: manual with adb command to send IMS related intent.
Bug: 34206487
Change-Id: Iac9636de33074634fe9ccd451d510b4863bdc9ba
msphone/ImsPhoneCallTracker.java
703465e2945e0fa71d22fbc0304753127a2053fe 11-Jan-2017 Robert Greenwalt <rgreenwalt@google.com> Merge "Add test case for restricted state change notification" am: d6e4422842 am: ccdfa9ad21 am: 1726f251bc
am: fc3f3c435f

Change-Id: Ie53576c9a7dfaaddc542e0f7137ed535b8b6cbff
e6070311987d20e0a676c2bf59a02febb2275af5 11-Jan-2017 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix issue of CS restriction notification incorrectly disappearing" am: 6b1cdff038 am: d0b462f383 am: 75e562718a
am: 9d30261840

Change-Id: Ie9134dd69d1e2571babaea3fa38969f7ad61f30c
fc3f3c435f993c997841d990ab0da766b25dd856 11-Jan-2017 Robert Greenwalt <rgreenwalt@google.com> Merge "Add test case for restricted state change notification" am: d6e4422842 am: ccdfa9ad21
am: 1726f251bc

Change-Id: Ic343baeff7e85f7891c190850a5f4c05efc25a03
9d30261840b7c68e5edd78944fd37fca5cb06cf4 11-Jan-2017 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix issue of CS restriction notification incorrectly disappearing" am: 6b1cdff038 am: d0b462f383
am: 75e562718a

Change-Id: I561bbd447d742feec237264b6fb3a167646cab5a
1726f251bc7c660afd6ab066b8c2786f40e65343 11-Jan-2017 Robert Greenwalt <rgreenwalt@google.com> Merge "Add test case for restricted state change notification" am: d6e4422842
am: ccdfa9ad21

Change-Id: If01ac44f9f2a4df18cfa836c47f9f5afc2e0028d
75e562718adeb9a6350aa668bb4eea119338bb2a 11-Jan-2017 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix issue of CS restriction notification incorrectly disappearing" am: 6b1cdff038
am: d0b462f383

Change-Id: If57b43bbb2c0043849257355e06df134723952c1
d6e44228421b6974beb454205c31a92d97e410e5 11-Jan-2017 Robert Greenwalt <rgreenwalt@google.com> Merge "Add test case for restricted state change notification"
6b1cdff038731302234d6007561b35834d421ac9 11-Jan-2017 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix issue of CS restriction notification incorrectly disappearing"
ed5af31ed3ace33d69ff77767daad816ef989c11 09-Jan-2017 Wenting Xiong <wenting.xa.xiong@sonymobile.com> Add test case for restricted state change notification

Verify ServiceStateTracker#onRestrictedStateChanged() to show
proper notification.

Bug: 31101137
Change-Id: Ib9fae72c669f1af7265123ca16560dbaba163277
erviceStateTracker.java
est/SimulatedCommands.java
e41a0a98edf9e069097eccc64bb42f4150e2d284 11-Jan-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Adding simple radio service and callbacks."
49e0dd794cf7f568dfc47ff7efe416dede44b8a1 14-Sep-2016 Satoshi, Baba X <satoshi.x.baba@sonymobile.com> Fix issue of CS restriction notification incorrectly disappearing

CS restriction notification disappears when restriction state changes
from whole restricted state to either Normal/Emergency call restricted
state. This issue is caused by incorrect conditions in if statements.

Bug: 31101137
Change-Id: I985d39a32a7ab293986e4694d5b6cc5160f158a8
estrictedState.java
erviceStateTracker.java
ac3e61c9cb50ea674704430c770389a61c7d19b6 22-Jun-2016 Tamas Berghammer <tberghammer@google.com> Update package names to work with the proto3 compiler

Bug: b/28974522
Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a
(cherry picked from commit 9460a22f3c1ae70dde80e34557d7011be113b39a)
IL.java
msApplication.java
msphone/ImsPhoneCallTracker.java
etrics/CallSessionEventBuilder.java
etrics/InProgressCallSession.java
etrics/InProgressSmsSession.java
etrics/SmsSessionEventBuilder.java
etrics/TelephonyEventBuilder.java
etrics/TelephonyMetrics.java
c47d77c153fdd568b4cd19ed93b326bf33893fd2 09-Jan-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Moved implicit intents into explicit intents"
e792f3d75621619daffe2f8c37a5da55cba43548 09-Jan-2017 Jack Yu <jackyu@google.com> Moved implicit intents into explicit intents
am: ba544c4187

Change-Id: Ib4725060e97bf5f093350505725f0e2f724c997b
333b4ce1b94c69575460679fd2c57a5ad69ac95e 09-Jan-2017 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Moved implicit intents into explicit intents" into nyc-mr1-dev-plus-aosp
ac78081c49e42e7fcdd4336dec99286f6305a898 09-Jan-2017 Chen Xu <fionaxu@google.com> Merge "make STK broadcast explicit" am: 1948672054 am: ad41feeed5 am: ec82ef204a
am: 35f8f69f6c

Change-Id: I85290512aefe6dfcc43bccea1573f25ae539c992
35f8f69f6ca17e3ce0289296459333b505a0b668 09-Jan-2017 Chen Xu <fionaxu@google.com> Merge "make STK broadcast explicit" am: 1948672054 am: ad41feeed5
am: ec82ef204a

Change-Id: I669367df6073aabb59b895e80cfa71aa5ebc24d1
ec82ef204af5cdb178077fdd8d95da287d4318cf 09-Jan-2017 Chen Xu <fionaxu@google.com> Merge "make STK broadcast explicit" am: 1948672054
am: ad41feeed5

Change-Id: I11d18c1c120ddd8ec6c94bf3b51088c795536dfe
ba544c4187af43a3110d69d699721198882d0b89 05-Jan-2017 Jack Yu <jackyu@google.com> Moved implicit intents into explicit intents

Moved two intents SMS_EMERGENCY_CB_RECEIVED_ACTION and
SMS_SERVICE_CATEGORY_PROGRAM_DATA_RECEIVED_ACTION are
now sent to the default cell broadcast receiver only.

The default cell broadcast receiver can be changed through
the resource overlay. Otherwise it is default to
com.android.cellbroadcastreceiver

bug: 33783447
Test: manual
Change-Id: I4e2bcd2b2f79f7a4a6a9b275c09684f204e201f4
Merged-In: I4e2bcd2b2f79f7a4a6a9b275c09684f204e201f4
ellBroadcastHandler.java
dma/CdmaServiceCategoryProgramHandler.java
9b275d12d3aec866953db8e2a2db18d3c8416e50 05-Jan-2017 Jack Yu <jackyu@google.com> Moved implicit intents into explicit intents

Moved two intents SMS_EMERGENCY_CB_RECEIVED_ACTION and
SMS_SERVICE_CATEGORY_PROGRAM_DATA_RECEIVED_ACTION are
now sent to the default cell broadcast receiver only.

The default cell broadcast receiver can be changed through
the resource overlay. Otherwise it is default to
com.android.cellbroadcastreceiver

bug: 33783447
Test: manual
Change-Id: I4e2bcd2b2f79f7a4a6a9b275c09684f204e201f4
Merged-In: I4e2bcd2b2f79f7a4a6a9b275c09684f204e201f4
ellBroadcastHandler.java
dma/CdmaServiceCategoryProgramHandler.java
5912e970166c21709f2d04ff22d00f977711a721 05-Jan-2017 Jack Yu <jackyu@google.com> Moved implicit intents into explicit intents

Moved two intents SMS_EMERGENCY_CB_RECEIVED_ACTION and
SMS_SERVICE_CATEGORY_PROGRAM_DATA_RECEIVED_ACTION are
now sent to the default cell broadcast receiver only.

The default cell broadcast receiver can be changed through
the resource overlay. Otherwise it is default to
com.android.cellbroadcastreceiver

bug: 33783447
Test: manual
Change-Id: I4e2bcd2b2f79f7a4a6a9b275c09684f204e201f4
ellBroadcastHandler.java
dma/CdmaServiceCategoryProgramHandler.java
685aaba80c3dee5daf0df761ed100221cf9f7cd4 05-Jan-2017 fionaxu <fionaxu@google.com> make STK broadcast explicit

only forward those STK broadcast to the system default app
- CAT_CMD_ACTION
- CAT_SESSION_END_ACTION
- CAT_ICC_STATUS_CHANGE
- CAT_ALPHA_NOTIFY

Bug: 33784801
Change-Id: Ia20ca030f9758dcfe5cd0de84a40a8db2d9468a1
Test: no break on existing telephony unit tests
at/AppInterface.java
at/CatService.java
c3242d2257c479fed9288dad3103e7697d9c75c6 25-Aug-2016 Amit Mahajan <amitmahajan@google.com> Adding simple radio service and callbacks.

Test: Sanity tests by telephony test team.
Bug: 32020264
Change-Id: I70552a681006ec46c901bdafb9d346c559ba5ec9
IL.java
adioIndication.java
adioResponse.java
3adc46165a65fe7ee46e43950d3043b2640a4d96 03-Jan-2017 Robert Greenwalt <rgreenwalt@google.com> Merge "Map IMEI_NOT_ACCEPTED fail cause" am: 06d6647bce am: 31b1bb7845 am: b1e4633f45
am: bcfb3339c9

Change-Id: I0fffac34cd9c5d5648e2e0167b247c7a68e53d22
bcfb3339c92fa8fd0d5c96ac1efe8e63904c71b6 03-Jan-2017 Robert Greenwalt <rgreenwalt@google.com> Merge "Map IMEI_NOT_ACCEPTED fail cause" am: 06d6647bce am: 31b1bb7845
am: b1e4633f45

Change-Id: I958dad8b2ecabf5752fd80a8ce70a00f7c7ef448
b1e4633f45c42842d82fea5ac82584788d33a16b 03-Jan-2017 Robert Greenwalt <rgreenwalt@google.com> Merge "Map IMEI_NOT_ACCEPTED fail cause" am: 06d6647bce
am: 31b1bb7845

Change-Id: I85bca48390c3b519a30d3a359b3f157588f49e57
06d6647bce594ccc09032eb9babc59aee56e86ba 03-Jan-2017 Robert Greenwalt <rgreenwalt@google.com> Merge "Map IMEI_NOT_ACCEPTED fail cause"
9964d930e05e40bb4ff410304fb0c4e8f01b2baf 28-Dec-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Send Filtered VVM SMS to telephony with phone account handle"
9e9d5109cabad749b0d1bcfa4ccc1efef546027f 23-Dec-2016 Ta-wei Yen <twyen@google.com> Send Filtered VVM SMS to telephony with phone account handle

This follows the public VisualVoicemailService using the
PhoneAccountHandle as account key instead of subId, and uses
VisualVoicmailSms to wrap the SMS content.

Also, previous design of the filter sent the broadcast directly to the
VVM client, which was always telephony. After this CL it will always
send to telephony which will relay it to the client.

Test: CTS tests in follow up CL
Change-Id: I45a3d276af9cb6f9509586f05fc8fc600e074c6b
isualVoicemailSmsFilter.java
2539fc03945ae1a604ab2049c245636d9f23fd1d 22-Dec-2016 Meng Wang <mewan@google.com> Merge "Update ImsConnectionStateListener"
c495c858f23ff641029f8a5015ea84e4817b0794 22-Dec-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Fixed that MMS incorrectly treated as metered data traffic." am: 51a49303f0
am: 538bee48cd

Change-Id: Ibea1a09ae7330c9f6102df4b393fa8076df193a6
51a49303f0809b2118ea8e09215f45f6d79ee56c 22-Dec-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Fixed that MMS incorrectly treated as metered data traffic."
df233bacb5f868db8b5ba1e26782382de866ee58 22-Dec-2016 Tyler Gunn <tgunn@google.com> Use video pause signaling when data limit reached. am: 359c182111
am: 0455ac9f63

Change-Id: Id98b7ac9d4ea603fefe58b3d6d668e359a521c01
0455ac9f63bc28372efc270396305ea3f3a3c805 22-Dec-2016 Tyler Gunn <tgunn@google.com> Use video pause signaling when data limit reached.
am: 359c182111

Change-Id: I38a6427012b31a94e6f461ded415775499d36d29
c712eb11110e0ebbdaacc8dd1f270e01b769d5c9 22-Dec-2016 Tyler Gunn <tgunn@google.com> Merge "Use video pause signaling when data limit reached." into nyc-mr2-dev
e67e5d98bfe762ac99303fc4ec5a1a5101c82ff8 22-Dec-2016 Brad Ebinger <breadley@google.com> Merge "Fix In Conference MMI codes" am: 6ee0044004 am: afa1cdb2a8
am: 0dc8d1d3db

Change-Id: Id747b734702d7621c3c2ad3dd59f05b14d4b7115
0dc8d1d3db8995fd242df41c4879b1175dd22117 22-Dec-2016 Brad Ebinger <breadley@google.com> Merge "Fix In Conference MMI codes" am: 6ee0044004
am: afa1cdb2a8

Change-Id: Iab324f633e685d3c9b9786a487998a3ae58582ce
b08ea56557e776da35c496e91ee8acff3aaab4c6 02-Dec-2016 Jack Yu <jackyu@google.com> Fixed that MMS incorrectly treated as metered data traffic.

The metered APN types cache was built before carrier config
is ready. Get rid of the cache because it doesn't buy us too much
in terms of performance as carrier config already has its own
cache. This will ensure we load the up to date configuration
when we bring up the data call.

Test: Manually sent mms on Vzw network.
bug: 31233558
Change-Id: I748e6aa713064601e09e8716424fca0b53f72847
Merged-In: Id0c243a7a92bd6ab3e7a46053e173bf727041015
ataconnection/ApnSetting.java
359c182111879b821c0b7eba6d5fa52194293212 21-Dec-2016 Tyler Gunn <tgunn@google.com> Use video pause signaling when data limit reached.

When the data limit is reached and video is disabled, use the "pause"
video signaling instead of disconnecting the call.
Previously, ImsManager#updateImsServiceConfig would be called when data
was disabled due to hitting the data limit. This would cause VT to be
unprovisioned; as a result it was not possible pause or unpause the video.
To solve this, when the data limit is reached and we're about to pause,
we are now deferring the updateImsServiceConfig until the call terminates.

Test: manual
Bug: 30760683
Change-Id: Ia1d4247cb5a11da7694e9d197a506442c7f675f4
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
94344fb8d5689abe429dca3c3d44d252ae952391 19-Dec-2016 Brad Ebinger <breadley@google.com> Adds logic to display UI if call forwarding is not enabled on 3gpp
am: 60109aa769

Change-Id: Id8b282bd6228a982881ea67d6c1a669b019702b9
f728f3826857dc59576368fbbe53e54fb7a54779 19-Dec-2016 Brad Ebinger <breadley@google.com> Merge "Adds logic to display UI if call forwarding is not enabled on 3gpp" into nyc-mr2-dev
8b9fe842a2b5b39f1a7efeda9a7f839c005277c1 19-Dec-2016 pkanwar <pkanwar@google.com> Notify user when user fails to connect to the network. am: 149f0d5d1c
am: e8503f29ac

Change-Id: I80e9aeac16b32321bbb80b8c5f45ab1f527fd774
f149ef74c9a4ee99644ff13e1d87fcf96e2978d7 19-Dec-2016 Junda Liu <junda@google.com> Merge "resolve merge conflicts of 4e0ad7b to master"
8ee13a12c94c5be9433be53765a8f56278a54396 16-Dec-2016 Brad Ebinger <breadley@google.com> Fix In Conference MMI codes

According to the 3gpp spec, when in a GSM conference, one of the
participants can be disconnected when a specific MMI code is placed.
This code includes the index of the participant being disconnected.
When the participant is disconnected using this method, the GsmCdmaConnection
stays in the DISCONNECTED state in the GsmCdmaCall until all
GsmCdmaConnections in the conference are disconnected. This causes an
issue in GsmCdmaCallTracker#hangupConnectionByIndex because the
getGsmCdmaIndex() method will always return an Exception if the
connection is in the DISCONNECTED state.

We now explicitly check if the GsmCdmaConnection has been disconnected
before querying the connection index.

Test: Manual
Bug: 29588832
Merged-In: I5f71937fbaa75bb93aa2175791a01fa063cb12ac
Change-Id: I5f71937fbaa75bb93aa2175791a01fa063cb12ac
smCdmaCallTracker.java
04d4dd5129b5b1087b98e1200dab18b9a99c09e4 19-Dec-2016 Brad Ebinger <breadley@google.com> Merge "Fix In Conference MMI codes"
277eee77a35134ee8e3072b4008b035d691ed0d8 18-Dec-2016 Junda Liu <junda@google.com> resolve merge conflicts of 4e0ad7b to master

Change-Id: Ie7773d0fa9abc8e5b1cfed31857aaa1e021dfb27
e8503f29ac86151671189ac7cbfb8c8083314aa1 17-Dec-2016 pkanwar <pkanwar@google.com> Notify user when user fails to connect to the network.
am: 149f0d5d1c

Change-Id: Ie5641d333334d911ce494a1fb9420e9b2428615d
c0cb41db168a22ed827e5c64fc0589f08e6e7651 17-Dec-2016 Pankaj Kanwar <pkanwar@google.com> Merge "Notify user when user fails to connect to the network." into nyc-mr2-dev
149f0d5d1ce3cebe17479d61454c33f700c3584b 04-Dec-2016 pkanwar <pkanwar@google.com> Notify user when user fails to connect to the network.

Bug: 28572539
Change-Id: I3e7591c6210b7ab20b46a8d41b1ebdf13c411ecc
arrierServiceStateTracker.java
erviceStateTracker.java
4e0ad7bd88c9d6596d5fdfa6ff25ebee56e4e322 16-Dec-2016 Junda Liu <junda@google.com> DcTracker will use dun APN from database if carrier allows it.
am: d92c67aa96

Change-Id: I7d68082d1edd97d6d12016365ef39aca8b8319e2
d92c67aa965200385acf3182ffb0af25297a366f 14-Dec-2016 Junda Liu <junda@google.com> DcTracker will use dun APN from database if carrier allows it.

If carrier config KEY_EDITABLE_TETHER_APN_BOOL is true, fetchDunApn will use APN with dun type in the database.
The order to look for tether APN is: tether_dun_apn setting, database if config is true, config_tether_apndata
resource.

Bug: b/30622475
Change-Id: I4f69c9f73b83ec6678f302e0b8dc151df36b0a07
ataconnection/DcTracker.java
60109aa7699e540f1ce8a9bb5a65055a0312603a 10-Dec-2016 Brad Ebinger <breadley@google.com> Adds logic to display UI if call forwarding is not enabled on 3gpp

If call forwarding is configured to not be allowed while roaming
on a 3gpp network by a carrier, we will now display descriptive
UI to the user indicating the problem if an MMI code fails.

Test: Manual
Bug: 30106345
Merged-In: I9626dea3546518bb81ea0ef9af647e37f6f2165d
Change-Id: I9626dea3546518bb81ea0ef9af647e37f6f2165d
smCdmaPhone.java
sm/GsmMmiCode.java
a902293867bdb04dc9f30e019b679176a9409c07 16-Dec-2016 Brad Ebinger <breadley@google.com> Merge "Adds logic to display UI if call forwarding is not enabled on 3gpp"
35c77cd6f3fd5ace756896b1ef0d82486c9ce4bf 16-Dec-2016 Brad Ebinger <breadley@google.com> Fix In Conference MMI codes

According to the 3gpp spec, when in a GSM conference, one of the
participants can be disconnected when a specific MMI code is placed.
This code includes the index of the participant being disconnected.
When the participant is disconnected using this method, the GsmCdmaConnection
stays in the DISCONNECTED state in the GsmCdmaCall until all
GsmCdmaConnections in the conference are disconnected. This causes an
issue in GsmCdmaCallTracker#hangupConnectionByIndex because the
getGsmCdmaIndex() method will always return an Exception if the
connection is in the DISCONNECTED state.

We now explicitly check if the GsmCdmaConnection has been disconnected
before querying the connection index.

Test: Manual
Bug: 29588832
Change-Id: I5f71937fbaa75bb93aa2175791a01fa063cb12ac
smCdmaCallTracker.java
9af9bc9b430c53c78ee4888e68166d6ee290ee9a 16-Dec-2016 Jack Yu <jackyu@google.com> resolve merge conflicts of cf93cbb to nyc-mr2-dev-plus-aosp

Test: unit test
Change-Id: If11d63bc2d76985f8507236ab6e1ca274d8271a3
cf93cbb0ca006550ad2d8e850dea40c04e6e8bf1 15-Dec-2016 Wei Huang <wei.x.huang@sonymobile.com> Merge "Fix : Reconnection not triggered when APN changed" am: 8d90dccd74
am: 1d21b84b0f

Change-Id: Id5f1dfb5efc806f7cc3714ecc4990cd1b821bc2f
b2ce2c5bf28bed00dab771b359a9fad7841d1403 06-Dec-2016 Wei Huang <wei.x.huang@sonymobile.com> Fix : Reconnection not triggered when APN changed

When APN is changed, connections whose ApnSetting change will be cleaned
up. However, as ApnSetting#equals doesn't check mmsPort, username and
password, connection will not be cleaned up even if user changes them.
To fix the issue, add logic to check them and also introduced test case
to prevent same failure in the future.

Bug: 30207789
Test: Telephony unit tests
Merged-In: I4ac75ebac1755a42c4e88da60b059874ea9f693c
Change-Id: I4ac75ebac1755a42c4e88da60b059874ea9f693c
ataconnection/ApnSetting.java
dae587b5bb307972b71baa760799948219e3081b 06-Dec-2016 Wei Huang <wei.x.huang@sonymobile.com> Fix : Reconnection not triggered when APN changed

When APN is changed, connections whose ApnSetting change will be cleaned
up. However, as ApnSetting#equals doesn't check mmsPort, username and
password, connection will not be cleaned up even if user changes them.
To fix the issue, add logic to check them and also introduced test case
to prevent same failure in the future.

Bug: 30207789
Test: Telephony unit test
Change-Id: I4ac75ebac1755a42c4e88da60b059874ea9f693c
ataconnection/ApnSetting.java
5947126064cce42d90423fa7e1604e637c20f79a 15-Dec-2016 Junda Liu <junda@google.com> DO NOT MERGE If set data profile with roaming protocol, set back to home when roaming off.
am: 4b17d6f820

Change-Id: I7ff89e4f2f389cf27377630664749988124ceef6
4b17d6f820839eb663ee4493b48a0184be7aefd4 09-Dec-2016 Junda Liu <junda@google.com> DO NOT MERGE If set data profile with roaming protocol, set back to home when roaming off.

Data profile will be updated in O to support both home and roaming protocol.
This is a MR2 only fix to minimize behavior change and fix data error when
device move from roaming to home without airplane mode or power cycle.

The sequence of events can be tricky, eg. set data profile may be called before
device registers on network and will set home protocol even device is indeed roaming.
It is intentional this behavior is unchanged. Same for not set roaming protocol in
onRoamingOn.

Test: manual, https://paste.googleplex.com/4566715396521984
Bug: b/32240817
Change-Id: I70598bb14c7cb499552b1b725cf5b464f8ec3b2c
ataconnection/DcTracker.java
e48f325a296ce0e74415dd737c7d461b021b0fcc 10-Dec-2016 Brad Ebinger <breadley@google.com> Adds logic to display UI if call forwarding is not enabled on 3gpp

If call forwarding is configured to not be allowed while roaming
on a 3gpp network by a carrier, we will now display descriptive
UI to the user indicating the problem if an MMI code fails.

Test: Manual
Bug: 30106345
Change-Id: I9626dea3546518bb81ea0ef9af647e37f6f2165d
smCdmaPhone.java
sm/GsmMmiCode.java
793a20fb5b45954bb14133bcad65e4e3f3efe397 12-Dec-2016 Meng Wang <mewan@google.com> Update ImsConnectionStateListener

1. Replace onImsConnected() with onImsConnected(int)
2. Replace onImsProgressing() with onImsProgressing(int)

Bug: 33430556
Test: m
Change-Id: I5021b41b2c44b1242f5866791cbb11f07815d86c
msphone/ImsPhoneCallTracker.java
9a550b9407716917e1ccc7c26e370cdfa3d20671 12-Dec-2016 Polina Bondarenko <pbond@google.com> Merge "Telephony: notify deviceProvisioningPackage" am: d13c5261e6 am: 8e626ffd88 am: c328eea40c
am: fccef9a108

Change-Id: Icf88f56ad384a56a4aa93ee925328dc218659b46
fccef9a108a9154e6219cfe2917ef0da732ac77d 12-Dec-2016 Polina Bondarenko <pbond@google.com> Merge "Telephony: notify deviceProvisioningPackage" am: d13c5261e6 am: 8e626ffd88
am: c328eea40c

Change-Id: Id7ce89deedd4c0886119b1d230ec92d176aec673
c328eea40ccd40c7a8e59505f24d02132f4b884b 12-Dec-2016 Polina Bondarenko <pbond@google.com> Merge "Telephony: notify deviceProvisioningPackage" am: d13c5261e6
am: 8e626ffd88

Change-Id: I16bba962406d7650a01712a2a06323d48660b30e
e72403fca336d72c57dd597812df782d64ecfcc2 09-Dec-2016 Nathan Harold <nharold@google.com> Hook the Phone.isUtEnabled() Function to ImsPhone.isUtEnabled()
am: c0ba7b0e1d

Change-Id: I708630bb0f8c2e06a6f05f83891e371eec9fb3a3
243f76a24b53bfa2754b905f28f3a4cebfe36828 09-Dec-2016 Youhan Wang <youhanw@google.com> Merge "Hook the Phone.isUtEnabled() Function to ImsPhone.isUtEnabled()" into nyc-mr2-dev
c556e9a3149b6cbd4517fe02aae11689ec5a4e03 09-Dec-2016 Polina Bondarenko <pbond@google.com> Telephony: notify deviceProvisioningPackage

Notify deviceProvisioningPackage when SIM state changes to/from
SIMSTATE_RESTRICTED.

Bug: 33100564
Test: runtest
Change-Id: I695790574431c3987ae9fd2d0741eb41382eabac
icc/UiccController.java
icc/UiccStateChangedLauncher.java
17ca88e667afa77a57f242cbc041059260fce626 09-Dec-2016 Polina Bondarenko <pbond@google.com> Revert "Telephony: notify deviceProvisioningPackage"

This reverts commit ec340144db9085e0815a513220b152326fd4fee7.

Change-Id: I0ebfe74416f25361234ba5adf00ec4acefd96f10
icc/UiccController.java
icc/UiccStateChangedLauncher.java
ec340144db9085e0815a513220b152326fd4fee7 29-Nov-2016 Polina Bondarenko <pbond@google.com> Telephony: notify deviceProvisioningPackage

Notify deviceProvisioningPackage when SIM state changes to/from
SIMSTATE_RESTRICTED.

Bug: 33100564
Test: runtest
Change-Id: Ibbc44ae293c306dc1b1891dc73829ef5f81207ca
icc/UiccController.java
icc/UiccStateChangedLauncher.java
1d7bfb91683b3df05b4d437d79a82fec4ce04f79 11-Nov-2016 Johan Redestig <johan.redestig@sonymobile.com> Map IMEI_NOT_ACCEPTED fail cause

Bug: 33263903
Test: manual (simulated error code from the network)
Change-Id: I1f940de7934a64c175812b2927ca3214aa465581
allFailCause.java
smCdmaConnection.java
c0ba7b0e1d7428e56adcc9d7ccab042628365bf0 28-Oct-2016 Nathan Harold <nharold@google.com> Hook the Phone.isUtEnabled() Function to ImsPhone.isUtEnabled()

Bug: 32874442
Change-Id: Icb6cd44a3673b31e1579c6e39dab1264856c9ef1
hone.java
b717f87d22396e3ede302708d8837b05c90fdc86 06-Dec-2016 Chad Brubaker <cbrubaker@google.com> Merge "Add single use App specific incoming SMSes"
229d3318ca022dcda540a86b9f60bb314c78998b 01-Nov-2016 Nathan Harold <nharold@google.com> Add PLMN Selection Info to SIM Records

Pull new paramters from SIMs and add them to SIMRecords
dumpsys for debugging purposes.

-Add OPLMNw/ACT
-Add HPLMNw/ACT
-Add FPLMN
-Add PLMNw/ACT

Bug: 32277497
Test: none
Change-Id: I28bd67e3667d5c6ba1046c43f24d8e02ce7b8313
icc/IccConstants.java
icc/IccFileHandler.java
icc/IccRecords.java
icc/IccUtils.java
icc/PlmnActRecord.java
icc/SIMRecords.java
icc/UsimFileHandler.java
4a1959c22e94e69040b6cab21fa08ca2e1df0c9b 03-Nov-2016 Nathan Harold <nharold@google.com> Add meaningful error strings to IccIoResult

Bug: 32641276
Test: none
Change-Id: I8c3e9068f7ece1fb90b73da556add060c9484f28
icc/IccIoResult.java
1df6da9bfcb589ccf9f45c207fb1a64bd3f0f36e 31-Oct-2016 Nathan Harold <nharold@google.com> Cleanup of IccConstants and SIMRecords Constants

-Fix formatting of IccConstants
-Remove Base implementation for setMsisdnNumber()
-Organize SIMRecord Message events by category

Bug: 32277497
Test: none
Change-Id: I929ed70b562dc19dfc95f2f69454d5876f97cff4
(cherry picked from commit d6a0c111d4737b4bd233ae6d2efcbc0a0cd1d755)
icc/IccConstants.java
icc/IccRecords.java
icc/SIMFileHandler.java
icc/SIMRecords.java
b4a28109bedc71afa5465247a86473a86d4b31fa 19-Nov-2016 Chad Brubaker <cbrubaker@google.com> Add single use App specific incoming SMSes

This allows applications to request that an upcoming incoming SMS be
routed directly to the calling application and to do so without
needing the RECEIVE_SMS permission.

This is especially important for ephemeral applications which we do not
want to have the ability to get the RECEIVE_SMS permission but do want
to support SMS based phone number verification. Ephemeral apps can use
this API to receive and SMS from their backend but will not be able to
access other SMSes on the device.

This is done by providing the app a token which when included in a
subsequent SMS message causes the application provided PendingIntent to
be sent with the SMS message data attached.

Test: Verified that an SMS containing the code is routed to the app.
Test: runtest --path GsmInboundHandlerTest.java
Test: cts-tradefed run cts -m CtsPermission2TestCases

Bug: 33047670
Change-Id: I7d2d259f09370bc8fac90dc5654231df4edd7e85
ppSmsManager.java
nboundSmsHandler.java
hone.java
elephonyComponentFactory.java
iccSmsController.java
1a8266795e6f1b3a9b20e0c0967ce776d167cd8a 03-Dec-2016 Jack Yu <jackyu@google.com> Fixed that MMS incorrectly treated as metered data traffic. am: 9cfc7dc5c0
am: bc36dc8683

Change-Id: I2275af0cf567ee7db9d13ecb960c0213a65e8732
bc36dc8683a83483d2a84745df40831e53aae503 03-Dec-2016 Jack Yu <jackyu@google.com> Fixed that MMS incorrectly treated as metered data traffic.
am: 9cfc7dc5c0

Change-Id: Id08bd3460a62b74abc9f6c4abc96a5f4f688b453
9cfc7dc5c097a8cba802a7b2256f2e6c27316492 02-Dec-2016 Jack Yu <jackyu@google.com> Fixed that MMS incorrectly treated as metered data traffic.

The metered APN types cache was built before carrier config
is ready. Get rid of the cache because it doesn't buy us too much
in terms of performance as carrier config already has its own
cache. This will ensure we load the up to date configuration
when we bring up the data call.

Test: Manually sent mms on Vzw network.
bug: 31233558
Change-Id: Id0c243a7a92bd6ab3e7a46053e173bf727041015
ataconnection/ApnSetting.java
60f4fdd23a701ba1078d82278a1bee988a989ddc 02-Dec-2016 Nathan Harold <nharold@google.com> Add PLMN Selection Info to SIM Records am: 14545cbe38 am: 58ee74d471 am: 14276bd523
am: 4e03ae99f8

Change-Id: I633b36972923d79d4c1373312394c8b76feecb5a
a35fcb05a92fbde4337d61661758fd8b60eb0820 02-Dec-2016 Nathan Harold <nharold@google.com> Add meaningful error strings to IccIoResult am: 633765fea4 am: ecca8c95bd am: 399d1e389e
am: 297f461bba

Change-Id: I2459e789d818c9a3c23bf6bd359b3dab2b41fc9f
5309535f4b6f83623b7d4edd9f5b1a8d53555066 02-Dec-2016 Nathan Harold <nharold@google.com> Merge commit 'd6a0c11' into stage-aosp-master am: 54faef7d87 am: cc2b4326a8
am: 1b37ca5567

Change-Id: I31dc099d5d4ba5b1d390bfda0d310b2bf6915cac
4e03ae99f84189ac327b2175a21ba415d9810077 02-Dec-2016 Nathan Harold <nharold@google.com> Add PLMN Selection Info to SIM Records am: 14545cbe38 am: 58ee74d471
am: 14276bd523

Change-Id: Id4035fdbf4590786834c7c960ba4d9dbcfadfc25
297f461bba9411082b702b43b751761f18b17f3b 02-Dec-2016 Nathan Harold <nharold@google.com> Add meaningful error strings to IccIoResult am: 633765fea4 am: ecca8c95bd
am: 399d1e389e

Change-Id: If2fe638df76368afac1c6b21fe432dfc353a227e
1b37ca55677f0f860108af9e239df004c42c1a06 02-Dec-2016 Nathan Harold <nharold@google.com> Merge commit 'd6a0c11' into stage-aosp-master am: 54faef7d87
am: cc2b4326a8

Change-Id: Ideb29ac57ce7b5c385ff3c47c905ae0e6f461457
14276bd523a348a22b96d8c9b0f68a6eaacd5c01 02-Dec-2016 Nathan Harold <nharold@google.com> Add PLMN Selection Info to SIM Records am: 14545cbe38
am: 58ee74d471

Change-Id: Ib0aa410839bf9935b9ee3d50c86abcfbf865e282
399d1e389efc4e6a414eb712651cdc68870b4959 02-Dec-2016 Nathan Harold <nharold@google.com> Add meaningful error strings to IccIoResult am: 633765fea4
am: ecca8c95bd

Change-Id: I8304c645ba453c599410d634e6ce8092fa1a8bf7
cc2b4326a87e2df9847841dd7784e4dbdb568a05 02-Dec-2016 Nathan Harold <nharold@google.com> Merge commit 'd6a0c11' into stage-aosp-master
am: 54faef7d87

Change-Id: I2a093674d4d94bfde9ced343eb2bee7cba507cf7
58ee74d471737e7f9c9cc8551da810f6966efb76 02-Dec-2016 Nathan Harold <nharold@google.com> Add PLMN Selection Info to SIM Records
am: 14545cbe38

Change-Id: I1071e41f919a173585f20e9c1d407383b2adcc6e
ecca8c95bdd1e55d46324e2bd376f6cd202da435 02-Dec-2016 Nathan Harold <nharold@google.com> Add meaningful error strings to IccIoResult
am: 633765fea4

Change-Id: I40894c24cfec79569454a7ccd495d587940d60cf
54faef7d87944028a9939e9f29a598f70e0257ca 02-Dec-2016 Nathan Harold <nharold@google.com> Merge commit 'd6a0c11' into stage-aosp-master

Change-Id: I8de0edc07ae2f7dd141cf4e4bc43f2f9c6fe9184
14545cbe38d5a17c4243a5e6113337b7bbb50a6c 01-Nov-2016 Nathan Harold <nharold@google.com> Add PLMN Selection Info to SIM Records

Pull new paramters from SIMs and add them to SIMRecords
dumpsys for debugging purposes.

-Add OPLMNw/ACT
-Add HPLMNw/ACT
-Add FPLMN
-Add PLMNw/ACT

Bug: 32277497
Test: none
Change-Id: I28bd67e3667d5c6ba1046c43f24d8e02ce7b8313
icc/IccConstants.java
icc/IccFileHandler.java
icc/IccRecords.java
icc/IccUtils.java
icc/PlmnActRecord.java
icc/SIMRecords.java
icc/UsimFileHandler.java
c95c50a172e34966d1518e3e722e62888f4b770c 02-Dec-2016 Robert Greenwalt <rgreenwalt@google.com> Merge commit '1ff8811330ba26d60d78bbe28482138a760b3126' into manual_merge_1ff8811

Change-Id: Icdec37469abb70462cb45ea843032fccd0a77a49
1ff8811330ba26d60d78bbe28482138a760b3126 02-Dec-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Get the correct operator name"
0123fbcacebebb6f31015db9c2922504e5ff4f34 01-Dec-2016 Zoran Jovanovic <zoran.jovanovic@sonymobile.com> Get the correct operator name
am: 59d170ef4c

Change-Id: I2a1dbae38495d1aaf615168ffd67412e101cdf37
63cb797b84392775c7d8db70807bf09a33aae6d3 25-Oct-2016 Zoran Jovanovic <zoran.jovanovic@sonymobile.com> Get the correct operator name

If the long operator name is not given by RIL,
try to get the short operator name.

Bug: 32791744
Merged-In: I4983ad708c57a650ce4a806e1f53837825bad2db
Depends-On: commit in frameworks/base with the same Change-Id
Change-Id: I4983ad708c57a650ce4a806e1f53837825bad2db
erviceStateTracker.java
04838332f5830ae7c44399f5745091b408f9cf13 01-Dec-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Get the correct operator name"
59d170ef4c75615173e4dfd162fcad41e660a933 25-Oct-2016 Zoran Jovanovic <zoran.jovanovic@sonymobile.com> Get the correct operator name

If the long operator name is not given by RIL,
try to get the short operator name.

Bug: 32791744
Test: Extended ServiceStateTest.
Depends-On: commit in frameworks/base with the same Change-Id
Change-Id: I4983ad708c57a650ce4a806e1f53837825bad2db
erviceStateTracker.java
bc672734910110248c1adf385fc08373c782db9c 01-Dec-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Add READ_PHONE_NUMBER permission"
477c55f901492d5c09c460e0a708ff3627e6850c 25-Oct-2016 Zoran Jovanovic <zoran.jovanovic@sonymobile.com> Get the correct operator name

If the long operator name is not given by RIL,
try to get the short operator name.

Bug: 32791744
Test: testOperatorName extended
Depends-On: commit in frameworks/base with the same Change-Id
Change-Id: I4983ad708c57a650ce4a806e1f53837825bad2db
erviceStateTracker.java
7f91cfd72977339118b77b9104cdc8b67dedc152 01-Dec-2016 Amith Yamasani <yamasani@google.com> Merge "Adapt to behavior change of MATCH_UNINSTALLED_PACKAGES"
d0213b9e37e89353bfc9c5d9648574b6b2566041 01-Dec-2016 Jordan Liu <jminjie@google.com> Update reference to config_onlySingleDcAllowed am: 47588e2307
am: 14ae21e411

Change-Id: Ib586511db3eef0b7b501a40cc3391e7f96bda7b0
14ae21e4111e1e3a461209f5dab195b85307b097 01-Dec-2016 Jordan Liu <jminjie@google.com> Update reference to config_onlySingleDcAllowed
am: 47588e2307

Change-Id: I9b834a71bfef55212a23113c25ae11763da67928
47588e2307efe45b21bf8384cf5fc49d167e2452 04-Oct-2016 Jordan Liu <jminjie@google.com> Update reference to config_onlySingleDcAllowed

Update the reference to the old config to use the new methods in
CarrierConfigManager.

Bug: 29873049
Change-Id: I8b5cfb9791999524cffffe159cc6b872ce86fe62
Merged-In: I8b5cfb9791999524cffffe159cc6b872ce86fe62
ataconnection/DcTracker.java
ef5a1c64137a7331e1ee5f37af2ffbd7e9b6638a 30-Nov-2016 Jordan Liu <jminjie@google.com> Merge "Update reference to config_onlySingleDcAllowed"
7dcde10d804e1c0234b6f3ce7d9fab29efc904b6 30-Nov-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix MSIM issue of broadcast intent overwritten unintentionally" am: 22cef0502e am: dd6d6cfe84 am: cf23ddf553
am: 9896f9919c

Change-Id: I60c29c8f3f1bd3546985c0a453d53f25c6e0ed0b
9896f9919c9dd75e1ec7b65bc698261a75970a3d 30-Nov-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix MSIM issue of broadcast intent overwritten unintentionally" am: 22cef0502e am: dd6d6cfe84
am: cf23ddf553

Change-Id: I031c1dd3b90d3b9e26ec97d83732fa66f796daa0
cf23ddf55393f87ac55add514f3ca718d4588368 30-Nov-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix MSIM issue of broadcast intent overwritten unintentionally" am: 22cef0502e
am: dd6d6cfe84

Change-Id: Ia3025f1f75269db6d46cddab09b184ea02d69a75
dd6d6cfe8433333eb836dbf80eb968ea3a5cc931 30-Nov-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix MSIM issue of broadcast intent overwritten unintentionally"
am: 22cef0502e

Change-Id: I491020287c868be0fa31434931420a1564f2d4a0
22cef0502ea1b7f78af03f0eb9bd2bd3e62793d9 30-Nov-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix MSIM issue of broadcast intent overwritten unintentionally"
633765fea496acd1c3891b1020f622b0dcf29439 03-Nov-2016 Nathan Harold <nharold@google.com> Add meaningful error strings to IccIoResult

Bug: 32641276
Test: none
Change-Id: I8c3e9068f7ece1fb90b73da556add060c9484f28
icc/IccIoResult.java
d6a0c111d4737b4bd233ae6d2efcbc0a0cd1d755 31-Oct-2016 Nathan Harold <nharold@google.com> Cleanup of IccConstants and SIMRecords Constants

-Fix formatting of IccConstants
-Remove Base implementation for setMsisdnNumber()
-Organize SIMRecord Message events by category

Bug: 32277497
Test: none
Change-Id: I929ed70b562dc19dfc95f2f69454d5876f97cff4
icc/IccConstants.java
icc/IccRecords.java
icc/SIMFileHandler.java
icc/SIMRecords.java
0769aad7f3cfe0de4366df13554829376c10986b 02-Jun-2016 Ping Sun <ping.x.sun@sonymobile.com> Fix MSIM issue of broadcast intent overwritten unintentionally

Since the following broadcast intents are differentiated only by extra
for each SIM, if intents for Slot1 and Slot2 are sent in succession,
Slot1 intent can be overwritten, causing loss of information. To prevent
the issue, remove "FLAG_RECEIVER_REPLACE_PENDING" from intent.
- ACTION_RADIO_TECHNOLOGY_CHANGED
- SPN_STRINGS_UPDATED_ACTION

Bug: 30296957
Change-Id: I281f8063b2bf10efe3165ea29305265bd9d3eb30
smCdmaPhone.java
erviceStateTracker.java
c0324e57a6f38f5c40549deee83f501faf56c3ec 24-Nov-2016 fionaxu <fionaxu@google.com> Re-evaluate Otasp state when reenable metered APNs am: 4839eb565b
am: 96fb8753f3

Change-Id: Ib99476045d521cfc73d703ae75319a945e7e3ee3
96fb8753f34714ac7c7683a7b456c45c002b59d2 24-Nov-2016 fionaxu <fionaxu@google.com> Re-evaluate Otasp state when reenable metered APNs
am: 4839eb565b

Change-Id: Ia2595d82d3611da64c4de3eac4d1fcb11b26dc97
861fb73f0542a962d60e232e81df6fbd31393ee5 24-Nov-2016 Chen Xu <fionaxu@google.com> Merge "Re-evaluate Otasp state when reenable metered APNs" into nyc-mr2-dev
5a57c1568473e4ce3f543601a473cb3bd0e6db8a 24-Nov-2016 Ji Yang <yangji@google.com> Launch the default SMS app for notification action. am: 12f0619383
am: d67fb40331

Change-Id: I66733116415039ebe2c2457c02e1b683e3c1cbfa
0a8e91e39b7627c8d429dc39814669564451e885 23-Nov-2016 Sanket Padawe <sanketpadawe@google.com> Add more logging to debug when radio power is turned off/on. am: 636fbb01fd
am: 81bc798956

Change-Id: Ibc74c57b983507f88ca118f224e9d49c471e87ea
81bc7989569678c3bd0ead7e5e3cae3514b3da6d 23-Nov-2016 Sanket Padawe <sanketpadawe@google.com> Add more logging to debug when radio power is turned off/on.
am: 636fbb01fd

Change-Id: Ie7ab08f6cd2f7d68905ee55c6b3567878326d015
636fbb01fd32e23d1e9ef86497115b2c992b03da 22-Nov-2016 Sanket Padawe <sanketpadawe@google.com> Add more logging to debug when radio power is turned off/on.

Bug: 32592409
Change-Id: Ie049143129ce13bc96ce4211509a605d2d24cd05
erviceStateTracker.java
ataconnection/DcTracker.java
4839eb565b4294443a34a93ee2ca93ac70b72b87 22-Nov-2016 fionaxu <fionaxu@google.com> Re-evaluate Otasp state when reenable metered APNs

- when carrier action is set to re-enable metered APNs, framework should
unset unprovisoned otasp state. trigger re-evaluation and notify all
registrants instead.

Bug: 32956839
Test: Telephony Unit Tests
Change-Id: Id370b84e0abe72356d16096253e481280e76e1b4
ataconnection/DcTracker.java
0f8a0562c5e9698ce690c1c2c8db40982ae9ac30 18-Nov-2016 Jack Yu <jackyu@google.com> Added configuration for VT downgrade/tear down when data disabled
am: a4e2afb6a9

Change-Id: I91d7c71bd0eae589b77f9db98ea4a66b61f87039
a4e2afb6a96c5a2350586df3d6884dc80d87f2c4 15-Nov-2016 Jack Yu <jackyu@google.com> Added configuration for VT downgrade/tear down when data disabled

Added a new flag that allows carriers to ignore data disabled
(e.g. data reaches limit or user disables data) so VT calls
will not be downgraded/torn down and VT service will not be
disabled.

bug: 32880745
Merged-In: I8852d1f636d7cc73802119666b902b7df6a39e72
Change-Id: I977f1aa511c59f32446b4a76de3c6da54500adc1
msphone/ImsPhoneCallTracker.java
16b2d037bcf47f79084b8dbc9e92979c83f55dba 18-Nov-2016 Jack Yu <jackyu@google.com> Added configuration for VT downgrade/tear down when data disabled

Added a new flag that allows carriers to ignore data disabled
(e.g. data reaches limit or user disables data) so VT calls
will not be downgraded/torn down and VT service will not be
disabled.

Test: telephony unit tests
bug: 32880745
Change-Id: I8852d1f636d7cc73802119666b902b7df6a39e72
msphone/ImsPhoneCallTracker.java
4de021f7dd9e3f067a1781e4c83f7b43758b0036 17-Nov-2016 Naveen Kalla <mrnaveen@google.com> Retry data call on low priority APNs when high priority APN is disabled. am: af0722d026
am: d238c0ff94

Change-Id: If6a80c24d9172f346627dc369576c8eef7cbbc44
d238c0ff9422a7b345296ddd02c6e2378cd771e9 17-Nov-2016 Naveen Kalla <mrnaveen@google.com> Retry data call on low priority APNs when high priority APN is disabled.
am: af0722d026

Change-Id: I754bafe387f1d0cbd0ceea74c1740ecd48233bae
ef212499e82b21ced2fd6fc170df91b08fd39838 17-Nov-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Retry data call on low priority APNs when high priority APN is disabled." into nyc-mr2-dev
af0722d026bf9687288c5aed65cdae9acc46059c 13-Nov-2016 Naveen Kalla <mrnaveen@google.com> Retry data call on low priority APNs when high priority APN is disabled.

When only single data call is allowed, when higher priority APN is
disabled, retry data call on lower priority connectable APNs

Bug: 32814839
Test: Manual change network modes between LTE/CDMA/UMTS, CDMA only,
CDMA (auto), CDMA (only) and LTE/CDMA/UMTS. And ensure that
we can browse internet in all modes.
Change-Id: If52a3ae3c1ca86c19c90e2bf1ad1b36458f47060
ataconnection/DcTracker.java
e6fa2d5404faa8e082a063a12441146d611bcf06 16-Nov-2016 Tyler Gunn <tgunn@google.com> Add method to check for ongoing video call or conference call. am: 1588309ffc
am: 25da42f7d0

Change-Id: I3427945be18e3f8f5dc2734a43e189ac44e7f2f4
99514fe66b80220ffd9bee6eda432944ce81b224 16-Nov-2016 Brad Ebinger <breadley@google.com> Only get WiFi status based on RAT extras am: 75f96a40e7
am: e3c2042b60

Change-Id: Ie393f5e38431fd95a3337baa64e4a6097c57d7e0
25da42f7d06eb603e14ca85d965f940202a4ae12 16-Nov-2016 Tyler Gunn <tgunn@google.com> Add method to check for ongoing video call or conference call.
am: 1588309ffc

Change-Id: I552081e2c2ece60b46d33a79199bb69d86d8851f
e3c2042b6068c5e0b0d3d12c4039bbc90f00b745 16-Nov-2016 Brad Ebinger <breadley@google.com> Only get WiFi status based on RAT extras
am: 75f96a40e7

Change-Id: I61e3c7d48e4549ddc5f190990a8748c5b08b4dbd
9868a41244789a83d1d6205bfaa98dc57e51c7d3 16-Nov-2016 Tyler Gunn <tgunn@google.com> Merge "Add method to check for ongoing video call or conference call." into nyc-mr2-dev
3a62fcce0a83b5add61986c38681530391f6d60b 16-Nov-2016 Brad Ebinger <breadley@google.com> Merge "Only get WiFi status based on RAT extras" into nyc-mr2-dev
75f96a40e73bbf262287b64f7ba79f058adac472 15-Nov-2016 Brad Ebinger <breadley@google.com> Only get WiFi status based on RAT extras

We used to set the WiFi Connection property based on the the provisioning
status of the phone until the RAT extra was set from the modem. This is an
obsolete method of determining whether or not to set the WiFi property and
was causing some calls to be improperly marked as WiFi.

Test: Manual Testing
Bug: 30964593
Change-Id: I9922ff17ffb704a09e9b2cebeb147a7463b9898b
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
1588309ffce8962606e37ca0b49704d58894c2a7 15-Nov-2016 Tyler Gunn <tgunn@google.com> Add method to check for ongoing video call or conference call.

Replace the isVideoCallPresent method on Phone (which is used only in the
accessibility settings screen) with a version that determines if there are
any ongoing video calls, downgraded video calls, or conference calls.

Test: Manual testing.
Bug: 28512893
Change-Id: If8b5db80aa0147234f6c4c0a8adf85f4643a2680
hone.java
e0c7ad5cbbb33333cc623ae54f218cac6b105a2f 15-Nov-2016 Sudheer Shanka <sudheersai@google.com> Merge "Update usage of ActivityManagerNative."
6ec64312486e1650ea5cd52123a27960a3a771f9 11-Nov-2016 Chad Brubaker <cbrubaker@google.com> Add READ_PHONE_NUMBER permission

READ_PHONE_NUMBER allows only access to the phone number and not all the
other things that READ_PHONE_STATE allows access to. READ_PHONE_NUMBER
will be accessible to ephemeral apps while READ_PHONE_STATE will no
longer be.

Test: Verified that getLine1Number works with READ_PHONE_NUMBER from an
epemheral app
Test: cts-tradefed run cts -m CtsPermission2TestCases
Change-Id: I4f087ff4308d3c895e9714c7309f44106a2e8e1b
honeSubInfoController.java
eb1881bf05b659283c52c0986933709a5aad0982 14-Nov-2016 Pankaj Kanwar <pkanwar@google.com> Merge "Provide an API to make USSD calls and read the responses."
800a988b95a4b9bc2bca2562108e54cd8bd21ee1 11-Nov-2016 Sudheer Shanka <sudheersai@google.com> Update usage of ActivityManagerNative.

Bug: 30977067
Test: N/A
Change-Id: I5a3934355e0a4bc47490c16b0dac3979c55d8d16
smCdmaPhone.java
nboundSmsHandler.java
ccTable.java
ubscriptionInfoUpdater.java
msphone/ImsPhone.java
icc/IccCardProxy.java
31399e10cf6d07509c4fbc294e24a9323214767f 03-Nov-2016 pkanwar <pkanwar@google.com> Provide an API to make USSD calls and read the responses.

Test: will be added in a subsequent CL.
Bug: 30973910
Change-Id: I8551323474c4d708d50a81001272812e7b651abc
smCdmaPhone.java
hone.java
msphone/ImsPhone.java
6630bde5d7b817744da4c79622bccea1f809e85a 09-Nov-2016 nharold <nharold@google.com> Merge "Add CellInfo to ServiceStateTracker's dump" am: d992bc1a7e am: 3403c6f222 am: 880fbbbecb
am: 95c9ce3518

Change-Id: I14749810934505d649e462b48539c767fde995b5
95c9ce3518e0558335e6010cd0253e1d632d2ab8 09-Nov-2016 nharold <nharold@google.com> Merge "Add CellInfo to ServiceStateTracker's dump" am: d992bc1a7e am: 3403c6f222
am: 880fbbbecb

Change-Id: Ibae8f6bc8ef07337f1111534828b1350ffeee5d0
880fbbbecb726fc919f8cbb9b5eade4d83bb6615 09-Nov-2016 nharold <nharold@google.com> Merge "Add CellInfo to ServiceStateTracker's dump" am: d992bc1a7e
am: 3403c6f222

Change-Id: Ice947d38b2cc812a25bad10facd2791c1c2e9a26
3403c6f2224f70600e45b9f69c94bdccd5166cf3 09-Nov-2016 nharold <nharold@google.com> Merge "Add CellInfo to ServiceStateTracker's dump"
am: d992bc1a7e

Change-Id: Ieeb693e65e680176b34876b150adf39030643462
b12a289126cb90c8ff07a7df23e3370f5a537793 07-Nov-2016 Nathan Harold <nharold@google.com> Add CellInfo to ServiceStateTracker's dump

This will print out the result of the most recent call to
getAllCellInfo().

Bug: 32639866
Test: none
Change-Id: I092d98de5f812f016ab7b4cba781f80dfe7da086
(cherry picked from commit 5a97f106d24a1eeafe4bbe422dfbbb9afc27b2c4)
erviceStateTracker.java
d992bc1a7ef757a40eb53017e5b610df653e9b38 09-Nov-2016 nharold <nharold@google.com> Merge "Add CellInfo to ServiceStateTracker's dump"
9ce8d6f5a6b378d02f4da031a87b279b1a9ada43 09-Nov-2016 Tamas Berghammer <tberghammer@google.com> Merge "Update package names to work with the proto3 compiler"
76e0d9e8ed3a3a031f57ebcfb7e8927502159a02 08-Nov-2016 Nathan Harold <nharold@google.com> Merge "Hook the Phone.isUtEnabled() Function to ImsPhone.isUtEnabled()"
4ddce7fae1de6be1f2f56919207fc1fa47f272c3 08-Nov-2016 Tyler Gunn <tgunn@google.com> Merge "Add voip audio mode configuration for ims call" am: a8829d52f2 am: 7796e4d3cb am: 84e64b102b
am: f234456e7e

Change-Id: Id4f13c4712f983c346cdb6372f969ada11338486
f234456e7ec30e53ed19818b2ccd8282c28818cc 08-Nov-2016 Tyler Gunn <tgunn@google.com> Merge "Add voip audio mode configuration for ims call" am: a8829d52f2 am: 7796e4d3cb
am: 84e64b102b

Change-Id: Icfd81bc6c22264e4704716a742c834d2bf70e52d
84e64b102b4eb2284f29f4116baac0b4970166a1 08-Nov-2016 Tyler Gunn <tgunn@google.com> Merge "Add voip audio mode configuration for ims call" am: a8829d52f2
am: 7796e4d3cb

Change-Id: I552f8877a07787a53a6c1ecb3e99ccf6f41489a6
7796e4d3cb0fc92aa52016f4f721470ad9df9eed 08-Nov-2016 Tyler Gunn <tgunn@google.com> Merge "Add voip audio mode configuration for ims call"
am: a8829d52f2

Change-Id: I7dd89155744d7f43b06dcd6500d854179bd0e91b
a8829d52f20884265530773c0d7a509d819d924c 08-Nov-2016 Tyler Gunn <tgunn@google.com> Merge "Add voip audio mode configuration for ims call"
9460a22f3c1ae70dde80e34557d7011be113b39a 22-Jun-2016 Tamas Berghammer <tberghammer@google.com> Update package names to work with the proto3 compiler

Bug: b/28974522
Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a
IL.java
msApplication.java
msphone/ImsPhoneCallTracker.java
etrics/CallSessionEventBuilder.java
etrics/InProgressCallSession.java
etrics/InProgressSmsSession.java
etrics/SmsSessionEventBuilder.java
etrics/TelephonyEventBuilder.java
etrics/TelephonyMetrics.java
0be7e9840ed7e465e7013c8b331b2435652ddf9e 08-Nov-2016 Jordan Liu <jminjie@google.com> Merge "Merge isInEcm for GsmCdmaPhone and ImsPhone" am: 73e1b75da7 am: 502e879579 am: 9e3f41286e
am: a195de9894

Change-Id: Ieb5a02ac6f4d73d1ee7d6db7a8480598b01c046c
a195de9894764eeb6c09ac4feb29c62dec65bdce 08-Nov-2016 Jordan Liu <jminjie@google.com> Merge "Merge isInEcm for GsmCdmaPhone and ImsPhone" am: 73e1b75da7 am: 502e879579
am: 9e3f41286e

Change-Id: I5331ca34c343bafaac6f7d2a75006c340bbe6a20
9e3f41286e5681f616137b73bd5b061a114085f8 08-Nov-2016 Jordan Liu <jminjie@google.com> Merge "Merge isInEcm for GsmCdmaPhone and ImsPhone" am: 73e1b75da7
am: 502e879579

Change-Id: I5420f084406669141c7cbecb0775712043d9fdab
502e879579f0c1d576fe969d759868913cdc6911 08-Nov-2016 Jordan Liu <jminjie@google.com> Merge "Merge isInEcm for GsmCdmaPhone and ImsPhone"
am: 73e1b75da7

Change-Id: Id0bc51809723f46050c5a2d3b865b2db42f0b0fe
73e1b75da778ddb942125a29e01ae2aefccf40a1 08-Nov-2016 Jordan Liu <jminjie@google.com> Merge "Merge isInEcm for GsmCdmaPhone and ImsPhone"
5a97f106d24a1eeafe4bbe422dfbbb9afc27b2c4 07-Nov-2016 Nathan Harold <nharold@google.com> Add CellInfo to ServiceStateTracker's dump

This will print out the result of the most recent call to
getAllCellInfo().

Bug: 32639866
Test: none
Change-Id: I092d98de5f812f016ab7b4cba781f80dfe7da086
erviceStateTracker.java
064157e01ca94ade0ce2a9f9e22f0101ce443550 28-Oct-2016 Nathan Harold <nharold@google.com> Hook the Phone.isUtEnabled() Function to ImsPhone.isUtEnabled()

Bug: 32438227
Test: none
Change-Id: Icb6cd44a3673b31e1579c6e39dab1264856c9ef1
hone.java
54ca0c11524dd637aaaca1acb637c7efdd10ee5a 01-Nov-2016 Amith Yamasani <yamasani@google.com> Adapt to behavior change of MATCH_UNINSTALLED_PACKAGES

Don't use MATCH_UNINSTALLED_PACKAGES to query across users.

Bug: 31000380
Test: Manually test setting default SMS App in each user
Change-Id: Ib134870a7844e7ea053816ba49a99df65e8ede71
msApplication.java
68b934aacdaff2a2688172cfb3e20135d72034e3 03-Nov-2016 Jack Yu <jackyu@google.com> Fixed the default value of telephony proto.

Added default value for the proto. Also fixed some off-by-1
issues.

Test: runtest -x frameworks/opt/telephony/tests/telephonytests/src/
com/android/internal/telephony/metrics/TelephonyMetricsTest.java

bug: 32622214
Change-Id: Ib58881c9f50c87f14e931e2c996789f3680277b8
etrics/TelephonyMetrics.java
c6e763fa8aa1121f9c5aef16368115b06e31c6a2 02-Nov-2016 Jimmy Wu <jimmyw@nvidia.com> Add voip audio mode configuration for ims call

Add mAudioModeIsVoip in Connection. Set it to true for
ImsPhoneConnection if config_use_voip_mode_for_ims is enabled.

Change-Id: Id4ef172deab636c79e749e8d1acb90fabdbcd4eb
onnection.java
msphone/ImsPhoneConnection.java
0c3eedddc833a0d159d72d287cb846215b5b60e7 02-Nov-2016 Robert Greenwalt <rgreenwalt@google.com> Use preferred APN for IA if it'll work. am: 40b0e247a4
am: 49e2bbc379

Change-Id: I1679174b549b6a0fe595b312186ca509f0b36e7b
49e2bbc3791581cd36123ed7099c383493a310cb 02-Nov-2016 Robert Greenwalt <rgreenwalt@google.com> Use preferred APN for IA if it'll work.
am: 40b0e247a4

Change-Id: I43ad188aa7cd2482df117bb2c55de42ee20e8107
be1e1a57a830d453b3f617ec677c4ee54dd5a640 01-Nov-2016 Pankaj Kanwar <pkanwar@google.com> Merge "Provide an API to make USSD calls and read the responses."
16b58d13bde6487c6993831ca63385915be8956e 15-Oct-2016 pkanwar <pkanwar@google.com> Provide an API to make USSD calls and read the responses.

Test: will be added in a subsequent CL.
Bug: 30973910
Change-Id: I0d826eaadd1bd5a0c23cfad651c0423f7b7cc5f6
smCdmaPhone.java
miCode.java
honeInternalInterface.java
dma/CdmaMmiCode.java
sm/GsmMmiCode.java
msphone/ImsPhone.java
msphone/ImsPhoneMmiCode.java
ip/SipPhoneBase.java
da243aa6e2c4285975feb44524603e8b20093e70 31-Oct-2016 Jack Yu <jackyu@google.com> Removed nano proto accessors usage

The generated proto java files consists 484 methods which
might break DEX's 64k method limit. Removed the accessors and
directly accessing the fields can lower the generated method
counts to 140. This will require some changes on the server
side as well.

Test: runtest -x frameworks/opt/telephony/tests/telephonytests/src/
com/android/internal/telephony/metrics/TelephonyMetricsTest.java

bug: 32544494
Change-Id: I766bf3402a138cf0570d5374ed0d8e1d95f25d52
etrics/CallSessionEventBuilder.java
etrics/SmsSessionEventBuilder.java
etrics/TelephonyEventBuilder.java
etrics/TelephonyMetrics.java
65d2fbff57871b60ca2ecc607fdbacdf7930b2f7 30-Oct-2016 Jack Yu <jackyu@google.com> Reduced redundant metrics logging

If the state changed events does not really contain the change,
do not log it. This can reduce the logging size significantly.
Also separated IMS outgoing and incoming call logging.

Test: runtest -x frameworks/opt/telephony/tests/telephonytests/src/
com/android/internal/telephony/metrics/TelephonyMetricsTest.java

bug: 32537099
Change-Id: I824ffebd45ef6a4c4a6ca8a5ad50b35a20748b07
etrics/TelephonyMetrics.java
40b0e247a4a79e83f10b6410025ef1d7cc537692 24-Oct-2016 Robert Greenwalt <rgreenwalt@google.com> Use preferred APN for IA if it'll work.

The old behavior would prefer the first IA APN over the
preferred APN even if the preferred APN listed IA. Crazy!

Reworked ApnSetting.canHandleType to incorporate the "wildcard (*)
doesn't work for IA - that has to be explicitly listed" idea
and added tests for the function.

Test: added ApnSettingTest.testCanHandleType unit test
bug:31949444
Change-Id: I7d72dcbb3e068c2defcf4cfbc0c2a5a0f69f26b8
ataconnection/ApnSetting.java
ataconnection/DcTracker.java
91c12d46797432c890c66c7c2804dcf116c90157 26-Oct-2016 Jordan Liu <jminjie@google.com> Merge "Update reference to config_default_vm_number" am: bd9734a4ae am: 2a0b347e9a
am: b049bcce54

Change-Id: I82e06b2f63cce073899f120b86e8985c23159123
b049bcce54caf273fd930516b4cd813620aa0ce2 26-Oct-2016 Jordan Liu <jminjie@google.com> Merge "Update reference to config_default_vm_number" am: bd9734a4ae
am: 2a0b347e9a

Change-Id: I2e71e6f7e6618649ae4dccb872f747d4d87ebd66
2a0b347e9a5f349ac0fe1220c8549a70643b8934 26-Oct-2016 Jordan Liu <jminjie@google.com> Merge "Update reference to config_default_vm_number"
am: bd9734a4ae

Change-Id: Ia412832b377581f72b1d8dc0da22f0ef8f426d42
bd9734a4ae4305d47382360bd6d5167fdf9ecd8b 26-Oct-2016 Jordan Liu <jminjie@google.com> Merge "Update reference to config_default_vm_number"
f5d19549da68b18d95ddd6e8457b98a323c10734 26-Oct-2016 Ji Yang <yangji@google.com> Launch the default SMS app for notification action. am: 12f0619383 am: d67fb40331 am: deeab2c77a
am: d24bffb01e

Change-Id: Ief6827bfce00ebf70feaf57494a78d2bc8922b9c
d24bffb01e858df5d1d82fef096f699914b715cc 26-Oct-2016 Ji Yang <yangji@google.com> Launch the default SMS app for notification action. am: 12f0619383 am: d67fb40331
am: deeab2c77a

Change-Id: I952cb41e090ac05160e4697c71f1b498b247a287
3220d26fe2ccecafa4f854c5264dd8f6fefbbfa6 04-Oct-2016 Jordan Liu <jminjie@google.com> Update reference to config_onlySingleDcAllowed

Update the reference to the old config to use the new methods in
CarrierConfigManager.

Bug: 29873049
Change-Id: I8b5cfb9791999524cffffe159cc6b872ce86fe62
Merged-In: I8b5cfb9791999524cffffe159cc6b872ce86fe62
ataconnection/DcTracker.java
12f061938321d160112fbe8f52831b01d63657e6 22-Oct-2016 Ji Yang <yangji@google.com> Launch the default SMS app for notification action.

Use a broadcast receiver to launch the default SMS app when the user clicks
the new message notification.

Bug:30882932
Change-Id: I44c48043e94119d0886cf24f3518891168a54d17
msSMSDispatcher.java
nboundSmsHandler.java
c61514fb4312fefc1e1f9f49a102f756afe57b33 22-Oct-2016 Jack Yu <jackyu@google.com> Update the proto and service state logging. am: d009ecff13 am: a1b456d583
am: 557ef97a69

Change-Id: If1b9a9d4dce2a7b414bb5319cc3fdbbe68644248
557ef97a69eef06fe22fb3d18f263a0d5e3a2f1a 22-Oct-2016 Jack Yu <jackyu@google.com> Update the proto and service state logging. am: d009ecff13
am: a1b456d583

Change-Id: Iabfb1624dc9393f6fc995caca6fc65ec9082de6e
d009ecff130b903cd597621b60ec84cddc0c4f16 21-Oct-2016 Jack Yu <jackyu@google.com> Update the proto and service state logging.

1. Update the proto so the version used on the device is
in sync with the version on the server.
2. Added CDMA service state logging in pollStateDoneCdma() and
pollStateDoneCdmaLte().

bug: 31224848
Change-Id: I7c56f4c23ebc0db126d44e9a119ad71289781ca1
erviceStateTracker.java
etrics/TelephonyMetrics.java
1237b674a1a1e5faf4489e552ec3317422d11685 17-Oct-2016 Jordan Liu <jminjie@google.com> Merge isInEcm for GsmCdmaPhone and ImsPhone

Merge mIsPhoneInEcmState and remove override in ImsPhone.

Fix: 30368080
Test: runtest --path GsmCdmaPhoneTest.java
runtest --path ImsPhoneTest.java
Change-Id: Iefcc7a2774605636beeafa466ae55f7a50699423
smCdmaPhone.java
hone.java
msphone/ImsPhone.java
782d1005d624e003d80eb53ab1f1901a6aba6615 19-Oct-2016 Amit Mahajan <amitmahajan@google.com> Remove additional logic around broadcasting emergency call state changes am: 722f9a0f02 am: 7fc988a5d5
am: 06a15cd6cf

Change-Id: I88fc1be60448865b67d03e7d6bfd78b13d46a5b2
06a15cd6cf9946c67410b2e96dece77c90268080 19-Oct-2016 Amit Mahajan <amitmahajan@google.com> Remove additional logic around broadcasting emergency call state changes am: 722f9a0f02
am: 7fc988a5d5

Change-Id: Icdc491ff5a739bab203115e9b9127673614833b8
28f0887bc73d461be7d0f569372ac83b8f79d3c2 19-Oct-2016 Jordan Liu <jminjie@google.com> Merge "Update references to config_sms_convert_dest_num"
9e73d808376bd41a639ae1a2748e7c4b8950211c 03-Oct-2016 Jordan Liu <jminjie@google.com> Update references to config_sms_convert_dest_num

Update SmsNumberUtils.java and its test to use the new config through
CarrierConfigManager.

Test: make on local machine
Bug: 29873049
Change-Id: I30062d6e1e3bc69d465c74cbfbad67bfa42fbb14
msNumberUtils.java
51ba185294467cf06356a595024c4326f13b8bc9 17-Oct-2016 Jordan Liu <jminjie@google.com> Merge "Update reference to config_onlySingleDcAllowed"
722f9a0f024c05ddc4cc7384f924e35be666fc07 10-Oct-2016 Amit Mahajan <amitmahajan@google.com> Remove additional logic around broadcasting emergency call state changes

Should be based only on carrier config. Wifi can decide if it should
disable on receiving the broadcasts based on its own config.

Bug: 31861987
Change-Id: If31d73deaea2a1e0bb34fbb33e594a3272732921
smCdmaPhone.java
be6ba3c63d5ac4d4c583942f23e932abc1ac8ad8 10-Oct-2016 Treehugger Robot <treehugger-gerrit@google.com> Merge "Cherry pick: Mcc should not set country code with persistent request"
1bb5864a6f2047b41da9ba6551ee4acfec4d7dd1 14-Sep-2016 Naveen Kalla <mrnaveen@google.com> Log Telephony Event on receiving RIL_UNSOL_MODEM_RESTART

RIL_UNSOL_MODEM_RESTART will be sent by vendor RILs when it detects
a modem restart along with the reason for restart which could be a
crash signature if the modem restarted due to a crash or a some
other string such as a user-initiated restart or AT command
initiated restart.

Test: Modified vendor RIL to send modem restart unsol message and
verified that the event is logged, added a test in TelephonyMetricsTest
and ensured all TelephonyMetricsTest tests pass

Change-Id: I6bc045341be59ac45cc2a8dd83bdbb3748352c0d
IL.java
etrics/TelephonyEventBuilder.java
etrics/TelephonyMetrics.java
bc95db4ecce234c24c6cb549a6762d8a39d5ab84 04-Oct-2016 Jordan Liu <jminjie@google.com> Update reference to config_onlySingleDcAllowed

Update the reference to the old config to use the new methods in
CarrierConfigManager.

Bug: 29873049
Change-Id: I8b5cfb9791999524cffffe159cc6b872ce86fe62
ataconnection/DcTracker.java
ea74a4a1db0d090ea97f2f24c1e8eff35aa6df7a 07-Oct-2016 Meng Wang <mewan@google.com> ImsPhone: defer intial roaming state update am: 6b85911009 am: d479f9c11d
am: 7fd4ecbed4

Change-Id: Iaac96b7ee3ec7c0afff75491d213f02f13baf2da
7fd4ecbed4e0118b69e6c1cc5be202c5ba545c8d 07-Oct-2016 Meng Wang <mewan@google.com> ImsPhone: defer intial roaming state update am: 6b85911009
am: d479f9c11d

Change-Id: I6c6a5e328c1f4ad56829631b3fe77e7884b4ebcf
6b8591100999ba4f12f8b519c0444fb89cb8617a 06-Oct-2016 Meng Wang <mewan@google.com> ImsPhone: defer intial roaming state update

The intial roaming update was in constructor of ImsPhone. It's so early
that settings provider and carrier config may not be loaded. Hence
incorrect WFC mode was got and set. Now we defer intial roaming update
to ImsManager#updateWfcFeatureAndProvisionedValues, invoked on
EVENT_CARRIER_CONFIG_CHANGED

Bug: 31972897
Change-Id: Id7a14f2d4ff0c638c53bcf7bbae2468750581e06
msphone/ImsPhone.java
f271e16613936c9f9600f20ae88cd9b865b88c6a 02-Sep-2016 Jordan Liu <jminjie@google.com> Update reference to config_default_vm_number

For the switch to CarrierConfig, update the methods used to set and get
this value to the new ones available through CarrierConfig.
Merged-In: I7fa7305dbdc708771bd87d092fdea88552515013

Bug: 29873049
Change-Id: I7fa7305dbdc708771bd87d092fdea88552515013
smCdmaPhone.java
07f03d782ea29c3c281168459016ef85f2b361c8 04-Oct-2016 Jordan Liu <jminjie@google.com> Merge "Update reference to editable_voicemailnumber" am: 6141ea952b am: cc343affbe
am: 38e54d7e80

Change-Id: Icf996074260b90ecf0dcd0f70d2ecb7ba9d79100
38e54d7e80099e715a31ab783153565f1e89b6e3 04-Oct-2016 Jordan Liu <jminjie@google.com> Merge "Update reference to editable_voicemailnumber" am: 6141ea952b
am: cc343affbe

Change-Id: Ic4beb1d0c8beecb1e1110c9aa7c786849d8504b9
6141ea952b126b7c4b4530820e2f7545d99cada8 04-Oct-2016 Jordan Liu <jminjie@google.com> Merge "Update reference to editable_voicemailnumber"
10976fc57300bbebd3067ca1a6d5fe273390faf0 29-Sep-2016 Sooraj Sasindran <sasindran@google.com> Correct the wakelock count while attributing for a request

Correct the wakelock count when a request response is received and
corresponding wakelock count is decremented.

Account for wakelock timeout during which wakelock is released and
all corresponding clients are released from the clientTracker.

Test: Through logs confirmed that the wakelock decrement is happening
correctly

BUG=31798717

Change-Id: Iec6ba6d8060620915c704b5086d18a776073b10c
IL.java
9fd206e3074915341de3f10948e9c75d41112f6d 30-Sep-2016 Chen Xu <fionaxu@google.com> Merge "simRecordLoaded registrants not notified for CDMA" am: 039a96b144 am: 3f6b95e9b6 am: 48d10abfd2
am: 45e836ec7b

Change-Id: Id4280cfdd2eb3e5ba8f4edd7c6fce6b579186e5d
45e836ec7b79111ce13df0855aa8c9841dd13378 30-Sep-2016 Chen Xu <fionaxu@google.com> Merge "simRecordLoaded registrants not notified for CDMA" am: 039a96b144 am: 3f6b95e9b6
am: 48d10abfd2

Change-Id: I59803730a67fa5f19e8a6c25cb940bad730e98a7
48d10abfd2813401c40f1ac193698716a47cb415 30-Sep-2016 Chen Xu <fionaxu@google.com> Merge "simRecordLoaded registrants not notified for CDMA" am: 039a96b144
am: 3f6b95e9b6

Change-Id: I3bdb8d57471282df1bfb7bc5c43fcd851ea7b6ca
039a96b144f8c9d77c87d907e5cae131f246f64d 30-Sep-2016 Chen Xu <fionaxu@google.com> Merge "simRecordLoaded registrants not notified for CDMA"
fa40a10c6cb76c998239b5af9417245532028103 30-Sep-2016 fionaxu <fionaxu@google.com> simRecordLoaded registrants not notified for CDMA

Bug: 31859450
Test: existing unit test still pass
- mPhone.registerSimRecordLoaded not get notified if phone type is
lteCdma

Change-Id: Id0420978fd8596f4a3db481480cf49e628cd9423
smCdmaPhone.java
7f8c8fbebb39e4530dfb6eea39850c8b228982d7 16-May-2013 Tsukasa Gotou <tsukasa.x.gotou@sonymobile.com> Invalid call forwarding indicator status check

According to ETSI specification, it is needed to check the value of
the first byte of EF_CFIS MSP, which is between 1 and 4. However,
existing many SIM cards don't follow ETSI specification, and hence,
CFU (Call Forwarding Unconditional) function is usually failed.

This patch deletes the check for the first byte of MSP so that
existing SIM cards can use CFU function.

Bug: 31851694
Change-Id: I78fe0f3ddc4d3650e8cae0efea80e0ed84917c2a
icc/SIMRecords.java
3fe0578ea48570cd5d8c8dfd8b53b8984915330f 30-Sep-2016 Jack Yu <jackyu@google.com> resolve merge conflicts of 5a5f487 to master

Test: runtest -x frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/metrics

Change-Id: Iea22620acd4efb0af845760544e00840014af4fb
5a5f4877b963501bc89f0b7e2d82ee2f36fc23a3 30-Sep-2016 Jack Yu <jackyu@google.com> Combined TelephonyEventLog and part of the connectivity metrics app into the new TelephonyMetrics am: f2d0fa6486
am: dc16d0f315

Change-Id: I62673b8b7019cd7c7e921c46738d24f68973e423
dc16d0f315fc0ded5566ad2f44b5ea4245a25021 30-Sep-2016 Jack Yu <jackyu@google.com> Combined TelephonyEventLog and part of the connectivity metrics app into the new TelephonyMetrics
am: f2d0fa6486

Change-Id: Idd0540c5568367a8df807eaa1f4aa9b64c1ab213
0db7db3a7f93eec7c86ac4de0947206ce8493430 30-Sep-2016 Jack Yu <jackyu@google.com> Merge "Combined TelephonyEventLog and part of the connectivity metrics app into the new TelephonyMetrics" into nyc-mr1-dev
2fffb383457119f04c9953ae6519e39730a3c474 08-Sep-2016 Jordan Liu <jminjie@google.com> Update reference to editable_voicemailnumber

For the switch to CarrierConfig, we update the method used to get the
value of what used to be called editable_voicemailnumber to the
new method provided by CarrierConfig.
Merged-In: Ib9873dc0bc866011da0d67d37500d47ae00d7a43

Bug: 29873049
Change-Id: Ib9873dc0bc866011da0d67d37500d47ae00d7a43
icc/SIMRecords.java
22a7d448ee77feb2aa87144cbdc36de21e6002a2 30-Sep-2016 Hall Liu <hallliu@google.com> Fix answering waiting call simultaneously with active call disconnect am: 3379e39978 am: b021750041
am: 730fb08bf1

Change-Id: Ib4d5fdf24e016673f2643961f76033162a675fbf
730fb08bf1f11851fbd158aa04c87f3f27c8f6df 30-Sep-2016 Hall Liu <hallliu@google.com> Fix answering waiting call simultaneously with active call disconnect am: 3379e39978
am: b021750041

Change-Id: I3b3505a3e3d5585ecaa0f674283a3ca938589f6d
f2d0fa64860a12423fb8709766d6af90fba5e6cf 27-Sep-2016 Jack Yu <jackyu@google.com> Combined TelephonyEventLog and part of the connectivity metrics
app into the new TelephonyMetrics

Added the new TelephonyMetrics to support metrics collection
through dumpsys.

bug: 31224848
Change-Id: If4b6032e98b6cc8b68e8459e0e799a3755b1f2f9
ebugService.java
smCdmaCallTracker.java
IL.java
erviceStateTracker.java
msResponse.java
elephonyEventLog.java
ataconnection/DcTracker.java
msphone/ImsPhoneCallTracker.java
etrics/CallSessionEventBuilder.java
etrics/InProgressCallSession.java
etrics/InProgressSmsSession.java
etrics/SmsSessionEventBuilder.java
etrics/TelephonyEventBuilder.java
etrics/TelephonyMetrics.java
b021750041202415515008fca0bc722065566478 30-Sep-2016 Hall Liu <hallliu@google.com> Fix answering waiting call simultaneously with active call disconnect
am: 3379e39978

Change-Id: Ifc5f61930d4aa51b903e2601fb047f7f7a244723
484d19242669992ef1c6a89053929deecb1f3c7b 29-Sep-2016 Hall Liu <hallliu@google.com> Merge "Fix answering waiting call simultaneously with active call disconnect" into nyc-mr1-dev
6a55e6cf77f43fa6f92454b03bed8908d0d62b03 29-Sep-2016 Jordan Liu <jminjie@google.com> Merge "Update reference to cdma_3waycall_flash_delay" am: 8e7038b80b
am: 94fbaf65c9

Change-Id: I959e19add8e76e0b7a89e999c656766f05275abf
8e7038b80b82335b54b6b207175fc24cc39fb164 29-Sep-2016 Jordan Liu <jminjie@google.com> Merge "Update reference to cdma_3waycall_flash_delay"
13307e9c9171a5fedca469c124b3eea2651c9d7d 29-Sep-2016 Jordan Liu <jminjie@google.com> Merge "Update reference to editable_voicemailnumber"
6a14ff8d0b222fbd85adc4d08cae61298c76c429 29-Sep-2016 Robert Greenwalt <rgreenwalt@google.com> Plug hole in Roaming indication. am: 1fb93b5f57 am: 9a2900456d
am: 91164b4747

Change-Id: I5877584d2073fbd240dff0ebfc58be52d00a0770
a51ce5995709659f24f390c1ef0507a88e4c7872 29-Sep-2016 Meng Wang <mewan@google.com> ImsPhone: update wfc mode per roaming status am: 322793ca2d am: 96b668cc54
am: 4b9d9f2bf2

Change-Id: If7c47c7b4c1b052f293096790a50b8ae9b3d68f7
91164b47472a169e27fb5ac6c611c6a2d059fa99 29-Sep-2016 Robert Greenwalt <rgreenwalt@google.com> Plug hole in Roaming indication. am: 1fb93b5f57
am: 9a2900456d

Change-Id: I0faed3bb304d75450c5ddb75ec43c895af221272
9a2900456dea1a65bf17acaddcae55dbc3ac2bb5 29-Sep-2016 Robert Greenwalt <rgreenwalt@google.com> Plug hole in Roaming indication.
am: 1fb93b5f57

Change-Id: I7686c1735833da83a703572110647e341d9f03f7
4a127e810b0dd61b7f6a80ba03b050b1ed3dc2e3 29-Sep-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Plug hole in Roaming indication." into nyc-mr1-dev
4b9d9f2bf297e39b0bbcb515a84a18b0c5ef87e7 29-Sep-2016 Meng Wang <mewan@google.com> ImsPhone: update wfc mode per roaming status am: 322793ca2d
am: 96b668cc54

Change-Id: I1aed3c0a4586c385cd758e7dfc23a00a31fc452e
26e89a0fcc8c6127fb2adbfe2bb071f34ea2e72e 29-Sep-2016 Jordan Liu <jminjie@google.com> Merge "Update reference to dial_string_replace" am: 03adc60300
am: 74e12a470a

Change-Id: Icda0d873d7076dd1f105f8ba77d094f2dafcdbfc
03adc60300417b6a7a3abf0f0ce460459ef5a280 29-Sep-2016 Jordan Liu <jminjie@google.com> Merge "Update reference to dial_string_replace"
1fb93b5f57b92a2951a0ca2122ad17809b45675e 28-Sep-2016 Robert Greenwalt <rgreenwalt@google.com> Plug hole in Roaming indication.

If we change phone types after falling into a roaming condition
(due to other bug/race) we were tossing the old state and not
notifying listeners. This could leave listeners thinking we
were still roaming.

Also added logging to try to catch this in the future and made
DataConnection (a listener) more robust by rechecking the roaming
state when it connects.

bug:31278802
Change-Id: Ica5b2bbf1cb6fde5bc11994d1a699c53ac562ade
erviceStateTracker.java
ataconnection/DataConnection.java
1a28a4e81feae9540283ab9b696103c37b69c7b0 08-Sep-2016 Jordan Liu <jminjie@google.com> Update reference to editable_voicemailnumber

For the switch to CarrierConfig, we update the method used to get the
value of what used to be called editable_voicemailnumber to the
new method provided by CarrierConfig.

Bug: 29873049
Change-Id: Ib9873dc0bc866011da0d67d37500d47ae00d7a43
icc/SIMRecords.java
4bd352bf6a97a2cb6acbd4bc38e5de668e3df521 28-Sep-2016 Jordan Liu <jminjie@google.com> Merge "Update reference to config_restart_radio" am: 519b4406c0 am: 077b2119b4
am: 624a9a3b22

Change-Id: Ie9b05b1cf1e6ed3c4b0b0bebf931ea316440f30d
624a9a3b22a994f5479dc84c96a48a5101545114 28-Sep-2016 Jordan Liu <jminjie@google.com> Merge "Update reference to config_restart_radio" am: 519b4406c0
am: 077b2119b4

Change-Id: Ic2f9b3ec09a58c7db2a90a1cbaf68072d622e55e
3379e399780e6e6531eb84f14d1eca92ae48af2a 24-Sep-2016 Hall Liu <hallliu@google.com> Fix answering waiting call simultaneously with active call disconnect

When the user answers a call-waiting call at the same time as the remote
end disconnects the formerly-active call, an error may occur where the
in-call ui is left in an inconsistent state and the waiting call is
never answered.

Normally, when a call-waiting call is answered, the active call will
first be held. Then, after the modem reports that as successful,
onCallHeld will issue the EVENT_RESUME_BACKGROUND message to answer the
call-waiting call. However, if the remote end disconnects while the user
is answering, onCallTerminated will be called instead.

This change alters onCallTerminated to issue the EVENT_RESUME_BACKGROUND
message if it occurs in the middle of a call-switch.

Change-Id: Icb757274ad63af46ebff5028dc484f8497777987
Fix: 31684640
msphone/ImsPhoneCallTracker.java
322793ca2dfe1be9c088f88336a68921d4718add 20-Sep-2016 Meng Wang <mewan@google.com> ImsPhone: update wfc mode per roaming status

Bug: 31492826
Change-Id: I35bf9994b3e96327e1d9678d177225c6a3656479
msphone/ImsPhone.java
f95d927d751e86626d43e6694ec01b7224eb765b 26-Sep-2016 Ningyuan Wang <nywang@google.com> Cherry pick: Mcc should not set country code with persistent request

A false persistent parameter ensures that wifi country code
will fall back to phone default country code upon SIM card removing.

Bug:31640617
Change-Id: I38c522aa22162c900109e12a5925d4d87d4d51f9
Test: compile
ccTable.java
6522550d731963e0c7a6c7809903c4faba03d198 24-Sep-2016 Sudheer Shanka <sudheersai@google.com> Merge "Add onLockedBootComplete callback to UserSwitchObserver."
b1d8ae745064270528be40531af4bfa5d13e7710 30-Aug-2016 Sudheer Shanka <sudheersai@google.com> Add onLockedBootComplete callback to UserSwitchObserver.

Bug: 30948225
Change-Id: Iecf991b6cb4e42383a341c9ab05d3a3b7c79d417
ubscriptionInfoUpdater.java
dfdcaddf421af887cd6d74fa9e62bcce02ff264d 23-Sep-2016 Ningyuan Wang <nywang@google.com> Mcc should not set country code with persistent request am: b31c62c877 am: 65cd23e8ff
am: 7d451f3da0

Change-Id: Id0379ebccce11d67d2afc2c8604950de05d7c8f9
7d451f3da0b69621049c57342e1495d55ed0da0f 23-Sep-2016 Ningyuan Wang <nywang@google.com> Mcc should not set country code with persistent request am: b31c62c877
am: 65cd23e8ff

Change-Id: Icf3e60e4cf203c226aa1565559ba708ac39aa3ce
b31c62c877f387b71504821bec36200b9d6449c9 21-Sep-2016 Ningyuan Wang <nywang@google.com> Mcc should not set country code with persistent request

A false persistent parameter ensures that wifi country code
will fall back to phone default country code upon SIM card removing.

Bug:31640617
Change-Id: Ie55fea196f314d0f8d7af8d9c68c04e14dd28987
Test: compile
ccTable.java
f572b8515c17ae436b8817b127fc671661b639b4 07-Sep-2016 Jordan Liu <jminjie@google.com> Update reference to cdma_3waycall_flash_delay

For the switch to CarrierConfig, we update the method used to get the
value of what used to be called config_cdma_3waycall_flash_delay to the
new method provided by CarrierConfig.
Merged-In: I045c610fbc60cee565cf1172833064b44ef076d4

Bug: 29873049
Change-Id: I045c610fbc60cee565cf1172833064b44ef076d4
smCdmaCallTracker.java
cd5d7df169d905d4e009d909e255a814eef0c064 20-Sep-2016 Brad Ebinger <breadley@google.com> Check ImsPhone WiFi State am: d0a85e9d7e am: 0db7554dac
am: a3b78e52ba

Change-Id: I3ebc998cc4135434e90e45bcf4ece6b78fa27f0c
a3b78e52ba128059d7907c273e5d05c6709bf16a 20-Sep-2016 Brad Ebinger <breadley@google.com> Check ImsPhone WiFi State am: d0a85e9d7e
am: 0db7554dac

Change-Id: I0726aef23e4825629a465615265d6676dc16db7f
0db7554dac49658e302666a3d6d0a0e95f61bc51 20-Sep-2016 Brad Ebinger <breadley@google.com> Check ImsPhone WiFi State
am: d0a85e9d7e

Change-Id: I5f76bd4cbc4ce8349d3e010abe18f688f9b1bd8c
d591dfc4f5ba2e64c75a713d85d293a5cb353447 20-Sep-2016 Brad Ebinger <breadley@google.com> Merge "Check ImsPhone WiFi State" into nyc-mr1-dev
ec9cd5d1b95595824567d881fb6b9b69cf8885cd 09-Sep-2016 Jordan Liu <jminjie@google.com> Update reference to dial_string_replace

For the switch to CarrierConfig, we update the method used to get the
value of what used to be called dial_string_replace to the new method
provided by CarrierConfig
Merged-In: I58f4375e4572f46a78c3d2479690fe35d820662d

Bug: 29873049
Change-Id: I27c3e0475a57de42936e29f7193e067224054f47
allTracker.java
316deb284df5aff89060007fc7500996dd991ca2 09-Sep-2016 Jordan Liu <jminjie@google.com> Update reference to dial_string_replace

For the switch to CarrierConfig, we update the method used to get the
value of what used to be called dial_string_replace to the new method
provided by CarrierConfig

Bug: 29873049
Change-Id: I58f4375e4572f46a78c3d2479690fe35d820662d
allTracker.java
e88efe6ce907e18ed7dfbff652aaf038f78ec6ec 07-Sep-2016 Jordan Liu <jminjie@google.com> Update reference to cdma_3waycall_flash_delay

For the switch to CarrierConfig, we update the method used to get the
value of what used to be called config_cdma_3waycall_flash_delay to the
new method provided by CarrierConfig.

Bug: 29873049
Change-Id: I045c610fbc60cee565cf1172833064b44ef076d4
smCdmaCallTracker.java
9c38f32ead59fda8b3708e579df69aa410305133 14-Sep-2016 Jordan Liu <jminjie@google.com> Merge "Update reference to config_restart_radio"
368165313ac36cd581bbde01f046bfc89dc0f2cd 14-Sep-2016 Jack Yu <jackyu@google.com> Extend apn retry configurability to more apn types am: cbda17a834 am: 9353024246
am: 3746007d25

Change-Id: I58f31fdb0efcb4056bceb30667e6e4b981bea938
3ea9f4b523fa37c60ad923841c0f06f7c20018e5 14-Sep-2016 Jordan Liu <jminjie@google.com> Merge "Update reference to config_default_vm_number"
383fc550310852f6078727a74413d5e5855c1878 12-Sep-2016 Jordan Liu <jminjie@google.com> Update reference to config_restart_radio

For the switch to CarrierConfig, we update the method used to get the
value of what used to be called
config_restart_radio_on_pdp_fail_regular_deactivation to the new method
provided by CarrierConfig. Since we need to pass the context, we also
update the places this value is accessed so they pass their context.

Merged-In: Id43344339b07628d62e640bf73f75af048a1259b

Bug: 29873049
Change-Id: Iba091f43e094b823b5f27db6b5f05b5a362c4658
ataconnection/DataConnection.java
ataconnection/DcController.java
ataconnection/DcFailCause.java
ataconnection/DcTracker.java
d0a85e9d7e52ecd5de9f7063361d9b01d2493627 13-Sep-2016 Brad Ebinger <breadley@google.com> Check ImsPhone WiFi State

We are currently checking the IMS feature FEATURE_TYPE_VOICE_OVER_WIFI
instead of checking the correct ImsCallProfile extras in the ImsCall.

This change also adds ImsCall tests for Wifi as well as modifies an
existing ImsPhoneConnection tests to facilitate the new change.

Bug: 30964593
Change-Id: Ib31fb1d4899fec47424f5e4869d27c429290f304
msphone/ImsPhoneConnection.java
3746007d25c1a08e3dd8cac6d3399f83df7d683d 13-Sep-2016 Jack Yu <jackyu@google.com> Extend apn retry configurability to more apn types am: cbda17a834
am: 9353024246

Change-Id: I98f741be6ef01f91ad9f79ccdf3d23ba984778b9
93530242462aab51386de43d7b0cc9e11117de47 13-Sep-2016 Jack Yu <jackyu@google.com> Extend apn retry configurability to more apn types
am: cbda17a834

Change-Id: I4a30dd05bba9617de605e6b057136d1c1c55df99
c67af8ef3baf30845c46fe97bcc2936f3f0267f4 13-Sep-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Extend apn retry configurability to more apn types" into nyc-mr1-dev
cbda17a8341b84d5a6910dccca9ff87be22a0ee2 10-Sep-2016 Jack Yu <jackyu@google.com> Extend apn retry configurability to more apn types

Extend apn retry configurability to more apn types so
we can control each APN retry behavior.

bug: 31381899
Change-Id: I6453aa76ebf2f977f5e730d34a502be9d0913577
etryManager.java
31f84bf1a4f1c945f7ca4646095ef4717a261c98 12-Sep-2016 Jordan Liu <jminjie@google.com> Update reference to config_restart_radio

For the switch to CarrierConfig, we update the method used to get the
value of what used to be called
config_restart_radio_on_pdp_fail_regular_deactivation to the new method
provided by CarrierConfig. Since we need to pass the context, we also
update the places this value is accessed so they pass their context.

Bug: 29873049
Change-Id: Id43344339b07628d62e640bf73f75af048a1259b
ataconnection/DataConnection.java
ataconnection/DcController.java
ataconnection/DcFailCause.java
ataconnection/DcTracker.java
625efcd38b8b03e1dab6d893c8be1ef11835256b 10-Sep-2016 Sanket Padawe <sanketpadawe@google.com> Remove flag from intent sent from Catservice to StkApp. am: f6f1da3df0 am: 20d1518c0a
am: d8418e9d34

Change-Id: Icbf11e4c462a8b87658287fa1af9250190d2d554
d8418e9d34938ff6b4c1e1705362906becf5955c 09-Sep-2016 Sanket Padawe <sanketpadawe@google.com> Remove flag from intent sent from Catservice to StkApp. am: f6f1da3df0
am: 20d1518c0a

Change-Id: Id7ab6a997916ec682893c4a6676f8236b5aebb4f
d0ab180b81ce138281ad2b6860fcbb0a969484f6 09-Sep-2016 Sanket Padawe <sanketpadawe@google.com> Remove flag from intent sent from Catservice to StkApp. am: f6f1da3df0
am: e6028d30ad

Change-Id: I7f06f25b0a03bbae68671fdfd84df6d04aa111df
20d1518c0ac301898a22dba886771308d12cef45 09-Sep-2016 Sanket Padawe <sanketpadawe@google.com> Remove flag from intent sent from Catservice to StkApp.
am: f6f1da3df0

Change-Id: I120511c62f238d8042c755982f3d902027745c60
e6028d30ad6289623ed1b357126408d7b6426dbc 09-Sep-2016 Sanket Padawe <sanketpadawe@google.com> Remove flag from intent sent from Catservice to StkApp.
am: f6f1da3df0

Change-Id: If68d26de17ca2e79cbe92b0c0346fb75b301d154
f6f1da3df0fee3f8a4f22e3d3f5d58c1a15bf912 09-Sep-2016 Sanket Padawe <sanketpadawe@google.com> Remove flag from intent sent from Catservice to StkApp.

+ Remove FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT from intent sent from
CatService to StkApp as StkApp doesn't have registered receiver.

Bug: 31292260
Change-Id: Icdf688795138342b7de3b1a4cd31563351b2ccd5
at/CatService.java
54ae9a655602d2e6a89d4841c39a7ba00c43f9c1 08-Sep-2016 Amit Mahajan <amitmahajan@google.com> Dispose pendingMO connection on phone type switch. am: 3746beeb18 am: ebdfe3bf56 am: 5b58c95254
am: 5b2d173698

Change-Id: Ib9c9040888e8f95fb7ef3d0758319131eab6094d
5b2d1736980baf362093250779dda57b9bd8d6d3 08-Sep-2016 Amit Mahajan <amitmahajan@google.com> Dispose pendingMO connection on phone type switch. am: 3746beeb18 am: ebdfe3bf56
am: 5b58c95254

Change-Id: I36fb595c13f265717d910c3d26df56545f8c585a
ebdfe3bf56ae9d5cb69ddca66b051bd6fb6a034d 08-Sep-2016 Amit Mahajan <amitmahajan@google.com> Dispose pendingMO connection on phone type switch.
am: 3746beeb18

Change-Id: I2373392f3a5a2c6847073b2472fc4b418c396a54
3746beeb1828ef27b2feca81ad57d7ceee61b7aa 08-Sep-2016 Amit Mahajan <amitmahajan@google.com> Dispose pendingMO connection on phone type switch.

Bug: 31288401
Change-Id: Ibc0157b655d10621e553130c7a2a24934ffe74b1
smCdmaCallTracker.java
5709deaa68a13b632d3ef702d0051de459bb760e 02-Sep-2016 Jordan Liu <jminjie@google.com> Update reference to config_default_vm_number

For the switch to CarrierConfig, update the methods used to set and get
this value to the new ones available through CarrierConfig.

Bug: 29873049
Change-Id: I7fa7305dbdc708771bd87d092fdea88552515013
smCdmaPhone.java
c9f45c9b314485efd36a3192d9dac390fb6a3739 07-Sep-2016 Amit Mahajan <amitmahajan@google.com> Use ERI to update operator name before updateSpnDisplay() if needed. am: b4d7a8ad67 am: 56d19500d6 am: 03fa0fe9dc
am: 9c1a272bc9

Change-Id: I2f11f43ac2abe1cdbbf8cc6ef8355de08dd729bd
9c1a272bc99d3533b34663cbb4bd3f5fdd6d374a 07-Sep-2016 Amit Mahajan <amitmahajan@google.com> Use ERI to update operator name before updateSpnDisplay() if needed. am: b4d7a8ad67 am: 56d19500d6
am: 03fa0fe9dc

Change-Id: Icd47bcfc558de344ac4cafa6cc352e4729b66aa7
56d19500d6ae0cf94d61af78ab9d5548deecc7b5 07-Sep-2016 Amit Mahajan <amitmahajan@google.com> Use ERI to update operator name before updateSpnDisplay() if needed.
am: b4d7a8ad67

Change-Id: I3767dd3d5aa9f200f8d391ec6bc778552a8af2b0
b4d7a8ad67f901661094e14a3c7acbd4ab65513d 07-Sep-2016 Amit Mahajan <amitmahajan@google.com> Use ERI to update operator name before updateSpnDisplay() if needed.

Bug: 31308687
Change-Id: Id8907abc8f76cc77b5bcfeee4d5ed34bf18e71e3
erviceStateTracker.java
8e2a1c76f67ebaeebd8401c4ebf7d0515b522d5e 18-Jul-2016 Sooraj Sasindran <sasindran@google.com> Expose api to retrieve wakelock information per client

Expose api to retrieve wakelock information per client
Provide calling package name in cell info apis

BUG=31041780
Change-Id: Id8ca0006478212c006a103b83fb720532e9c0fab
lientWakelockTracker.java
ommandsInterface.java
smCdmaPhone.java
hone.java
honeInternalInterface.java
IL.java
erviceStateTracker.java
msphone/ImsPhoneBase.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
ip/SipPhoneBase.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
1b90799284785b26b0853ae367cac139ba37e18b 11-Jul-2016 Naveen Kalla <mrnaveen@google.com> Attribute wakelocks held by RIL to clients

Telephony services are requested by applications and other
services in the Android framework. Attribute the wakelock
held time to the applications and services that requested
the particular operation.

If multiple clients are requesting for a service at the same
time, divide the time equally between all the requests

BUG=31041780
Change-Id: Id5521809d5a4324c1bd9dc229a743033886b35a3
lientWakelockAccountant.java
lientWakelockTracker.java
IL.java
ilWakelockInfo.java
51b6262703d13249c6e9d4382e338ad1d401e3da 02-Sep-2016 Tyler Gunn <tgunn@google.com> Expand ImsPhoneCall logging and add updatePhoneState check. am: 9cf07ae65e am: 4790c7769b
am: de514aa6eb

Change-Id: I3c3831947d35c704114763018a6387b1a53e405a
de514aa6eb176a77842ae4b80ffe8b07432000a3 02-Sep-2016 Tyler Gunn <tgunn@google.com> Expand ImsPhoneCall logging and add updatePhoneState check. am: 9cf07ae65e
am: 4790c7769b

Change-Id: Icabd512fec08f29c04b2688136f9e49efe54a464
9cf07ae65ed86b9e79aaa74b66441f0811d9cc15 01-Sep-2016 Tyler Gunn <tgunn@google.com> Expand ImsPhoneCall logging and add updatePhoneState check.

Analysis of the logs for the associated bug has not revealed any reason
why that bug has happened.

1. Added a speculative fix to ImsPhoneCallTracker#updatePhoneState to
ensure that any pending MO call is also not idle when considering the
state to be off hook.
2. Added more logging to ImsPhoneCallTracker, and ImsPhone to help diagnose
the issue.

Bug: 31000943
Change-Id: I0713a7bd6e5c91fc458e67af530de0bcce8a7aee
msphone/ImsPhoneCall.java
msphone/ImsPhoneCallTracker.java
1997313130a88c5fdcd121f46a6d396e02ef2ae7 01-Sep-2016 Christopher Desjardins <christopher.desjardins@tomtom.com> Merge "Fix parseInt format exception." am: 7c08118a61 am: 1138b975c4 am: 52e83fde57
am: 28c0c91878

Change-Id: I5851d89e8de9991df14204bc37b6a4fd912e6fe4
28c0c9187835694cb38df978978e86fe283b85bb 01-Sep-2016 Christopher Desjardins <christopher.desjardins@tomtom.com> Merge "Fix parseInt format exception." am: 7c08118a61 am: 1138b975c4
am: 52e83fde57

Change-Id: I5dafdb781ecca1522241754605cbdfd0a0259384
52e83fde574085dd01af2e524a088d09d6a0fe0e 01-Sep-2016 Christopher Desjardins <christopher.desjardins@tomtom.com> Merge "Fix parseInt format exception." am: 7c08118a61
am: 1138b975c4

Change-Id: Id7570d87693b121e348a2050a7e22a2907130081
e07351fd1000d16eda1834993fe8dc6863dd3cf0 31-Aug-2016 Christopher Desjardins <christopher.desjardins@tomtom.com> Fix parseInt format exception.

In the radio logs I see the following exception:
08-09 14:41:27.849 E/GsmSST ( 1006): [GsmSST] error parsing RegistrationState: java.lang.NumberFormatException: Invalid int: "ffffffff"

The issue is that parseInt doesn't go to 0xffffffff.
parseLong does and it returns -1 when passed ffffffff

Change-Id: Ie98873cefb551cc88075d39b64164b130130d0e0
erviceStateTracker.java
84fcf9f8129c431f22ce7a8a67cacb0fb99fabf9 31-Aug-2016 Amit Mahajan <amitmahajan@google.com> Merge "Avoid deadlock in getIccSimChallengeResponse() when disposing IccRecords" am: 1288d45623 am: c28d7322a7 am: aa97bf2e96
am: ccfea28893

Change-Id: I265e6320c3c7d7bfa496ea4a60cbb5577be69ebb
25063128677e226e941c6db9577258f34e710f6c 31-Aug-2016 Amit Mahajan <amitmahajan@google.com> Fixed failing tests. am: 7e9240253e am: ea379f5a4b
am: b808324d73

Change-Id: I14e619ea769eaddeb980d8f1e28612f59a894edc
ccfea288933dea0f5b16b3bc24641a867d6f7716 31-Aug-2016 Amit Mahajan <amitmahajan@google.com> Merge "Avoid deadlock in getIccSimChallengeResponse() when disposing IccRecords" am: 1288d45623 am: c28d7322a7
am: aa97bf2e96

Change-Id: I9b86271aefa627c5198f4333ec967653bd01ca30
b808324d73a0ba94c6635c3aa2c5291380fd9526 31-Aug-2016 Amit Mahajan <amitmahajan@google.com> Fixed failing tests. am: 7e9240253e
am: ea379f5a4b

Change-Id: I7fb1709cd6849aa8049ec56fd4f89d2f999b5574
aa97bf2e969b243d18e5e9e9e2759e24e6c95d88 31-Aug-2016 Amit Mahajan <amitmahajan@google.com> Merge "Avoid deadlock in getIccSimChallengeResponse() when disposing IccRecords" am: 1288d45623
am: c28d7322a7

Change-Id: I532502339d0c0a8ef5bb92214b2a8e965bec813f
7e9240253edb59e0aa657de434faa1ccdf17a742 29-Aug-2016 Amit Mahajan <amitmahajan@google.com> Fixed failing tests.

Also marked some of them @Postsubmit.

Bug: 31041734
Change-Id: I9a93bbb6d7f9c28fa90bab260d837761bc07eb77
ataconnection/DcTracker.java
346d3b47b32ce07b5007049ef5f973ebb75ea112 24-Aug-2016 Kenji Soutome <kenji.x.soutome@sonymobile.com> Avoid deadlock in getIccSimChallengeResponse() when disposing IccRecords

The lock object 'mLock' must be cared in IccRecords.dispose() as there
might be another thread waiting in getIccSimChallengeResponse().
EVENT_AKA_AUTHENTICATE_DONE never comes to IccRecords.handleMessage() if
IccRecords has already been disposed. That is because such events are
ignored in handleMessage() of the derived classes.

Change-Id: I8b36d4b44bc07bf5281325fb759b7a8dac0a8a32
icc/IccRecords.java
e26f15a176813828fa8b2dc2b556c70a5f589fcd 25-Aug-2016 Naveen Kalla <mrnaveen@google.com> Add MODEM_RESTART event to TelephonyEvent

Bug=30483143

Change-Id: Ib56701d8dd4889ed0f4180d912062c2746673c4c
elephonyEventLog.java
70d39d0960bbf20d97946ced0a70592f1912804b 26-Aug-2016 Robert Greenwalt <rgreenwalt@google.com> Don't tear down a network unnecessarily. am: 76c5a9479d am: 03c02f93e0
am: 362191298c

Change-Id: Ia63fde2e97fd88088acf90365b2af9d68dad6a27
f0de5317732c8c1ce3a04422628ed05d65e9ec7b 26-Aug-2016 fionaxu <fionaxu@google.com> pii part2: redact non-null pii with SHA-1 Hash am: 5e040f4db9 am: 9f9a350cf9
am: c38091103c

Change-Id: Ibbb6474a692ce8fa474bce1ceccd76f7904a638b
06a7f6ff861a3c95bccd33499bd82f943c1199a0 26-Aug-2016 Robert Greenwalt <rgreenwalt@google.com> Log Cell DataStall recovery actions. am: 0a39f581e1 am: 7e36e28a77
am: 2875181572

Change-Id: If55729745966093c1c95a7628c0f76af12c1530b
362191298c31439699a29ec164bdd0d7c3f7be0f 25-Aug-2016 Robert Greenwalt <rgreenwalt@google.com> Don't tear down a network unnecessarily. am: 76c5a9479d
am: 03c02f93e0

Change-Id: I726ab53142c599a8a72dbaf9242b7d8436de7a92
03c02f93e0e50292bd1336105363535e15877429 25-Aug-2016 Robert Greenwalt <rgreenwalt@google.com> Don't tear down a network unnecessarily.
am: 76c5a9479d

Change-Id: I8ce85f762a0d41f6f55f758daf4ff2e28a30208e
9c1c0e035dd87d3020dfce2ea0abcad2e57c57a1 25-Aug-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Don't tear down a network unnecessarily." into nyc-mr1-dev
c38091103c0b83a89fc8a09501a79ebc39895242 24-Aug-2016 fionaxu <fionaxu@google.com> pii part2: redact non-null pii with SHA-1 Hash am: 5e040f4db9
am: 9f9a350cf9

Change-Id: I6bbc799bec8f41628a70b0597f6568f449081a36
9f9a350cf974ea00cef1a8685a2f709da649270f 24-Aug-2016 fionaxu <fionaxu@google.com> pii part2: redact non-null pii with SHA-1 Hash
am: 5e040f4db9

Change-Id: I7680fb527f0edd708bf89861deb1aaa82cd5221b
c485d167adf559ebcd67384a94211b6cc6ec0802 24-Aug-2016 Chen Xu <fionaxu@google.com> Merge "pii part2: redact non-null pii with SHA-1 Hash" into nyc-mr1-dev
287518157259ca1856bac1c854a6cfcf1e2eb9f2 24-Aug-2016 Robert Greenwalt <rgreenwalt@google.com> Log Cell DataStall recovery actions. am: 0a39f581e1
am: 7e36e28a77

Change-Id: Ic59e001c73fd16a8d73a7f266b1f7bae5faf3e8f
5e040f4db9d136fd7f509dd78edb380265fd0119 09-Aug-2016 fionaxu <fionaxu@google.com> pii part2: redact non-null pii with SHA-1 Hash

Bug: 30073833
Change-Id: Id4d7b59623b39660218f35d2c202518a994bae4c
icc/IccRecords.java
icc/SIMRecords.java
7e36e28a7732dcdb50c8a0ede230588a99e60603 24-Aug-2016 Robert Greenwalt <rgreenwalt@google.com> Log Cell DataStall recovery actions.
am: 0a39f581e1

Change-Id: Ia668ae451ff70aeb45957ca4818b64adcbb3f269
9cec95d62fab68ebdc0d094130d83d0534ea6421 24-Aug-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Log Cell DataStall recovery actions." into nyc-mr1-dev
ecb062f214fe07c7300e406bf30100f97f3e8cd6 18-Aug-2016 Tyler Gunn <tgunn@google.com> DO NOT MERGE ANYWHERE Fire connection events when call is remotely held and unheld.

Bug: 30349182
Change-Id: Icb94db6a8c146db7d4e63108cb19b16ea438f212
(cherry picked from commit 33290100c702ea8a1d4fcede360fc81e81bfccb2)
msphone/ImsPhoneCallTracker.java
b8da7f2923ddd116825d4908e47a045219a6d6a0 19-Aug-2016 Ta-wei Yen <twyen@google.com> Add carrier regex filtering to VisualVoicemailSmsFilter

This CL adds a extra step in the VisualVoicemailSmsFilter which will
match the message body against the carrier specified regex. Even if
the message have a unknown format if it matches the regex it will
still be considered a VVM SMS.

For example, Verizon requires any SMS that starts with "//VZW" to be
dropped. Other cases are handled by the AppDirectedSms app, but
"//VZWVVM" is left for the system visual voicemail. Previously
"//VZWVVM garbage data" will pass though the filter because it is not
a valid VVM SMS, which is against the specification of dropping
everything. After this CL it will match the regex and dropped.
The VVM client will also receive the message body, but ignore it.

Change-Id: I8d446d69d75914bf5fe63834cfebec92f7917711
Fixes: 30954955
(cherry picked from commit 585c46499c06297f19129a024047e2feacd30753)
isualVoicemailSmsFilter.java
92e781f2fd60f5ba8d412d691a21f79392770c9a 23-Aug-2016 Tyler Gunn <tgunn@google.com> Remove one time sending of handover from wifi to LTE connection event. am: 2d996aa606 am: 68d7118dd5 am: 24e6ab96fe
am: 002b8c7b01

Change-Id: I4b391390e7f732e74b11c9f39fbcc95ef38bc317
70659c4f4960c0c9b013ea9e9ea1fb562b86c3af 23-Aug-2016 Amit Mahajan <amitmahajan@google.com> Bind to service only after USER_UNLOCKED. am: 9e27168859 am: db4d5805ea
am: 762feb2b01

Change-Id: If8d3a6b51fa88681bc1cd4e5bbe4805eaa91858a
d886d4b4d65296380ff09e96d39f0b2659c77199 23-Aug-2016 Ta-wei Yen <twyen@google.com> Add carrier regex filtering to VisualVoicemailSmsFilter am: 585c46499c am: de228f8406
am: 1c6b90ba1b

Change-Id: I98b0a6510d0bed5e5291cea52589bd16b222f1ff
002b8c7b012a4886a311f36c3972d3f17286c668 23-Aug-2016 Tyler Gunn <tgunn@google.com> Remove one time sending of handover from wifi to LTE connection event. am: 2d996aa606 am: 68d7118dd5
am: 24e6ab96fe

Change-Id: Ibfba44e0da83448c3911067c33092ed5db4d288c
762feb2b016528e487c3c71e89189f2cd4d6c9e6 23-Aug-2016 Amit Mahajan <amitmahajan@google.com> Bind to service only after USER_UNLOCKED. am: 9e27168859
am: db4d5805ea

Change-Id: Icf6685c95f549f82f99b51f5be85fbbc91558c1f
1c6b90ba1b5ba65052d2e1aec6ae88c59a059e16 23-Aug-2016 Ta-wei Yen <twyen@google.com> Add carrier regex filtering to VisualVoicemailSmsFilter am: 585c46499c
am: de228f8406

Change-Id: If2cd07aca946bd8088f89fdb609a4583e303377f
db4d5805ea484be49ce2df445c362a0335031ba2 23-Aug-2016 Amit Mahajan <amitmahajan@google.com> Bind to service only after USER_UNLOCKED.
am: 9e27168859

Change-Id: I9b4f0512e8dce6d6b8fbf1c88c7eea9ee23f58c0
de228f8406ea6f22d9bde1b567c5e9bc1e1afbc7 23-Aug-2016 Ta-wei Yen <twyen@google.com> Add carrier regex filtering to VisualVoicemailSmsFilter
am: 585c46499c

Change-Id: I20fa9747bd3c892cd6c513af5acb59e58b812beb
76c5a9479d312139740dcaf7644172f2beb2f7e0 23-Aug-2016 Robert Greenwalt <rgreenwalt@google.com> Don't tear down a network unnecessarily.

If conditions ease so restricted networks are now allowed don't
just assume every up network needs to be torn down. Instead
check and see if it's marked restricted (or not, not-restricted)
first.

bug:30490689
Change-Id: Ib19d45979f6f9e0b605a3e5b39f569a01d30d42b
ataconnection/DcTracker.java
68d7118dd596c2459c6af3eb531654aafa9fe602 23-Aug-2016 Tyler Gunn <tgunn@google.com> Remove one time sending of handover from wifi to LTE connection event.
am: 2d996aa606

Change-Id: I7ddab85cc9d84b5c1978340913ca0023060278c3
0a39f581e11eb7b040a5412229164ef72044279f 23-Aug-2016 Robert Greenwalt <rgreenwalt@google.com> Log Cell DataStall recovery actions.

bug: 30481185
Change-Id: I467a723144da078fa323284eca7f3bec98ebbb4f
elephonyEventLog.java
ataconnection/DcTracker.java
bee3496be8b347d1e8e63599e8d481d76990df15 22-Aug-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Bind to service only after USER_UNLOCKED." into nyc-mr1-dev
04406d95791022b4adf46a2cf7d77f67037f9f27 21-Aug-2016 Sailesh Nepal <sail@google.com> Merge "Add carrier regex filtering to VisualVoicemailSmsFilter" into nyc-mr1-dev
2d996aa6061c038ba69dbe3b9430c5164283db22 19-Aug-2016 Tyler Gunn <tgunn@google.com> Remove one time sending of handover from wifi to LTE connection event.

We will always send the event and let dialer filter it out.

Bug: 30837560
Change-Id: I3c40d8ee236bd5c27a8891f5c7b25a8fef0d4feb
elephonyTester.java
msphone/ImsPhoneCallTracker.java
585c46499c06297f19129a024047e2feacd30753 19-Aug-2016 Ta-wei Yen <twyen@google.com> Add carrier regex filtering to VisualVoicemailSmsFilter

This CL adds a extra step in the VisualVoicemailSmsFilter which will
match the message body against the carrier specified regex. Even if
the message have a unknown format if it matches the regex it will
still be considered a VVM SMS.

For example, Verizon requires any SMS that starts with "//VZW" to be
dropped. Other cases are handled by the AppDirectedSms app, but
"//VZWVVM" is left for the system visual voicemail. Previously
"//VZWVVM garbage data" will pass though the filter because it is not
a valid VVM SMS, which is against the specification of dropping
everything. After this CL it will match the regex and dropped.
The VVM client will also receive the message body, but ignore it.

Change-Id: I8d446d69d75914bf5fe63834cfebec92f7917711
Fixes: 30954955
isualVoicemailSmsFilter.java
91f44e35fd040c58604faf08a07a2cf934e0d06e 19-Aug-2016 Tyler Gunn <tgunn@google.com> Fire connection events when call is remotely held and unheld. am: 33290100c7 am: 6256289033
am: 01c5a6c3ae

Change-Id: I9496087c744ad0cbad1706cdc306f2b6c1a3609e
01c5a6c3ae53979f0528531899030904f7fa2efc 19-Aug-2016 Tyler Gunn <tgunn@google.com> Fire connection events when call is remotely held and unheld. am: 33290100c7
am: 6256289033

Change-Id: Ie1b0ce82a9d6f9577c51174f55b59b6b9ef7b268
62562890338923bd3b94386192692c598eab1b76 19-Aug-2016 Tyler Gunn <tgunn@google.com> Fire connection events when call is remotely held and unheld.
am: 33290100c7

Change-Id: Icc8eae702d063b580aca40b13d4010378c888014
9d20ef647af402d5929f572507953034cadfe278 19-Aug-2016 Tyler Gunn <tgunn@google.com> Merge "Fire connection events when call is remotely held and unheld." into nyc-mr1-dev
33290100c702ea8a1d4fcede360fc81e81bfccb2 18-Aug-2016 Tyler Gunn <tgunn@google.com> Fire connection events when call is remotely held and unheld.

Bug: 30349182
Change-Id: Icb94db6a8c146db7d4e63108cb19b16ea438f212
msphone/ImsPhoneCallTracker.java
9c36f8faddac5c67796f5b7e8b76653b193b7ebc 18-Aug-2016 Tyler Gunn <tgunn@google.com> Send connection event on handover from WIFI to LTE. am: df0a189fcd am: b68aa80ce3
am: 0d9298063f

Change-Id: I60d1dd579c09b17f9ead9dad970907cd5a5da840
cb650a5846d1e400a6d32eff9724c5d2f8c84f77 13-Aug-2016 Tyler Gunn <tgunn@google.com> Add support for downgrade to audio when data limit is reached.

Fix the SUPPORTS_DOWNGRADE_TO_VOICE calculation in ImsPhoneConnection; it
was relying on signaling from the modem, which apparently doesnt work.
Instead relying on a carrier config option to set that value.

Adding logic in ImsPhoneCallTracker to auto-downgrade to audio and send
a connection event indicating why it happeend to Dialer. This is only used
when the carrier supports it.

Bug: 30702393
Change-Id: Ie7ed3ba8b8aa6c45391d9dd45c4bbf7fe8c957ee
(cherry picked from commit 2e7e09e79c04f34034bebea8f5d86606bb584577)
onnection.java
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
0d9298063ff55ed200db0c2686b9f096e0a6c0c1 17-Aug-2016 Tyler Gunn <tgunn@google.com> Send connection event on handover from WIFI to LTE. am: df0a189fcd
am: b68aa80ce3

Change-Id: I4990b22ad56f95afc661e9576dbcdc02f33b871f
1384c849a6d44e8cd66580ef274b1def43515b40 17-Aug-2016 Tyler Gunn <tgunn@google.com> Add support for downgrade to audio when data limit is reached. am: 2e7e09e79c
am: bf0751d93f

Change-Id: I0ce68321bbc5b6d6abea7b7ea80ad8f267aed5ff
bf0751d93fed60b7f55daff18fe7d7444ce54bf5 17-Aug-2016 Tyler Gunn <tgunn@google.com> Add support for downgrade to audio when data limit is reached.
am: 2e7e09e79c

Change-Id: I3954929427d9715cc8f69e2fcb0798aa14357a6f
df0a189fcdf375cb6f0f1f533e20efec575d6c4e 17-Aug-2016 Tyler Gunn <tgunn@google.com> Send connection event on handover from WIFI to LTE.

Send a connection event when handover from wifi to LTE occurs for a video
call. This event is only sent once, the first time it happens.

Also added a test intent which can be sent to reset the preference.

Bug: 30837560
Change-Id: Iefc2c4024d4d1956e8a9153345b6c2892bd7c38b
elephonyTester.java
msphone/ImsPhoneCallTracker.java
8e3273bee920710cad3dda10baea31e633ec17cc 16-Aug-2016 Tyler Gunn <tgunn@google.com> Merge "Add support for downgrade to audio when data limit is reached." into nyc-mr1-dev
169e8247517900419cfc13e807c17c8163a201cc 16-Aug-2016 Jack Yu <jackyu@google.com> Set NetworkInfo's meter flag when capability changes. am: a8201a7b8c am: fecd73b4a9
am: 7ca591d224

Change-Id: I4be056ba0179cb7be7a52af5d715cdb41b2cb278
7ca591d2248f194acaad173e8ef836b3c0db03e1 16-Aug-2016 Jack Yu <jackyu@google.com> Set NetworkInfo's meter flag when capability changes. am: a8201a7b8c
am: fecd73b4a9

Change-Id: Ie323a1af0145612737d0b7845759c0747b4f9cc7
fecd73b4a9d145887b93d9a9eff0e161917e2e10 16-Aug-2016 Jack Yu <jackyu@google.com> Set NetworkInfo's meter flag when capability changes.
am: a8201a7b8c

Change-Id: I72bf528cc45dcc2c06a58306c6952de66347bb98
d5b505aa8937c4d37e9d6bcab56f80f8fcea60a3 16-Aug-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Set NetworkInfo's meter flag when capability changes." into nyc-mr1-dev
d98ee691834da3d8d6d655ae603ed0499eb50f24 15-Aug-2016 Brad Ebinger <breadley@google.com> Stop OUT_OF_SERVICE message during Emergency Call am: cdcf059efa am: 51d4aa16bf
am: a89b73018f

Change-Id: Icf168c599aabe78c389a8f2d720f8a7ef4d06d07
a89b73018f48969822f4c74115f6a2e52415de20 15-Aug-2016 Brad Ebinger <breadley@google.com> Stop OUT_OF_SERVICE message during Emergency Call am: cdcf059efa
am: 51d4aa16bf

Change-Id: I697c92671f4aab104c877cd7ae1a4fea984e56bf
51d4aa16bfb95c6ec1ae38ab5ade2cc9db8d4918 15-Aug-2016 Brad Ebinger <breadley@google.com> Stop OUT_OF_SERVICE message during Emergency Call
am: cdcf059efa

Change-Id: I02d9b84cc001abc850bd018090f0e12d1444f96e
b7d1d41b9d3ca752baf26088fed6e50b1be5f5b4 15-Aug-2016 Brad Ebinger <breadley@google.com> Merge "Stop OUT_OF_SERVICE message during Emergency Call" into nyc-mr1-dev
2e7e09e79c04f34034bebea8f5d86606bb584577 13-Aug-2016 Tyler Gunn <tgunn@google.com> Add support for downgrade to audio when data limit is reached.

Fix the SUPPORTS_DOWNGRADE_TO_VOICE calculation in ImsPhoneConnection; it
was relying on signaling from the modem, which apparently doesnt work.
Instead relying on a carrier config option to set that value.

Adding logic in ImsPhoneCallTracker to auto-downgrade to audio and send
a connection event indicating why it happeend to Dialer. This is only used
when the carrier supports it.

Bug: 30702393
Change-Id: Ie7ed3ba8b8aa6c45391d9dd45c4bbf7fe8c957ee
onnection.java
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
a8201a7b8ce12cfada51784ebe06534e35c2ae04 12-Aug-2016 Jack Yu <jackyu@google.com> Set NetworkInfo's meter flag when capability changes.

bug: 30812533
Change-Id: Ib25eebc5f439895317c4011384b1b10a330911b3
ataconnection/DataConnection.java
0c2eb42965cab188d091647dd2b083f38086ffc2 12-Aug-2016 Tyler Gunn <tgunn@google.com> resolve merge conflicts of d46b146 to master

Change-Id: I88e5fe76c9e07a0415221e78f57e056d994effc0
d46b146edc8f9f88934ec7ac745a1d40b7712a86 12-Aug-2016 Tyler Gunn <tgunn@google.com> Drop video calls when data is disabled. am: 2f9f55d539
am: 7a9e91d3df

Change-Id: Ic06e1411c430b634defc42bc08d5a0decfc41c08
7a9e91d3dfe9e941e1e96777775ada2af9190775 12-Aug-2016 Tyler Gunn <tgunn@google.com> Drop video calls when data is disabled.
am: 2f9f55d539

Change-Id: Icbb08f7caacfa82357f22ec9d5d4a6cbac75d1d6
d45a3f8e57efadd2e9046b39f8b1fda8e742c17f 12-Aug-2016 Tyler Gunn <tgunn@google.com> Merge "Drop video calls when data is disabled." into nyc-mr1-dev
2f9f55d539817926542b7db63a41d76badded853 12-Aug-2016 Tyler Gunn <tgunn@google.com> Drop video calls when data is disabled.

Handle dropping of video calls for one of two reasons:
1. User disables data.
2. User exceeds the data limit policy on their device.

In both cases, terminate any ongoing video calls. Ensures the correct
disconnect cause is propagated up to the InCallService.

Bug: 30702393
Change-Id: I36d236c8f69f9dc5b17368cc5329ac1df991fac4
ataconnection/DataEnabledSettings.java
msphone/ImsPhoneCallTracker.java
cdcf059efaf8f413cecc88f3ef8e05ef811fa5e9 10-Aug-2016 Brad Ebinger <breadley@google.com> Stop OUT_OF_SERVICE message during Emergency Call

Currently, the radio can report an OUT_OF_SERVICE (but Emergency calls
are available) status from the radio during an emergency call if that
call is made when there is no SIM card available or the SIM card is
locked. If the remote party disconnects, we mistakenly show a "Cellular
Network not Available" dialog when a call ends successfully because the
disconnect cause is mapped to OUT_OF_SERVICE. We now check to see if the
call was an emergency call before mapping to that disconnect cause.

Bug: 30657253
Change-Id: I7bf16c502c12125506ed31a56278f68ea39737ac
smCdmaCallTracker.java
smCdmaConnection.java
c9b83a3390c96585cf7cb45e89adcc1be98b21af 11-Aug-2016 Amit Mahajan <amitmahajan@google.com> Use correct SPN format for WFC. am: fce584177a am: e180ce0240
am: 2035db4276

Change-Id: I4f4a56d2cc35e26ccb80c4e53611e5f63e0ca7db
2035db427607aa284b4f3b476ee8ed184d720664 11-Aug-2016 Amit Mahajan <amitmahajan@google.com> Use correct SPN format for WFC. am: fce584177a
am: e180ce0240

Change-Id: If95f9d48166b15323f8344291831170e71b80a05
e180ce0240b5373c927a1058489b69178335cf49 11-Aug-2016 Amit Mahajan <amitmahajan@google.com> Use correct SPN format for WFC.
am: fce584177a

Change-Id: I281a4dc00fbe43963c5a9b8d06e261d30bc661fa
1d3273efe56e6e2c2e0d1f03c859bc811f82998b 11-Aug-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Use correct SPN format for WFC." into nyc-mr1-dev
fb63a8e732d5014b37d8b2ba29593c2b2f0683aa 11-Aug-2016 Tyler Gunn <tgunn@google.com> Add timeout for handover to wifi. am: 508daf6f82 am: eeb09c1b89
am: 387fa8c1cc

Change-Id: I98da6920a23b94a44dec7f5c910746635ee0172c
387fa8c1ccd27e70abed462fb120f47b62e01962 10-Aug-2016 Tyler Gunn <tgunn@google.com> Add timeout for handover to wifi. am: 508daf6f82
am: eeb09c1b89

Change-Id: Ia7eba85595a1339a3877f655591198115cb3ac59
508daf6f8286407cf34e32750148fad120009c13 10-Aug-2016 Tyler Gunn <tgunn@google.com> Add timeout for handover to wifi.

When we expect to handover a vt call to wifi, add a timeout to check to
be sure the handover did happen. IF it iddn't notify the Connection of
the failure.

Bug: 30697460
Change-Id: I243d4a063b5300cdf3b8e7fedddd4d747153af66
msphone/ImsPhoneCallTracker.java
fce584177afabb301d8ecbeea55f432adcee5e0b 08-Aug-2016 Amit Mahajan <amitmahajan@google.com> Use correct SPN format for WFC.

Bug: 30474919
Change-Id: I082dfd847316c15a2e4eda86e21e003e3ac398d5
erviceStateTracker.java
3b053e94fe188213a0a3fb366f3c8a7d9f57daa4 09-Aug-2016 Amit Mahajan <amitmahajan@google.com> Rebroadcast last SIM_STATE_CHANGED after USER_UNLOCKED. am: 372989357e am: a049141ad0
am: fc114274d4

Change-Id: Iedf9e17b1b3e5b802820cd2a74a7b47e51c979cb
fc114274d43aada264301071564d8a791cb5e46b 09-Aug-2016 Amit Mahajan <amitmahajan@google.com> Rebroadcast last SIM_STATE_CHANGED after USER_UNLOCKED. am: 372989357e
am: a049141ad0

Change-Id: I759b3b66b7ed4cc096a6503753cd28a045c0da42
a049141ad0340624fb6333c11464e825f5fecae8 09-Aug-2016 Amit Mahajan <amitmahajan@google.com> Rebroadcast last SIM_STATE_CHANGED after USER_UNLOCKED.
am: 372989357e

Change-Id: I1b5f53a5f38743495b99edc88e28d3595ff65d55
51f7ab2d6fab3279fc267823d66beb7e57e815e5 09-Aug-2016 Amit Mahajan <amitmahajan@google.com> Merge "Rebroadcast last SIM_STATE_CHANGED after USER_UNLOCKED." into nyc-mr1-dev
72baaf16b28598f3ca93d82e1baf494c90cbbeae 08-Aug-2016 Jack Yu <jackyu@google.com> Added debug message to help auto downgrade debugging

Change-Id: Ia16dced72d157c42c59486a53ba26b6995a6b32d
msphone/ImsPhoneCallTracker.java
c90e0a198e09fdeed2840e94c454ebc2d03d9a30 08-Aug-2016 Tyler Gunn <tgunn@google.com> Notify telephony when a handover from LTE to WIFI fails. am: 0b93f32c1b am: 0d6163871c
am: f2ad4c52f5

Change-Id: Ia06f74bd8f11b9125784249cafaad8e0b0869cd5
f2ad4c52f5dca646e93becbf58a7d03ba4ea0f22 08-Aug-2016 Tyler Gunn <tgunn@google.com> Notify telephony when a handover from LTE to WIFI fails. am: 0b93f32c1b
am: 0d6163871c

Change-Id: If9afcd3b6149d4ff6987b3ae713d9d1bf3f6b2a0
372989357e7a32de613a592b9646eac0d6117411 04-Aug-2016 Amit Mahajan <amitmahajan@google.com> Rebroadcast last SIM_STATE_CHANGED after USER_UNLOCKED.

Earlier it was done only if the intent was for LOADED/LOCKED. Correct
behavior is to rebroadcast the last intent regardless of the state.

Bug: 30582961
Change-Id: Ife57f70d4849655a6769bbdd0b883679f9444abf
ubscriptionInfoUpdater.java
0b93f32c1bed6554f058b9f614a0435f7dbfe942 05-Aug-2016 Tyler Gunn <tgunn@google.com> Notify telephony when a handover from LTE to WIFI fails.

Also adding test intent which can be used to simulate this situation.

Bug: 30697460
Change-Id: Ic45708699bbeedbb58920373180ea63a8d65ad78
onnection.java
elephonyTester.java
msphone/ImsPhoneCallTracker.java
eff05014378273900ecf51ea5ed3025a0b49b1ad 03-Aug-2016 Tyler Gunn <tgunn@google.com> Add "SIP forbidden" as valid reason for call pull failure. am: 48208a2493 am: 406719fa0f
am: d79683c05a

Change-Id: Ide2379910071f3d6003b1d7e9a8fcd622afdf9c9
d79683c05aa2a9c39c06b8249e86bae8564c0ecc 03-Aug-2016 Tyler Gunn <tgunn@google.com> Add "SIP forbidden" as valid reason for call pull failure. am: 48208a2493
am: 406719fa0f

Change-Id: Ie12225bb1eaa4ea4ab22358f244d418f3fc21fbf
406719fa0f904d315b8d8912f1f81cfb58fe317d 03-Aug-2016 Tyler Gunn <tgunn@google.com> Add "SIP forbidden" as valid reason for call pull failure.
am: 48208a2493

Change-Id: If83556dd371aebded3269a70f211e9327c0761f1
443425174529c240c9a5675a7ef63f0b4ae806fd 03-Aug-2016 Tyler Gunn <tgunn@google.com> Merge "Add "SIP forbidden" as valid reason for call pull failure." into nyc-mr1-dev
48208a24933a644261184f47517a6a8ed7d6fd54 03-Aug-2016 Tyler Gunn <tgunn@google.com> Add "SIP forbidden" as valid reason for call pull failure.

Vendor testing uncovered the fact that a call pull could fail due to a
SIP Forbidden error. Adding this disconnect cause to the pull fail logic
to ensure that a failure to pull due to this reason will result in the
call becoming external again.

Bug: 29906222
Change-Id: Ifab30cff23bb512731da0e16ea00e86c22d8226b
msphone/ImsPhoneCallTracker.java
78b7d3d94ca7cb605bf61a80e30bbc58b82b7413 03-Aug-2016 fionaxu <fionaxu@google.com> scrub PII for voiceMail am: 30c45c4b31 am: f3d9e4fdd3
am: 82a9196e01

Change-Id: Ie49dd6c39f32a4feafbe3ee7ae910f02612c3eef
82a9196e01f71ebff6ee3b3d878ce24fd0ca8b3b 03-Aug-2016 fionaxu <fionaxu@google.com> scrub PII for voiceMail am: 30c45c4b31
am: f3d9e4fdd3

Change-Id: If6fd355702506092396a31df74227d64b82eb3d5
30c45c4b31efb140679e4d945199f5c4296d21cd 03-Aug-2016 fionaxu <fionaxu@google.com> scrub PII for voiceMail

Bug: 30073833
Change-Id: If56a2caac9d51861f5494874f786a4d12689a0a5
smCdmaPhone.java
icc/AdnRecord.java
9e271688595d0281fe73acb16eb70925be9cf9b5 02-Aug-2016 Amit Mahajan <amitmahajan@google.com> Bind to service only after USER_UNLOCKED.

WapPushOverSms which starts before USER_UNLOCKED binds to
WapPushManager. However the service is not direct boot aware so
the bind fails.

Bug: 30007288
Change-Id: Ia436045c1538b89ec25049accff3c4ded69cfa92
apPushOverSms.java
d0699703245bde9d65f06aef39150f9691f6e04f 21-Jul-2016 Yoshiaki Naka <yoshiaki.naka@sonymobile.com> Unreliable number(255) for voice message count should not be provided

There are SIM cards in the market that write the voice message count
0xFF to EF_MWIS when the exact number is undetermined. Since only 0x00
is handled as 'unknown' in the current Android implementation. 0xFF
should also be treated as 'unknown'.

It is better to do so from a different point of view also. 3GPP TS
23.040 says that the voice message count 255 shall be taken not only
255 but also greater number. Therefore, phone should not display the
notification "New Voicemail (255)" because the exact number of the
voice messages cannot be determined.

Bug: 30544108
Change-Id: Ic024e2063f2047b46db894d226097ab27bb6d9de
icc/SIMRecords.java
55a21374bfc04e5d5c8921e90f7088bb045973fd 30-Jul-2016 Robert Greenwalt <rgreenwalt@google.com> Merge \\\"Stop exposing LTE_CA as a RAT type.\\\" into nyc-mr1-dev am: ca882dcdf8 am: faab590084
am: fbb44922bd

Change-Id: I2c50657d7563349f31408b51956788a91c64be80
c53fb59a70456b059cd6f009a19ee5519ca88773 30-Jul-2016 Robert Greenwalt <rgreenwalt@google.com> Stop exposing LTE_CA as a RAT type. am: 2cd7606f4d am: 3b5e75aba5
am: 5a220f8c74

Change-Id: I93ccd9aa95d501eadd801ba5c5a78af32c108b6f
9df7325c7fdc1e866d061d47f44191e6c0e216da 30-Jul-2016 Amit Mahajan <amitmahajan@google.com> Call pollState() in APM if RAT or radio state changes. am: 07a76e6efd am: b4052cd6c5
am: 462079af80

Change-Id: If1842d2b8fc98848126a741c6527112587c14513
fbb44922bd6e9287ad2a47aaf45a2b3038d0afc0 30-Jul-2016 Robert Greenwalt <rgreenwalt@google.com> Merge \\"Stop exposing LTE_CA as a RAT type.\\" into nyc-mr1-dev am: ca882dcdf8
am: c64aaffeaf

Change-Id: I4db5d9d0e47e327058b98c4b8c3f746caf06f07b
5a220f8c7400a421c0ffe27a4457db21ef99f105 30-Jul-2016 Robert Greenwalt <rgreenwalt@google.com> Stop exposing LTE_CA as a RAT type. am: 2cd7606f4d
am: 3b5e75aba5

Change-Id: Ifb56775d12f1ceb8a20a4542231fa60d1e7f83ca
462079af800e58bf4f74e41d806fb4576d09e39a 30-Jul-2016 Amit Mahajan <amitmahajan@google.com> Call pollState() in APM if RAT or radio state changes. am: 07a76e6efd
am: b4052cd6c5

Change-Id: Ica1cd5bc707069d31f3d904955e2327697ae1d66
c64aaffeafa55b0ae5cc972afa955fc94445a828 30-Jul-2016 Jack Yu <jackyu@google.com> Fixed that RAT_UNKNOWN incorretly reported in metrics data.
am: 528dc88249

Change-Id: I419c61b99d9b97adfc8a4f87d0240a66af924412
3b5e75aba5fc7f98646d9443764f10f73e04a099 30-Jul-2016 Robert Greenwalt <rgreenwalt@google.com> Stop exposing LTE_CA as a RAT type.
am: 2cd7606f4d

Change-Id: I4b5afadbcf02e723f8dbd9025cb5152dc30639fa
b4052cd6c57b262bb7c0a2add26cf279f20e055d 30-Jul-2016 Amit Mahajan <amitmahajan@google.com> Call pollState() in APM if RAT or radio state changes.
am: 07a76e6efd

Change-Id: Ic3537b52ccddece6dcf37b2da76cd70692e7ddbe
b3e64b01c117663c1599da30492ee1d0d0672952 30-Jul-2016 Jack Yu <jackyu@google.com> Merge "Fixed that RAT_UNKNOWN incorretly reported in metrics data." into nyc-mr1-dev
ca882dcdf8dfd9fa01f402108a7aaea2a041c363 30-Jul-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Stop exposing LTE_CA as a RAT type." into nyc-mr1-dev
aad98b463eae7b3f24913948b3eafba37d7b22dc 30-Jul-2016 Amit Mahajan <amitmahajan@google.com> Merge "Call pollState() in APM if RAT or radio state changes." into nyc-mr1-dev
07a76e6efd5b6e9193cd159c82c88c4eb79d117e 29-Jul-2016 Amit Mahajan <amitmahajan@google.com> Call pollState() in APM if RAT or radio state changes.

Earlier state was never polled in APM. With b/27486486 it was done
on network state changes since that is considered a modem trigger.
RAT and radio state changes are also modem triggers and should
trigger pollState().

Bug: 30286279
Change-Id: I6695a8db5b61170643cc4a81c7db25072804b306
erviceStateTracker.java
2cd7606f4d72cb7340c164aebb1835cd87f4996c 29-Jul-2016 Robert Greenwalt <rgreenwalt@google.com> Stop exposing LTE_CA as a RAT type.

Instead use a new hidden field in ServiceState until we
get a real api in O.

bug:30480638
Change-Id: I40e3eeddced2c8f078c51fe8be4d45ce2e1139df
atRatcheter.java
erviceStateTracker.java
528dc88249f11282c6ee260ca269987da55fcaf5 29-Jul-2016 Jack Yu <jackyu@google.com> Fixed that RAT_UNKNOWN incorretly reported in metrics data.

Send full service state in the event.

bug: 29390529
Change-Id: Ibf71e961b1c4fdaf8c404af102ae6bcc55380af1
elephonyEventLog.java
28cf0bb00cf38d93060aeb2e2bffdf1def6f32d0 29-Jul-2016 Brad Ebinger <breadley@google.com> Retry Connecting to ImsService if it is not up yet am: c10b7afb2e am: 83440d4e3c
am: 80a1bb61ac

Change-Id: Ie3e383049c22a441fe250f5d5f8056298364c44a
80a1bb61ac29074d5b4c34560b5caa08ab3c7ee8 29-Jul-2016 Brad Ebinger <breadley@google.com> Retry Connecting to ImsService if it is not up yet am: c10b7afb2e
am: 83440d4e3c

Change-Id: I024d96082ee764eb2a8f81196e296cf99640cffa
83440d4e3ce847ba29b3e81031aa645fbe4ac876 29-Jul-2016 Brad Ebinger <breadley@google.com> Retry Connecting to ImsService if it is not up yet
am: c10b7afb2e

Change-Id: I5618f6543159d2b48ac446c398cf3ea8632e6943
8b118b28a31ed863a6cc2bcc13949fb6be8a91da 28-Jul-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Retry Connecting to ImsService if it is not up yet" into nyc-mr1-dev
c94caaa28567919ee617480f278577954e528a25 28-Jul-2016 Tyler Gunn <tgunn@google.com> Fix issue where incoming rejected calls were not being marked as such. am: 1999b9772e am: a7abb729bb
am: 1d2eb67d2e

Change-Id: Ie4b045f6138948e3e76f9efbacdbc4e77e5ad63f
926073462af7ff12fa429585aab576a0da918ce0 28-Jul-2016 Roozbeh Pournader <roozbeh@google.com> Make English the default language for Indian SIMs am: 9bc0e394c5 am: 52e48357ff
am: 4f3aee9146

Change-Id: I66d1bc4960a3583dec52b99fc52b21b659928e4a
1d2eb67d2e411ff0bf8961c4ab584cb6229e6f76 28-Jul-2016 Tyler Gunn <tgunn@google.com> Fix issue where incoming rejected calls were not being marked as such. am: 1999b9772e
am: a7abb729bb

Change-Id: I0cc0f72f35de1b16a008f710657991e3fd12730b
4f3aee91468bee66903ae4a7ac3561dc49ccb48e 28-Jul-2016 Roozbeh Pournader <roozbeh@google.com> Make English the default language for Indian SIMs am: 9bc0e394c5
am: 52e48357ff

Change-Id: I686dde5bca0fe2e67db1c9fda39f643fb7340225
a7abb729bb5ff2cb3aeaf6f10d4afe1afd1c4323 28-Jul-2016 Tyler Gunn <tgunn@google.com> Fix issue where incoming rejected calls were not being marked as such.
am: 1999b9772e

Change-Id: I475fe1417b8721379ce32022ff9a863a0289bf63
52e48357ff6158ad17848832d6791cd9e9deae45 28-Jul-2016 Roozbeh Pournader <roozbeh@google.com> Make English the default language for Indian SIMs
am: 9bc0e394c5

Change-Id: Iea5b8b59172641f18ef8cfcd48c1822918ac000d
2e82015e201c74882aaf2693bc2435c49e83e9b3 28-Jul-2016 Tyler Gunn <tgunn@google.com> Merge "Fix issue where incoming rejected calls were not being marked as such." into nyc-mr1-dev
5e453f91a431c0493988ce3984cb5bc0879c20eb 28-Jul-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Make English the default language for Indian SIMs" into nyc-mr1-dev
1999b9772eb9b3a230bd2520ffebb152544eaba9 28-Jul-2016 Tyler Gunn <tgunn@google.com> Fix issue where incoming rejected calls were not being marked as such.

Code in onDisconnect for ImsPhoneConnection assumed that if the current
disconnect cause is "LOCAL" that we couldn't ever override this value.
However, in the case of an incoming rejected call, we do want to override
the disconnect cause.

Bug: 30474601
Change-Id: I3ffe4e6844658e063c01ea5e3aeec82989d053cd
msphone/ImsPhoneConnection.java
9bc0e394c572693ac14770d25d024ef85f130c55 28-Jul-2016 Roozbeh Pournader <roozbeh@google.com> Make English the default language for Indian SIMs

Previously, Hindi would be reported by ICU's addLikelySubtags(), but
English is a better default for India.

Bug: 29627436
Change-Id: I168f05c4c0377ea49bd9eb8591c6dddac16d5605
ccTable.java
b50bbb4bfbf9a16cb95d320dd8ce91f8a4bb0299 28-Jul-2016 Robert Greenwalt <rgreenwalt@google.com> Merge \\\\"EF_SDN and EF_EXT3 under DF_ADF shall be selected for USIM application\\\\" am: df3f5e869b am: 8033cae230 am: 1a8d8682ec
am: de061412f6

Change-Id: Ia1fcc24bbf3d2712b5cc6e422b2dfe1f386d47d5
de061412f66500bf663a661c250692ed758df9e3 28-Jul-2016 Tsukasa Gotou <tsukasa.x.gotou@sonymobile.com> Merge \\\"EF_SDN and EF_EXT3 under DF_ADF shall be selected for USIM application\\\" am: df3f5e869b am: 8033cae230
am: 1a8d8682ec

Change-Id: I960656fd402b64367feb5123e0b0af2b92d307f5
1a8d8682ec240f73dc249e1e3de5663d198832b3 28-Jul-2016 Robert Greenwalt <rgreenwalt@google.com> Merge \\"EF_SDN and EF_EXT3 under DF_ADF shall be selected for USIM application\\" am: df3f5e869b
am: 8033cae230

Change-Id: I4e18b3a7d681f3f50a40ca5e74124d1f9901d8f9
8033cae230e96e312642b859b19ab626a724a9fe 28-Jul-2016 Tsukasa Gotou <tsukasa.x.gotou@sonymobile.com> Merge \"EF_SDN and EF_EXT3 under DF_ADF shall be selected for USIM application\"
am: df3f5e869b

Change-Id: Ia25cef16bbc52946d4e04eaddb780c8423030a36
d02ce67489a01a3fb35f200422e1fe499b31f295 28-Jul-2016 Amit Mahajan <amitmahajan@google.com> Change to not broadcast emergency call state changes on wifi call. am: 57dd2efb73 am: 7b5e9c8c2e
am: 40c7523024

Change-Id: Idc931044e010a8c65fc5c0d25786813f899845d5
96c5275a9d991ed78b40e4d338255e3529f305f4 28-Jul-2016 Jeff Davidson <jpd@google.com> resolve merge conflicts of b2f61d5 to master

Change-Id: Ib29e9b6c24a4a6403d63805921f3927a7918811d
40c7523024ad3d39b86b08cba11ba10f494a1e76 28-Jul-2016 Amit Mahajan <amitmahajan@google.com> Change to not broadcast emergency call state changes on wifi call. am: 57dd2efb73
am: 7b5e9c8c2e

Change-Id: Ic62dcde1b59329588bb873eff1b159f9756adcec
b2f61d53bcf75bf1c90066a65714292dc281fd9a 28-Jul-2016 Jeff Davidson <jpd@google.com> Updated tests and callers for carrier \\"associated\\" apps. am: 3aab0a4e86
am: d00ed6d53c

Change-Id: I8d7b9f3b7ab4cc281589c68a0ff2d4e15ac59d37
c10b7afb2e174246d7110db5cf2948129af4603d 27-Jul-2016 Brad Ebinger <breadley@google.com> Retry Connecting to ImsService if it is not up yet

When the ImsService crashes, there is a possibility of the
ACTION_IMS_SERVICE_UP broadcast getting received before the ImsService
is available from ServiceManager. This change introduces a retry timer to
try reconnecting the ImsService if it fails to bind.

Bug: 29891063
Change-Id: Id3d69d76630752f892ec80573d79f4da55c70395
msphone/ImsPhoneCallTracker.java
7b5e9c8c2ef3e50b255776cf773632f921221025 28-Jul-2016 Amit Mahajan <amitmahajan@google.com> Change to not broadcast emergency call state changes on wifi call.
am: 57dd2efb73

Change-Id: I9209f9dc14e7dffe497583ca6a7ca8cb0668812e
d00ed6d53c483cce9fbeb42de3709060440ab1eb 28-Jul-2016 Jeff Davidson <jpd@google.com> Updated tests and callers for carrier \"associated\" apps.
am: 3aab0a4e86

Change-Id: Ie838cb3f36c110a570b4573d342fd7f6e5d84ec7
da874dea5914db413a9424e5906abab5234ba9cf 28-Jul-2016 Robert Greenwalt <rgreenwalt@google.com> Fix tcp buffer sizes on LTE_CA.
am: 2f43e7848e

Change-Id: I09bd7e2d123da80a4c1bfc7e1390f88ab961ea30
58e123d9ce8ce49d7680bf6bdca095dd938431f4 27-Jul-2016 Amit Mahajan <amitmahajan@google.com> Merge "Change to not broadcast emergency call state changes on wifi call." into nyc-mr1-dev
413fb982e98b271e3ee05941b2a584aa1ce03d95 27-Jul-2016 Jeff Davidson <jpd@google.com> Merge "Updated tests and callers for carrier "associated" apps." into nyc-mr1-dev
57dd2efb733c7806170a8938b2808c8d72703dbe 27-Jul-2016 Amit Mahajan <amitmahajan@google.com> Change to not broadcast emergency call state changes on wifi call.

Bug: 30348902
Change-Id: I27811ed2d4f26785352f97890d0b6f2a6491880d
smCdmaPhone.java
62a1456fe97401cecac898431b94a70c43fe1b2f 27-Jul-2016 Robert Greenwalt <rgreenwalt@google.com> Fix tcp buffer sizes on LTE_CA. am: 2f43e7848e
am: 93f30d3f84

Change-Id: I16bb7fec86cccc8c38bdfc9f77f397692a58eb11
93f30d3f842f7be457d3ae5441758901ab53acef 27-Jul-2016 Robert Greenwalt <rgreenwalt@google.com> Fix tcp buffer sizes on LTE_CA.
am: 2f43e7848e

Change-Id: Iece148b704ca453b574b82b91e577b7ceed42296
3aab0a4e86bf59165a784104f4297f3a3388803f 21-Jul-2016 Jeff Davidson <jpd@google.com> Updated tests and callers for carrier "associated" apps.

Bug: 30141427
Change-Id: I15a4a04983e80e7d8c1b212ed6654ae5b6b3a0bf
ubscriptionInfoUpdater.java
9e461a51f6c6c93ed79fdc35a04ed491eb1a298d 27-Jul-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix tcp buffer sizes on LTE_CA." into nyc-mr1-dev
2f43e7848e6039b1f7541ef129fedad3b66947f0 26-Jul-2016 Robert Greenwalt <rgreenwalt@google.com> Fix tcp buffer sizes on LTE_CA.

Make them the same as LTE since we don't have an overlay setting for
LTE_CA (nor do we want one).

Also noticed that on CDMA/CDMA+LTE we didn't enable the ratcheting
mechanism so we'd bounce between LTE and LTE_CA unnecessarily.

bug:30269506
Change-Id: I34d308c7ee92745ce18700f31b8b68e78728b01e
erviceStateTracker.java
ataconnection/DataConnection.java
293b3fd3564b41168248a19e6b85a9097cb71794 26-Jul-2016 fionaxu <fionaxu@google.com> scrub pii in imsphoneconnection + code cleanup am: 77a1f167b9
am: 04d1dfe4de

Change-Id: I149ae3f7124905a81ff3076d86e31806bf72509c
04d1dfe4de41396863c108846bc33d5e08b368ed 26-Jul-2016 fionaxu <fionaxu@google.com> scrub pii in imsphoneconnection + code cleanup
am: 77a1f167b9

Change-Id: I137c4d70fd62d0dcd5d3c6da6da07be8409b2d59
77a1f167b962ceaf7972d246f4c23e17772d1c69 26-Jul-2016 fionaxu <fionaxu@google.com> scrub pii in imsphoneconnection + code cleanup

bug: 30368127
Change-Id: I14e8e6de97543786cc7dd327fe4a79f8968ecf04
ccPhoneBookInterfaceManager.java
ccProvider.java
dma/sms/BearerData.java
msphone/ImsPhoneConnection.java
icc/SIMRecords.java
0f5f59a45e648c4225d5b453a041e46535e3507c 25-Jul-2016 Amit Mahajan <amitmahajan@google.com> Update ECBM system property early to reduce race condition window. am: ec15d7bd04
am: a5340df2ff

Change-Id: I9f023dee3d9baa3cc4f1a80d1ca4a346bf5fc36f
a5340df2ff11166e05bc964495aa5ba1c1cdce77 25-Jul-2016 Amit Mahajan <amitmahajan@google.com> Update ECBM system property early to reduce race condition window.
am: ec15d7bd04

Change-Id: I64aa1ae02c5f36f77fc95657103adfb0f981cfd8
ec15d7bd04fc3e6cba2cc6645184c5f47c55aea8 25-Jul-2016 Amit Mahajan <amitmahajan@google.com> Update ECBM system property early to reduce race condition window.

Update property before broadcasting ECBM intent.

Bug: 30237792
Change-Id: I787fd55cc9406d7f48b24797e29eb11413d6c0c0
smCdmaPhone.java
msphone/ImsPhone.java
d05beef2022bd91f10a3abfb908d9cb2f24c31f0 22-Jul-2016 Tsukasa Gotou <tsukasa.x.gotou@sonymobile.com> EF_SDN and EF_EXT3 under DF_ADF shall be selected for USIM application

Service dial number shall be retrieved from EF_SDN and EF_EXT3 under
DF_ADF if USIM application is active.

UsimFileHandler.getEFPath() returns MF_SIM + DF_ADF for EF_FDN and
EF_EXT2 in the current implementation. EF_SDN and EF_EXT3 shall also be
treated in the same way.

Bug: 30330927
Change-Id: I7282c5d1ab30369f7e967ececd53905de67d5ad9
icc/UsimFileHandler.java
6df05e6fb96a9331136e0cc45b454e3d8e0fdcdd 23-Jul-2016 Tyler Gunn <tgunn@google.com> Handle video session modify responses while paused. am: db5b6a5018
am: dfa53388af

Change-Id: I0c74b40d1152e46276eebfd907f3bb711d818f38
dfa53388af9f87c38201cd7500888ac346235b3c 23-Jul-2016 Tyler Gunn <tgunn@google.com> Handle video session modify responses while paused.
am: db5b6a5018

Change-Id: Ia2e154583475158f5d3964b7a5980b8b70594543
db5b6a50186bc3fc8d42c50f4d23c91b05412ec6 22-Jul-2016 Tyler Gunn <tgunn@google.com> Handle video session modify responses while paused.

There is a limitation in the modem implementation whereby when the remote
party has paused video (eg sent dialer to the background) any session
modify requests which are sent are responded to, but the video state of
the connection is NOT updated until the video state becomes unpaused
again.

To handle this, ImsPhoneConnection will now listen for session modify
responses received via the VideoProvider. When paused, valid
responses to requests will be used to update the current video state of
the ImsPhoneConnection. When the video becomes unpaused, we will resume
using the modem reported video state.

Bug: 29381561
Change-Id: I1ac854dbc292affb3bc0bb9ce98b2fea33014cbb
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
8d1e1bb544cdc60283f40eb7f1ea862eb59eb227 22-Jul-2016 Tyler Gunn <tgunn@google.com> Handle failure to pull an external call. am: 3de018282c
am: 1121cdd6d7

Change-Id: I562833fe87c2f4359f515cb2bcc83bf035994bd0
1121cdd6d73d94ff9163550c701e84f9f3814a2f 22-Jul-2016 Tyler Gunn <tgunn@google.com> Handle failure to pull an external call.
am: 3de018282c

Change-Id: I5c38612ffc376ffcc0cff1e77786b18da4be5f08
cdcdab3863bfa009f50ab30569ec2eefb31d34d2 22-Jul-2016 Tyler Gunn <tgunn@google.com> Merge "Handle failure to pull an external call." into nyc-mr1-dev
e3eb5782734bc9c8dc357dbfe8daa54b760812fe 22-Jul-2016 Amit Mahajan <amitmahajan@google.com> Use correct convention for member variable. am: 0da16b3708
am: cf744a8df3

Change-Id: I3ab98f7c5a2bc3bb07aa21c13899360ac669c1d4
cf744a8df38a904d9aca3e248598665ff45885a5 22-Jul-2016 Amit Mahajan <amitmahajan@google.com> Use correct convention for member variable.
am: 0da16b3708

Change-Id: I3867ae5d0da2bf8a4df20006db26f95e4eae8a41
c95fe5fae8f3571bd9a8cd2571f02ca59770eaeb 21-Jul-2016 Amit Mahajan <amitmahajan@google.com> Merge "Use correct convention for member variable." into nyc-mr1-dev
0da16b3708f3394e9d72d8dd525a50ad37aa8a65 20-Jul-2016 Amit Mahajan <amitmahajan@google.com> Use correct convention for member variable.

Bug: 24613146
Change-Id: Ib3fce8e01300f97fae556422aae6e11884998700
msphone/ImsPhone.java
3de018282cd7dae66d4dfff41303e81419d2004d 20-Jul-2016 Tyler Gunn <tgunn@google.com> Handle failure to pull an external call.

Look for two expected call fail causes which can occur if an external
call is being pulled, and the pulled ImsPhoneConnection disconnects.
These call fail causes are a signal that the call pull has failed.

We use this to trigger a callback which causes the TelephonyConnection to
swap the ImsPhoneConnection out for the ImsExternalConnection.

Bug: 29906222
Change-Id: I22e570ffd578ef5e474d6abaf5d89378bd17996c
onnection.java
msphone/ImsExternalCallTracker.java
msphone/ImsPhoneCallTracker.java
msphone/ImsPullCall.java
d0fe046aadaf00137f3351a24fd9c1fc9ff20cf3 20-Jul-2016 Amit Mahajan <amitmahajan@google.com> Merge \\"Store selfIdentityUris provided by IMS service.\\" into nyc-mr1-dev am: 2a6e7242e7
am: aef8f7ef11

Change-Id: Ib16b39acd294ec3c6907557f78ad63d8e9c67c83
aef8f7ef114d91665f517e9396fd100315008bd3 20-Jul-2016 Amit Mahajan <amitmahajan@google.com> Merge \"Store selfIdentityUris provided by IMS service.\" into nyc-mr1-dev
am: 2a6e7242e7

Change-Id: Iba361d253086d0eef6881f5be2b86fe25d14a94b
2a6e7242e703827778fd74d76012d1d6f819eb30 20-Jul-2016 Amit Mahajan <amitmahajan@google.com> Merge "Store selfIdentityUris provided by IMS service." into nyc-mr1-dev
3c781a32b35864bf9df211ba247bcebdd27e01c2 19-Jul-2016 Robert Greenwalt <rgreenwalt@google.com> Merge \\"Exclude DUN from data-disabled override.\\" into nyc-mr1-dev am: 625407ffc3
am: 16da014000

Change-Id: If1df86536d7d5baa25b6d7f24ea0560254ed1de1
16da014000424e39023cd85765151f5512ffa172 19-Jul-2016 Robert Greenwalt <rgreenwalt@google.com> Merge \"Exclude DUN from data-disabled override.\" into nyc-mr1-dev
am: 625407ffc3

Change-Id: Ie4a01b1a149db4d8398f6e4219600bd573cd5227
625407ffc32664bb63c8f4edaf4f17355bfd92ec 19-Jul-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Exclude DUN from data-disabled override." into nyc-mr1-dev
d2b1b9dbc1f6a4fa960c9b5762f82e503cc37c27 18-Jul-2016 Amit Mahajan <amitmahajan@google.com> Store selfIdentityUris provided by IMS service.

Bug: 24613146
Change-Id: I337a84a2ed6a37eaa146f9abc2ad28c059ff37e5
hone.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
ffc929881a789eb89c86b6614209a04f75b22f36 18-Jul-2016 Tyler Gunn <tgunn@google.com> Merge \\"Fix issue with pulling a previously pulled call.\\" into nyc-mr1-dev am: c18b300f7c
am: 15a1bcd108

Change-Id: Ic0de14e410061f4f806c2637ad872019dac513ac
15a1bcd10865a37d96b39d505d948232e65456d2 18-Jul-2016 Tyler Gunn <tgunn@google.com> Merge \"Fix issue with pulling a previously pulled call.\" into nyc-mr1-dev
am: c18b300f7c

Change-Id: I34a25c56b38cc7d11d5e452676ea161fdaa0c7f2
c18b300f7c9654674af6ee0fc5eb12679c8fb8f8 18-Jul-2016 Tyler Gunn <tgunn@google.com> Merge "Fix issue with pulling a previously pulled call." into nyc-mr1-dev
443b0ae99852b74898fa688f90dee303a80c1b89 15-Jul-2016 Robert Greenwalt <rgreenwalt@google.com> Exclude DUN from data-disabled override.

Don't use DUN's restricted status to override the user, carrier
or netpolicy control over metered networks. This should be fixed
better in the future, but this targeted fix should be good for now.

bug:30120613
Change-Id: I38217b6537cc66b4d678fb82d7fa95388d5a5d6c
ataconnection/ApnContext.java
ataconnection/DataConnection.java
ataconnection/DcTracker.java
a91b34b37f247eb6e36eef4af2ff74da812d2f54 16-Jul-2016 Ta-wei Yen <twyen@google.com> Merge \\"Handle Verizon iPhone WAP push for VVM\\" into nyc-mr1-dev am: 0b0a0104be
am: 1b13bd9d6b

Change-Id: Ia266028d2c7e7c55850419219ec8a9550123ccac
1b13bd9d6b7de477ce39509e2266f086b1a56d7e 16-Jul-2016 Ta-wei Yen <twyen@google.com> Merge \"Handle Verizon iPhone WAP push for VVM\" into nyc-mr1-dev
am: 0b0a0104be

Change-Id: I528fd17ea6a5de3c72ec2dbae7123726c385a015
0b0a0104beb73b67fdf738681ee9b47ce67b58a9 16-Jul-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Handle Verizon iPhone WAP push for VVM" into nyc-mr1-dev
9452da00610c4d8c4378ee112de88214d4ec4383 16-Jul-2016 Ta-wei Yen <twyen@google.com> Handle Verizon iPhone WAP push for VVM

Verizon iPhone WAP push is a pure ASCII message, which is used to be
dropped by the system.

this CL will attempt to parse such SMS as an "alternative" VVM format.
The filter will not drop the SMS.

Change-Id: I7ea68bfa7a0bdc190fdc86c85c0e532cbf301e74
Fixes: 30123702
isualVoicemailSmsFilter.java
isualVoicemailSmsParser.java
5cd65c0be8d9f0df84e291269393e6bdb1440ea1 16-Jul-2016 Vineeta Srivastava <vsrivastava@google.com> Merge \\"Return IMEI as device id if carrier config requires it.\\" into nyc-mr1-dev am: f58233297e
am: 3a345e5ec5

Change-Id: Ib04200fd274dc8754b72ea96c3e93236fc684f0d
2dc8e758331fd83e43704af511bb82b655f6952b 15-Jul-2016 Chen Xu <fionaxu@google.com> Merge "MSIM: Remove calling duplicate setMccMnc"
449f8237502f6fccb6cc13949cf9cd2f070ef877 07-Mar-2016 Sandeep Gutta <sangutta@codeaurora.org> MSIM: Remove calling duplicate setMccMnc

When records loading completed SubscriptionInfoUpdater
taking care of updating MccMnc by calling setMccMnc(),
remove the duplicate call from SIMRecords.java.

Bug: 28090974
Change-Id: I02036a70912bd8a09c75fe1cff9b213bb787dc5b
icc/SIMRecords.java
3a345e5ec5d90ad3bdf7983dcecab29fba143f48 15-Jul-2016 Junda Liu <junda@google.com> Merge \"Return IMEI as device id if carrier config requires it.\" into nyc-mr1-dev
am: f58233297e

Change-Id: Ibf3c9f37cbbba9e7cbe4ebd74966d5357c412799
f58233297ef5955865f1be465da29a2cf2618626 15-Jul-2016 Vineeta Srivastava <vsrivastava@google.com> Merge "Return IMEI as device id if carrier config requires it." into nyc-mr1-dev
aefbc9586bd14e604a7f6ddf666e3da56f19ddf8 15-Jul-2016 Fyodor Kupolov <fkupolov@google.com> Application names are now lazily loaded am: 2345d2e2fa
am: 088be0a99f

Change-Id: I22829d7709b2821984c4637b24c33940b676ce3d
088be0a99fa667e79c1ae5d1d4cbc037f5db9ee8 15-Jul-2016 Fyodor Kupolov <fkupolov@google.com> Application names are now lazily loaded
am: 2345d2e2fa

Change-Id: I2d1b28c4733155c26c2b367bc106db2375536044
2345d2e2fa613ac4a2ecc670c0a9c924158fb3a2 14-Jul-2016 Fyodor Kupolov <fkupolov@google.com> Application names are now lazily loaded

Previously when SmsApplication.getDefaultApplication was called, application
names were loaded for all candidate apps. The problem with that approach
that names are expensive to load and not always needed.

The implementation has been changed to only load application name when
it's requested by getApplicationName(Context).

Bug: 26237300
Change-Id: I034c62ad66794e180a3918f7cd18675134550ca1
msApplication.java
21407702972eb51518fe11ccfc9942f4b9c65767 15-Jul-2016 Pankaj Kanwar <pkanwar@google.com> Merge \\"Enhance logic for determining if answering call will disconnect fg call.\\" into nyc-mr1-dev am: c73180f291
am: b342069b8f

Change-Id: I9833bdf02cad09af2a520de1b8189106101af604
b342069b8f17d6e12778593af82daa8ee1c06493 15-Jul-2016 Tyler Gunn <tgunn@google.com> Merge \"Enhance logic for determining if answering call will disconnect fg call.\" into nyc-mr1-dev
am: c73180f291

Change-Id: Id0f24681a91f1a2219ce651de96c5b16a29f55d7
c73180f29125d48e582e5104d65635601f0d296b 15-Jul-2016 Pankaj Kanwar <pkanwar@google.com> Merge "Enhance logic for determining if answering call will disconnect fg call." into nyc-mr1-dev
cd2d7521585d928a6497baef88bfb99d2ecaf51b 15-Jul-2016 Junda Liu <junda@google.com> Return IMEI as device id if carrier config requires it.

Previously getDeviceId returns MEID for CDMA phones, now it will return IMEI if a carrier config requires it.

Bug: b/29340579
Change-Id: I61447281d45999e10eaca696da5a7032fd7e6591
smCdmaPhone.java
6607b3df0c560aac0a1b202e56fa0ccc1dee4056 14-Jul-2016 Jack Yu <jackyu@google.com> Merge \\"Disable VT when users turn off data or hit data limit\\" into nyc-mr1-dev am: 2014a27a7b
am: 4ab1152455

Change-Id: Id72d98f3d94de5c086d4d42b2a347bced2177efc
4ab11524551db332d73b3a0673656427922b1a0c 14-Jul-2016 Jack Yu <jackyu@google.com> Merge \"Disable VT when users turn off data or hit data limit\" into nyc-mr1-dev
am: 2014a27a7b

Change-Id: Ib67865ff6aae2b809327535cff979f2f29178217
2014a27a7b2a3d121d69488b4f577d93180009d5 14-Jul-2016 Jack Yu <jackyu@google.com> Merge "Disable VT when users turn off data or hit data limit" into nyc-mr1-dev
88c3d762e1c8b13b217b142f33025acbf8169252 14-Jul-2016 Ta-wei Yen <twyen@google.com> Merge \\"Allow key-value pair without value for VVM SMS\\" into nyc-mr1-dev am: b360dcec28
am: 769a1c1902

Change-Id: I84c46ff651047fab2e2aef6d8ad13b7fd4e14303
769a1c1902edc6452ad59b567d3e040e3dc5f2a5 14-Jul-2016 Ta-wei Yen <twyen@google.com> Merge \"Allow key-value pair without value for VVM SMS\" into nyc-mr1-dev
am: b360dcec28

Change-Id: I3177fa3d88be5a3dd605c14dbe2f5e1979038b63
b360dcec28bf1648166d60804bd94084eab11e3b 14-Jul-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Allow key-value pair without value for VVM SMS" into nyc-mr1-dev
a2e7767bf6e66c92b2e96954c7b9e2194431043d 14-Jul-2016 Sungmin Choi <sungmin.choi@lge.com> uicc: Add FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT intent flag on CatCmdmessage am: 59a14aab02 am: f0a3dc10c4
am: c43b6ca6e0

Change-Id: I1e6a733b77496e9e22c841141e08bb13b09986de
c43b6ca6e0711d220e7eaf9a58ccd6abe5b230a0 14-Jul-2016 Sungmin Choi <sungmin.choi@lge.com> uicc: Add FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT intent flag on CatCmdmessage am: 59a14aab02
am: f0a3dc10c4

Change-Id: Ida510b4eacc7c122edcd18daf4921674f9c291e7
3557a4a892a03ba842125568a7f6868b0eb56dd2 14-Jul-2016 Sungmin Choi <sungmin.choi@lge.com> uicc: Add FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT intent flag on CatCmdmessage
am: 59a14aab02

Change-Id: I4e7ae0d79a2b8035525c4b5dc7020bdb0e6c67ea
f0a3dc10c4d841719c136a01a1b28db71fc9fc8f 14-Jul-2016 Sungmin Choi <sungmin.choi@lge.com> uicc: Add FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT intent flag on CatCmdmessage
am: 59a14aab02

Change-Id: I716a1c3618b9d8a4c189dc7ce969bb35ca968a48
7d61cd7d933a2611932bfdce49deb5e4371fd4c1 14-Jul-2016 Ta-wei Yen <twyen@google.com> Allow key-value pair without value for VVM SMS

While a field doesn't have a value the field should not be sent, but
some carrier ignores this specification.

This CL relaxes the constraint on key-value pairs.

Change-Id: Ic3f8b4ff538447fb2aec6aa0107015f8c3fd0808
Fixes: 30124301
isualVoicemailSmsParser.java
59a14aab02a9e87bd209f63654d047ab9f214afd 12-Jul-2016 Sungmin Choi <sungmin.choi@lge.com> uicc: Add FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT intent flag on CatCmdmessage

If framework get the SETUP_MENU event before geting the BOOT COMPLETE,
STK menu intent is missing. Then User cannot see the STK menu on that seen.
Thus FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT flag is added for this case.

Bug: 29881312
Change-Id: I1e91e6ee6eae15d0289a739a81e496956eb2e9a1
Signed-off-by: hoonsung.park <hoonsung.park@lge.com>
Signed-off-by: Sungmin Choi <sungmin.choi@lge.com>
at/CatService.java
79de4402e6be40cbe9cef27d8378645957e4ec88 14-Jul-2016 Tyler Gunn <tgunn@google.com> Enhance logic for determining if answering call will disconnect fg call.

There is logic to determine if a FG video call should be disconnected
when an audio call is received. It was missing a check to see if VOWIFI
is enabled. If VOWIFI is not enabled, then the check applies. If VOWIFI
is enabled, the check does not apply.

Bug: 28933314
Change-Id: I57ace7583906bddb93f81735809a2e21069da380
msphone/ImsPhoneCallTracker.java
a8f5a859f8e4a15902d729af5d2edc9a9433ba41 08-Jul-2016 Jack Yu <jackyu@google.com> Disable VT when users turn off data or hit data limit

Disable VT when users turn off data or hit data limit. If
there are ongoing VT calls, we'll need to downgrade them
to VoLTE calls.

bug: 27316521
Change-Id: I7988d0475583e7fec50888eaee1e5a0d4d5b8cc6
hone.java
ataconnection/DataConnection.java
ataconnection/DataEnabledSettings.java
ataconnection/DcTracker.java
msphone/ImsPhoneCallTracker.java
825a1ae2dd9eba29b7637a9ea2665c016b780a59 13-Jul-2016 fionaxu <fionaxu@google.com> Do not allow premium SMS during SuW am: d8764991ca am: b6cb6ad791 am: b63de96943 am: aa6025d02c am: 6ac76ba0a7 am: bd6080f644 am: 23e85fe010 am: 7933d601ff am: cd86f722d9 am: 32388fe90e am: 756ccba97f
am: 2c4daadc04

Change-Id: Idf4da83fba079f7f2d5d84b4254dc417b576242c
2c4daadc0430022e1e617040fde5738ebac00511 13-Jul-2016 fionaxu <fionaxu@google.com> Do not allow premium SMS during SuW am: d8764991ca am: b6cb6ad791 am: b63de96943 am: aa6025d02c am: 6ac76ba0a7 am: bd6080f644 am: 23e85fe010 am: 7933d601ff am: cd86f722d9 am: 32388fe90e
am: 756ccba97f

Change-Id: I82d110d6bd6f3326d6fd1a87255c347c30da1383
756ccba97f11e8aeec25b8a05af248f499f578c7 13-Jul-2016 fionaxu <fionaxu@google.com> Do not allow premium SMS during SuW am: d8764991ca am: b6cb6ad791 am: b63de96943 am: aa6025d02c am: 6ac76ba0a7 am: bd6080f644 am: 23e85fe010 am: 7933d601ff am: cd86f722d9
am: 32388fe90e

Change-Id: Iaa3cbf7ea815831564a9f1c0e4bbcc875e6d242f
32388fe90e838226db294147b79d348d20382b04 13-Jul-2016 fionaxu <fionaxu@google.com> Do not allow premium SMS during SuW am: d8764991ca am: b6cb6ad791 am: b63de96943 am: aa6025d02c am: 6ac76ba0a7 am: bd6080f644 am: 23e85fe010 am: 7933d601ff
am: cd86f722d9

Change-Id: I914b72b6671a65db35e4d40c9ab56237e4a4bdb1
cd86f722d91d0f5e37215520dc565fc22bba0da4 13-Jul-2016 fionaxu <fionaxu@google.com> Do not allow premium SMS during SuW am: d8764991ca am: b6cb6ad791 am: b63de96943 am: aa6025d02c am: 6ac76ba0a7 am: bd6080f644 am: 23e85fe010
am: 7933d601ff

Change-Id: I17e1a44949c91ccdecf21e3dae8d8a38dd9bfa8a
7933d601ff5a637c143309ee4d45140e3abc596e 13-Jul-2016 fionaxu <fionaxu@google.com> Do not allow premium SMS during SuW am: d8764991ca am: b6cb6ad791 am: b63de96943 am: aa6025d02c am: 6ac76ba0a7 am: bd6080f644
am: 23e85fe010

Change-Id: I843aa9d978dd5a3ea9713d899a01ce41ca6856b6
23e85fe01035af3bfd6f939ce226009f288527a0 13-Jul-2016 fionaxu <fionaxu@google.com> Do not allow premium SMS during SuW am: d8764991ca am: b6cb6ad791 am: b63de96943 am: aa6025d02c am: 6ac76ba0a7
am: bd6080f644

Change-Id: I6befcef00c76930c2e1f0aafa6583533282fd00e
bd6080f644d8c2c158892940487ce5c4fa0e278d 13-Jul-2016 fionaxu <fionaxu@google.com> Do not allow premium SMS during SuW am: d8764991ca am: b6cb6ad791 am: b63de96943 am: aa6025d02c
am: 6ac76ba0a7

Change-Id: I56749d214ce413982a24ef86ee20e4c5af046b6f
6ac76ba0a754025789985b4c26fa4d5baf1d0dfa 13-Jul-2016 fionaxu <fionaxu@google.com> Do not allow premium SMS during SuW am: d8764991ca am: b6cb6ad791 am: b63de96943
am: aa6025d02c

Change-Id: I6abf13b4106dacf49e0cf7a26ac055e324eea808
aa6025d02c6f1837aa3b5b26a5d8e9bc72e91f70 13-Jul-2016 fionaxu <fionaxu@google.com> Do not allow premium SMS during SuW am: d8764991ca am: b6cb6ad791
am: b63de96943

Change-Id: I35219792f39314bd644368374fd641c953f9a55c
b63de96943fef7d4ccffc36536398ddb49608845 13-Jul-2016 fionaxu <fionaxu@google.com> Do not allow premium SMS during SuW am: d8764991ca
am: b6cb6ad791

Change-Id: I085bed6a4ccbc3aa9f9334b3bb921a09a403b38f
814442c3754ef76d896247aa72cf0b050c6c0f29 13-Jul-2016 Tyler Gunn <tgunn@google.com> Fix issue with pulling a previously pulled call.

The bug reported is that sometimes a call isn't marked as pullable when
it should be.
The mExternalCallPullableState map tracks the last pullable state reported
by the network. When a new external call is created, there was an issue
where the network pullable state was not being correctly tracked. Further
updates to the network pullable state were not saved.

Bug: 30047706
Change-Id: I37060f12c393f2e2aba2bd2e8e3237f152495807
msphone/ImsExternalCallTracker.java
768ce01777d2100bda6b9f253c037f1e0192ea55 13-Jul-2016 Amit Mahajan <amitmahajan@google.com> Merge \\\\"Fix: updateExternalState() does not update SIM state to PERM_DISABLED\\\\" am: 6a7fad755d am: 213dd8bdc3 am: bc2d1292b3
am: b971522207

Change-Id: I6255b4ee7f5bf385c41b263f42dc88d8443700f0
b9715222078ce2e4d00ccc455c50943405165a06 13-Jul-2016 Yuling Liu <yuling.liu@sonymobile.com> Merge \\\"Fix: updateExternalState() does not update SIM state to PERM_DISABLED\\\" am: 6a7fad755d am: 213dd8bdc3
am: bc2d1292b3

Change-Id: I631a6d3a37c51182fe1e01de019e4c47828a5d7e
bc2d1292b392fca56f591915c98a1f91c9d0f05b 13-Jul-2016 Amit Mahajan <amitmahajan@google.com> Merge \\"Fix: updateExternalState() does not update SIM state to PERM_DISABLED\\" am: 6a7fad755d
am: 213dd8bdc3

Change-Id: I56caee4c62a1f97447e95c8ca7d5f4d38e6cd145
213dd8bdc35ad50b844d9b74df7b97f3b3584f16 13-Jul-2016 Yuling Liu <yuling.liu@sonymobile.com> Merge \"Fix: updateExternalState() does not update SIM state to PERM_DISABLED\"
am: 6a7fad755d

Change-Id: I3ae9b508408a5d2cd6993ec558f9f33dd4dbd8e4
6a7fad755db5fd9b9580887c94d133fff8f90471 13-Jul-2016 Amit Mahajan <amitmahajan@google.com> Merge "Fix: updateExternalState() does not update SIM state to PERM_DISABLED"
6c12d8a20e062355ff883e7b6adf5bd05297db5c 13-Jul-2016 Robert Greenwalt <rgreenwalt@google.com> Merge \\\\"Support self-explanatory icon for GET INKEY and GET INPUT commands\\\\" am: f80c9f7aef am: b2354f7861 am: 9c346f40d4
am: 4e5bb018fe

Change-Id: Icc74654423a2eb39498937977ed30a601af58bf2
4e5bb018fe0b0c2bf0c4af0f97e314a6f5bfe0c7 13-Jul-2016 Takeshi Shinohara <takeshi.x.shinohara@sonymobile.com> Merge \\\"Support self-explanatory icon for GET INKEY and GET INPUT commands\\\" am: f80c9f7aef am: b2354f7861
am: 9c346f40d4

Change-Id: I77869c15a35ef5b8c561462654e79b01142bc9f9
9c346f40d43ceadbd1d6475f06164b2652e692f2 13-Jul-2016 Robert Greenwalt <rgreenwalt@google.com> Merge \\"Support self-explanatory icon for GET INKEY and GET INPUT commands\\" am: f80c9f7aef
am: b2354f7861

Change-Id: Ie4e94743ca9c6d622d16efd2effafc247c2b9944
b2354f78614da9b9777942cb373975509ccf4f9a 12-Jul-2016 Takeshi Shinohara <takeshi.x.shinohara@sonymobile.com> Merge \"Support self-explanatory icon for GET INKEY and GET INPUT commands\"
am: f80c9f7aef

Change-Id: Ie53d30ce565b0ee64e972fe59cea5c1aecf1ae16
220718bac9e64aa459c27d9ced61b21225985c14 12-Jul-2016 Chen Xu <fionaxu@google.com> Merge \\"remove PII from telephony log\\" into nyc-mr1-dev am: 0f6c27884f
am: 5cb90f2d09

Change-Id: Ib3685aaf2c4a0b7334b45c001abb79c45c43368b
5cb90f2d09812124b390a531b16a866f8bc9b14b 12-Jul-2016 fionaxu <fionaxu@google.com> Merge \"remove PII from telephony log\" into nyc-mr1-dev
am: 0f6c27884f

Change-Id: Icd974b644166b6ef6a08e358d56742301e01d7f8
0f6c27884f6e7d370853c6eed623698e87de7284 12-Jul-2016 Chen Xu <fionaxu@google.com> Merge "remove PII from telephony log" into nyc-mr1-dev
f93c1d8f996f800dae4d180b752410137e4a6ed9 12-Jul-2016 fionaxu <fionaxu@google.com> remove PII from telephony log

Bug: 30073833
Change-Id: I9d83cf29894956baa6d00b60716861664ca0189f
allForwardInfo.java
ccPhoneBookInterfaceManager.java
ccProvider.java
dma/sms/BearerData.java
icc/IccRecords.java
b0b6604c4acdf7d5d2480e360d2a03b40e7f69ae 27-May-2013 Takeshi Shinohara <takeshi.x.shinohara@sonymobile.com> Support self-explanatory icon for GET INKEY and GET INPUT commands

Self-explanatory icon should be supported for GET INKEY and GET INPUT
like the other proactive commands, e.g. DISPLAY TEXT. The icon
qualifier must be propagated to the STK application.

Bug: 30081488
Change-Id: Iac5b5d21bbd35be73870a7c0908e6cfdf9d5b5e2
at/CommandParamsFactory.java
at/Input.java
bdb53ae4ebeed0658da03f72513a821446b52b49 12-Jul-2016 Amit Mahajan <amitmahajan@google.com> Merge \\"Clean up calls in GsmCdmaCallTracker on GSM<->CDMA transitions.\\" into nyc-mr1-dev am: 9ed723c270
am: bd9acaafcb

Change-Id: I2219d884fc6d7b8db17a6cede6dddc30e097a213
60121181f6dc9502b5e424cad587ab167922c1c0 27-Aug-2012 Yuling Liu <yuling.liu@sonymobile.com> Fix: updateExternalState() does not update SIM state to PERM_DISABLED

setExternalState() shall be called with State.PERM_DISABLED if the state
of PIN1 is PinState.PINSTATE_ENABLED_PERM_BLOCKED. Refer to the same
logic in processLockedState().

Bug: 29864172
Change-Id: I68f6c62b3713520431177b041c23027e94a5d66b
icc/IccCardProxy.java
bd9acaafcba66799ae56794fddfbaee40f062890 12-Jul-2016 Amit Mahajan <amitmahajan@google.com> Merge \"Clean up calls in GsmCdmaCallTracker on GSM<->CDMA transitions.\" into nyc-mr1-dev
am: 9ed723c270

Change-Id: I62e2820186fa92c7cd6d6a710cff3d9590195684
9ed723c27069718e4ef3726696157cb392d20589 12-Jul-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Clean up calls in GsmCdmaCallTracker on GSM<->CDMA transitions." into nyc-mr1-dev
8dd4a1915f45460dfed9646470fbc0405bff934b 08-Jul-2016 Amit Mahajan <amitmahajan@google.com> Clean up calls in GsmCdmaCallTracker on GSM<->CDMA transitions.

Bug: 29972199
Change-Id: I2df4264a97239d6c87378ebae8e30abd8de6af0f
smCdmaCallTracker.java
smCdmaConnection.java
b82af4827d505f45511eb1e83a98abc3bcb0e1c5 12-Jul-2016 Tyler Gunn <tgunn@google.com> resolve merge conflicts of 7869b42 to master

Change-Id: I24f88e4403fbcebe009f8046566fef0bd6382f3c
7869b420f54132a09c18d094e3124b0a7a5372c4 12-Jul-2016 Tyler Gunn <tgunn@google.com> Finalizing Multiendpoint functionality.
am: 91c714c06c

Change-Id: Iccf335eedd183ffad8c846015fa61d82624789c9
91c714c06cc426b4f1af05a758c4d560b16f6d24 11-Jul-2016 Tyler Gunn <tgunn@google.com> Finalizing Multiendpoint functionality.

1) Finish plumbing of PULLING call state.
2) b/29522023 - Handle case where the maximum number of calls across all
devices has been reached and a new call cannot be placed; report a new
Telephony disconnect cause which maps to an appropriate user friendly
message.
3) b/29633039 - Make the ImsExternalCallTracker keep track of the last
call pull state for each external call. Also, track whether the device is
in a call, and whether video is enabled on the device. Use this to enforce
the rules that an external video call cannot be pulled if video is not
enabled on the device, and that calls cannot be pulled when there is an
active call on the device.
4) Fixed a circular initialization dependency between ImsPhoneCallTracker
and ImsExternalCallTracker. Previously, the ImsPhoneCallTracker would
spool up the ImsMultiEndpoint service and set the ImsExternalCallTracker
as a listener. HOWEVER, the ImsEXternalCallTracker isn't actually
created until AFTER the ImsPhoneCallTracker is. It just so happens the
ImsPhoneCallTracker init happens on a thread, so ImsExternalCallTracker
would normally be initialized before ImsPhoneCallTracker. Whoops.

Bug: 29522023
Bug: 29633039
Change-Id: Iddabb61dcad79c93665c28e07b333e807cbc576d
onnection.java
elephonyComponentFactory.java
msphone/ImsExternalCallTracker.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
80080339392cac44bfed28bc0c19d84232d1c9fd 09-Jul-2016 Chen Xu <fionaxu@google.com> Merge \\"Do not allow premium SMS during SuW\\" into nyc-mr1-dev am: 5f5b0f0daf
am: e4910b66df

Change-Id: Ibbcb9fbb53302f9283b14d39721e4a28dda6213b
e4910b66dfca8d94f8fc8335d36b055882ccf747 09-Jul-2016 fionaxu <fionaxu@google.com> Merge \"Do not allow premium SMS during SuW\" into nyc-mr1-dev
am: 5f5b0f0daf

Change-Id: If705833dbec2d8ef1c8a1009a09e85c64f1d0bba
d8764991caedd2cd5f6b92de0ea609313cbead03 07-Jul-2016 fionaxu <fionaxu@google.com> Do not allow premium SMS during SuW

Bug: 29420123
Change-Id: I41ef7138635f11fbe7f495dd81103458cb969c35
(cherry picked from commit 15f55ca2f204e664807e047b5f898693b274bab6)
MSDispatcher.java
5f5b0f0dafa88be620c759193bca346c875568d5 09-Jul-2016 Chen Xu <fionaxu@google.com> Merge "Do not allow premium SMS during SuW" into nyc-mr1-dev
7a3005bc0b7649d26f781767ce2449cfa1a1afa8 08-Jul-2016 Brad Ebinger <breadley@google.com> Merge \\"Add a public method to access the Radio state\\" into nyc-mr1-dev am: 1514d5753e
am: 1b319250f1

Change-Id: I4d3c3f2c9b637a9d12fe07682c6c845b48e9674f
1b319250f1f62b53e820d15b87c5ea316b9be9e4 08-Jul-2016 Brad Ebinger <breadley@google.com> Merge \"Add a public method to access the Radio state\" into nyc-mr1-dev
am: 1514d5753e

Change-Id: Ic4b2e368de954af47a077e84f2347efb311b8925
1514d5753e9518474fe08497c7b1ddfaa1fd07ce 08-Jul-2016 Brad Ebinger <breadley@google.com> Merge "Add a public method to access the Radio state" into nyc-mr1-dev
15f55ca2f204e664807e047b5f898693b274bab6 07-Jul-2016 fionaxu <fionaxu@google.com> Do not allow premium SMS during SuW

Bug: 29420123
Change-Id: I41ef7138635f11fbe7f495dd81103458cb969c35
MSDispatcher.java
5a1dcfc5b2c49726bfd6113a90b8fffea6af4823 08-Jul-2016 Shriram Ganesh <sganesh@codeaurora.org> Merge \\"Fix incorrect call radio type on UI during silent redial\\" into nyc-mr1-dev am: 6f62aeaeed
am: e5b643c141

Change-Id: I63d7aac8ca276d941dafde9a91ed3c3dd43eaf18
e5b643c141da2b4eb34ad4a2961b3a78585103e6 08-Jul-2016 Shriram Ganesh <sganesh@codeaurora.org> Merge \"Fix incorrect call radio type on UI during silent redial\" into nyc-mr1-dev
am: 6f62aeaeed

Change-Id: I0645b44b9a1632e34f0956f4394dd136674c40ea
6f62aeaeed40342a41a838245da92f9d6982aafd 08-Jul-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fix incorrect call radio type on UI during silent redial" into nyc-mr1-dev
d45e0852699f073cb67ef957eadffd4e8130aff5 22-Jun-2016 Shriram Ganesh <sganesh@codeaurora.org> Fix incorrect call radio type on UI during silent redial

When handover takes place, the ImsPhoneConnection objects
attached to the handover call are not cleaned up until the call
ends on the CS pipe after handover. As a result, the stale object
keeps updating UI on the IMS registration state. This causes the
call UI to show WiFi call when the call is on CS. The fix here is
to clean up the ImsPhoneConnection objects as soon as they are
mapped to CS connections upon handover.

Bug: 29551456
Change-Id: Iafa668c29c9501d6c3845327a9b19458dbfdd84e
smCdmaCallTracker.java
msphone/ImsPhoneCallTracker.java
e10ebcea080d93027593d6b463ee86592e7ec09e 07-Jul-2016 Jack Yu <jackyu@google.com> Merge \\"Removed unused PII from TelephonyEventLog\\" into nyc-mr1-dev am: a2dfbf36ff
am: 2be251313b

Change-Id: I9a8298ff9f809add1cb9099dd18350e9ba75bf33
2be251313b11fd366447b645c24027409f001416 07-Jul-2016 Jack Yu <jackyu@google.com> Merge \"Removed unused PII from TelephonyEventLog\" into nyc-mr1-dev
am: a2dfbf36ff

Change-Id: I0666c57925d9f6cf42956b28a4c7f5350f76c991
a2dfbf36ff4cea04078fccecdb7382bbbf5420ce 07-Jul-2016 Jack Yu <jackyu@google.com> Merge "Removed unused PII from TelephonyEventLog" into nyc-mr1-dev
c3ec7d484569eff5005ee31fe3c96dfc00b86096 07-Jul-2016 Jack Yu <jackyu@google.com> Removed unused PII from TelephonyEventLog

Removed the PII captured during call origination even
though it is not used or sent to the server at all.

bug: 30000046
Change-Id: I1f54fda0b4390c78dc6848b66d9a9ed19737ec7d
elephonyEventLog.java
msphone/ImsPhoneCallTracker.java
d0c604696991e8b15b91562708004dc20792dd9a 07-Jul-2016 Brad Ebinger <breadley@google.com> Merge \\"Fix NullPointerException in ImsPhoneCallTracker\\" into nyc-mr1-dev am: 6b3969d111
am: ebf74cbd9a

Change-Id: Ib33f03c2260f1ce4c6114aae125167ca6c761fa7
ebf74cbd9a0c3d89ee7aff849351f057320028b5 07-Jul-2016 Brad Ebinger <breadley@google.com> Merge \"Fix NullPointerException in ImsPhoneCallTracker\" into nyc-mr1-dev
am: 6b3969d111

Change-Id: I1d15b04f36b29d0d504ed12005b996da88baa2a7
6b3969d11122cff1a1f6a35ba0605ac657197d04 07-Jul-2016 Brad Ebinger <breadley@google.com> Merge "Fix NullPointerException in ImsPhoneCallTracker" into nyc-mr1-dev
9d9ed4b65b507fed96fbe4ffacacd6e3ae85af68 07-Jul-2016 fionaxu <fionaxu@google.com> DO NOT MERGE add private function convertSafeLable am: 0af0a3bf21
am: 998af3d7d6

Change-Id: I82dcd5fa4ca98633cb1cb7243a5d7f270c4a2d34
998af3d7d6219bfefe74f355b73019235b3f764c 07-Jul-2016 fionaxu <fionaxu@google.com> DO NOT MERGE add private function convertSafeLable
am: 0af0a3bf21

Change-Id: I1d427bc05f66b258536f4c2de3811b87e7feb12b
fdd6fb424d920e22f7bcd36115df4d6f2ecf53d0 01-Jul-2016 Brad Ebinger <breadley@google.com> Add a public method to access the Radio state

In order to be sure that the Radio is available to communicate, we now
check to see if the radio is available for commands. We are going to use
this in emergency calling to make sure that the Radio is on (and not
still in the unavailable state) after disabling airplane mode.

Bug: 29039211
Change-Id: I3ee828e165f8e9501de4650c06172ad33c93d51f
erviceStateTracker.java
0af0a3bf2114d38bb70813656abbf832c9a45885 01-Jul-2016 fionaxu <fionaxu@google.com> DO NOT MERGE add private function convertSafeLable

Bug: 28557603
Change-Id: I8d6a13a71011c38e7dd7039fa7ae0a69cf6adc2e
MSDispatcher.java
5a7f942917081e92f9dec52e13b86313f58e8957 07-Jul-2016 fionaxu <fionaxu@google.com> Merge \\\"DO NOT MERGE add private function convertSafeLable\\\" into mnc-dev am: 26af9db300 am: d36c2d23e0
am: be24b21235

Change-Id: I3c1e19a8933d0a3e91e456bed77f04a02df3e4b0
be24b212350252241776ccfe24e2f14b76b54304 07-Jul-2016 Chen Xu <fionaxu@google.com> Merge \\"DO NOT MERGE add private function convertSafeLable\\" into mnc-dev am: 26af9db300
am: d36c2d23e0

Change-Id: I21af10eb2082ce9af8582206d856843c1753aee5
89e94941d8f24d1bf17f3a4229441be0d45417ff 07-Jul-2016 Chen Xu <fionaxu@google.com> Merge \\"hide personal private information from log\\" into nyc-mr1-dev am: 6a012a4902
am: 077cb44ab7

Change-Id: I545c5e5daea1a91a6d193f37b07f5e5248c986b8
d36c2d23e0c2928ad3448418382edddd61d82ac5 07-Jul-2016 fionaxu <fionaxu@google.com> Merge \"DO NOT MERGE add private function convertSafeLable\" into mnc-dev
am: 26af9db300

Change-Id: I916509da22d8896e1c087bbd5176ce69a4a3ef97
077cb44ab716b4d8be7aafa7abdb26b431b7978b 07-Jul-2016 fionaxu <fionaxu@google.com> Merge \"hide personal private information from log\" into nyc-mr1-dev
am: 6a012a4902

Change-Id: I7b99c7922eb6a2fe3f89b1d6f9c3970271260c5a
6a012a4902337fed4341aa3b735fdcb4368ae7be 07-Jul-2016 Chen Xu <fionaxu@google.com> Merge "hide personal private information from log" into nyc-mr1-dev
f8a97a03e91c81eee19420bcdf66a2305f0b4578 07-Jul-2016 Brad Ebinger <breadley@google.com> Fix NullPointerException in ImsPhoneCallTracker

Fixes a NullPointerException in ImsPhoneCallTracker.getVtDataUsage(). We
must first check that the VideoProvider returned is non-null.

Bug: 29998389
Change-Id: Ia3132a2e8c8f2c5d70528f89cd9af78c857382e5
msphone/ImsPhoneCallTracker.java
a1cdb9b9a81cc4b637b6b76cc267166719936862 06-Jul-2016 fionaxu <fionaxu@google.com> hide personal private information from log

Bug: 29943985
Change-Id: Icf3a7d5b6517ac027ad92f07bd626bd69399dcc4
icc/SIMRecords.java
e2bf2e86af224eec5e3b9df4ccd25d542c6c8bc2 06-Jul-2016 Ji Yang <yangji@google.com> Merge \\"Pass non-null resultReceiver into filterSms.\\" into nyc-mr1-dev am: d21e179e9f
am: ac4c7fd5d4

Change-Id: I5cddf647f060e5f1f6802193ea6c3b8cc0ea1a82
ac4c7fd5d458147c18f82f4ecf355661c2752daa 06-Jul-2016 Ji Yang <yangji@google.com> Merge \"Pass non-null resultReceiver into filterSms.\" into nyc-mr1-dev
am: d21e179e9f

Change-Id: Id8de24ef2538de40941d49fcf113b610fba8506c
d21e179e9f713631e269fe4a49272a6cd912c297 06-Jul-2016 Ji Yang <yangji@google.com> Merge "Pass non-null resultReceiver into filterSms." into nyc-mr1-dev
6ddd26d139771e1a2122698f1243e172726a4ac0 02-Jul-2016 Chen Xu <fionaxu@google.com> Merge \\"FDN cache shall be reset when receiving the file change notification\\" into nyc-mr1-dev am: f2a7444f97
am: 75b33cb5b1

Change-Id: I8c896740dfc083955c6b133dfc6dd262524c5867
75b33cb5b1f46ba3f3e8b0cb47d47d3f87c5e4f4 02-Jul-2016 Kenji Soutome <kenji.x.soutome@sonymobile.com> Merge \"FDN cache shall be reset when receiving the file change notification\" into nyc-mr1-dev
am: f2a7444f97

Change-Id: I4f8fed8ab68f9aa761ce823de81c540f16d22572
f2a7444f973fc9ab0df1228a0c812172d8a13679 02-Jul-2016 Chen Xu <fionaxu@google.com> Merge "FDN cache shall be reset when receiving the file change notification" into nyc-mr1-dev
9bddbaa5f2da1005876121a4cb9e56fbcda55b23 01-Jul-2016 Tyler Gunn <tgunn@google.com> Merge \\"Properly handle multi-endpoint answered elsewhere disconnect cause.\\" into nyc-mr1-dev am: 4d4857b26a
am: 76b8a1a23c

Change-Id: I836ed4f708422473c1e00702440be3ba9ec9ac21
76b8a1a23c5c523ff8451da598d287f558fd207f 01-Jul-2016 Tyler Gunn <tgunn@google.com> Merge \"Properly handle multi-endpoint answered elsewhere disconnect cause.\" into nyc-mr1-dev
am: 4d4857b26a

Change-Id: Ib76550a2d851d49d2310e443c70662dfd9a02f6e
4d4857b26a7bac1689fc28f20b5682a9a9fd26d0 01-Jul-2016 Tyler Gunn <tgunn@google.com> Merge "Properly handle multi-endpoint answered elsewhere disconnect cause." into nyc-mr1-dev
79e7c693f0a13feda3ae7ce0f647196c15ead103 01-Jul-2016 Chen Xu <fionaxu@google.com> Merge \\"Fix airplane mode doesnt persist cross boot-up\\" into nyc-mr1-dev am: 48fc925563
am: ef578df8be

Change-Id: Ia8fc21f9e88a5bb87348f6bad55b9477fc0ad488
29668a1dc85b808ef1da8a1678f059fca6e3092b 01-Jul-2016 fionaxu <fionaxu@google.com> DO NOT MERGE fix build breakage am: 2b4cff6935
am: 1173aa0fc1

Change-Id: Iaf21869737ba28c8292531f0e7ffbce3202aa6b6
ef578df8be98a1acee72ee9f552a1d652b6fd530 01-Jul-2016 fionaxu <fionaxu@google.com> Merge \"Fix airplane mode doesnt persist cross boot-up\" into nyc-mr1-dev
am: 48fc925563

Change-Id: Ia91245944407e9bec64ddb0f71b683527528054b
48fc92556305b51f1e222ffb4ac1ff3900615f5a 01-Jul-2016 Chen Xu <fionaxu@google.com> Merge "Fix airplane mode doesnt persist cross boot-up" into nyc-mr1-dev
0d5e6cc0fdfb839d63abe1e7eb85eee1b5942108 30-Jun-2016 fionaxu <fionaxu@google.com> Fix airplane mode doesnt persist cross boot-up

Bug: 29645680
Change-Id: Ic179390dbab365a026e159895c2c5de2ad90508e
erviceStateTracker.java
ataconnection/DcTracker.java
34623551df702917b1872de4125edf98b7ade913 01-Jul-2016 Amit Mahajan <amitmahajan@google.com> Merge \\"Change to not reset vmCount on GSM<->CDMA switching.\\" into nyc-mr1-dev am: c74572faf8
am: 5e041d49d0

Change-Id: Ie432b87c907600dd305f5534545240f9aeaf8ff4
5e041d49d08989f911c2badc1792379587e0308c 01-Jul-2016 Amit Mahajan <amitmahajan@google.com> Merge \"Change to not reset vmCount on GSM<->CDMA switching.\" into nyc-mr1-dev
am: c74572faf8

Change-Id: I7ee64e8633528de671908cf624afd8f34f436701
2b4cff6935bbedd2eddae90e7a600af409105ca1 01-Jul-2016 fionaxu <fionaxu@google.com> DO NOT MERGE fix build breakage

Bug: 28557603
Change-Id: I4542dd8f11903522ce19d9d832324a3f7abdf766
MSDispatcher.java
c74572faf89afb2440666dde313f94d921243f9a 01-Jul-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Change to not reset vmCount on GSM<->CDMA switching." into nyc-mr1-dev
ea47a899025c1f3e865378acd20f4b2e107664b6 01-Jul-2016 Amit Mahajan <amitmahajan@google.com> Merge \\"VVM filtering should be done after carrier sms app.\\" into nyc-mr1-dev am: db52e9a4c2
am: 30a7ac3b7d

Change-Id: Ia2f3eb45e40c71d9ab968942e59a72d1140e72a1
30a7ac3b7d936e2a83ba981b38b82e1f8565d7b6 01-Jul-2016 Amit Mahajan <amitmahajan@google.com> Merge \"VVM filtering should be done after carrier sms app.\" into nyc-mr1-dev
am: db52e9a4c2

Change-Id: I763c7e95d8f68bf6bc606c39bb2ac6cfdcd39212
db52e9a4c2fe204e679ea37726de566577e0052e 01-Jul-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "VVM filtering should be done after carrier sms app." into nyc-mr1-dev
7949bed6532c4a3fc103c6d999e095c577bd2399 01-Jul-2016 fionaxu <fionaxu@google.com> DO NOT MERGE add private function convertSafeLable

Bug: 28557603
Change-Id: I8d6a13a71011c38e7dd7039fa7ae0a69cf6adc2e
MSDispatcher.java
cc6a2e28291e5728697a89e09ba75776cdd0fae3 01-Jul-2016 fionaxu <fionaxu@google.com> DO NOT MERGE add private function converSafeLabel am: 37a4402d74
am: 87cbea65fa

Change-Id: Iee1c312676ece2e181a82b2d3c4f1b508540521d
8494d184e6a21dd1fa17a4823b66a6b23667008c 28-Jun-2016 fionaxu <fionaxu@google.com> DO NOT MERGE add private function converSafeLabel

Bug: 28557603
Change-Id: I4618013bd07b697063872e51ae3d88aa59a2864e
MSDispatcher.java
c764f8fb5b94a0e3f51ac6fa80a640d27ddabb4d 30-Jun-2016 Amit Mahajan <amitmahajan@google.com> Get current calls on phone type switch. am: 77eeade7a1 am: 9ec60c4790
am: 5b2ab35a32

Change-Id: Icd8c77758ee0fca7f02c67fc4f77381108de920a
5b2ab35a32f1f897b98978a177ae87c90678cd29 30-Jun-2016 Amit Mahajan <amitmahajan@google.com> Get current calls on phone type switch. am: 77eeade7a1
am: 9ec60c4790

Change-Id: I359d78eb9bbb5341a100b2d5663a845491ef4898
9ec60c47906aaeb288ffa7c72d5140ca948551e8 30-Jun-2016 Amit Mahajan <amitmahajan@google.com> Get current calls on phone type switch.
am: 77eeade7a1

Change-Id: I2f3a4cae01f37bcbee0d6d39aff8d91038799202
19045bf1c59985d25c9d7289760b0faf522f04b0 30-Jun-2016 Amit Mahajan <amitmahajan@google.com> Get current calls on phone type switch.
am: 77eeade7a1

Change-Id: If788e7fdfbbd8c53e9a8fdcba6a2103e4d07533e
86da287ba153134ce662acf676a31bd91933a343 30-Jun-2016 Amit Mahajan <amitmahajan@google.com> VVM filtering should be done after carrier sms app.

Carrier app can be signed by a certificate present on SIM (app
will show up in CarrierPackage), or it can be a system app.
VVM filtering should not be between these 2; should be either
before them, or after, and we've decided to go with after for now.

Bug: 29899506
Change-Id: I2dfe0dce4e9d7f207b53275d594a6119c1224dba
nboundSmsHandler.java
77eeade7a1391b045f8b2ce681efd49f27d3506f 30-Jun-2016 Amit Mahajan <amitmahajan@google.com> Get current calls on phone type switch.

There may be active calls from previous phone type.

Bug: 29738766
Change-Id: I16a57567fd72be35a7e15eccb6a65f540b51874d
smCdmaCallTracker.java
est/SimulatedCommands.java
58e6f781b0bbd3a5820c774c2fc3b550b87f8087 30-Jun-2016 Tyler Gunn <tgunn@google.com> Merge \\"Label dialog event package entries for conferences.\\" into nyc-mr1-dev am: cab2907361
am: 1c098694b3

Change-Id: Ic36dcb9a4d936a80fc5f6d472137acc72aea51ee
1c098694b3a840cfa76513b639a4fbc233f6bcb6 30-Jun-2016 Tyler Gunn <tgunn@google.com> Merge \"Label dialog event package entries for conferences.\" into nyc-mr1-dev
am: cab2907361

Change-Id: Ifa0f66c2d2eece06dc180a7008fd3b1738b90838
cab2907361fdc486dec4a3a35fe90bf13ec794dc 30-Jun-2016 Tyler Gunn <tgunn@google.com> Merge "Label dialog event package entries for conferences." into nyc-mr1-dev
add4386d2823993acaa4f784e971e3354c483ce4 30-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Fix race condition leading to crash in RIL.java.
am: 2cd71ff65f

Change-Id: I5d6e4174fddc15c3e73bdcbe9bd2d8dbe518b8fb
69944a0d9a872e5d1c5dae0837c3a7e45494dac5 14-Apr-2016 Kenji Soutome <kenji.x.soutome@sonymobile.com> FDN cache shall be reset when receiving the file change notification

The issue happens in the expected sequence 1.2 (REFRESH, File Change
Notification) of 3GPP 31.124 TC 27.22.4.7. The FDN cache is not reset
when the file change event for FDN is notified, so no one can know the
updated FDN in Android layer.

Bug: 29085691
Change-Id: I339c85692b8b9d57c2899e8bde71b33e326d523c
icc/SIMRecords.java
2cd71ff65f3dba4cd33cc8a59778b6f6a411198c 25-May-2016 Sanket Padawe <sanketpadawe@google.com> Fix race condition leading to crash in RIL.java.

+ Crash occuring because of using RilRequest object after releasing it.

Bug: 28855244

Change-Id: Ieb337a2403ba76de37c4f06a99845709863f19b9
(cherry picked from commit d0fdd8bd6ab1261ad474a3e7cddcc99090613931)
IL.java
783d379da945c8cf0a8502c5f27828ae5ac6c01a 30-Jun-2016 Jack Yu <jackyu@google.com> Added VT data usage support am: 48921d863b
am: 5408d8ffcd

Change-Id: I5e5f17d10b3243d985a596d3e07124353aa59932
5408d8ffcd029a67ad180db03233c0c650005b8d 30-Jun-2016 Jack Yu <jackyu@google.com> Added VT data usage support
am: 48921d863b

Change-Id: Iba4e1d1b8f4ed9616d4260b7d61d45d16fc5a40d
48921d863bf4d93c89071dfde4d44cd27fec6314 22-Jun-2016 Jack Yu <jackyu@google.com> Added VT data usage support

Store total VT data usage since boot up for NetworkStatsService
to query.

bug: 20888836
Change-Id: If2078bd85fcbe2838a17fc8b282a05317e94c3ff
hone.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
f41783220aa8cc2e0e62c2ae2c3300b779c96101 29-Jun-2016 Tyler Gunn <tgunn@google.com> Label dialog event package entries for conferences.

Dialog event package entries (multiendpoint) for a conference call on
another device will have a uri something like this:
sip:conf=2001-4888-205-710f-e0-113-0-120-1466524732857069@[2001

This ends up looking nasty in the UI. To prevent this, adding code to
detect this type of URI and set the caller name to "Conference Call",
and blank out the caller number.

See bug for screenshot.

Bug: 29534470
Change-Id: I892897ca80347f57497928cb1b02fba83c3c664a
msphone/ImsExternalConnection.java
37a4402d7465755505649718756b23a8fd1fa70e 28-Jun-2016 fionaxu <fionaxu@google.com> DO NOT MERGE add private function converSafeLabel

Bug: 28557603
Change-Id: I48fda34700ea389a13110530f1d9f4b3df65cf28
MSDispatcher.java
0e47113bbf537bb1f7d4c25ead9ca021405970f9 28-Jun-2016 Hall Liu <hallliu@google.com> Merge \\"Set disable add call during video call extra from carrier config\\" into nyc-mr1-dev am: 1f1e8ef2ca
am: e8e9d978f0

Change-Id: I5e4f469ca84654110ca1ecb03abf3abb0e43d19c
e8e9d978f0cb08ecca39ffa98fc12109f36f1e65 28-Jun-2016 Hall Liu <hallliu@google.com> Merge \"Set disable add call during video call extra from carrier config\" into nyc-mr1-dev
am: 1f1e8ef2ca

Change-Id: I1d26467b197a1519adc43296ed5f50bc7c0c290e
1f1e8ef2cacc256b949bc7e8e95a8afc3e290d28 28-Jun-2016 Hall Liu <hallliu@google.com> Merge "Set disable add call during video call extra from carrier config" into nyc-mr1-dev
d57fd843aa63ec5abe55a1e209f66fd3bac05a47 28-Jun-2016 Stuart Scott <stuartscott@google.com> Merge \\"Better matching of PCO data to DataConnections\\" into nyc-mr1-dev am: 8a7f6e5a54
am: b0884ff26f

Change-Id: Ia721a74fa40f46d55485171f371be5318f51a18a
b0884ff26fcd18693ef9dd3e5496bb2339bfd0e3 28-Jun-2016 Robert Greenwalt <rgreenwalt@google.com> Merge \"Better matching of PCO data to DataConnections\" into nyc-mr1-dev
am: 8a7f6e5a54

Change-Id: Id3b0f6375442527f7d460894a249e7527718a428
8582f01cac98266bfd86c42e58eab3bf810328c4 16-Jun-2016 Hall Liu <hallliu@google.com> Set disable add call during video call extra from carrier config

Bug: 29047863

Change-Id: Ic32f01c40337eccd197cc2573f5a01f81b35f3ea
onnection.java
msphone/ImsPhoneCallTracker.java
b4fe99dacb5da11d31de3ae00e68d808734246ba 28-Jun-2016 Amit Mahajan <amitmahajan@google.com> Change to not reset vmCount on GSM<->CDMA switching.

Bug: 29640920
Change-Id: Ida5a91554578e625e7245f18dc720d8fd2d752aa
smCdmaPhone.java
58c74734c761f01c123f9759c4418e4075c7ea2e 28-Jun-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge \"Fix ImsPhone.processDisconnectReason() function\" into nyc-dev
am: fc589fc26d

Change-Id: Ifaa0e4d191051a131ff67eea3e9a78a4e887bde7
fc589fc26d07d09c5bcd5610e0ba94b626af2452 28-Jun-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "Fix ImsPhone.processDisconnectReason() function" into nyc-dev
97032e3f6ec2ebcd7258eae60d7c223339c116df 28-Jun-2016 Ji Yang <yangji@google.com> Pass non-null resultReceiver into filterSms.

BUG:29740091
Change-Id: If85beb9449a0831d5c4f5f588833ccd9546171ef
nboundSmsHandler.java
cda5b321ceddda71d47ec2fe619d6624dd2ea3da 24-Jun-2016 Robert Greenwalt <rgreenwalt@google.com> Better matching of PCO data to DataConnections

There appears to be latency between the Dc connecting and
the DcController learning about it. Try other options:
- look into each Dc to see if it has the cid set
- look for a Dc with CONNECTING ApnContext

bug:29624199
Change-Id: I20e34ff38491a5d1ae404b37704d66642adbf064
ataconnection/ApnContext.java
ataconnection/DcTracker.java
1bb182dd0cad8c9fd5f68eade50e8991843f56bc 28-Jun-2016 Pavel Zhamaitsiak <pavelz@google.com> Fix ImsPhone.processDisconnectReason() function

Escape "|" (pipe) symbol.

Bug: 29581592
Change-Id: Ic25f0b7455c7197396001519995d73fbaaf1140f
msphone/ImsPhone.java
2670c770290c9943092bd4e508c11ab1ee9d7640 27-Jun-2016 Jack Yu <jackyu@google.com> Merge \\"Fixed failed unit test cases\\" into nyc-mr1-dev am: 47b07ccca0
am: 0bd1f51791

Change-Id: Ife11a1ab671a926f2be35ea6801bd8b0186b17d0
0bd1f51791a3f4d66f9459f9e088d07e518a39b5 27-Jun-2016 Jack Yu <jackyu@google.com> Merge \"Fixed failed unit test cases\" into nyc-mr1-dev
am: 47b07ccca0

Change-Id: Ic6171ec2a9b32dcc938a909f22a2ffd797ed9b02
6a150c08f8160c870c29d3baa8e886a26258cc54 27-Jun-2016 Chen Xu <fionaxu@google.com> Merge "SubscriptionInfo not loaded correctly for dual sim"
47b07ccca0c25ea5fb29a572890966a0f7501e02 27-Jun-2016 Jack Yu <jackyu@google.com> Merge "Fixed failed unit test cases" into nyc-mr1-dev
d55c424b8e0b4a4c5d87d1b45f1b3d9ffd8e709e 23-Jun-2016 fionaxu <fionaxu@google.com> SubscriptionInfo not loaded correctly for dual sim

- code cleanup: replace deprecated getSubId api with
getSubIdUsingPhoneId
- fix the bug in handleSimLoaded. we will only
write subscriptionInfo of the lastest loaded sim, leaving incorrect
parameter for the other sims in db.

Bug: 29620319
Change-Id: Iccf2afa36bacd0f436adfd16ef5faa6f7ce4e7c7
ubscriptionController.java
ubscriptionInfoUpdater.java
icc/RuimRecords.java
ded69b64e9c80837b293152a3f80b1f1a1440e98 24-Jun-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge \\"Fix ImsPhone.processDisconnectReason() function\\" into nyc-mr1-dev am: 4866c6d44a
am: a47275888d

Change-Id: I9f2a27bf66d79bee1ed15b5a0212f8037405ac71
a47275888d8cfb87890cf9b96229e91607a63d4b 24-Jun-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge \"Fix ImsPhone.processDisconnectReason() function\" into nyc-mr1-dev
am: 4866c6d44a

Change-Id: I36af2cdbb94608c235cd9612e278bdaa6e976e66
4866c6d44aa2a945737444b4a3b01332233ab2c4 24-Jun-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fix ImsPhone.processDisconnectReason() function" into nyc-mr1-dev
0b03bcd1eccc833d5cac5ecf937cf0e037375561 24-Jun-2016 Jack Yu <jackyu@google.com> Fixed failed unit test cases

Changed isDataEnabled to public so Mockito can mock the method.
This is a regression introduced in ag/1103220.

Change-Id: Ib2c734cb7047f1702796d1578ce241f488d5a09a
ataconnection/DcTracker.java
fa762788345ab4de3ac244800027995395bbafa3 24-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Merge \\"Fix emergency call issue\\" into nyc-mr1-dev am: 0babe05ad9
am: f07e470bdc

Change-Id: I288962c2b41fd5ef84c07890b9386318015ea944
f07e470bdc44dc19d4eca577aca01c1e7ee57161 24-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Merge \"Fix emergency call issue\" into nyc-mr1-dev
am: 0babe05ad9

Change-Id: Ie3b92d136ee0971658cd787f89eca42a71d02d1d
0babe05ad968338c2ff28ca635782a878ec911c2 24-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Fix emergency call issue" into nyc-mr1-dev
2712f31b9ad49d926c68d9c3f227acc0478cac61 24-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Fix emergency call issue

When emergency network request is received, mms id is being
returned in apncontext instead of emergency id.

Fix is to replace mms id with emergency id for emergency request.

Bug: 29577522
Change-Id: I288ce4bf6f855fc5fe4ce93b6449ae16c4dd6dfb
ataconnection/ApnContext.java
e1aeaee24464191130da0133981d47fb9e469960 24-Jun-2016 Pavel Zhamaitsiak <pavelz@google.com> Fix ImsPhone.processDisconnectReason() function

- Escape "|" (pipe) symbol.
- Add unit test

Bug: 29581592
Change-Id: I4c7f5758478ab8360fad8a7b97055bbaaa7805bf
hone.java
msphone/ImsPhone.java
7230ede4639072fcb6a6d7146aee314e7f13d242 24-Jun-2016 Fyodor Kupolov <fkupolov@google.com> Merge \\"Print names of observers causing timeout\\" into nyc-mr1-dev am: f76be2c87c
am: f699821f88

Change-Id: I52ffb98ba39f7625b7268eb821c735ff291da93e
f699821f88f0fe6e26e4bd45be37327f4268873b 23-Jun-2016 Fyodor Kupolov <fkupolov@google.com> Merge \"Print names of observers causing timeout\" into nyc-mr1-dev
am: f76be2c87c

Change-Id: Ibc0e6e5f7e620fd149cd1b6060841bc53238ea54
f76be2c87c7cdf30ad8ad28b8c708b9d9ca68506 23-Jun-2016 Fyodor Kupolov <fkupolov@google.com> Merge "Print names of observers causing timeout" into nyc-mr1-dev
b785ef660dfa3cffb2e1ece793baa33fc92cbbaa 23-Jun-2016 Tyler Gunn <tgunn@google.com> Merge \\"Update ImsPhoneCallTracker to detect situations where call will drop.\\" into nyc-mr1-dev am: ae21c0e075
am: bd28c60820

Change-Id: I7a6f1cf2e1af04ef01897cabf30b561811722422
bd28c60820b6048ff9f86241771e6e0e740c87c9 23-Jun-2016 Tyler Gunn <tgunn@google.com> Merge \"Update ImsPhoneCallTracker to detect situations where call will drop.\" into nyc-mr1-dev
am: ae21c0e075

Change-Id: I74f7c87698e9afbb1748130d5b0049f86a94095d
ae21c0e0753cae288b13da1f78c1ebe0679e38b2 23-Jun-2016 Tyler Gunn <tgunn@google.com> Merge "Update ImsPhoneCallTracker to detect situations where call will drop." into nyc-mr1-dev
b878a9b23de50c23dcd239e74f77865046683705 23-Jun-2016 Ajay Nambi <anambi@codeaurora.org> Add support for LTE CarrierAgregation am: 000f48b9c9
am: 4c545b1994

Change-Id: Ia129a2de54288217778e49173aef2f8f4c85feb8
4c545b199449247d833da00f7a07ce20f097f619 23-Jun-2016 Ajay Nambi <anambi@codeaurora.org> Add support for LTE CarrierAgregation
am: 000f48b9c9

Change-Id: I8d67674031072a4feef7c24dc2003a7122d9c3ad
000f48b9c960010bf41cd22b8625b4ff16c2e719 29-May-2015 Ajay Nambi <anambi@codeaurora.org> Add support for LTE CarrierAgregation

Note this may be redesigned in O to better handle the
various bitrate/channel combinations in a sane way.

bug:27360321
Change-Id: I29dc8cbbdec60b3a5c0eed8117e3b7bb27f429ed
smCdmaPhone.java
erviceStateTracker.java
dma/CdmaSMSDispatcher.java
ataconnection/DataConnection.java
1fc96c540fd6c0a02241d237282e07e8e56e292b 21-Jun-2016 Fyodor Kupolov <fkupolov@google.com> Print names of observers causing timeout

Pass and store name in registerUserSwitchObserver and later print names of
observers causing timeout.

Bug: 29039588
Change-Id: I028f996542f234de9325584df59830d7985dbba9
ubscriptionInfoUpdater.java
043a3d9f5a0bb6b27247a37cd472d4d6dc74c196 23-Jun-2016 Amit Mahajan <amitmahajan@google.com> Merge \\"Read SIM when radio state is available on FBE devices.\\" into nyc-mr1-dev am: b52b572dde
am: ecf8fe9810

Change-Id: I58030d926b1cd12c5476cf0ad0ad34ac1ebccc54
ecf8fe9810e0b7cd41c3b56949628f054c67f421 23-Jun-2016 Amit Mahajan <amitmahajan@google.com> Merge \"Read SIM when radio state is available on FBE devices.\" into nyc-mr1-dev
am: b52b572dde

Change-Id: I3ec36d4136031596d4d594d1b7a22d64a3e1504b
b52b572ddefb45465b03b4ae2292d2aa388682ad 23-Jun-2016 Amit Mahajan <amitmahajan@google.com> Merge "Read SIM when radio state is available on FBE devices." into nyc-mr1-dev
b7eec4cff7a573398a9ef761216c5be1011bb4d3 22-Jun-2016 Robert Greenwalt <rgreenwalt@google.com> Merge \\"Add a Carrier-config specific ratcheter of RATs.\\" into nyc-mr1-dev am: 14cc6cf7a1
am: bbdfedf837

Change-Id: I0296cba66d0f4e8320d728116ddb02b9bd7b0e18
bbdfedf8379db35b596cb0feb15a3b7ef81f4733 22-Jun-2016 Robert Greenwalt <rgreenwalt@google.com> Merge \"Add a Carrier-config specific ratcheter of RATs.\" into nyc-mr1-dev
am: 14cc6cf7a1

Change-Id: I678668c54e7f1f2d9879d08ea80544a9fc54b732
f52f04a550c556af972d5ae1b0de379ad74620ca 22-Jun-2016 Y <fionaxu@google.com> Merge \"add upper bound on nitz year\" into nyc-dev
am: f1c51240c7

Change-Id: I5f0bbb467005cf41382371a2a87a03bfd3f27178
8c751b4ec57a6f2a7702d9ee003b0ec721c2ebac 10-Jun-2016 Robert Greenwalt <rgreenwalt@google.com> Add a Carrier-config specific ratcheter of RATs.

Only reports transitions to higher RATs within a given family.
Reset when we move to a new cell.
Avoids costly propogation of RAT flapping within the family,
for example every outgoing data pops us into a higher RAT and
idle time pops us back down.

bug:27360321
Change-Id: Ifd219eda701eb2c87a8b6798d919f71fab804f5d
atRatcheter.java
erviceStateTracker.java
37c0d71f5221943f25a36613d52618b37126d1c2 22-Jun-2016 Tyler Gunn <tgunn@google.com> Update ImsPhoneCallTracker to detect situations where call will drop.

Add logic to set a property on incoming telephony connections if
answering the call will cause the active call to be disconnected. This is
tied to carrier logic which requires that a wifi video call is dropped
when an incoming audio-only call is answered. That same logic also
includes the provision that a call which has had video at some point in its
lifespan will be treated as a video call.

Bug: 29275420
Change-Id: Id9f58150a6bbd9894076913a880036a7e7fc6834
onnection.java
msphone/ImsPhoneCallTracker.java
5c90e11a655cfde1e7eeb047f05ce66ccb5828bc 22-Jun-2016 Y <fionaxu@google.com> add upper bound on nitz year

-framework will ignore NITZ time after Jan 1, 2038 to avoid malicious
basestation hack phone time and cause phone crashes
-unit test

Bug: 29083635
Change-Id: I4f60610ed13f5d6e7b0cf18f43708be2e528368c
erviceStateTracker.java
est/SimulatedCommands.java
63545e1616dd2edb807afac19e3092c5209dc07b 21-Jun-2016 fionaxu <fionaxu@google.com> backport security fix: avoid set NITZ time to 2038 am: 6c2365a258 am: 4c10b30d95 am: 2e7bd47d74 am: a88ccfbb38 am: 7425e8ae34 am: 2f5f0f89b5 am: 188595cac7 am: bc102e54b6 am: 7af7734d1a
am: 16dcb2b40a

Change-Id: I7ef131ba25995a9ed47c8a4115dd0b47cc45a353
16dcb2b40a4e17209431dc4146978d4656aed908 21-Jun-2016 fionaxu <fionaxu@google.com> backport security fix: avoid set NITZ time to 2038 am: 6c2365a258 am: 4c10b30d95 am: 2e7bd47d74 am: a88ccfbb38 am: 7425e8ae34 am: 2f5f0f89b5 am: 188595cac7 am: bc102e54b6
am: 7af7734d1a

Change-Id: Ieb0e41efa9ac29e6b2a4b7be28718e6f92f19fc7
7af7734d1ab8e5ce46813ad741b8a6a56d6e6150 21-Jun-2016 fionaxu <fionaxu@google.com> backport security fix: avoid set NITZ time to 2038 am: 6c2365a258 am: 4c10b30d95 am: 2e7bd47d74 am: a88ccfbb38 am: 7425e8ae34 am: 2f5f0f89b5 am: 188595cac7
am: bc102e54b6

Change-Id: Ibea6c09ad6121142cba54c98e384f1453bc5054b
bc102e54b6636eea5919e86bf70d00b60618fc21 21-Jun-2016 fionaxu <fionaxu@google.com> backport security fix: avoid set NITZ time to 2038 am: 6c2365a258 am: 4c10b30d95 am: 2e7bd47d74 am: a88ccfbb38 am: 7425e8ae34 am: 2f5f0f89b5
am: 188595cac7

Change-Id: I0eff305eeef80cd98764092908d3ce34241b88de
188595cac7c728443a91227d079c46ccf3f0d04d 21-Jun-2016 fionaxu <fionaxu@google.com> backport security fix: avoid set NITZ time to 2038 am: 6c2365a258 am: 4c10b30d95 am: 2e7bd47d74 am: a88ccfbb38 am: 7425e8ae34
am: 2f5f0f89b5

Change-Id: Ic1fc0894a1a090bb29fd5ba042be96f8a7d9276a
2f5f0f89b54ce16a9e732a6bd641ff885aee5e8b 21-Jun-2016 fionaxu <fionaxu@google.com> backport security fix: avoid set NITZ time to 2038 am: 6c2365a258 am: 4c10b30d95 am: 2e7bd47d74 am: a88ccfbb38
am: 7425e8ae34

Change-Id: Id287309d3d9ba5c82c5166a82544c03217266e89
7425e8ae345d76aec5068e7d1f216da0d50e2c79 21-Jun-2016 fionaxu <fionaxu@google.com> backport security fix: avoid set NITZ time to 2038 am: 6c2365a258 am: 4c10b30d95 am: 2e7bd47d74
am: a88ccfbb38

Change-Id: I65ac1137c793d79987a8a54a33521cbc6c4f5912
b813625595698ff6fa3ecfdaa5230e7289185ce8 21-Jun-2016 Chen Xu <fionaxu@google.com> Merge \\"add upper bound on nitz year\\" into nyc-mr1-dev am: 7cd0ed851a
am: 64248e95fa

Change-Id: I4203ac1b27e6c63605e677544c582723967e878a
a88ccfbb38921ec73a0902c2a022ab7e67136e53 21-Jun-2016 fionaxu <fionaxu@google.com> backport security fix: avoid set NITZ time to 2038 am: 6c2365a258 am: 4c10b30d95
am: 2e7bd47d74

Change-Id: Iaa0e689a681ba4edb3f46b774c85010808cfc043
2e7bd47d740ad8762ab397167b07dc049fab4788 21-Jun-2016 fionaxu <fionaxu@google.com> backport security fix: avoid set NITZ time to 2038 am: 6c2365a258
am: 4c10b30d95

Change-Id: I73318ebba70279899920adf4dc164b8d14171159
64248e95fa743cc333948ed5c0dd8ea12b112834 21-Jun-2016 fionaxu <fionaxu@google.com> Merge \"add upper bound on nitz year\" into nyc-mr1-dev
am: 7cd0ed851a

Change-Id: I192a99afca13a2d4f208831fd5a91598c9bde4ef
7cd0ed851ad96291d414fa685beda96edfa0fc6b 21-Jun-2016 Chen Xu <fionaxu@google.com> Merge "add upper bound on nitz year" into nyc-mr1-dev
b4237f12fd73204e9775909e03d9277e59d94766 20-Jun-2016 fionaxu <fionaxu@google.com> add upper bound on nitz year

-framework will ignore NITZ time after Jan 1, 2038 to avoid malicious
basestation hack phone time and cause phone crashes
-unit test

Bug: 29083635
Change-Id: I4f60610ed13f5d6e7b0cf18f43708be2e528368c
erviceStateTracker.java
est/SimulatedCommands.java
6c2365a258381ac0ecb34f143b620a32649d3d32 21-Jun-2016 fionaxu <fionaxu@google.com> backport security fix: avoid set NITZ time to 2038

Bug: 29083635
Change-Id: I21c5f4147d8146f92b7e33f0967a179ae644a263
dma/CdmaServiceStateTracker.java
sm/GsmServiceStateTracker.java
ada4e08dbf50485b8cb9f1fa9e8cfc5e3c8cab1e 20-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Fix crash in ApnContext after EVENT_DISCONNECT_DONE event in DcTracker. am: 4fdc57b9bf
am: 02e5c32f51

Change-Id: Ia5d7cf9022846f561cef3a7d0b26ca7a9319497c
02e5c32f5176e3789484854a95205dbce5f144c8 20-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Fix crash in ApnContext after EVENT_DISCONNECT_DONE event in DcTracker.
am: 4fdc57b9bf

Change-Id: I0cbc013a898f6b614171f30fa3236a1cc4d133a6
4fdc57b9bf223c908474c4545cc6f63456117a3b 20-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Fix crash in ApnContext after EVENT_DISCONNECT_DONE event in DcTracker.

+ This issue is fixed by setting non null reason for ApnContext from
DcTracker.
+ Minor fix over ag/1112902 which actually helped figure out that we were
passing null reason code to ApnContext.

Bug: 29346477
Change-Id: I40c007de804bd5b10b28736c3012c6c88de8811e
ataconnection/ApnContext.java
ataconnection/DcTracker.java
977a5fef9e852ebaa96648bc67a9a41f35522106 18-Jun-2016 Jack Yu <jackyu@google.com> Merge "Make data call setup permanent failure configurable."
cceeff8d3e53a55f7f64e593ead11e5944a55d52 17-Jun-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge \\"Add missing null checks to ImsPhoneCallTracker\\" into nyc-mr1-dev am: 5e22d71a07
am: 2302c3d8df

Change-Id: I6b009f6822fe5c4e9e27c3089a87aef163e1c32d
f27b2ccd80050d0d45c1a30575b36eb3e34ab8e2 17-Jun-2016 Amit Mahajan <amitmahajan@google.com> Merge \\"Do not create SmsMessage obj if it cannot be parsed correctly.\\" into nyc-mr1-dev am: b6c7afcb75
am: fa624413f0

Change-Id: Icd49c7dd7120bfb7e24f52bafae8dac76e084a76
8ddf3e31a735cc799c6f5cd3bf476ab4972d6511 17-Jun-2016 Stuart Scott <stuartscott@google.com> Merge \\"User ByteBuffer to pack array\\" into nyc-mr1-dev am: b7b5b0ac79
am: b47d2f113d

Change-Id: I276b0a1b4e42c9563afc1266f34d7798461bc0ef
9708ccb69c563c7f7a12f1a5962f1fc039395d6e 17-Jun-2016 Ta-wei Yen <twyen@google.com> Merge \\"Allow the phone process to hide outbound text SMS\\" into nyc-mr1-dev am: eda99b021b
am: 6c5ef2c7aa

Change-Id: I038283b26dfa09e50391edadc548c9b7ef569244
ccfe5ebaf81c1378e8dbe44e45df26b0dc462a21 15-Jun-2016 Jack Yu <jackyu@google.com> Make data call setup permanent failure configurable.

Carriers might have different data call setup permanent failure
causes. Make them configurable through carrier config.

bug: 28728821
Change-Id: I8c1b534bffddaa12ba53a11de9756af232712a51
ataconnection/DataConnection.java
ataconnection/DcController.java
ataconnection/DcFailCause.java
ataconnection/DcTracker.java
2302c3d8df6c3b08cdd60548e4558c4df2cc5bd0 17-Jun-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge \"Add missing null checks to ImsPhoneCallTracker\" into nyc-mr1-dev
am: 5e22d71a07

Change-Id: Ib6ea8e1df73fe53869d47d85fff487b19a8b2f06
5e22d71a07404565e67192ea40ef44916f15dab3 17-Jun-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "Add missing null checks to ImsPhoneCallTracker" into nyc-mr1-dev
fa624413f071861ec397cca22a254c0c30be58b3 17-Jun-2016 Amit Mahajan <amitmahajan@google.com> Merge \"Do not create SmsMessage obj if it cannot be parsed correctly.\" into nyc-mr1-dev
am: b6c7afcb75

Change-Id: I4149c3df05c603495d77ea8600ecf27a48460d60
b6c7afcb75248eb20dd9d66cb53a6777799535ed 17-Jun-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Do not create SmsMessage obj if it cannot be parsed correctly." into nyc-mr1-dev
cf3a2925c10f87f4b6af0f3a1c369f57954f7733 17-Jun-2016 Pavel Zhamaitsiak <pavelz@google.com> Add missing null checks to ImsPhoneCallTracker

Also use CODE_LOCAL_ILLEGAL_STATE instead of CODE_UNSPECIFIED when
ImsManager is null.

Bug: 29386303
Change-Id: I9fcaecf033b9f3363fb849b2d64b9c2b8db20035
msphone/ImsPhoneCallTracker.java
b47d2f113dc3571389a9c0428586598f515d4aa3 17-Jun-2016 Stuart Scott <stuartscott@google.com> Merge \"User ByteBuffer to pack array\" into nyc-mr1-dev
am: b7b5b0ac79

Change-Id: I9772da7489da234dbbffe398c8a503aaad086b00
b7b5b0ac7966b72d9e88e8bcbe003ed93557ba7d 17-Jun-2016 Stuart Scott <stuartscott@google.com> Merge "User ByteBuffer to pack array" into nyc-mr1-dev
6c5ef2c7aaa2b41e29c2a150b8c582ef5a538616 17-Jun-2016 Ta-wei Yen <twyen@google.com> Merge \"Allow the phone process to hide outbound text SMS\" into nyc-mr1-dev
am: eda99b021b

Change-Id: Iaf32b928511d2ef32c798738465f047b969f6bae
eda99b021b6e3d1925699d26397aee30ca3f27db 17-Jun-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Allow the phone process to hide outbound text SMS" into nyc-mr1-dev
676e73ec8586d1a8f2b471780d198e556ea95ecf 04-Jun-2016 Amit Mahajan <amitmahajan@google.com> Do not create SmsMessage obj if it cannot be parsed correctly.

Bug: 29123941
Change-Id: Ic77220c05e4a712a16ac32563ddb45a318452d71
msSMSDispatcher.java
271770174f97e010dab9b7916034aecb270b1d81 16-Jun-2016 Ta-wei Yen <twyen@google.com> Allow the phone process to hide outbound text SMS

Bug: 29095322
Change-Id: Ibe91cc98c70e91563aae77d7f48f617a5fb65823
ccSmsInterfaceManager.java
iccSmsController.java
7695051bf2bb6562ad6a9b5fa7616cd1002f245a 16-Jun-2016 Amit Mahajan <amitmahajan@google.com> Read SIM when radio state is available on FBE devices.

Change is basically to not wait until radio state is on as device
may be booted in APM.

Bug: 29408861
Change-Id: Ibd94d985fa6a10e2644428b3bcb249e3bb592fc6
icc/UiccController.java
b2f5cedd0fcba98a2586ba7f91c96995233494d7 16-Jun-2016 Nathan Harold <nharold@google.com> Merge \\\"Move Spammy SST.getAllCellInfo Logs to Verbose\\\" into nyc-dev am: 5dc5ace26c am: fca80f0bff
am: 454ede3baa

Change-Id: I90a2286c05aa9d222366ebbd4efd21bca84543c0
454ede3baa62d05da28e52a7f25f7c405330ec55 16-Jun-2016 Nathan Harold <nharold@google.com> Merge \\"Move Spammy SST.getAllCellInfo Logs to Verbose\\" into nyc-dev am: 5dc5ace26c
am: fca80f0bff

Change-Id: Ifa75cdad39a3e6d55fd9d5a3b1e5b37e353ce9bf
fca80f0bff5e7aec65db2eedec777c3dd935e866 16-Jun-2016 Nathan Harold <nharold@google.com> Merge \"Move Spammy SST.getAllCellInfo Logs to Verbose\" into nyc-dev
am: 5dc5ace26c

Change-Id: I55cdf70f467363825debd625a46afb91b10212e3
d4d44ac2eb661cb8b5faaaa549481b8ab39b1f28 16-Jun-2016 Nathan Harold <nharold@google.com> Merge \"Move Spammy SST.getAllCellInfo Logs to Verbose\" into nyc-dev
am: 5dc5ace26c

Change-Id: I3ef1cb4cc70cc8adb0f7342c20f2905864eb5c20
5dc5ace26ca279049a8842fd39b6a9f6e26a4a74 16-Jun-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Move Spammy SST.getAllCellInfo Logs to Verbose" into nyc-dev
bf05060c53755d5a9c35dbe7754bc96e61fe530f 15-Jun-2016 Nathan Harold <nharold@google.com> Move Spammy SST.getAllCellInfo Logs to Verbose

The relative frequency of the getAllCellInfo() logs and the
large size of these log lines is contributing substantively
to the log eliding of the RADIO_LOG buffer. Because the RILJ
call contains all the same info these logs add little value.

Bug: 29368040
Change-Id: Ia3ebf3d74986f8f12ac2adbd2dfd7283bb8162b5
erviceStateTracker.java
377829357347112a3d4f8e1083b4833bc47ba8a1 13-Jun-2016 Stuart Scott <stuartscott@google.com> User ByteBuffer to pack array

Change-Id: I3d06f2aeae7e12e8b9d48e4a48e5bebc9de98abf
ataconnection/DcTracker.java
e4d629b1a490b78493630d2899c558aad37aa617 14-Jun-2016 qingxi <qingxi@google.com> Merge \\\"change CDMA roaming mode when ACTION_CARRIER_CONFIG_CHANGED received.\\\" into nyc-dev am: 1cea5b7404 am: 0f0b552e4f
am: a289c2d5c8

Change-Id: Iaa45418aed7f977f9f8b8bec9889a223821bf937
a289c2d5c8114d3d71aef34753f33ac850a5f702 14-Jun-2016 Qingxi Li <qingxi@google.com> Merge \\"change CDMA roaming mode when ACTION_CARRIER_CONFIG_CHANGED received.\\" into nyc-dev am: 1cea5b7404
am: 0f0b552e4f

Change-Id: Ib18d1714f48008b85c509e898c18168b6c6696b7
9890dbcac99d6b7ff44dcc826f10f9acf8bf2a68 14-Jun-2016 qingxi <qingxi@google.com> Merge \"change CDMA roaming mode when ACTION_CARRIER_CONFIG_CHANGED received.\" into nyc-dev
am: 1cea5b7404

Change-Id: I28433f84f0b23ceb70a8ea35bea400d6a5355a28
0f0b552e4fb12f8841a530d7d7a37c466c84fa58 14-Jun-2016 qingxi <qingxi@google.com> Merge \"change CDMA roaming mode when ACTION_CARRIER_CONFIG_CHANGED received.\" into nyc-dev
am: 1cea5b7404

Change-Id: I6e5dcf8df7380194541706160675e897055a38c5
1cea5b740416ed58f95ae1d0f3bffc062dc589de 14-Jun-2016 Qingxi Li <qingxi@google.com> Merge "change CDMA roaming mode when ACTION_CARRIER_CONFIG_CHANGED received." into nyc-dev
9d3f7e2198479ede7009c53aea1499d73016de7c 04-Jun-2016 qingxi <qingxi@google.com> change CDMA roaming mode when ACTION_CARRIER_CONFIG_CHANGED received.

Change-Id: I672dbd7c72fa4ea140e073d52b271ea99046cd4e
bug: 28836467
smCdmaPhone.java
hone.java
honeInternalInterface.java
27404828098f9bd256f954c3a1d35a5fecf2e866 10-Jun-2016 Ji Yang <yangji@google.com> Suppress new message notification on non-FBE devices. am: 7abb62a097 am: 4953003ee8
am: f445738b1f

Change-Id: I95229195b10a4885fe71819bab65e20fc37b1be7
f445738b1f0fccc7db64292f934554965039af11 10-Jun-2016 Ji Yang <yangji@google.com> Suppress new message notification on non-FBE devices. am: 7abb62a097
am: 4953003ee8

Change-Id: I673c39860e1a56b1214be04860d2dbe2000658d5
e090d1b4867480fe6dcceb1ce0ea9220405145a3 10-Jun-2016 Ji Yang <yangji@google.com> Suppress new message notification on non-FBE devices.
am: 7abb62a097

Change-Id: Ieb9d010ad18bd28540e01f62327674b8d7729d80
4953003ee8bf2ad759437837435301ef0c879dc7 10-Jun-2016 Ji Yang <yangji@google.com> Suppress new message notification on non-FBE devices.
am: 7abb62a097

Change-Id: I84d91dfc7e8fb118acbf5acfd6da64efc2f5411c
5153ef906bc74bd8bc28c798538d5ed9c4b85acc 10-Jun-2016 Robert Greenwalt <rgreenwalt@google.com> Merge \\"Hook PCO RIL signal with the CarrierSignal app.\\" into nyc-mr1-dev am: d007b482f2
am: db8fd12ea4

Change-Id: I5727956b9a0c30dd7b5e003dbd1f49e2e6a6d253
db8fd12ea461fbce1968f98b5c92c7255d14539c 10-Jun-2016 Robert Greenwalt <rgreenwalt@google.com> Merge \"Hook PCO RIL signal with the CarrierSignal app.\" into nyc-mr1-dev
am: d007b482f2

Change-Id: I4ea56461ab7598dfd4bfc20e0445af8b83722bba
d007b482f2f60c59535067daf147611d6ea9bebf 10-Jun-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Hook PCO RIL signal with the CarrierSignal app." into nyc-mr1-dev
bc41f288c617a064c2f858fe722e7506c9e733d8 10-Jun-2016 Amit Mahajan <amitmahajan@google.com> Merge \\"Additional sms segment de-duping for multi-part SMS.\\" into nyc-mr1-dev am: ae00825eaa
am: 9dd448c4c4

Change-Id: I0dd33fd54d14107e3b95477d17dc99dd75b00ff5
9e7bdf3a20ec311c2a4e9e30c4dff7bac90780ba 10-Jun-2016 Amit Mahajan <amitmahajan@google.com> Merge \\"Do not check permission multiple times.\\" into nyc-mr1-dev am: ad6db4f97a
am: 81a276b7e8

Change-Id: I2e5fb37c0ffb1bb73b7207f76ae363f8010568dc
3fd4a88bd853df2482776efce7823fcfd3f2e33a 10-Jun-2016 Pavel Zhamaitsiak <pavelz@google.com> Notify ImsManager when ACTION_IMS_CONFIG_CHANGED intent is received am: 232c49a375
am: 4e0ce0fc19

Change-Id: I89aefac322d3cfea166431d196d41e0419dec226
9dd448c4c4e1bf9098077096f4271bd847bc390d 10-Jun-2016 Amit Mahajan <amitmahajan@google.com> Merge \"Additional sms segment de-duping for multi-part SMS.\" into nyc-mr1-dev
am: ae00825eaa

Change-Id: If4b2dd3753ae586048323e9b4dd3855e255e49b0
81a276b7e8b2fd025f43f262d429f0b7f41a7f56 10-Jun-2016 Amit Mahajan <amitmahajan@google.com> Merge \"Do not check permission multiple times.\" into nyc-mr1-dev
am: ad6db4f97a

Change-Id: Ib4f5ddafe25de71f1208c7d789c9679239416757
4e0ce0fc19d4b5e55a43c26202cf6327002d58f2 10-Jun-2016 Pavel Zhamaitsiak <pavelz@google.com> Notify ImsManager when ACTION_IMS_CONFIG_CHANGED intent is received
am: 232c49a375

Change-Id: Ie5a7dc09ed6636154830b0fd962db9a25c753f6d
ae00825eaa816397f4bfaa9b1a61ce38c02930db 10-Jun-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Additional sms segment de-duping for multi-part SMS." into nyc-mr1-dev
ad6db4f97a942238ec41c91b7c42f7ffd7b3a5bc 10-Jun-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Do not check permission multiple times." into nyc-mr1-dev
54543184e3fd345fe0c96d4d96022ad4f058e410 26-May-2016 Amit Mahajan <amitmahajan@google.com> Additional sms segment de-duping for multi-part SMS.

Adding de-duping logic for segments with same parameters that can
cause ambiguity when concatenating them to get the complete
message.

Bug: 28932719
Change-Id: I187942d8384dc18d4311265441d076f085651c67
nboundSmsHandler.java
isualVoicemailSmsFilter.java
b6081ea2cdae9dc6265721cbd5e75f483f76eb76 10-Jun-2016 Robert Greenwalt <rgreenwalt@google.com> Support requesting restricted default am: 5292d0e24a
am: 626667ccf7

Change-Id: I050ed38bf898d19c74e21e89132a00f6337eb11c
232c49a375d316c584f1dc2b45c5df3c1c0285ca 03-Jun-2016 Pavel Zhamaitsiak <pavelz@google.com> Notify ImsManager when ACTION_IMS_CONFIG_CHANGED intent is received

Bug: 26496388
Change-Id: Id7624df12bc09dd18a72ba78c447907f1066e09e
hone.java
626667ccf785c62d9b1fa50cc5605e8637f339d0 10-Jun-2016 Robert Greenwalt <rgreenwalt@google.com> Support requesting restricted default
am: 5292d0e24a

Change-Id: I2f92d7b7550a9914958476ec0c398003fb0b7d90
ef6b720fb6af9059e082e0891abb65772775ea65 10-Jun-2016 Amit Mahajan <amitmahajan@google.com> Do not check permission multiple times.

ag/827318 on L should have been DO NOT MERGE. As a result of
automerge this bug got introduced in M which leads to duplicate
permission checks.

Bug: 29233690
Change-Id: Ifb2c8773c6fa404b747ba3a6c2f0e7fce3c90cb2
honeSubInfoController.java
2e2ec7d6844b8441df95b9ff38129e1e4a2d18f3 08-Jun-2016 Robert Greenwalt <rgreenwalt@google.com> Hook PCO RIL signal with the CarrierSignal app.

Passes data from the RIL to the registered carrier app.

bug:28567303
Change-Id: Icec5765dd7d2a8f5a22903791dba7c84296d9d3e
ataconnection/DcController.java
ataconnection/DcTracker.java
5292d0e24a73aed20bb3ed8591c0ac6005a0e3c9 08-Jun-2016 Robert Greenwalt <rgreenwalt@google.com> Support requesting restricted default

Fixes a bug where if we had a restricted request up when data became
unrestricted (either user or carrier enabled data) we wouldn't get a
general purpose, unrestricted connection.

bug:28567303
Change-Id: Ib10f495e705c3a1a1bd283d84ba8353485c672fe
ataconnection/DcTracker.java
7abb62a0971290c1ad2e9e1be4a81cf4537cdc22 09-Jun-2016 Ji Yang <yangji@google.com> Suppress new message notification on non-FBE devices.

BUG: 28791378
Change-Id: Ib0e37cfdcc1b30ee1cbe21ad7398522113c8c976
nboundSmsHandler.java
5deeeef8a7c8685abda3bdf00464bc2582c2b5c6 09-Jun-2016 Tyler Gunn <tgunn@google.com> Properly handle multi-endpoint answered elsewhere disconnect cause.

Two issues:
1. The "answered elsewhere" disconnect cause was mapped to "call pulled".
2. The "answered elsewhere" disconnect cause would be remapped as a missed
call.

Bug: 29236416
Change-Id: I4cb46a68079fdefd273c532b378e703c24ba7f4e
msphone/ImsPhoneCallTracker.java
6c6121de9ae343b29f000528fc37e032b564ebb4 09-Jun-2016 Chen Xu <fionaxu@google.com> Merge \\"change to non-static cache in carrierSignalAgent\\" into nyc-mr1-dev am: 5523cc4cc2
am: 7f18d246ae

Change-Id: Ie2154e71b231c808114fc32e72e2041e73cb4e73
b325ad73026291a00dac9ed06568c52115e96484 09-Jun-2016 Chen Xu <fionaxu@google.com> Merge \\"shorter delay of apn retry for certain reasons\\" into nyc-mr1-dev am: 1e9bc601e6
am: 493f48db74

Change-Id: Ie09ed928e6252fa30884c74804bec891a57fb116
7f18d246ae416bac745ae04286267cf10a9d93a2 09-Jun-2016 fionaxu <fionaxu@google.com> Merge \"change to non-static cache in carrierSignalAgent\" into nyc-mr1-dev
am: 5523cc4cc2

Change-Id: I24ebe02e975af9d2a8721de7e7ababc41aa0d6c5
493f48db74ef131ebd31ef3f38b6b7d1c5ad086d 09-Jun-2016 fionaxu <fionaxu@google.com> Merge \"shorter delay of apn retry for certain reasons\" into nyc-mr1-dev
am: 1e9bc601e6

Change-Id: I92c1a6e0d19c13a7471b77b058cda2e171acc9a2
5523cc4cc2ff704175175a4c2fb51d218f20310c 09-Jun-2016 Chen Xu <fionaxu@google.com> Merge "change to non-static cache in carrierSignalAgent" into nyc-mr1-dev
1e9bc601e633e33e5e99907fd04b8c59be7b2e5d 09-Jun-2016 Chen Xu <fionaxu@google.com> Merge "shorter delay of apn retry for certain reasons" into nyc-mr1-dev
d9ba2683e866ca3a813684a90472062232cbc732 06-Jun-2016 fionaxu <fionaxu@google.com> shorter delay of apn retry for certain reasons

this is based on external
CL:https://partner-android-review.googlesource.com/#/c/467885/1

Bug:26928735
Change-Id: Ie9dd07f13874d225b491d50f44d7daa3daaab34e
ataconnection/ApnContext.java
805a08b4ceb8b86f7fe453f01a73e96beb371be9 08-Jun-2016 Ta-wei Yen <twyen@google.com> Merge \\"Calling as system when filtering VVM SMS in CarrierSmsFilterCallback\\" into nyc-mr1-dev am: 96e9002d06
am: 015cb346fa

Change-Id: Ia6925aa6e58c7dc780219975e68158bc7c879988
015cb346fa79ba95d661e535764ed656f8618592 08-Jun-2016 Ta-wei Yen <twyen@google.com> Merge \"Calling as system when filtering VVM SMS in CarrierSmsFilterCallback\" into nyc-mr1-dev
am: 96e9002d06

Change-Id: I1140e185adc8177098c301c501ba6515b38ad721
96e9002d06d8ae9db434b1dee3276c3b4d6f8273 08-Jun-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Calling as system when filtering VVM SMS in CarrierSmsFilterCallback" into nyc-mr1-dev
b9b14f0b00a396295f6f91e5e83dbc8573f4de3b 08-Jun-2016 Ta-wei Yen <twyen@google.com> Calling as system when filtering VVM SMS in CarrierSmsFilterCallback

When the callback is invoked in CarrierSmsFilterCallback, the calling
identity is replaced with the carrier app.

VisualVoicemailSmsFilter need to be called from the system so the
calling identity must be restored before calling.

Change-Id: I03ad92aaefba58c57e76317cb30565a794a1c268
Fixes:28982677
nboundSmsHandler.java
2f6e5a0985f65686759f43d4f07669bdc43efc19 08-Jun-2016 fionaxu <fionaxu@google.com> Backport changes to read sms app name safely am: 98f7080e8e am: f6a6d47561 am: f61e7e7aaa am: 3549133e53 am: a92fe9a1fd am: 18f0dcfbb3 am: 008679ddff am: 86391365a9 am: a72e8f1af6
am: 345f1232bc

Change-Id: I628d31b26afc0177cc43eb3dc6d20414c63154f9
345f1232bc4f77ee58f5781d1c6450b1449bdfcf 08-Jun-2016 fionaxu <fionaxu@google.com> Backport changes to read sms app name safely am: 98f7080e8e am: f6a6d47561 am: f61e7e7aaa am: 3549133e53 am: a92fe9a1fd am: 18f0dcfbb3 am: 008679ddff am: 86391365a9
am: a72e8f1af6

Change-Id: I7399cbd17fe7f4830cb9b792bcc54ded1d3c387c
a72e8f1af6b791ac701993f3f66ea94b16d3f1c1 08-Jun-2016 fionaxu <fionaxu@google.com> Backport changes to read sms app name safely am: 98f7080e8e am: f6a6d47561 am: f61e7e7aaa am: 3549133e53 am: a92fe9a1fd am: 18f0dcfbb3 am: 008679ddff
am: 86391365a9

Change-Id: I0cf3c975c182c948562c811729698e241eb83053
111b4826bca13341f53e3f63eee147c59790384b 08-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Merge \\"Move ACK_WAKE_LOCK_TIMEOUT log to verbose mode.\\" into nyc-mr1-dev am: 876e81e4eb
am: c9bbc400f8

Change-Id: Ie896afa802c76d0eea6764b7222a46412899d68e
86391365a957b4c8a3836be5ab9915a2b093e390 08-Jun-2016 fionaxu <fionaxu@google.com> Backport changes to read sms app name safely am: 98f7080e8e am: f6a6d47561 am: f61e7e7aaa am: 3549133e53 am: a92fe9a1fd am: 18f0dcfbb3
am: 008679ddff

Change-Id: I44780ca82ff0b48234f188e976ac4adf795ba686
008679ddff03e4a543b32337d2457e0c847baaac 08-Jun-2016 fionaxu <fionaxu@google.com> Backport changes to read sms app name safely am: 98f7080e8e am: f6a6d47561 am: f61e7e7aaa am: 3549133e53 am: a92fe9a1fd
am: 18f0dcfbb3

Change-Id: I9e39db136e7ed815b47ff013a330f431cf20a294
c9bbc400f8e9c2482207a63854f3bcf6fd4614e2 08-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Merge \"Move ACK_WAKE_LOCK_TIMEOUT log to verbose mode.\" into nyc-mr1-dev
am: 876e81e4eb

Change-Id: Id4e10a0d6e97ef318cf60502c7c4ecad23e98e2b
18f0dcfbb3cc39b8d49d94f8b7f7adc30447a9ef 08-Jun-2016 fionaxu <fionaxu@google.com> Backport changes to read sms app name safely am: 98f7080e8e am: f6a6d47561 am: f61e7e7aaa am: 3549133e53
am: a92fe9a1fd

Change-Id: I2e18d8663fb38ffb9a8cc96173ae42c421be15af
c4ed983e8df098f4b3538e5114e8992f03cac095 06-Jun-2016 fionaxu <fionaxu@google.com> change to non-static cache in carrierSignalAgent

Bug: 29150383
Change-Id: I34f44aa8557af028b96fee41d2ab68daefebc29c
arrierSignalAgent.java
a92fe9a1fd1d996076df23d3d066a11afdabc7ff 08-Jun-2016 fionaxu <fionaxu@google.com> Backport changes to read sms app name safely am: 98f7080e8e am: f6a6d47561 am: f61e7e7aaa
am: 3549133e53

Change-Id: I75785fb1449782bccce7127e77ef2db6c8e8417e
876e81e4eb88d8cecf0698f4f6d3e69cc35d24ba 08-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Move ACK_WAKE_LOCK_TIMEOUT log to verbose mode." into nyc-mr1-dev
3549133e530fce516a7b812009bfd3e9cd360448 08-Jun-2016 fionaxu <fionaxu@google.com> Backport changes to read sms app name safely am: 98f7080e8e am: f6a6d47561
am: f61e7e7aaa

Change-Id: I9019a6818cdc1d9cbc3102cfdd46d1fd72cae893
f61e7e7aaa1051a4de3b08b81316ef3be6e5de29 08-Jun-2016 fionaxu <fionaxu@google.com> Backport changes to read sms app name safely am: 98f7080e8e
am: f6a6d47561

Change-Id: I3bc5caf5b490b44fa12bc83e77ae94c0e1879a58
87af9b1c803acb4101203ecccab2f2b87b308380 08-Jun-2016 Robert Greenwalt <rgreenwalt@google.com> Merge \\"Support requesting restricted default\\" into nyc-mr1-dev am: 5b561176e9
am: 088e39fc06

Change-Id: I096e155edce926480775812da793cd3d51ed7cb5
088e39fc06e8fa59d186d0780fb9d05c22fc7bc2 08-Jun-2016 Robert Greenwalt <rgreenwalt@google.com> Merge \"Support requesting restricted default\" into nyc-mr1-dev
am: 5b561176e9

Change-Id: I113b85ddf583ecca2b07087c1feb7fadbc54f01c
5b561176e9417e7c31c4ae42dd40efb634be6373 08-Jun-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Support requesting restricted default" into nyc-mr1-dev
cbc41cd79cf680ce866b98a422809ddcc577bf6a 07-Jun-2016 Neil Fuller <nfuller@google.com> Merge "Explicitly use en_US when picking a Locale using "en"" am: fb00edac3d
am: 33fd0e3a8c

* commit '33fd0e3a8c66c72d02505e46c90bb6bb8755c24e':
Explicitly use en_US when picking a Locale using "en"

Change-Id: Iaf67be2e1bd943b710a520d9f09e8e68a5fc13e9
44fa80631da0f4be66a141f025dd6bb59d1760dc 07-Jun-2016 Ta-wei Yen <twyen@google.com> Fix VisualVoicemailSmsFilter NPE on invalid SmsMessage am: 649d6ef945
am: 04b75728b2

* commit '04b75728b2d1067124af2f5ced14049faf8751f4':
Fix VisualVoicemailSmsFilter NPE on invalid SmsMessage

Change-Id: I63f112e179ee6a2ae3f154fa4335daad23a5b97b
04b75728b2d1067124af2f5ced14049faf8751f4 07-Jun-2016 Ta-wei Yen <twyen@google.com> Fix VisualVoicemailSmsFilter NPE on invalid SmsMessage
am: 649d6ef945

* commit '649d6ef94525802e2911d4063431e3207e452810':
Fix VisualVoicemailSmsFilter NPE on invalid SmsMessage

Change-Id: I3063216f4e1d88028d23f77e8745f60442541132
649d6ef94525802e2911d4063431e3207e452810 07-Jun-2016 Ta-wei Yen <twyen@google.com> Fix VisualVoicemailSmsFilter NPE on invalid SmsMessage

Certain PDU will cause createFromPdu() to return a SmsMessage with null
mWrappedSmsMessage, throwing NPE on any method called. In this case, just
ignore the message.

Bug:29123941
Change-Id: Id649af4b7a7a9f5d7b7a08d007b619a4c98f81cb
isualVoicemailSmsFilter.java
692640f429efa8e292c6261472b2c682e1079f8e 03-Jun-2016 Robert Greenwalt <rgreenwalt@google.com> Support requesting restricted default

Carrier app will need to use the default cell network when the carrier
has restricted that (reprovisioning when out of bytes). Add support
for bringing up internet with restricted capability, sidesteping
user/carrier enablement.

bug:28567303
Change-Id: I83fc29fa6707a7014ae1bc2e914cfa120f07c983
ataconnection/ApnContext.java
ataconnection/DataConnection.java
ataconnection/DcTracker.java
b1ab53f72a68f1bf985a409de366a56d12805ff3 06-Jun-2016 Neil Fuller <nfuller@google.com> Merge "Explicitly use en_US when picking a Locale using "en"" into nyc-mr1-dev am: fddcc60b6b
am: f31b4ce987

* commit 'f31b4ce987b33beff7f80b95b7e54fcca7996602':
Explicitly use en_US when picking a Locale using "en"

Change-Id: I3c1fb04966b3b278ca7de0a4ad3c390430f2d745
04b84d06b92316106f3625c2cbeba3c580609c04 31-May-2016 Neil Fuller <nfuller@google.com> Explicitly use en_US when picking a Locale using "en"

In the absence of a clear country, this change adds an explicit
FALLBACK entry for Locale.ENGLISH to ensure the device defaults
to en_US. There were reports of en_AU being chosen, which covers
fewer users than en_US.

The code was previously using the first locale that matches the
language obtained from the list returned by:
context.getAssets().getLocales()

The ordering for this list is not well defined. The existing
arbitrary behavior will continue for other language-only matches.

This fallback behavior is only used when the device only has a
language signal and other sources on device (i.e. ro.carrier /
R.array.carrier_properties, or MCC code) have not yielded a
language AND country. An example being when the user's sim has
a sim lock set and they have not unlocked the sim yet.

Bug: 28998094
(cherry-picked from commit 47c2502872793cf8c7931adc32071f64b533a3c4)

Change-Id: Ib5acdbd7d5d26b24365769811db0d7c7be05c687
ccTable.java
f31b4ce987b33beff7f80b95b7e54fcca7996602 06-Jun-2016 Neil Fuller <nfuller@google.com> Merge "Explicitly use en_US when picking a Locale using "en"" into nyc-mr1-dev
am: fddcc60b6b

* commit 'fddcc60b6b68c5efbe7ee5960983597368ff562f':
Explicitly use en_US when picking a Locale using "en"

Change-Id: I8899d7e7aaddee95367b454dc12ee873b8a76f0e
fddcc60b6b68c5efbe7ee5960983597368ff562f 06-Jun-2016 Neil Fuller <nfuller@google.com> Merge "Explicitly use en_US when picking a Locale using "en"" into nyc-mr1-dev
47c2502872793cf8c7931adc32071f64b533a3c4 31-May-2016 Neil Fuller <nfuller@google.com> Explicitly use en_US when picking a Locale using "en"

In the absence of a clear country, this change adds an explicit
FALLBACK entry for Locale.ENGLISH to ensure the device defaults
to en_US. There were reports of en_AU being chosen, which covers
fewer users than en_US.

The code was previously using the first locale that matches the
language obtained from the list returned by:
context.getAssets().getLocales()

The ordering for this list is not well defined. The existing
arbitrary behavior will continue for other language-only matches.

This fallback behavior is only used when the device only has a
language signal and other sources on device (i.e. ro.carrier /
R.array.carrier_properties, or MCC code) have not yielded a
language AND country. An example being when the user's sim has
a sim lock set and they have not unlocked the sim yet.

Bug: 28998094
Change-Id: Ie563c74466dbfa2ebc3faa8dada50bb7872e95fc
ccTable.java
5816874b7b0e25632ffcc46202c1a4ce5b370bdf 04-Jun-2016 Chen Xu <fionaxu@google.com> Merge "cold sim clean up" into nyc-mr1-dev am: e274482c43
am: c33ff760c7

* commit 'c33ff760c71844625193dbeb44e7c126c828b5ec':
cold sim clean up

Change-Id: I2615eeef0aff9b59daa98ca1d849f59e1dbee693
c33ff760c71844625193dbeb44e7c126c828b5ec 04-Jun-2016 fionaxu <fionaxu@google.com> Merge "cold sim clean up" into nyc-mr1-dev
am: e274482c43

* commit 'e274482c43261f29bf9690491f064e2ce2cb8996':
cold sim clean up

Change-Id: Idbe0f8fbdefe6ff4c76a06d98b033ad9af9d7ede
e274482c43261f29bf9690491f064e2ce2cb8996 04-Jun-2016 Chen Xu <fionaxu@google.com> Merge "cold sim clean up" into nyc-mr1-dev
12724d595eb88c30ab2855ce7ec4970326aa778d 04-Jun-2016 Amit Mahajan <amitmahajan@google.com> Merge "Revert to sticky broadcast for SIM_STATE_CHANGED." into nyc-dev am: 2e8333e41e am: da3a5ba9df
am: 0527b394c1

* commit '0527b394c13290dfac2f5ed366605eb511aa5d62':
Revert to sticky broadcast for SIM_STATE_CHANGED.

Change-Id: I789a0cf83b2b6c37e772eb84345e2be8529493be
0527b394c13290dfac2f5ed366605eb511aa5d62 04-Jun-2016 Amit Mahajan <amitmahajan@google.com> Merge "Revert to sticky broadcast for SIM_STATE_CHANGED." into nyc-dev am: 2e8333e41e
am: da3a5ba9df

* commit 'da3a5ba9df47e771202b640bda70f1451fcc4e69':
Revert to sticky broadcast for SIM_STATE_CHANGED.

Change-Id: I937e61f23d4ed42d74925099e2df60291c9d9ac1
34dffd7066bcf421829e249f56288bc33735eaf4 04-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Move ACK_WAKE_LOCK_TIMEOUT log to verbose mode.

Bug: 29127300
Change-Id: I4ed9d89c0c651a00fc6c37cb5e07043d30ebf20f
IL.java
da3a5ba9df47e771202b640bda70f1451fcc4e69 04-Jun-2016 Amit Mahajan <amitmahajan@google.com> Merge "Revert to sticky broadcast for SIM_STATE_CHANGED." into nyc-dev
am: 2e8333e41e

* commit '2e8333e41e016c4a5eda6f9f7f9a2a8010bd6ff0':
Revert to sticky broadcast for SIM_STATE_CHANGED.

Change-Id: Ia36c066780aa5d03ce0f64694883dbe673936593
4c31e4c0d2db31fe84081aa6f1e2bcc08b31f9d3 24-May-2016 fionaxu <fionaxu@google.com> cold sim clean up

- add new api to control provisioning notification visibility through
network agent
- rework on the interaction between carrier app and framework
- code cleanup
- unit test support
- hook pco value into datacallcomplete, enabling test by set sysprop for
pco values

Bug: 28567303
Change-Id: Id6b9b2aff4c4f128103593aab0bcef1c3a365141
arrierSignalAgent.java
hone.java
honeInternalInterface.java
erviceStateTracker.java
ubscriptionController.java
ataconnection/DataConnection.java
ataconnection/DcTracker.java
66b45d07f680fd4fdffed52fc1a97df825ae7c20 03-Jun-2016 Amit Mahajan <amitmahajan@google.com> Merge "Revert to sticky broadcast for SIM_STATE_CHANGED." into nyc-dev
am: 2e8333e41e

* commit '2e8333e41e016c4a5eda6f9f7f9a2a8010bd6ff0':
Revert to sticky broadcast for SIM_STATE_CHANGED.

Change-Id: I5011697538969c34c92ea4f1fb5b1acc47775e2c
2e8333e41e016c4a5eda6f9f7f9a2a8010bd6ff0 03-Jun-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Revert to sticky broadcast for SIM_STATE_CHANGED." into nyc-dev
7d9297a8415f4515508c0bf9abbd650e5ce6aa1b 03-Jun-2016 Amit Mahajan <amitmahajan@google.com> Revert to sticky broadcast for SIM_STATE_CHANGED.

Should be changed only when an API is added that allows query for
LOADED state, otherwise this causes issues for some OEM apps.

Bug: 29061608
Change-Id: I52b2139cb1807f8c39329a08762fb98e24a75adb
ubscriptionInfoUpdater.java
a52e2be1d9b8cf9b61ab65864b2857c004e4fd28 03-Jun-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Add support for UNSOL PCO Data." into nyc-mr1-dev am: 3630d6b29d
am: 7603f7f791

* commit '7603f7f791a9fd90d009e6eb19b719a8d9a5b1a5':
Add support for UNSOL PCO Data.

Change-Id: Ic69d5895d99e8bb3acbadf8fc2e83b3fd2dcd37a
7603f7f791a9fd90d009e6eb19b719a8d9a5b1a5 03-Jun-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Add support for UNSOL PCO Data." into nyc-mr1-dev
am: 3630d6b29d

* commit '3630d6b29d5bc73f3032127370d0ecc9c33c70ea':
Add support for UNSOL PCO Data.

Change-Id: I0539ff6d98752f23d552ae688e67bc366ac23013
3630d6b29d5bc73f3032127370d0ecc9c33c70ea 03-Jun-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Add support for UNSOL PCO Data." into nyc-mr1-dev
98f7080e8e93fe5ae9581809ddfb975e56d606e1 03-Jun-2016 fionaxu <fionaxu@google.com> Backport changes to read sms app name safely

Bug: 28557603
Change-Id: Ia6e187d6292f85c3a84a6dc16322b726d488b2ae
MSDispatcher.java
cdfb9b09ecd7656f0281c6f664ce682179165e1b 03-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Add receiver to override carrier name after carrierconfig is loaded." into nyc-dev am: 1532a87452 am: a9cb487c58
am: da9138f65f

* commit 'da9138f65fa72bee61ba5e87dbfea3b3c3e7c198':
Add receiver to override carrier name after carrierconfig is loaded.

Change-Id: Ifde91fb867c8ed7d9c9e54b06832c82658020c88
da9138f65fa72bee61ba5e87dbfea3b3c3e7c198 03-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Add receiver to override carrier name after carrierconfig is loaded." into nyc-dev am: 1532a87452
am: a9cb487c58

* commit 'a9cb487c58b69ebce28a1a0bc0c4f98d42813cc7':
Add receiver to override carrier name after carrierconfig is loaded.

Change-Id: I9b652484b02d77b86733fe421172c657ce636cd8
a9cb487c58b69ebce28a1a0bc0c4f98d42813cc7 03-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Add receiver to override carrier name after carrierconfig is loaded." into nyc-dev
am: 1532a87452

* commit '1532a87452ee8a58f16b3e6af233382c6bfaf3d3':
Add receiver to override carrier name after carrierconfig is loaded.

Change-Id: I7403a8f8df4cf794fcc4d3218293fd976b675452
f35cbbea72b6172e227eceec652c523e211a19b8 03-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Add receiver to override carrier name after carrierconfig is loaded." into nyc-dev
am: 1532a87452

* commit '1532a87452ee8a58f16b3e6af233382c6bfaf3d3':
Add receiver to override carrier name after carrierconfig is loaded.

Change-Id: I6a4b9c0df90e4bbec6fe2f7605f05d6b9f544cb9
1532a87452ee8a58f16b3e6af233382c6bfaf3d3 03-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Add receiver to override carrier name after carrierconfig is loaded." into nyc-dev
4b4d80db8a8d447d3c1110831c2a821a2bd2a186 02-Jun-2016 Robert Greenwalt <rgreenwalt@google.com> Add support for UNSOL PCO Data.

PCO is a container in data-call responses with a range
of optional fields devoted to carrier-proprietary signalling.
This change includes a class to contain this opaque info on
its way to carrier apps.

bug:28961371
bug:28567303
Change-Id: I8ad4e8e56f71d29a7dce52074959459b3063e103
aseCommands.java
ommandsInterface.java
IL.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
7ff21a17555e4c638d6ecfc3ba807b7d9bfc8cc0 03-Jun-2016 Jeff Davidson <jpd@google.com> More carrier bind fixes: direct boot and package changes. am: 72461457ec am: 6e707e9502
am: 4db1de0a2c

* commit '4db1de0a2c7ee0aeab821f80769b5a29be9f40ec':
More carrier bind fixes: direct boot and package changes.

Change-Id: I0e4ba495988c370c02922963f5bad53fc15dacb6
4db1de0a2c7ee0aeab821f80769b5a29be9f40ec 03-Jun-2016 Jeff Davidson <jpd@google.com> More carrier bind fixes: direct boot and package changes. am: 72461457ec
am: 6e707e9502

* commit '6e707e95020058b38fedb8fbc8752cce421b8e6f':
More carrier bind fixes: direct boot and package changes.

Change-Id: I476768f635ea5761b4d49ddfbcd7805cbfa184ac
6e707e95020058b38fedb8fbc8752cce421b8e6f 03-Jun-2016 Jeff Davidson <jpd@google.com> More carrier bind fixes: direct boot and package changes.
am: 72461457ec

* commit '72461457ecf97b19a98d8b581ae72e9819db3ade':
More carrier bind fixes: direct boot and package changes.

Change-Id: I0166b46de1bc5f61dad3ad7537e3a93e20d1d8dc
aa13a63ee39eca6c9609d42662b79e1d1f031391 03-Jun-2016 Jeff Davidson <jpd@google.com> More carrier bind fixes: direct boot and package changes.
am: 72461457ec

* commit '72461457ecf97b19a98d8b581ae72e9819db3ade':
More carrier bind fixes: direct boot and package changes.

Change-Id: I3a16d90d30c5a83a11bbffa7e6887c4b27dbd748
72461457ecf97b19a98d8b581ae72e9819db3ade 02-Jun-2016 Jeff Davidson <jpd@google.com> More carrier bind fixes: direct boot and package changes.

For direct boot, we must listen to ACTION_USER_UNLOCKED and rebind
upon unlock in case the carrier service is not direct boot aware.

Also, previously, we only evaluated bindings on package changes to the
package that was currently bound to, if any. But if no binding is
present, and then a package change leads to a scenario where a binding
should be made, the binding would never be established. This can
happen when a new carrier package is first installed, or if the
component/package goes from disabled to enabled. Thus, when package
changes occur, also reevaluate bindings for any phones which have no
binding information.

Fixes: 28964849
Fixes: 29043701
Change-Id: Ia60c7035d2a3f3f02445f017920f8c4650f464f4
arrierServiceBindHelper.java
d1a13bf0c70f5ad84d5270798f669c641fb0055c 01-Jun-2016 Jack Yu <jackyu@google.com> Merge "Fixed that data call is not torn down when data roaming is disabled." into nyc-dev am: 048e4a733c am: 6ab6544fed
am: b955acd6b7

* commit 'b955acd6b799e84eff1fc873060c52d487705680':
Fixed that data call is not torn down when data roaming is disabled.

Change-Id: I443b739ba22f08639b4061879e80b1361b2dd332
2f59b5167ef77b6aa998ffd72db7fe416c1c421a 01-Jun-2016 fionaxu <fionaxu@google.com> Merge "sms app is able to control alert message" into nyc-dev am: e01f6802ee am: bac040e0d3
am: 57f584091b

* commit '57f584091b98e33356fa0a4f6677912265dfb837':
sms app is able to control alert message

Change-Id: I3572954ab6c917c0d83ec39ddc9be9685f3e944f
42813c4c238eeb51727451aae6e8a6f7f956a583 01-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Add receiver to override carrier name after carrierconfig is loaded.

Bug: 27718118
Change-Id: Ie62dd3dc52f0977a2b05ae8f0ba4898c80174658
icc/SIMRecords.java
b955acd6b799e84eff1fc873060c52d487705680 01-Jun-2016 Jack Yu <jackyu@google.com> Merge "Fixed that data call is not torn down when data roaming is disabled." into nyc-dev am: 048e4a733c
am: 6ab6544fed

* commit '6ab6544fed86686fb7ac260984745d2d9d132d8a':
Fixed that data call is not torn down when data roaming is disabled.

Change-Id: Ie5126192077246c03fbea89b8a790a38bf16ad4d
b766c3e94768138cd48c17b27a1ffeb6f05c8e17 01-Jun-2016 Jack Yu <jackyu@google.com> Merge "Fixed that data call is not torn down when data roaming is disabled." into nyc-dev
am: 048e4a733c

* commit '048e4a733c5b07a2f68fe188107cea2a1c4a8edb':
Fixed that data call is not torn down when data roaming is disabled.

Change-Id: I1b72b9c39db46e70361d5abbc6b75ac56df4105e
6ab6544fed86686fb7ac260984745d2d9d132d8a 01-Jun-2016 Jack Yu <jackyu@google.com> Merge "Fixed that data call is not torn down when data roaming is disabled." into nyc-dev
am: 048e4a733c

* commit '048e4a733c5b07a2f68fe188107cea2a1c4a8edb':
Fixed that data call is not torn down when data roaming is disabled.

Change-Id: Ib721f60b5c2d2bdd6d9afd2aaddf47bfefd2cf11
048e4a733c5b07a2f68fe188107cea2a1c4a8edb 01-Jun-2016 Jack Yu <jackyu@google.com> Merge "Fixed that data call is not torn down when data roaming is disabled." into nyc-dev
57f584091b98e33356fa0a4f6677912265dfb837 01-Jun-2016 Chen Xu <fionaxu@google.com> Merge "sms app is able to control alert message" into nyc-dev am: e01f6802ee
am: bac040e0d3

* commit 'bac040e0d39c5a26c83beb6cc152dbf1ee2345fc':
sms app is able to control alert message

Change-Id: I68f0e7875f817b45170ae3a1eec204be629c352b
38cd57cf72b4ae1db28b91115a6bc4f0ea180220 01-Jun-2016 fionaxu <fionaxu@google.com> Merge "sms app is able to control alert message" into nyc-dev
am: e01f6802ee

* commit 'e01f6802ee3542e70a55570a8d087622f8ddd1f6':
sms app is able to control alert message

Change-Id: I765dc9c3facbdbfeb05c4cd19a2eb5e234ec3094
bac040e0d39c5a26c83beb6cc152dbf1ee2345fc 01-Jun-2016 fionaxu <fionaxu@google.com> Merge "sms app is able to control alert message" into nyc-dev
am: e01f6802ee

* commit 'e01f6802ee3542e70a55570a8d087622f8ddd1f6':
sms app is able to control alert message

Change-Id: I99a2b550a3143f3575b88775826ed0660f2acbf9
e01f6802ee3542e70a55570a8d087622f8ddd1f6 01-Jun-2016 Chen Xu <fionaxu@google.com> Merge "sms app is able to control alert message" into nyc-dev
2eca414f1c7641c5b8069a09f191de7ebe692045 25-May-2016 fionaxu <fionaxu@google.com> sms app is able to control alert message

By changing the name of the application to include HTML characters, it
is possible to manipulate the warning message shown to the user when the
application then tries to send a premium rate SMS message.

Bug: 28557603
Change-Id: I4d43ca12f4ca3c1b00f9628a7301b63690379faf
MSDispatcher.java
f629e7f1a1e36215d9bbed40df310a54b772f9e9 31-May-2016 Jack Yu <jackyu@google.com> Fixed that data call is not torn down when data roaming is disabled.

Fixed the incorrect content observer initialization and its event
handler.

bug: 28923982
Change-Id: I730cb1c737acc2285eb6de4aab97a463db7f4301
ubscriptionController.java
ataconnection/DcTracker.java
3093fecb96400ab343787e9309335af32cc38d37 31-May-2016 Jeff Davidson <jpd@google.com> resolve merge conflicts of 40bb6eb to nyc-mr1-dev-plus-aosp
am: 38fb1a53cb

* commit '38fb1a53cbc4e43ecd202d688010f09f12ec4b62':
Simplify carrier service binding and make it more robust.

Change-Id: Iabc4bf88f1fd1d750ec02429273e43530079e6b7
38fb1a53cbc4e43ecd202d688010f09f12ec4b62 31-May-2016 Jeff Davidson <jpd@google.com> resolve merge conflicts of 40bb6eb to nyc-mr1-dev-plus-aosp

Change-Id: I8a9c014ea3f0db854425cd479f32c2934619f12a
5a9758f240fa65a8c2c53d4c3f1267096787ac12 31-May-2016 Jeff Davidson <jpd@google.com> resolve merge conflicts of 50d0505 to nyc-mr1-dev

Change-Id: Ia198439d675d07b0d57990824084b2ad6b0322cd
40bb6ebddc441e729b8dcb77d642ad2e1e57ae37 31-May-2016 Jeff Davidson <jpd@google.com> Merge "Simplify carrier service binding and make it more robust." into nyc-dev
am: 50d0505585

* commit '50d0505585a990eacbddc594ea2ae67a2f4a7551':
Simplify carrier service binding and make it more robust.

Change-Id: I2d79a2cba3695838ae6a4ad055c2479fb6ce8422
50d0505585a990eacbddc594ea2ae67a2f4a7551 31-May-2016 Jeff Davidson <jpd@google.com> Merge "Simplify carrier service binding and make it more robust." into nyc-dev
ae3c64cfa69240e0393ee4d6948d6c12a7e9342a 31-May-2016 Ian Rogers <irogers@google.com> Merge "Fix leaking connection."
5514c376d79765c6aa2ccf32e61bbd61c4f6934c 27-May-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "CDMA SMS decoding support for GSM data coding scheme"
a25ce48b6ade6416b61320f3bc154ccee6a34663 27-May-2016 Brad Ebinger <breadley@google.com> Add Null check for extras bundle am: 5b47b7f7ad am: 61629ce963
am: 73b15d158a

* commit '73b15d158a427d07336f07d4b3c80fb9fb7383bb':
Add Null check for extras bundle

Change-Id: Idc0b3a958f2aec9f03f41d8cab43258df96d606f
73b15d158a427d07336f07d4b3c80fb9fb7383bb 26-May-2016 Brad Ebinger <breadley@google.com> Add Null check for extras bundle am: 5b47b7f7ad
am: 61629ce963

* commit '61629ce963612861e611c22f7ba33486744ebfcb':
Add Null check for extras bundle

Change-Id: Ic36721f659e3d028a258e1ca2a9b258993eac16b
61629ce963612861e611c22f7ba33486744ebfcb 26-May-2016 Brad Ebinger <breadley@google.com> Add Null check for extras bundle
am: 5b47b7f7ad

* commit '5b47b7f7ad1cb541dabe62e28e3be81eaca3565d':
Add Null check for extras bundle

Change-Id: I4211ba56eb0684aacf2290fc3a71903e83c1a259
9039008791967001c2df72c1c83c46b8805f12f6 26-May-2016 Brad Ebinger <breadley@google.com> Add Null check for extras bundle
am: 5b47b7f7ad

* commit '5b47b7f7ad1cb541dabe62e28e3be81eaca3565d':
Add Null check for extras bundle

Change-Id: Ia29ea096e780f27e7261ae22b276bc70636f94a4
34675030a82d8efe06d2a9b8cbf0666d5be9791e 21-May-2016 Ian Rogers <irogers@google.com> Fix leaking connection.

Issue identified by Error Prone:
Argument 'connection' should not be passed to this method; its type
ImsExternalConnection is not compatible with its collection's type argument
Integer
http://errorprone.info/bugpattern/CollectionIncompatibleType

Bug: 27723540
Change-Id: I6986ffa78bea24dd6ef5ac5ceb8b41c48edde2f5
msphone/ImsExternalCallTracker.java
dc7e8e0543c96ce82c03735168d579aa0bf690ad 17-May-2013 Ajay Nambi <anambi@codeaurora.org> CDMA SMS decoding support for GSM data coding scheme

Decoding support for MT sms encoding type "GSM data coding scheme".

Bug: 21062899

Change-Id: Ib36fcd75272a5a66632f00660b6152b00a0b1455
dma/sms/BearerData.java
dma/sms/UserData.java
5b47b7f7ad1cb541dabe62e28e3be81eaca3565d 26-May-2016 Brad Ebinger <breadley@google.com> Add Null check for extras bundle

Bug: 28982151
Change-Id: I1bcb809c8df79f1faa2ae082d353de94a6d64979
onnection.java
b3b7acda695298456f6ca47fe1f97d715b650b49 26-May-2016 Tyler Gunn <tgunn@google.com> Merge "Multi-endpoint changes." into nyc-mr1-dev am: babfe1553c
am: c11fc641ce

* commit 'c11fc641ce932880d2320a06e387f1e94dc5e6a8':
Multi-endpoint changes.

Change-Id: Ibb55215130909ca90348c11fbdb92971d15afc9a
c11fc641ce932880d2320a06e387f1e94dc5e6a8 26-May-2016 Tyler Gunn <tgunn@google.com> Merge "Multi-endpoint changes." into nyc-mr1-dev
am: babfe1553c

* commit 'babfe1553cc8515bf9a47714c6150ecee58aac97':
Multi-endpoint changes.

Change-Id: I33e7a276dae20a0bd54a568b9b3fd76abf0d3bbf
babfe1553cc8515bf9a47714c6150ecee58aac97 26-May-2016 Tyler Gunn <tgunn@google.com> Merge "Multi-endpoint changes." into nyc-mr1-dev
c95232e4691427a1bdd64bad1babea8e0e796f56 26-May-2016 Brad Ebinger <breadley@google.com> Merge "Clone extras Bundle when operating on it in onExtrasChanged" into nyc-dev am: 6dd1ab357f am: bc0f1d16fc
am: c301735b71

* commit 'c301735b718f0ba076371d69c95148b78dc88f1f':
Clone extras Bundle when operating on it in onExtrasChanged

Change-Id: Ibb2e8123bf7897562e6b8d66454052df1a433c36
c301735b718f0ba076371d69c95148b78dc88f1f 26-May-2016 Brad Ebinger <breadley@google.com> Merge "Clone extras Bundle when operating on it in onExtrasChanged" into nyc-dev am: 6dd1ab357f
am: bc0f1d16fc

* commit 'bc0f1d16fcd72504578135eb224d54558c27eade':
Clone extras Bundle when operating on it in onExtrasChanged

Change-Id: Ie8617cf871bbeba494275ce30a132a9d26f7bd4d
bc0f1d16fcd72504578135eb224d54558c27eade 26-May-2016 Brad Ebinger <breadley@google.com> Merge "Clone extras Bundle when operating on it in onExtrasChanged" into nyc-dev
am: 6dd1ab357f

* commit '6dd1ab357fa15443ff20e5b7bcdbf7fe900518eb':
Clone extras Bundle when operating on it in onExtrasChanged

Change-Id: I6c83e8d77313fb7f53d00826818fe9c3b8dfbcae
f97681864e40f6ac7fa7d1f3fec70aa285c4af5b 26-May-2016 Brad Ebinger <breadley@google.com> Merge "Clone extras Bundle when operating on it in onExtrasChanged" into nyc-dev
am: 6dd1ab357f

* commit '6dd1ab357fa15443ff20e5b7bcdbf7fe900518eb':
Clone extras Bundle when operating on it in onExtrasChanged

Change-Id: Ibae3c3ac9be48dae82ad6d712d2325f4299422c6
6dd1ab357fa15443ff20e5b7bcdbf7fe900518eb 26-May-2016 Brad Ebinger <breadley@google.com> Merge "Clone extras Bundle when operating on it in onExtrasChanged" into nyc-dev
c6fbbecad4e4ff7e80278d2aa4dd315c172d8293 26-May-2016 Ji Yang <yangji@google.com> Merge "Rename carrier messaging API constant name." into nyc-dev am: bc94e86d20 am: 0ca4045776
am: 1a5175b1ad

* commit '1a5175b1ade8f0bca707cdc073ff1ddd4d83839b':
Rename carrier messaging API constant name.

Change-Id: I89a70ea0c3f7ab5d13363973970438363011a4b5
1a5175b1ade8f0bca707cdc073ff1ddd4d83839b 26-May-2016 Ji Yang <yangji@google.com> Merge "Rename carrier messaging API constant name." into nyc-dev am: bc94e86d20
am: 0ca4045776

* commit '0ca4045776af850c2dcd7eaf5ffd9dbd86653897':
Rename carrier messaging API constant name.

Change-Id: Ie09d3e6d5f752851b9c268c9e06b15e8f380cc83
0ca4045776af850c2dcd7eaf5ffd9dbd86653897 26-May-2016 Ji Yang <yangji@google.com> Merge "Rename carrier messaging API constant name." into nyc-dev
am: bc94e86d20

* commit 'bc94e86d207f0dbf839c548f4cee0609e19bd15f':
Rename carrier messaging API constant name.

Change-Id: I99709ddf030e45d997184531e5eeca451a9b2e5c
bc417cdccca348a7607f9cdacc31b5b9f09ee410 26-May-2016 Ji Yang <yangji@google.com> Merge "Rename carrier messaging API constant name." into nyc-dev
am: bc94e86d20

* commit 'bc94e86d207f0dbf839c548f4cee0609e19bd15f':
Rename carrier messaging API constant name.

Change-Id: I54f9e31572262dea198cd90989c34b92e09c7e36
bc94e86d207f0dbf839c548f4cee0609e19bd15f 26-May-2016 Ji Yang <yangji@google.com> Merge "Rename carrier messaging API constant name." into nyc-dev
4effa398215d02824e08a300cd6af63c67f408ea 24-May-2016 Jeff Davidson <jpd@google.com> Simplify carrier service binding and make it more robust.

-Change bind() to rebind(), and have it ensure the binding is always
in the right state. It will drop the binding if it's unneeded,
establish a new binding if the parameters have changed, or else leave
the existing binding alone.

-Use a PackageMonitor instead of a BroadcastReceiver as a minor
simplification. Handle add/remove/update as before.

-Handle package changes by rebinding.

-Handle package force stops by explicitly unbinding and rebinding.

-Remove the bind timeout. This was designed to catch cases where
onBind returned null, but leaving the binding isn't actually harmful,
and having a timeout introduces risk that the binding is dropped when
it is legitimately taking a while to establish.

-Fix log tag which is > 23 characters and thus invalid.

Bug: 28897103
Change-Id: I2e9311588dc378bfb3bc221f2149d3e2d27ce351
arrierServiceBindHelper.java
51c6581b163188fb1909a9732e8ef848ce195d59 26-May-2016 Brad Ebinger <breadley@google.com> Clone extras Bundle when operating on it in onExtrasChanged

Currently, we do not make a copy of the extras Bundle when calling
Connection.setConnectionExtras. In rare cases, when multiple
setConnectionExtras events come in at the same time, they are posted
onto a concurrent Handler and the extras Bundle is cleared while being
copied in TelephonyConnection.updateExtras. This causes an
ArrayOutOfBoundsException and causes the Phone process to crash.

We now create a copy of the Bundle when we post it onto the concurrent
Handler to ensure that there is no simultaneous copy/clear operations
happening on the same extras Bundle.

Bug: 28957661
Change-Id: Icc8200b9a73c261acc6f2b94ace6284437e32e6e
onnection.java
21c249257838ab14340d31580c5989d154e5b0dc 26-May-2016 Derek Tan <derektan@google.com> Use getConfigForSubId instead of getConfig(int). am: f6d865fd88 am: bcc248256f
am: bfdb17a14b

* commit 'bfdb17a14b1f9df893dca7b3c27501c8e1ef1c71':
Use getConfigForSubId instead of getConfig(int).

Change-Id: I53f2aef701ce45585a31f759119643244b0c414f
bfdb17a14b1f9df893dca7b3c27501c8e1ef1c71 26-May-2016 Derek Tan <derektan@google.com> Use getConfigForSubId instead of getConfig(int). am: f6d865fd88
am: bcc248256f

* commit 'bcc248256f31fac1d689b5552fb867851aead161':
Use getConfigForSubId instead of getConfig(int).

Change-Id: I4a340f3b05031bcf46ae273375355b5c749de401
bcc248256f31fac1d689b5552fb867851aead161 26-May-2016 Derek Tan <derektan@google.com> Use getConfigForSubId instead of getConfig(int).
am: f6d865fd88

* commit 'f6d865fd88a8326126e2b3f836b94cfebba3a5a7':
Use getConfigForSubId instead of getConfig(int).

Change-Id: Id1740d58de4fdf10c7c5fa3ec2ea53cc1d451bd3
f6ff9efa40d49b60029c88273316f0e696eacf7c 26-May-2016 Derek Tan <derektan@google.com> Use getConfigForSubId instead of getConfig(int).
am: f6d865fd88

* commit 'f6d865fd88a8326126e2b3f836b94cfebba3a5a7':
Use getConfigForSubId instead of getConfig(int).

Change-Id: Ie06f51798eaeef319f1c093b023b99fa9a1ebe89
315ab03c423ecadd9bb461a3d6e2bfe1d4aff2cf 26-May-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Fix race condition leading to crash in RIL.java." into nyc-mr1-dev am: f198c12600
am: 8884f7791a

* commit '8884f7791a88f0357729ec8f8572ec0fe9528073':
Fix race condition leading to crash in RIL.java.

Change-Id: I488fff33f0e8e577ebc87bd201f94e98b232f901
8884f7791a88f0357729ec8f8572ec0fe9528073 26-May-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Fix race condition leading to crash in RIL.java." into nyc-mr1-dev
am: f198c12600

* commit 'f198c126005e2aa992af485d1c716c36b1b84dfc':
Fix race condition leading to crash in RIL.java.

Change-Id: I7426f57515a21fce68c1db884b1f88c2a8581304
fdb61b2b66ec676eac1f7853a4b8bd7b68a5bf12 26-May-2016 Junda Liu <junda@google.com> Merge "Add restricted card status." into nyc-mr1-dev am: b8edc02f2d
am: 36ad3d6408

* commit '36ad3d6408f89b49948c54d1145ed3ba8bda5d8a':
Add restricted card status.

Change-Id: I724959b35780ff26a9273869ccb18a5906faabb2
f198c126005e2aa992af485d1c716c36b1b84dfc 25-May-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Fix race condition leading to crash in RIL.java." into nyc-mr1-dev
36ad3d6408f89b49948c54d1145ed3ba8bda5d8a 25-May-2016 Junda Liu <junda@google.com> Merge "Add restricted card status." into nyc-mr1-dev
am: b8edc02f2d

* commit 'b8edc02f2d885632214452a7f27b5953822c9689':
Add restricted card status.

Change-Id: I160a5ea9e50cb57028458917443a4470e24fbdd5
b8edc02f2d885632214452a7f27b5953822c9689 25-May-2016 Junda Liu <junda@google.com> Merge "Add restricted card status." into nyc-mr1-dev
f6d865fd88a8326126e2b3f836b94cfebba3a5a7 25-May-2016 Derek Tan <derektan@google.com> Use getConfigForSubId instead of getConfig(int).

Per API review, we want to revert getConfig(int) to
getConfigForSubId(int) (ag/1075011). This CL changes all
callers to use getConfigForSubId(int).

Bug: 28295813
Change-Id: Ib55064226da5371d5acf014c0e0c20f3724d02c4
erviceStateTracker.java
dma/EriManager.java
ataconnection/ApnSetting.java
msphone/ImsPhone.java
d0fdd8bd6ab1261ad474a3e7cddcc99090613931 25-May-2016 Sanket Padawe <sanketpadawe@google.com> Fix race condition leading to crash in RIL.java.

+ Crash occuring because of using RilRequest object after releasing it.

Bug: 28855244

Change-Id: Ieb337a2403ba76de37c4f06a99845709863f19b9
IL.java
67f3535dbfa1e4ca1ed846dd649015e8bd1f7328 25-May-2016 Tyler Gunn <tgunn@google.com> Multi-endpoint changes.

Passing the EXTRA_IS_CALL_PULL extra directly into the ImsCallProfile.
mCallExtras; this is where the modem looks for it, not in the "intent
extras".

Adding unit test for ImsExternalCallTracker (still more tests to be added
in the future); this required adding a new interface to abstract away
some stuff that is needed for the tests.

Bug: 27458894
Change-Id: I24b20d13d5dfeb422295d80c0eec72800836ae74
msphone/ImsExternalCallTracker.java
msphone/ImsPhoneCallTracker.java
fff9b035bd6523190b8f17558ec6fcec3bfe8db1 25-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Do not register broadcastReceiver for all users." into nyc-dev am: 4ac3b86a52 am: 92ccddaac8
am: 65efeee334

* commit '65efeee3340d442510b6270f04302f45d13c1417':
Do not register broadcastReceiver for all users.

Change-Id: I931027a3ca86f46318a145e759e32eb42cbe35af
65efeee3340d442510b6270f04302f45d13c1417 25-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Do not register broadcastReceiver for all users." into nyc-dev am: 4ac3b86a52
am: 92ccddaac8

* commit '92ccddaac8dd109418e3d53f69f9e42a5af108d8':
Do not register broadcastReceiver for all users.

Change-Id: Ibe78f9e0629c2735130a10ae1d92c02aca615a48
4c1e5a77110bb90a6f7eb8f7db355001dad9a46c 25-May-2016 Ta-wei Yen <twyen@google.com> Merge "Switch VVM SMS filter to Builder pattern" into nyc-mr1-dev am: 31a34a63fc
am: 06717524db

* commit '06717524db9f7de7092df0a8613c5da61137e241':
Switch VVM SMS filter to Builder pattern

Change-Id: Ia72d7b3d90cf436282d605cbf8e6f4401bacda73
619ccd02ed402bca2709a4d1399043614658ecee 25-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Do not register broadcastReceiver for all users." into nyc-dev
am: 4ac3b86a52

* commit '4ac3b86a52c65cdbc63a20893969cd5063ec0c21':
Do not register broadcastReceiver for all users.

Change-Id: Ic0467d2f0e9a52739fa180bce225c78ddc1ee1d3
92ccddaac8dd109418e3d53f69f9e42a5af108d8 25-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Do not register broadcastReceiver for all users." into nyc-dev
am: 4ac3b86a52

* commit '4ac3b86a52c65cdbc63a20893969cd5063ec0c21':
Do not register broadcastReceiver for all users.

Change-Id: Ieec2015cab5f720fc645eca161ac0b38aff40c43
06717524db9f7de7092df0a8613c5da61137e241 25-May-2016 Ta-wei Yen <twyen@google.com> Merge "Switch VVM SMS filter to Builder pattern" into nyc-mr1-dev
am: 31a34a63fc

* commit '31a34a63fc891d0afce5036f019aff0d82f706ab':
Switch VVM SMS filter to Builder pattern

Change-Id: Ia75fbd477aab7a0521b9eb2a164ff508db5f6483
31a34a63fc891d0afce5036f019aff0d82f706ab 25-May-2016 Ta-wei Yen <twyen@google.com> Merge "Switch VVM SMS filter to Builder pattern" into nyc-mr1-dev
4ac3b86a52c65cdbc63a20893969cd5063ec0c21 25-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Do not register broadcastReceiver for all users." into nyc-dev
aebb070ebfc2c858a5185b299654c6a85e33088c 24-May-2016 Junda Liu <junda@google.com> Add restricted card status.

Bug: b/28564314
Change-Id: I502f7ddbbe03fc8528226ec2e4e33d0d8a73ad98
arrierServiceBindHelper.java
ubscriptionInfoUpdater.java
icc/IccCardProxy.java
icc/IccCardStatus.java
9b813aa455186511edd03bb738334a1acca7e7b3 24-May-2016 Amit Mahajan <amitmahajan@google.com> Do not register broadcastReceiver for all users.

Registering for all users makes it receive the intent for each
user which is not required.

Bug: 28933982
Change-Id: I797d4d3d4553658a7e4e5021f45dfef5bb6ff05c
msBroadcastUndelivered.java
0434be4c5c4974cd73b105cf8a13ea96c62ab192 23-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Add null check to avoid exception." into nyc-dev am: d6ef8b2687 am: 46fcf696e4
am: e0e6ebe475

* commit 'e0e6ebe475ed5f43098d3254d596632f5c24f066':
Add null check to avoid exception.

Change-Id: I24fc01ecf68aa933fc7881ac6eb122b8d83b5087
e0e6ebe475ed5f43098d3254d596632f5c24f066 23-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Add null check to avoid exception." into nyc-dev am: d6ef8b2687
am: 46fcf696e4

* commit '46fcf696e45525474d35f1a3e726c33d8429a596':
Add null check to avoid exception.

Change-Id: If85c61a1d80fe616572edff06a933d81ada896ad
ba2f0aada2803c2ce73b4df957ff34c163e32714 23-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Add null check to avoid exception." into nyc-dev
am: d6ef8b2687

* commit 'd6ef8b268789f1202416149254ca16e33e27d74b':
Add null check to avoid exception.

Change-Id: I19546ae1973f3de77b1fea426719a39f68cd5710
46fcf696e45525474d35f1a3e726c33d8429a596 23-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Add null check to avoid exception." into nyc-dev
am: d6ef8b2687

* commit 'd6ef8b268789f1202416149254ca16e33e27d74b':
Add null check to avoid exception.

Change-Id: If7151d5196d7e08ac434180bae6165abaa9d3b80
d6ef8b268789f1202416149254ca16e33e27d74b 23-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Add null check to avoid exception." into nyc-dev
5580eae0ac10c1b38aae54b6e9f45b4259f409e2 23-May-2016 Ta-wei Yen <twyen@google.com> Switch VVM SMS filter to Builder pattern

Bug:27816386
Change-Id: Ibc3c6ba4487b4a45472c3fc066895828bb796e22
isualVoicemailSmsFilter.java
2523de374115df9edc87325c955ea067ecadc81f 23-May-2016 Santos Cordon <santoscordon@google.com> Merge "Hide SIP PII data from logs." into nyc-dev am: 359603b1ce am: 1e571ea490
am: b190d6f73c

* commit 'b190d6f73c3764975a4d0199b35e89e619f669ca':
Hide SIP PII data from logs.

Change-Id: If502b848aad0d2aee737f7b95672ce32fe360913
b190d6f73c3764975a4d0199b35e89e619f669ca 23-May-2016 Santos Cordon <santoscordon@google.com> Merge "Hide SIP PII data from logs." into nyc-dev am: 359603b1ce
am: 1e571ea490

* commit '1e571ea490547ba55034c023b9584f61372a8f02':
Hide SIP PII data from logs.

Change-Id: I4d87572e2778e0b71ff89afa7644c1cbec7d0672
1e571ea490547ba55034c023b9584f61372a8f02 23-May-2016 Santos Cordon <santoscordon@google.com> Merge "Hide SIP PII data from logs." into nyc-dev
am: 359603b1ce

* commit '359603b1ce84de5d31fae909be5e8e0bf8f3aaf8':
Hide SIP PII data from logs.

Change-Id: Ie486b6368aafd6a05e73f2e4e274afff9cc17016
cb76e17c99aeeec4432142f656b9640cd52841fc 23-May-2016 Santos Cordon <santoscordon@google.com> Merge "Hide SIP PII data from logs." into nyc-dev
am: 359603b1ce

* commit '359603b1ce84de5d31fae909be5e8e0bf8f3aaf8':
Hide SIP PII data from logs.

Change-Id: I59f635a2489d2560732a0e4a56691d0df1468573
359603b1ce84de5d31fae909be5e8e0bf8f3aaf8 23-May-2016 Santos Cordon <santoscordon@google.com> Merge "Hide SIP PII data from logs." into nyc-dev
4395afce210430030617a4ee262e5b61a3037afa 23-May-2016 Ji Yang <yangji@google.com> Merge "Revert "Revert "Remove the system new message notification automatically.""" into nyc-dev am: 3ea0cc6163 am: d58649a2ea
am: 8a1c33c54e

* commit '8a1c33c54e8dfbc00d08bf34fd5c2acb71690e58':
Revert "Revert "Remove the system new message notification automatically.""

Change-Id: I75ef56de6384e506474e2cba5c6a9e6e1d8c9be3
46eed322a0d0f3e5b9ceb9627ea9a6450e7592c5 23-May-2016 Ji Yang <yangji@google.com> Merge "Revert "Revert "Remove the system new message notification automatically.""" into nyc-dev
am: 3ea0cc6163

* commit '3ea0cc6163742407ce9497c2c1348904d9dede5e':
Revert "Revert "Remove the system new message notification automatically.""

Change-Id: I1c3363bbef430bef08d0a719746ec553704194d0
8a1c33c54e8dfbc00d08bf34fd5c2acb71690e58 23-May-2016 Ji Yang <yangji@google.com> Merge "Revert "Revert "Remove the system new message notification automatically.""" into nyc-dev am: 3ea0cc6163
am: d58649a2ea

* commit 'd58649a2ea31306825ad7f21cbec0cd54ae32122':
Revert "Revert "Remove the system new message notification automatically.""

Change-Id: I8a2ca27ee8aeebedbe9d16a23483932e3f8a5b13
d58649a2ea31306825ad7f21cbec0cd54ae32122 23-May-2016 Ji Yang <yangji@google.com> Merge "Revert "Revert "Remove the system new message notification automatically.""" into nyc-dev
am: 3ea0cc6163

* commit '3ea0cc6163742407ce9497c2c1348904d9dede5e':
Revert "Revert "Remove the system new message notification automatically.""

Change-Id: I122960a16e2752f36d4cc015a3ab8ed857eb6f21
3ea0cc6163742407ce9497c2c1348904d9dede5e 23-May-2016 Ji Yang <yangji@google.com> Merge "Revert "Revert "Remove the system new message notification automatically.""" into nyc-dev
8a54cdb7fdac1b325213a775939ccfc50dc65425 23-May-2016 Ji Yang <yangji@google.com> Revert "Revert "Remove the system new message notification automatically.""

This reverts commit de705fdb1d33c79ef676271fd6938120e15912f0.

The root cause was not caused by the original CL and it is now fixed.

BUG: 28874264

Change-Id: If250a2e59b8230fe54fdf5d35d3b669a70fe9a28
nboundSmsHandler.java
msBroadcastUndelivered.java
058f54014bdd6bc9585d39bb9872b7614c8bb63e 21-May-2016 Amit Mahajan <amitmahajan@google.com> Add null check to avoid exception.

Code was already added for b/28614514; moving it to check a little
earlier. Also adding another null pointer check.

This takes care of b/28842442 too.

Bug: 28883656
Change-Id: Ib8e29a7cc18bffa45a361c27a640fef791d6cafa
nboundSmsHandler.java
e88d7acdae5942a17a496f9aef776b1101a92705 21-May-2016 Ji Yang <yangji@google.com> Merge "Revert "Remove the system new message notification automatically."" into nyc-dev am: 90dc598127 am: f0d1ccb7e2
am: 17a0910333

* commit '17a0910333a3526ecb717d7d8c12b521983d371a':
Revert "Remove the system new message notification automatically."

Change-Id: I4a582c252788f767858141fc9f75a3f7e76d6765
17a0910333a3526ecb717d7d8c12b521983d371a 21-May-2016 Ji Yang <yangji@google.com> Merge "Revert "Remove the system new message notification automatically."" into nyc-dev am: 90dc598127
am: f0d1ccb7e2

* commit 'f0d1ccb7e2cf12c257c8c72014801d3bbaefe630':
Revert "Remove the system new message notification automatically."

Change-Id: Idb030ba17d1df4f66bdef9940fb4e088289c4e5c
f0d1ccb7e2cf12c257c8c72014801d3bbaefe630 21-May-2016 Ji Yang <yangji@google.com> Merge "Revert "Remove the system new message notification automatically."" into nyc-dev
am: 90dc598127

* commit '90dc598127614cc6dc45f31592c75edc6b8fdf4c':
Revert "Remove the system new message notification automatically."

Change-Id: Ia851940fe1db0f889d8ac2c88305b4121806ce77
af65124e9b873a836e18ec0fa9ca8483ed4430b5 21-May-2016 Ji Yang <yangji@google.com> Merge "Revert "Remove the system new message notification automatically."" into nyc-dev
am: 90dc598127

* commit '90dc598127614cc6dc45f31592c75edc6b8fdf4c':
Revert "Remove the system new message notification automatically."

Change-Id: Idb4d105195883f60b5c1da49ac4083d5e95b8a7a
90dc598127614cc6dc45f31592c75edc6b8fdf4c 21-May-2016 Ji Yang <yangji@google.com> Merge "Revert "Remove the system new message notification automatically."" into nyc-dev
e62c56c8fc5f19a05ec80834cffbda3121943c6d 21-May-2016 Meng Wang <mewan@google.com> Merge "Add setAllowedCarriers, getAllowedCarriers to Phone and RIL" into nyc-mr1-dev am: c3425e3d02
am: 2595a568c9

* commit '2595a568c9929e90b45674c0b116274afb745dae':
Add setAllowedCarriers, getAllowedCarriers to Phone and RIL

Change-Id: I4164d560bd403a0eaf387fdd89bff514b05c7748
de705fdb1d33c79ef676271fd6938120e15912f0 21-May-2016 Ji Yang <yangji@google.com> Revert "Remove the system new message notification automatically."

This reverts commit d5059539e839b7bd1e9c62bbc0181444b38a6751.

Change-Id: I5fb1e9e000bc3cf59d6eb8c3a14c5c1fd908284f
nboundSmsHandler.java
msBroadcastUndelivered.java
2595a568c9929e90b45674c0b116274afb745dae 21-May-2016 Meng Wang <mewan@google.com> Merge "Add setAllowedCarriers, getAllowedCarriers to Phone and RIL" into nyc-mr1-dev
am: c3425e3d02

* commit 'c3425e3d0296010427ac478a13b98245251b2c62':
Add setAllowedCarriers, getAllowedCarriers to Phone and RIL

Change-Id: I41f6feadbf39e32ce7b6485c7a2492944cf80f62
c3425e3d0296010427ac478a13b98245251b2c62 21-May-2016 Meng Wang <mewan@google.com> Merge "Add setAllowedCarriers, getAllowedCarriers to Phone and RIL" into nyc-mr1-dev
430b3262febcd1f953612a6098df708abad8d6bb 20-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Changes to not use getFullIccId in SubscriptionInfo." into nyc-dev am: 716f4e1a5c am: 2e98bfac80
am: 718243c4aa

* commit '718243c4aa34d4e738e3438ab2ad3b70adf40785':
Changes to not use getFullIccId in SubscriptionInfo.

Change-Id: I7c05f7ed60c2516f1399ed6439e8144b85274ff2
718243c4aa34d4e738e3438ab2ad3b70adf40785 20-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Changes to not use getFullIccId in SubscriptionInfo." into nyc-dev am: 716f4e1a5c
am: 2e98bfac80

* commit '2e98bfac804a0a8d90695bc369d99e58c2f6be9b':
Changes to not use getFullIccId in SubscriptionInfo.

Change-Id: Iacd1d0575783d287b501e4fa2cee96ce6da0f38a
43e44896eda125fefa30f1f4cfc60f48d9c42ce0 20-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Changes to not use getFullIccId in SubscriptionInfo." into nyc-dev
am: 716f4e1a5c

* commit '716f4e1a5cac924603c59661ef2eb90f4d34d0d8':
Changes to not use getFullIccId in SubscriptionInfo.

Change-Id: I34ceb6b9249903b18bbb5ff6cbe3911f195b4c0b
2e98bfac804a0a8d90695bc369d99e58c2f6be9b 20-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Changes to not use getFullIccId in SubscriptionInfo." into nyc-dev
am: 716f4e1a5c

* commit '716f4e1a5cac924603c59661ef2eb90f4d34d0d8':
Changes to not use getFullIccId in SubscriptionInfo.

Change-Id: I355725e08d91a438941510a8b0d4666c21c6ec60
c9b6db7ae79170f193c128cf49e7c6a6ee3c62ac 20-May-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Collect telephony RIL commands metrics." into nyc-mr1-dev am: 1a899ad469
am: f0c5480a64

* commit 'f0c5480a6429817b05f22a450c216399c1c1349a':
Collect telephony RIL commands metrics.

Change-Id: Ie92346d06690daf49fa1860177c9bb4eff1787c7
716f4e1a5cac924603c59661ef2eb90f4d34d0d8 20-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Changes to not use getFullIccId in SubscriptionInfo." into nyc-dev
f0c5480a6429817b05f22a450c216399c1c1349a 20-May-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Collect telephony RIL commands metrics." into nyc-mr1-dev
am: 1a899ad469

* commit '1a899ad469618efe4e08362f99a1ab1aa03cffe3':
Collect telephony RIL commands metrics.

Change-Id: Ifce4c713f5e33da051bc3a6f36aacb9aef08f61d
1a899ad469618efe4e08362f99a1ab1aa03cffe3 20-May-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Collect telephony RIL commands metrics." into nyc-mr1-dev
40659286ac42ec77bbe7893830bd50c06f393ee8 11-May-2016 Meng Wang <mewan@google.com> Add setAllowedCarriers, getAllowedCarriers to Phone and RIL

Bug: 28564314
Change-Id: I52be8bc7b2f74af9af2a1e3364d4ea33bb806681
ommandsInterface.java
hone.java
IL.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
4184a832bd9e271b342b160ed134e1aa7ed72a29 20-May-2016 Ji Yang <yangji@google.com> Rename carrier messaging API constant name.

BUG: 28842531
Change-Id: I5c8870034d2b19f7647c0dfef352d2d3c202986f
nboundSmsHandler.java
d031a66c786f90be55b79f1dc348505681e354d9 20-May-2016 Ji Yang <yangji@google.com> Merge "Remove the system new message notification automatically." into nyc-dev am: 579a67f0eb am: 7c90c912a0
am: d15d43212c

* commit 'd15d43212c3f6af4113004a2de1ca934c9603c73':
Remove the system new message notification automatically.

Change-Id: I512d6c40dcb9870ae7b6ede50dc5b66ef6050fd6
d15d43212c3f6af4113004a2de1ca934c9603c73 20-May-2016 Ji Yang <yangji@google.com> Merge "Remove the system new message notification automatically." into nyc-dev am: 579a67f0eb
am: 7c90c912a0

* commit '7c90c912a02fc444609a61763c0254a9a482066a':
Remove the system new message notification automatically.

Change-Id: I9c26e9478b47653ab5a150b5ec87e1488ddbebc9
acd8f26d638420e10039135cd4b052349ee435f6 20-May-2016 Ji Yang <yangji@google.com> Merge "Remove the system new message notification automatically." into nyc-dev
am: 579a67f0eb

* commit '579a67f0eb5148bb6577a6734860b01112b59345':
Remove the system new message notification automatically.

Change-Id: Iff4b49c18f8fc3a55c60059cb2b324faccbc2258
7c90c912a02fc444609a61763c0254a9a482066a 20-May-2016 Ji Yang <yangji@google.com> Merge "Remove the system new message notification automatically." into nyc-dev
am: 579a67f0eb

* commit '579a67f0eb5148bb6577a6734860b01112b59345':
Remove the system new message notification automatically.

Change-Id: I59440ba5449d4643b5a510cc8c25b56d2315ad3a
579a67f0eb5148bb6577a6734860b01112b59345 20-May-2016 Ji Yang <yangji@google.com> Merge "Remove the system new message notification automatically." into nyc-dev
5cb60eaffec16576766ab84eca47bd87922e5c4e 19-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Rebroadcast SIM_STATE_CHANGED after USER_UNLOCKED." into nyc-dev am: 41a58e19c4 am: 9c36b3610a
am: 322619247b

* commit '322619247b66b4990505d6f96a4f3a29fc58c27e':
Rebroadcast SIM_STATE_CHANGED after USER_UNLOCKED.

Change-Id: I5ce8893f7a3b8d2ff66a6ba0ad8e3b6bc9f290aa
322619247b66b4990505d6f96a4f3a29fc58c27e 19-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Rebroadcast SIM_STATE_CHANGED after USER_UNLOCKED." into nyc-dev am: 41a58e19c4
am: 9c36b3610a

* commit '9c36b3610ac88c0d37d663e414f464f1fa4b4a2a':
Rebroadcast SIM_STATE_CHANGED after USER_UNLOCKED.

Change-Id: I6f6fa845fffc6127c8a8dda477452fe0e170ba3d
ece01de16a6401d1824e83fabefe85ef49ae765d 19-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Rebroadcast SIM_STATE_CHANGED after USER_UNLOCKED." into nyc-dev
am: 41a58e19c4

* commit '41a58e19c420cf2301aceed5f02813d1e5646f11':
Rebroadcast SIM_STATE_CHANGED after USER_UNLOCKED.

Change-Id: Id7687fc382cbfb497e8ae524152ca200fbe47449
9c36b3610ac88c0d37d663e414f464f1fa4b4a2a 19-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Rebroadcast SIM_STATE_CHANGED after USER_UNLOCKED." into nyc-dev
am: 41a58e19c4

* commit '41a58e19c420cf2301aceed5f02813d1e5646f11':
Rebroadcast SIM_STATE_CHANGED after USER_UNLOCKED.

Change-Id: I037b6a5de58da46d5b471aed4d4be0189df46c0a
41a58e19c420cf2301aceed5f02813d1e5646f11 19-May-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Rebroadcast SIM_STATE_CHANGED after USER_UNLOCKED." into nyc-dev
d5059539e839b7bd1e9c62bbc0181444b38a6751 18-May-2016 Ji Yang <yangji@google.com> Remove the system new message notification automatically.

The notification is removed after user-unlock. It's no longer needed
at that point because the messaging app will show its own notification.

BUG: 28791378
Change-Id: I49f942e565cb8b830c763305483590323ba21e4b
nboundSmsHandler.java
msBroadcastUndelivered.java
53c8950cdfa49267e2ffafa009d40cc02bc510cc 19-May-2016 Amit Mahajan <amitmahajan@google.com> Changes to scan raw table right away if user is already unlocked. am: a83613955a am: 87a5e20011
am: 112bd29f4a

* commit '112bd29f4ae11be462a5d2aa79e44ddfa6128d15':
Changes to scan raw table right away if user is already unlocked.

Change-Id: I970b2311942ec8e154eb0852cb87f460f6126e79
d506d3daaa7f7ec94fdffcf31cb906b385534127 17-May-2016 Sanket Padawe <sanketpadawe@google.com> Collect telephony RIL commands metrics.

Bug: 28717269
Change-Id: Ic1fb35fde03add6d3632738dcdc1e4112a39bf25
IL.java
112bd29f4ae11be462a5d2aa79e44ddfa6128d15 19-May-2016 Amit Mahajan <amitmahajan@google.com> Changes to scan raw table right away if user is already unlocked. am: a83613955a
am: 87a5e20011

* commit '87a5e2001174ba19ce0056582493fb65b8ffb0b7':
Changes to scan raw table right away if user is already unlocked.

Change-Id: I594d8ba6050ad3de6a4b738415d2c493087c1365
c58a27779507d97b02cd78158deee6d46116edb8 19-May-2016 Amit Mahajan <amitmahajan@google.com> Changes to scan raw table right away if user is already unlocked.
am: a83613955a

* commit 'a83613955a113b805729cd415aca50707529208a':
Changes to scan raw table right away if user is already unlocked.

Change-Id: Ief3c4124e144190df5b931f7f7392192d8e4a417
87a5e2001174ba19ce0056582493fb65b8ffb0b7 19-May-2016 Amit Mahajan <amitmahajan@google.com> Changes to scan raw table right away if user is already unlocked.
am: a83613955a

* commit 'a83613955a113b805729cd415aca50707529208a':
Changes to scan raw table right away if user is already unlocked.

Change-Id: I0f179c9e13bbe6020ea01fb37bc97a5346812574
bbc21152b5a554a742b9482953f62fd5cbcfb63a 18-May-2016 Tyler Gunn <tgunn@google.com> Merge "Better handling of dialog event package numbers, and call pulling." into nyc-mr1-dev am: 4fd6713f30
am: 9748db0d07

* commit '9748db0d07cca565070ee6f31d4fc4afb10fab85':
Better handling of dialog event package numbers, and call pulling.

Change-Id: I43f8963b1e93b1cdee73982283425ff76fa6489b
bd84d5d03d74f181175c56bec18c13e65008e5c0 18-May-2016 Tyler Gunn <tgunn@google.com> Merge "Fix issue where null dialog event packages crash external call tracker." into nyc-mr1-dev am: dd9256daa7
am: a6a87f3887

* commit 'a6a87f3887d8209eabb10392f1ad17bbb0678480':
Fix issue where null dialog event packages crash external call tracker.

Change-Id: I4f4bbcfe754c1fef462a386cdcf7927701da8242
9748db0d07cca565070ee6f31d4fc4afb10fab85 18-May-2016 Tyler Gunn <tgunn@google.com> Merge "Better handling of dialog event package numbers, and call pulling." into nyc-mr1-dev
am: 4fd6713f30

* commit '4fd6713f309debc864c67efd26b7ed9c2036c9b4':
Better handling of dialog event package numbers, and call pulling.

Change-Id: I158bd27de34b984accdfafde84fbca0cae222dd8
a6a87f3887d8209eabb10392f1ad17bbb0678480 18-May-2016 Tyler Gunn <tgunn@google.com> Merge "Fix issue where null dialog event packages crash external call tracker." into nyc-mr1-dev
am: dd9256daa7

* commit 'dd9256daa74c3216fa9e2795ce8ec81f1a8ae40a':
Fix issue where null dialog event packages crash external call tracker.

Change-Id: I27d6b786170bcdf47230970c14ba188452071769
4fd6713f309debc864c67efd26b7ed9c2036c9b4 18-May-2016 Tyler Gunn <tgunn@google.com> Merge "Better handling of dialog event package numbers, and call pulling." into nyc-mr1-dev
dd9256daa74c3216fa9e2795ce8ec81f1a8ae40a 18-May-2016 Tyler Gunn <tgunn@google.com> Merge "Fix issue where null dialog event packages crash external call tracker." into nyc-mr1-dev
a83613955a113b805729cd415aca50707529208a 18-May-2016 Amit Mahajan <amitmahajan@google.com> Changes to scan raw table right away if user is already unlocked.

Bug: 28821195
Change-Id: I79d7bcccbaa2e0bb4841c70b7188cff151b701f7
msBroadcastUndelivered.java
2416ed9dea025ad22c37d333ac1cbf4fae75c3ab 17-May-2016 Amit Mahajan <amitmahajan@google.com> Rebroadcast SIM_STATE_CHANGED after USER_UNLOCKED.

There may be apps that rely on SIM_STATE_CHANGED but may not receive
the intent if they are not direct-boot aware. This change is to
rebroadcast the last SIM_STATE_CHANGED intents for each phone
after user unlock.

Bug: 28763595
Change-Id: Ib81e73a946d731987576357ec7c2da19fa310341
ubscriptionInfoUpdater.java
b4350195add6b77d9352a41e1a8e5580a6a4816c 13-May-2016 Santos Cordon <santoscordon@google.com> Hide SIP PII data from logs.

Bug: 28560740
Change-Id: I46464669d5f920c2af8756254a5549508ce99eca
ip/SipConnectionBase.java
ip/SipPhone.java
29c4df7eda45016c7e7c57a2ec0609f3b2eead0b 17-May-2016 Junda Liu <junda@google.com> Merge "Handle both null and empty string for package name in carrier rule." into nyc-dev am: 946fe8e093 am: 5150307435
am: d8dc3984e7

* commit 'd8dc3984e7a3c32a12fe172641b8d48dc27373b6':
Handle both null and empty string for package name in carrier rule.

Change-Id: Icf78b6a6896cd9b90d1d147108711ec8f59358b9
d8dc3984e7a3c32a12fe172641b8d48dc27373b6 17-May-2016 Junda Liu <junda@google.com> Merge "Handle both null and empty string for package name in carrier rule." into nyc-dev am: 946fe8e093
am: 5150307435

* commit '5150307435b4e24c84e203318d070b3807ce85ae':
Handle both null and empty string for package name in carrier rule.

Change-Id: I8f75433281031d534b43acd66b1b42ef942c9fca
49fd072461c6da7565d49c85c772f94c84b03856 17-May-2016 Junda Liu <junda@google.com> Merge "Handle both null and empty string for package name in carrier rule." into nyc-dev
am: 946fe8e093

* commit '946fe8e0934e8fff2a0345bcc94a4228b8cded1c':
Handle both null and empty string for package name in carrier rule.

Change-Id: I24e187c2812138a20d6266d7a1c874563689c697
5150307435b4e24c84e203318d070b3807ce85ae 17-May-2016 Junda Liu <junda@google.com> Merge "Handle both null and empty string for package name in carrier rule." into nyc-dev
am: 946fe8e093

* commit '946fe8e0934e8fff2a0345bcc94a4228b8cded1c':
Handle both null and empty string for package name in carrier rule.

Change-Id: If5e1f5c656a3e23f4827e4bb357ad3806faf5526
946fe8e0934e8fff2a0345bcc94a4228b8cded1c 17-May-2016 Junda Liu <junda@google.com> Merge "Handle both null and empty string for package name in carrier rule." into nyc-dev
525130aaed5ad8bfa22f64353d298b927b7ed3d0 17-May-2016 Amit Mahajan <amitmahajan@google.com> Changes to not use getFullIccId in SubscriptionInfo.

getFullIccId includes hex chars in the ICCID, making it appear
as if its a new ICCID and thus SubscriptionInfo generates new subId
even for SIMs already known to the device (on first upgrading to N).

Bug: 28773363
Change-Id: I4d262d69c3042bef9e711935e02942ec3667171f
ubscriptionInfoUpdater.java
030e16a4334a3dc89e229409178d22041fbf2e14 16-May-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Protect completeRadioCapabilityTransaction with READ_PHONE_STATE permission" into nyc-dev am: ab8dde0e3a am: 35124c6eeb
am: 2d4d2142cb

* commit '2d4d2142cb308b9cb1bfa6617a7cfa85672c0b3a':
Protect completeRadioCapabilityTransaction with READ_PHONE_STATE permission

Change-Id: If9d4439d8bd63c88c70248d26b66df852a0e09bf
2d4d2142cb308b9cb1bfa6617a7cfa85672c0b3a 16-May-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Protect completeRadioCapabilityTransaction with READ_PHONE_STATE permission" into nyc-dev am: ab8dde0e3a
am: 35124c6eeb

* commit '35124c6eeb1b91c53a8be87d01fa299028964277':
Protect completeRadioCapabilityTransaction with READ_PHONE_STATE permission

Change-Id: I0790e6a63b344baae2f03dec7e4c1975e250c867
35124c6eeb1b91c53a8be87d01fa299028964277 16-May-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Protect completeRadioCapabilityTransaction with READ_PHONE_STATE permission" into nyc-dev
am: ab8dde0e3a

* commit 'ab8dde0e3a4a7b211bfdce81fd1d344d97c10f10':
Protect completeRadioCapabilityTransaction with READ_PHONE_STATE permission

Change-Id: I9d13f450b82d2c1ca4a821ef5387a4e517db1711
0bd826a8967e6dd7cb286a1b2f65f1508578b536 16-May-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Protect completeRadioCapabilityTransaction with READ_PHONE_STATE permission" into nyc-dev
am: ab8dde0e3a

* commit 'ab8dde0e3a4a7b211bfdce81fd1d344d97c10f10':
Protect completeRadioCapabilityTransaction with READ_PHONE_STATE permission

Change-Id: If692597ff9923496ae33698fd3239d366cf1dfd7
28c2c8f0fbf091d9731d8cf172028830918b8853 16-May-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "Use HD icon for EVS audio codecs." into nyc-mr1-dev am: 1a91bc6d61
am: 3c61f062b6

* commit '3c61f062b655746bc18df3ed588e39516fcdea05':
Use HD icon for EVS audio codecs.

Change-Id: I3d6fba964d254fc84264279799fe79a5e19149b6
3c61f062b655746bc18df3ed588e39516fcdea05 16-May-2016 Dheeraj Shetty <dshetty@codeaurora.org> Merge "Use HD icon for EVS audio codecs." into nyc-mr1-dev
am: 1a91bc6d61

* commit '1a91bc6d61214b9d2a85c4ccb5ea9280c4f484cc':
Use HD icon for EVS audio codecs.

Change-Id: I79777e303e0b4ba794384ef285ec9d6142c16d96
ab8dde0e3a4a7b211bfdce81fd1d344d97c10f10 16-May-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Protect completeRadioCapabilityTransaction with READ_PHONE_STATE permission" into nyc-dev
1a91bc6d61214b9d2a85c4ccb5ea9280c4f484cc 16-May-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "Use HD icon for EVS audio codecs." into nyc-mr1-dev
6f9b76c422d52d9b21b4b35112eadb9df4f13019 16-May-2016 Ta-wei Yen <twyen@google.com> Add VisualVoicemailSmsFilter
am: 3081824ff4

* commit '3081824ff4942b9bd19db7a0d9918e188c7f69d1':
Add VisualVoicemailSmsFilter

Change-Id: Ie98aac5a3e075dff47071779b103e25e21f23aab
363911ade99b8c798fd1c6ef545d253b8c35a001 14-Apr-2016 Dheeraj Shetty <dshetty@codeaurora.org> Use HD icon for EVS audio codecs.

Show HD icon for audio codecs EVS_WB, EVS_FB and EVS_SWB.

Bug: 28675902

Change-Id: I5550e6c9660c0ccd25418a33c44ee2c71ddd47b9
msphone/ImsPhoneConnection.java
3081824ff4942b9bd19db7a0d9918e188c7f69d1 14-May-2016 Ta-wei Yen <twyen@google.com> Add VisualVoicemailSmsFilter

Several implementation exists for OMTP-like visual voicemail SMS
interfaces because what type of SMS to use is not specified.
Before this CL we can only handle data SMS using the DATA_SMS_RECEIVED
broadcast. With this CL, we can handle data, text and type-0 SMS.

SMS filters will potentially do actions base on the SMS or drop it, so
proper priority should be established to make them work nicely together.

The android framework already provides the CarrierMessagingService
interface to filter SMS. There are 2 possible packages that implements
the interface, the carrier package and the system package. One of them
if any will be chosen to do the filtering. The carrier package is
installed with user interaction and have complex restraints. The
system package is preloaded by the OEM.

If there's a carrier package, we will filter after the carrier package
as it should have priority. If there's a system app, we will filter
before it as we offered mechanism to enable/disable us.

For type-0 SMS, we will filter it before it is going to be dropped.

We will filter visual voicemail SMS based on the content of the message.
A visual voicemail SMS should start with a certain prefix defined
through TelephonyManager, have a event field, and the rest of the message
is consist of OMTP key-value pairs. Future CL will add further
restrictions like originating number and destination port number to
reduce false positives.

If the parsing succeeded, we will compile it into a intent and send a
broadcast. The broadcast is to be made explicit in a future CL.

Bug:27816386
Bug:27817303
Change-Id: I120418d344a1537ff006583759659fa025cac712
(cherry picked from commit 0aa683b47dfd8590f71d88e0814dade4503f0b5d)
nboundSmsHandler.java
isualVoicemailSmsFilter.java
isualVoicemailSmsParser.java
sm/GsmInboundSmsHandler.java
69e6d62ad5af56cdf77953f09988667684ce1cb6 16-May-2016 Android Build Merger (Role) <android-build-merger@google.com> Merge "Merge "Screen state cannot be updated while modem was reset." am: 21fa6126f6 am: ff1d36bf9b am: fda1093ce8 am: 0dbcd5e6a4"
334ea8da9d35fccd0cda023306d288178cf5593d 16-May-2016 Yifan Bai <yifan.bai@spreadtrum.com> Merge "Screen state cannot be updated while modem was reset." am: 21fa6126f6 am: ff1d36bf9b am: fda1093ce8
am: 0dbcd5e6a4

* commit '0dbcd5e6a4b4de6476d17c511080f5cd8048ab92':
Screen state cannot be updated while modem was reset.

Change-Id: I7935cea5ceb3e66e0a71b78948275962b62b7c72
1cfc08fb30b09e1abec79ea5e2f4bf998dde6f50 16-May-2016 Ta-wei Yen <twyen@google.com> Merge "Add VisualVoicemailSmsFilter"
0dbcd5e6a4b4de6476d17c511080f5cd8048ab92 16-May-2016 Yifan Bai <yifan.bai@spreadtrum.com> Merge "Screen state cannot be updated while modem was reset." am: 21fa6126f6 am: ff1d36bf9b
am: fda1093ce8

* commit 'fda1093ce83c430f30ed244b08111b95e789864f':
Screen state cannot be updated while modem was reset.

Change-Id: I7a868a19230321e22e90272ccdfac0d0064d1624
fda1093ce83c430f30ed244b08111b95e789864f 16-May-2016 Yifan Bai <yifan.bai@spreadtrum.com> Merge "Screen state cannot be updated while modem was reset." am: 21fa6126f6
am: ff1d36bf9b

* commit 'ff1d36bf9b2993c8e528e566cea28a6b322f7f88':
Screen state cannot be updated while modem was reset.

Change-Id: Iddf73c0c28462e2a16aff3e6926e6ca7740f829c
6a39d8c99e6822ecb3dd447a993b68d5dc704ea4 02-Apr-2016 Yifan Bai <yifan.bai@spreadtrum.com> Screen state cannot be updated while modem was reset.

When modem was resetting by modem assert, and user turns off the screen
before RIL was reconnected, screen state cannot send to modem. This
could lead to the signal strength keep reporting and high power
consumption. Therefore, screen state needs to be checked again when RIL
is connected.

Change-Id: Ia3ede8670d0a962ca32a775ea79100d550be914f
IL.java
0aa683b47dfd8590f71d88e0814dade4503f0b5d 14-May-2016 Ta-wei Yen <twyen@google.com> Add VisualVoicemailSmsFilter

Several implementation exists for OMTP-like visual voicemail SMS
interfaces because what type of SMS to use is not specified.
Before this CL we can only handle data SMS using the DATA_SMS_RECEIVED
broadcast. With this CL, we can handle data, text and type-0 SMS.

SMS filters will potentially do actions base on the SMS or drop it, so
proper priority should be established to make them work nicely together.

The android framework already provides the CarrierMessagingService
interface to filter SMS. There are 2 possible packages that implements
the interface, the carrier package and the system package. One of them
if any will be chosen to do the filtering. The carrier package is
installed with user interaction and have complex restraints. The
system package is preloaded by the OEM.

If there's a carrier package, we will filter after the carrier package
as it should have priority. If there's a system app, we will filter
before it as we offered mechanism to enable/disable us.

For type-0 SMS, we will filter it before it is going to be dropped.

We will filter visual voicemail SMS based on the content of the message.
A visual voicemail SMS should start with a certain prefix defined
through TelephonyManager, have a event field, and the rest of the message
is consist of OMTP key-value pairs. Future CL will add further
restrictions like originating number and destination port number to
reduce false positives.

If the parsing succeeded, we will compile it into a intent and send a
broadcast. The broadcast is to be made explicit in a future CL.

Bug:27816386
Bug:27817303
Change-Id: I120418d344a1537ff006583759659fa025cac712
nboundSmsHandler.java
isualVoicemailSmsFilter.java
isualVoicemailSmsParser.java
sm/GsmInboundSmsHandler.java
ea8eb7dd21f24aff83cb3a82ed1949b378a1db97 14-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Avoid carrier/system SMS filter if pdu(s) is null." into nyc-dev am: 0c281de37e am: ab588090b3
am: da617f034a

* commit 'da617f034a8e5947de0d9e253a281b4c6b8eb27f':
Avoid carrier/system SMS filter if pdu(s) is null.

Change-Id: I146cb66ec39239988ea3dded781321c917355094
da617f034a8e5947de0d9e253a281b4c6b8eb27f 14-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Avoid carrier/system SMS filter if pdu(s) is null." into nyc-dev am: 0c281de37e
am: ab588090b3

* commit 'ab588090b373ad1975fe4e4f149082cdcf42253d':
Avoid carrier/system SMS filter if pdu(s) is null.

Change-Id: Ic8a26ccf5f1eba444dee9c2d6435f3fb09f25443
ab588090b373ad1975fe4e4f149082cdcf42253d 14-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Avoid carrier/system SMS filter if pdu(s) is null." into nyc-dev
am: 0c281de37e

* commit '0c281de37ec9d95cd1745bd6275c62db8e90a384':
Avoid carrier/system SMS filter if pdu(s) is null.

Change-Id: Id8840e85488ae0d05c2ad85d9526b2019ba207c8
e101fcf5dbac26aeb315f77cccb2a2bc97adf66d 14-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Avoid carrier/system SMS filter if pdu(s) is null." into nyc-dev
am: 0c281de37e

* commit '0c281de37ec9d95cd1745bd6275c62db8e90a384':
Avoid carrier/system SMS filter if pdu(s) is null.

Change-Id: I6b8cbe71c45de08fa36172685240e7c2e885aa65
0c281de37ec9d95cd1745bd6275c62db8e90a384 14-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Avoid carrier/system SMS filter if pdu(s) is null." into nyc-dev
da646a06d4f889c0591f118ccf246c65eb2cff91 13-May-2016 Sanket Padawe <sanketpadawe@google.com> Protect completeRadioCapabilityTransaction with READ_PHONE_STATE permission

Bug: 24450765
Change-Id: I9caaaea299b58e42c988b91e1706e72fc5edb91f
roxyController.java
1c23d391a314ffdb71874b06e9a0e54607208832 12-May-2016 Tyler Gunn <tgunn@google.com> Better handling of dialog event package numbers, and call pulling.

1. Remapping the ImsReasonInfo codes associated with pulling a call to
the DisconnectCause.CALL_PULLED cause. Note: This will need to be updated
in the future as there is a bug in the modem which remaps calls pulled to
the "answered elsewhere code".
2. Convert the dialog event package SIP URI to a tel URI and use that to
set the address on the connection.

Bug: 27458894
Change-Id: I197ce52f6a15df74dcc0c8609f74242b1af910bc
msphone/ImsExternalCallTracker.java
msphone/ImsExternalConnection.java
msphone/ImsPhoneCallTracker.java
d53a74c7e012ff52687013fd892cdbb257df63de 12-May-2016 Junda Liu <junda@google.com> Handle both null and empty string for package name in carrier rule.

If package name is null or empty, the rule should allow all packages signed by the same cert.

Bug: b/28426990
Change-Id: Iba75f0bd4f4642a95aff039d6cadbe3396d3ce51
icc/UiccCarrierPrivilegeRules.java
c1a8c122430453bc08625614cec7ea5914149440 12-May-2016 Abhijith Shastry <ashastry@google.com> Populate destination address in InboundSmsTracker. am: 0a0852c293 am: 5feaa781da
am: 48c3655af3

* commit '48c3655af33141c5ac1d0cd12ade8da3dc555e20':
Populate destination address in InboundSmsTracker.

Change-Id: Ib51647009f4c0935c2894e884fa2e737d22b6f3a
48c3655af33141c5ac1d0cd12ade8da3dc555e20 12-May-2016 Abhijith Shastry <ashastry@google.com> Populate destination address in InboundSmsTracker. am: 0a0852c293
am: 5feaa781da

* commit '5feaa781da2ba9da3b7c8d421c5be7e9de6c5f16':
Populate destination address in InboundSmsTracker.

Change-Id: I6953da2c981b3330d3a9b912cfa3f0c4b4a9f058
5feaa781da2ba9da3b7c8d421c5be7e9de6c5f16 12-May-2016 Abhijith Shastry <ashastry@google.com> Populate destination address in InboundSmsTracker.
am: 0a0852c293

* commit '0a0852c293e26e15d0ab4c286b5aa9b3db287ebc':
Populate destination address in InboundSmsTracker.

Change-Id: I86e7c0e9dae7e6d74a62b789ea00daa6e3b50a3c
9ec6562cd9351d5d5953ec6750bc3547e7710de7 12-May-2016 Abhijith Shastry <ashastry@google.com> Populate destination address in InboundSmsTracker.
am: 0a0852c293

* commit '0a0852c293e26e15d0ab4c286b5aa9b3db287ebc':
Populate destination address in InboundSmsTracker.

Change-Id: I513696bbfe5fd1aad236a361ead3d250d133cb96
7d55a544ba490fab31d2ec2b12d2c0d0c7e7dd12 12-May-2016 yifan.bai <yifan.bai@spreadtrum.com> Merge "Add PLMN 405854 - 405874 to MCCMNC_CODES_HAVING_3DIGITS_MNC array." am: ee290f2ddb am: e6d9c06c15 am: 02f92e5bb9
am: 56e153e449

* commit '56e153e449722aab25581440427cc5d5ea39eda3':
Add PLMN 405854 - 405874 to MCCMNC_CODES_HAVING_3DIGITS_MNC array.

Change-Id: Ia2df11f09ff9c3745eeb42b1b257952f6c1dd5b8
0a0852c293e26e15d0ab4c286b5aa9b3db287ebc 11-May-2016 Abhijith Shastry <ashastry@google.com> Populate destination address in InboundSmsTracker.

This code path is used to deliver undelivered messages.

BUG: 28715722
Change-Id: Ia22ef9130f9ebdda5e7a1f03ec7a71fa8d4663d2
nboundSmsTracker.java
56e153e449722aab25581440427cc5d5ea39eda3 12-May-2016 yifan.bai <yifan.bai@spreadtrum.com> Merge "Add PLMN 405854 - 405874 to MCCMNC_CODES_HAVING_3DIGITS_MNC array." am: ee290f2ddb am: e6d9c06c15
am: 02f92e5bb9

* commit '02f92e5bb935d0740495441a7f470ead5ab43e32':
Add PLMN 405854 - 405874 to MCCMNC_CODES_HAVING_3DIGITS_MNC array.

Change-Id: I218c354d14e49bbe010cd9edbeb8c161feabafce
02f92e5bb935d0740495441a7f470ead5ab43e32 11-May-2016 yifan.bai <yifan.bai@spreadtrum.com> Merge "Add PLMN 405854 - 405874 to MCCMNC_CODES_HAVING_3DIGITS_MNC array." am: ee290f2ddb
am: e6d9c06c15

* commit 'e6d9c06c15a507f2e35dcf3321ba1a559a4ef9ca':
Add PLMN 405854 - 405874 to MCCMNC_CODES_HAVING_3DIGITS_MNC array.

Change-Id: I93f350f9abe38e109741bad29cf265a4acf88c7a
da8286bfe1baf68d81a778031d05c3d13fa03f7c 05-May-2016 Tyler Gunn <tgunn@google.com> Fix issue where null dialog event packages crash external call tracker.

Bug: 27458894
Change-Id: I4dec6fd7619a823023d4958d26a38579a54b3be9
msphone/ImsExternalCallTracker.java
7fb2fe162e5cc018805e335ec858205af65ac41a 10-May-2016 yifan.bai <yifan.bai@spreadtrum.com> Add PLMN 405854 - 405874 to MCCMNC_CODES_HAVING_3DIGITS_MNC array.

Add 21 PLMN to MCCMNC_CODES_HAVING_3DIGITS_MNC array:
"405854", "405855", "405856", "405857", "405858", "405859", "405860",
"405861", "405862", "405863", "405864", "405865", "405866", "405867",
"405868", "405869", "405870", "405871", "405872", "405873", "405874"

Change-Id: Ie017fb716afddd597a624c4d4b73bc2ea15c6952
icc/SIMRecords.java
9272d7f10382ab17db7ea3654f1aa5d426f15464 09-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Do not send unnecessary EVENT_NV_READY to GsmCdmaPhone." into nyc-dev am: 3f93be265f am: 17dfe051ae
am: 76bbab7545

* commit '76bbab75453329be88b099e61da49d94eede1ffb':
Do not send unnecessary EVENT_NV_READY to GsmCdmaPhone.

Change-Id: Ia298317d08846568a6b36f7dffbad29b162400a0
76bbab75453329be88b099e61da49d94eede1ffb 09-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Do not send unnecessary EVENT_NV_READY to GsmCdmaPhone." into nyc-dev am: 3f93be265f
am: 17dfe051ae

* commit '17dfe051ae7aa0de4aa2ed270150352ce344c756':
Do not send unnecessary EVENT_NV_READY to GsmCdmaPhone.

Change-Id: Ia442baed3d5c6197f704d3ad441ece72d48cd04a
caeecabade6f7e68fb732bea0d1a6b554251e21a 09-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Do not send unnecessary EVENT_NV_READY to GsmCdmaPhone." into nyc-dev
am: 3f93be265f

* commit '3f93be265ffc0d7e4ea289393126d207441386f7':
Do not send unnecessary EVENT_NV_READY to GsmCdmaPhone.

Change-Id: I32c28e464ff255df3540700aaf379ea70844dde2
17dfe051ae7aa0de4aa2ed270150352ce344c756 09-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Do not send unnecessary EVENT_NV_READY to GsmCdmaPhone." into nyc-dev
am: 3f93be265f

* commit '3f93be265ffc0d7e4ea289393126d207441386f7':
Do not send unnecessary EVENT_NV_READY to GsmCdmaPhone.

Change-Id: Ib1e83e2333be1578d6463e53d0d316f249e46e94
3f93be265ffc0d7e4ea289393126d207441386f7 09-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "Do not send unnecessary EVENT_NV_READY to GsmCdmaPhone." into nyc-dev
867e0150ea9181755c681013f18877e8eab8ffff 07-May-2016 Amit Mahajan <amitmahajan@google.com> Do not send unnecessary EVENT_NV_READY to GsmCdmaPhone.

Also changing default CDMA subscription source from NV to RUIM.

Bug: 28639524
Change-Id: I778af7f43f1907f8fcfe5d3a1110fe2fa1fc29b3
smCdmaPhone.java
dma/CdmaSubscriptionSourceManager.java
fc2150177a6c7a7f715822bd3390e91f3ab9b5dc 06-May-2016 Amit Mahajan <amitmahajan@google.com> Avoid carrier/system SMS filter if pdu(s) is null.

Bug: 28614514
Change-Id: Ia750d39af000a27b3d0b78281cf8fb949f003de3
nboundSmsHandler.java
87c133cce050bd6bd88f99f8fa0bab0e9de27536 07-May-2016 Junda Liu <junda@google.com> Merge "Fix lower case hex string." into nyc-dev am: 4a1bdb35f2 am: ccc75afaeb
am: 3d84512f5c

* commit '3d84512f5c7eda28132baa1833ac6fcf8906df53':
Fix lower case hex string.

Change-Id: Ie3f40bb4ab0dd8472f36e3c6eb21687c15e6e845
3d84512f5c7eda28132baa1833ac6fcf8906df53 07-May-2016 Junda Liu <junda@google.com> Merge "Fix lower case hex string." into nyc-dev am: 4a1bdb35f2
am: ccc75afaeb

* commit 'ccc75afaebf299feda4160cc5b409a8af7a4b341':
Fix lower case hex string.

Change-Id: I926dd58382f88828f1bd84a0ce91b77ffcde706f
2c5d237b09b73ec1bfd5b0dce00a247b08840832 07-May-2016 Junda Liu <junda@google.com> Merge "Fix lower case hex string." into nyc-dev
am: 4a1bdb35f2

* commit '4a1bdb35f22c72ee8ddb9de35c92299de4897611':
Fix lower case hex string.

Change-Id: Ib27921db9035cb734cde936cf45dd8882f6bec58
ccc75afaebf299feda4160cc5b409a8af7a4b341 07-May-2016 Junda Liu <junda@google.com> Merge "Fix lower case hex string." into nyc-dev
am: 4a1bdb35f2

* commit '4a1bdb35f22c72ee8ddb9de35c92299de4897611':
Fix lower case hex string.

Change-Id: I8e079015e8ebb917396fed00fac088aff177e686
4a1bdb35f22c72ee8ddb9de35c92299de4897611 07-May-2016 Junda Liu <junda@google.com> Merge "Fix lower case hex string." into nyc-dev
d69682b8223822c5b4eca67c71b55340cd06c19f 06-May-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Base APN State on the state of the ApnContext." into nyc-dev am: af891393ac am: 79dabb89fd
am: 594fe67794

* commit '594fe677943ddf0d4c9a19e117f36817c00434c0':
Base APN State on the state of the ApnContext.

Change-Id: I13b8e82120bb37351deaf5510e34cbc00222f7ce
594fe677943ddf0d4c9a19e117f36817c00434c0 06-May-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Base APN State on the state of the ApnContext." into nyc-dev am: af891393ac
am: 79dabb89fd

* commit '79dabb89fd381117b73453471a5ba85120454c98':
Base APN State on the state of the ApnContext.

Change-Id: I6f5b5be86b1ca37a6ef18c3d4cb200b06df4de4b
6fe3ed6ab18881248a4876d9866f026b34234779 06-May-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Base APN State on the state of the ApnContext." into nyc-dev
am: af891393ac

* commit 'af891393ac9e6bd19bef8f5b5b01804d06e268fd':
Base APN State on the state of the ApnContext.

Change-Id: I4a9db7bb60315bdaea28fceb01bc4cf8a26098e2
79dabb89fd381117b73453471a5ba85120454c98 06-May-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Base APN State on the state of the ApnContext." into nyc-dev
am: af891393ac

* commit 'af891393ac9e6bd19bef8f5b5b01804d06e268fd':
Base APN State on the state of the ApnContext.

Change-Id: I23ef21ec3209db2e0ab4fb59937d4c7de5491cf3
af891393ac9e6bd19bef8f5b5b01804d06e268fd 06-May-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Base APN State on the state of the ApnContext." into nyc-dev
5c9990e391dbf776da85480d88856850d9ef16fb 06-May-2016 Hung-ying Tyan <tyanh@google.com> Merge "Fix potential hang in getIccSimChallengeResponse" am: 5ce5110606 am: 34fc622b12 am: f3b41864a1
am: 7366e81b25

* commit '7366e81b25dd950b560d34224a85e0160399208d':
Fix potential hang in getIccSimChallengeResponse

Change-Id: Ifcb59a1fe162ed39f56962561addc0830fb98f31
7366e81b25dd950b560d34224a85e0160399208d 06-May-2016 Hung-ying Tyan <tyanh@google.com> Merge "Fix potential hang in getIccSimChallengeResponse" am: 5ce5110606 am: 34fc622b12
am: f3b41864a1

* commit 'f3b41864a1156ad172ff757e90309b7ac965eaab':
Fix potential hang in getIccSimChallengeResponse

Change-Id: Ia969637cd653c5d2cf17f47a2234fdcef55dd225
f3b41864a1156ad172ff757e90309b7ac965eaab 06-May-2016 Hung-ying Tyan <tyanh@google.com> Merge "Fix potential hang in getIccSimChallengeResponse" am: 5ce5110606
am: 34fc622b12

* commit '34fc622b127ae618863bcc7cb1c7b8db94bc835f':
Fix potential hang in getIccSimChallengeResponse

Change-Id: I23d7f9d5510038462440ab964faedb0562d3d64d
5ce5110606f44d3d012f24b10ba92d8206443ee3 06-May-2016 Treehugger Robot <treehugger-gerrit@google.com> Merge "Fix potential hang in getIccSimChallengeResponse"
b4f9e3979b1bf82a57ce55c7d63cdf932cafb02b 06-May-2016 Amit Mahajan <amitmahajan@google.com> Add check for empty operatorNumeric to avoid crash. am: 7f14ab6328 am: be99da703a
am: 86589513cf

* commit '86589513cf4c05d04b5e5e9f2205e173626e5084':
Add check for empty operatorNumeric to avoid crash.

Change-Id: If5b5e6bcf352f50db439d103f6bbd7e4f59a3da9
86589513cf4c05d04b5e5e9f2205e173626e5084 06-May-2016 Amit Mahajan <amitmahajan@google.com> Add check for empty operatorNumeric to avoid crash. am: 7f14ab6328
am: be99da703a

* commit 'be99da703ac75b914848fdd0d19adaeb8167a106':
Add check for empty operatorNumeric to avoid crash.

Change-Id: I39ee44ae7c10ec13b7b9b84857ba08b2a9e9eccc
be99da703ac75b914848fdd0d19adaeb8167a106 06-May-2016 Amit Mahajan <amitmahajan@google.com> Add check for empty operatorNumeric to avoid crash.
am: 7f14ab6328

* commit '7f14ab6328559e4456d969b735ab8f383a05d0e5':
Add check for empty operatorNumeric to avoid crash.

Change-Id: Ief368521e9a781c11095bf5c26f6a76cc008415c
e93cd90efe8d936d72499aaacd214902b2330b06 06-May-2016 Amit Mahajan <amitmahajan@google.com> Add check for empty operatorNumeric to avoid crash.
am: 7f14ab6328

* commit '7f14ab6328559e4456d969b735ab8f383a05d0e5':
Add check for empty operatorNumeric to avoid crash.

Change-Id: I2f0fdc6ba1059860fb5cdab3e01e58f4cab19f9c
7f14ab6328559e4456d969b735ab8f383a05d0e5 06-May-2016 Amit Mahajan <amitmahajan@google.com> Add check for empty operatorNumeric to avoid crash.

Bug: 28600710
Change-Id: I7816457abbe2431c543274715f33220ff9f0cb29
ubscriptionInfoUpdater.java
5452ccfc4d32fab9933bdcfe775c38f73d4e1b15 05-May-2016 Robert Greenwalt <rgreenwalt@google.com> Base APN State on the state of the ApnContext.

Stop using enablement or activeness as a proxy for state and
just ask for the state. Enablement has changed (since L)
to indicate if we should look for a connection and is not
representative of if we have a connection.

bug:26785653
Change-Id: I8c1edda733509d2539989e727809c13002abf37f
smCdmaPhone.java
ataconnection/DcTracker.java
218aef33df07fa26a91f771cef9be8afec8a12a9 05-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "SAT: SET_UP_MENU missing minimum information" into nyc-mr1-dev am: af40ba22f0
am: 5a9786c903

* commit '5a9786c9030b56c53cc5dbe20a458f13d39f7003':
SAT: SET_UP_MENU missing minimum information

Change-Id: Ie4475d6e21f66d4d8dc7f60c4d9f5c35a2bde0a4
5a9786c9030b56c53cc5dbe20a458f13d39f7003 05-May-2016 Mohammad Rahimpur <mohammad.rahimpur@sonymobile.com> Merge "SAT: SET_UP_MENU missing minimum information" into nyc-mr1-dev
am: af40ba22f0

* commit 'af40ba22f00785c82999363390a7e5722540b0e9':
SAT: SET_UP_MENU missing minimum information

Change-Id: I0b44a19eda12c57f69f2f05e4d135091c1fb13a7
af40ba22f00785c82999363390a7e5722540b0e9 05-May-2016 Amit Mahajan <amitmahajan@google.com> Merge "SAT: SET_UP_MENU missing minimum information" into nyc-mr1-dev
7dd1718b87a2050d9c2f0c34809c118670bb561d 14-May-2012 Mohammad Rahimpur <mohammad.rahimpur@sonymobile.com> SAT: SET_UP_MENU missing minimum information

processSelectItem() is used for both SET_UP_MENU and
SELECT_ITEM command type and since Alpha Identifier
is optional for SELECT_ITEM, its existence is not
checked even for SET_UP_MENU.

Added the check to handle missing Alpha ID now.

Bug: 28201090
Change-Id: I65457b48c85dc0e9f67b7071dc27cb4e6b699c50
at/CommandParamsFactory.java
5a497595a1c23e1c5059728b66330e5968231a78 04-May-2016 Pavel Zhamaitsiak <pavelz@google.com> Telephony metrics: Avoid sending same data on ServiceState changes am: b1759bbf1d am: 51096517e2
am: de49160c91

* commit 'de49160c91757c1998f5ce1186dc48bbfe2c2248':
Telephony metrics: Avoid sending same data on ServiceState changes

Change-Id: I4f7245cd455df7c399843b1d911a42d67ec8fbb4
de49160c91757c1998f5ce1186dc48bbfe2c2248 04-May-2016 Pavel Zhamaitsiak <pavelz@google.com> Telephony metrics: Avoid sending same data on ServiceState changes am: b1759bbf1d
am: 51096517e2

* commit '51096517e2a87bebd7e1cf779d579de7c0f910d7':
Telephony metrics: Avoid sending same data on ServiceState changes

Change-Id: I89f74cfc3a3f99f112b8d6130a37f2fd1c247077
51096517e2a87bebd7e1cf779d579de7c0f910d7 04-May-2016 Pavel Zhamaitsiak <pavelz@google.com> Telephony metrics: Avoid sending same data on ServiceState changes
am: b1759bbf1d

* commit 'b1759bbf1d382177c4103e70b690f1d26460b0d7':
Telephony metrics: Avoid sending same data on ServiceState changes

Change-Id: I87f0575133cb1f44e4491dec94cf238f274c48c3
a62787bfe0a0d90991b351498dd2e392359b83c3 04-May-2016 Pavel Zhamaitsiak <pavelz@google.com> Telephony metrics: Avoid sending same data on ServiceState changes
am: b1759bbf1d

* commit 'b1759bbf1d382177c4103e70b690f1d26460b0d7':
Telephony metrics: Avoid sending same data on ServiceState changes

Change-Id: I1920cbcd07aef3a5f1971dab9f8d8ae59ca4f590
b1759bbf1d382177c4103e70b690f1d26460b0d7 26-Apr-2016 Pavel Zhamaitsiak <pavelz@google.com> Telephony metrics: Avoid sending same data on ServiceState changes

Bug: 27856524
Change-Id: Ifc257559f4ffddba42f483c26f282645910a0dee
elephonyEventLog.java
2f989b84bc2daa5d4af6ec0be7a2a900cbed9d16 03-May-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Fix NPE at TelephonyEvenLog in RIL.java" into nyc-dev am: 652ea3a855 am: 596b8837e0
am: e2ccc96d3a

* commit 'e2ccc96d3ad4671c42ead2b21c464c1b41f31f68':
Fix NPE at TelephonyEvenLog in RIL.java

Change-Id: I2afd968e502d3fe508241a97c74a685333d9c8af
e2ccc96d3ad4671c42ead2b21c464c1b41f31f68 03-May-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Fix NPE at TelephonyEvenLog in RIL.java" into nyc-dev am: 652ea3a855
am: 596b8837e0

* commit '596b8837e02faeda6a4dffe30c1cbac7c68735c7':
Fix NPE at TelephonyEvenLog in RIL.java

Change-Id: I819497c3346173c483b01b4b96c41704995d83ae
596b8837e02faeda6a4dffe30c1cbac7c68735c7 03-May-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Fix NPE at TelephonyEvenLog in RIL.java" into nyc-dev
am: 652ea3a855

* commit '652ea3a8558a07ba940aa873d325394350e7da54':
Fix NPE at TelephonyEvenLog in RIL.java

Change-Id: Iec860d1c1615aa2bbcb505b9c7b89b413940cd2c
70209b92b1059a2852c73cc3255d6e62b703ae01 03-May-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Fix NPE at TelephonyEvenLog in RIL.java" into nyc-dev
am: 652ea3a855

* commit '652ea3a8558a07ba940aa873d325394350e7da54':
Fix NPE at TelephonyEvenLog in RIL.java

Change-Id: I7f272a32834e3bc97eaec5f9ecf9ddc36c738543
652ea3a8558a07ba940aa873d325394350e7da54 03-May-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Fix NPE at TelephonyEvenLog in RIL.java" into nyc-dev
30f0c3dc13a660c3fdc038e9651f015cf5523521 03-May-2016 fionaxu <fionaxu@google.com> start cold sim detection without pending disconnect am: 44993c4f39 am: 38d97236c7
am: a416f752f7

* commit 'a416f752f72fcf1cccdf8bd602a5ce07514b63ae':
start cold sim detection without pending disconnect

Change-Id: I64506ecef1f038e08998d1e3964969e343246926
a416f752f72fcf1cccdf8bd602a5ce07514b63ae 03-May-2016 fionaxu <fionaxu@google.com> start cold sim detection without pending disconnect am: 44993c4f39
am: 38d97236c7

* commit '38d97236c7153ceaa38f499494e0f9829fc73db1':
start cold sim detection without pending disconnect

Change-Id: I706dfb0df1b4613b0eb8f61e12dc804b1d1cfdfb
38d97236c7153ceaa38f499494e0f9829fc73db1 03-May-2016 fionaxu <fionaxu@google.com> start cold sim detection without pending disconnect
am: 44993c4f39

* commit '44993c4f39d050ac5caddf73dbf76854ed519dc1':
start cold sim detection without pending disconnect

Change-Id: Iab5e36c780e3eb705126f2485ec31e325dd614ed
addcd36d81d646881b1a58a61b842699916fce64 03-May-2016 fionaxu <fionaxu@google.com> start cold sim detection without pending disconnect
am: 44993c4f39

* commit '44993c4f39d050ac5caddf73dbf76854ed519dc1':
start cold sim detection without pending disconnect

Change-Id: Ie80db54e351b1fe43710e423bcb279a7550ab9c6
44993c4f39d050ac5caddf73dbf76854ed519dc1 27-Apr-2016 fionaxu <fionaxu@google.com> start cold sim detection without pending disconnect

Bug: 25203607
Change-Id: I2fd8ba8c936406341064663439dcc954169bb7f2
ataconnection/DcTracker.java
6ecde9339aae07c53148d6785c3d3c36eec501b1 27-Apr-2016 Junda Liu <junda@google.com> Fix lower case hex string.

Code expects uppercase TAG and AID and ignores payload if lowercase. Convert payload to uppercase solves the issue.

Bug: b/28426990
Change-Id: I840e6175c9c8617b81fa4ad8b2ddb9d64ecbfe6a
icc/UiccPkcs15.java
497a101fc95c1b5bba8195cfa459cccee04c23f6 27-Apr-2016 fionaxu <fionaxu@google.com> Merge "Info zero-rating for roaming based on carrier cfg" into nyc-dev am: 8f88e37 am: 27c4e68
am: bc9ba74

* commit 'bc9ba74268256f546af204a3088dadd07f9532fc':
Info zero-rating for roaming based on carrier cfg

Change-Id: I43f8b7fed2e767d2da9887daa778e1a2cd94e0ab
bc9ba74268256f546af204a3088dadd07f9532fc 27-Apr-2016 Chen Xu <fionaxu@google.com> Merge "Info zero-rating for roaming based on carrier cfg" into nyc-dev am: 8f88e37
am: 27c4e68

* commit '27c4e68d8e5c204f0780c2afc05d45475fce5a08':
Info zero-rating for roaming based on carrier cfg

Change-Id: I81a6d7f4e876533e095de07122188d0f37d221a1
4a9b765d9614c77d23f4ebc81de5c88f2208b997 27-Apr-2016 fionaxu <fionaxu@google.com> Merge "Info zero-rating for roaming based on carrier cfg" into nyc-dev
am: 8f88e37

* commit '8f88e375252b7a9e2af233604b162f8e486ddff3':
Info zero-rating for roaming based on carrier cfg

Change-Id: If84aced2f4b118653ef99204e797cc626e1492f6
27c4e68d8e5c204f0780c2afc05d45475fce5a08 27-Apr-2016 fionaxu <fionaxu@google.com> Merge "Info zero-rating for roaming based on carrier cfg" into nyc-dev
am: 8f88e37

* commit '8f88e375252b7a9e2af233604b162f8e486ddff3':
Info zero-rating for roaming based on carrier cfg

Change-Id: I8619bb24ad6444b8d8c510ff9e8dce3177b8f644
8f88e375252b7a9e2af233604b162f8e486ddff3 27-Apr-2016 Chen Xu <fionaxu@google.com> Merge "Info zero-rating for roaming based on carrier cfg" into nyc-dev
dbf451ed607a014f8d9cd90dd830c222826ed3c8 26-Apr-2016 fionaxu <fionaxu@google.com> Cold Sim issue fix part 2 am: 68f4f4a am: ac2eb2d
am: a5dfe9d

* commit 'a5dfe9d16e2229c1dfb8b78aa11c261ab41d3dba':
Cold Sim issue fix part 2

Change-Id: I6c1ba560bc94e7188522c3eef89bd9fa64ab49ae
a5dfe9d16e2229c1dfb8b78aa11c261ab41d3dba 26-Apr-2016 fionaxu <fionaxu@google.com> Cold Sim issue fix part 2 am: 68f4f4a
am: ac2eb2d

* commit 'ac2eb2d841db662527407ec140024beb4cbd4975':
Cold Sim issue fix part 2

Change-Id: I2f70ddd361482f651a9d104f8b0fafae07f25eb9
36ab2cb57459e99f26058d1b9c783438c4ea8cb9 26-Apr-2016 fionaxu <fionaxu@google.com> Cold Sim issue fix part 2
am: 68f4f4a

* commit '68f4f4a0bc8d4060b5775e7a24a97ea5b485989e':
Cold Sim issue fix part 2

Change-Id: I2a5c7d7608fe096a4bd90e0b6f2e4c1ea76718d1
ac2eb2d841db662527407ec140024beb4cbd4975 26-Apr-2016 fionaxu <fionaxu@google.com> Cold Sim issue fix part 2
am: 68f4f4a

* commit '68f4f4a0bc8d4060b5775e7a24a97ea5b485989e':
Cold Sim issue fix part 2

Change-Id: I7570463d2277c4089a83dd3e54b026c6f4756a26
6b2c435543ea191cf0148f8c76fcfed9f7ae2679 26-Apr-2016 Sanket Padawe <sanketpadawe@google.com> Fix NPE at TelephonyEvenLog in RIL.java

Bug: 27743675
Change-Id: I8974c217a36f8bb69e67cd1e2cfa383faa7a32e1
IL.java
3d8c0f70a6fa7a53fda3c5d592de0ac3aa247e3c 21-Apr-2016 fionaxu <fionaxu@google.com> Info zero-rating for roaming based on carrier cfg

ignore non-metered roaming apn types when cleanup or setUpDatacall.

Bug: 26317905
Change-Id: Iae9a798c43fde020ba215b7a59e83e41559a97c9
ataconnection/ApnSetting.java
ataconnection/DataConnection.java
ataconnection/DcTracker.java
68f4f4a0bc8d4060b5775e7a24a97ea5b485989e 21-Apr-2016 fionaxu <fionaxu@google.com> Cold Sim issue fix part 2

implement a way to hide sign-in notification and bring it back
if out-of-credit sim is detected

Bug: 25203607
Change-Id: Ic16b88df87070bdb47a81376e218940808c6d38a
ataconnection/DataConnection.java
ataconnection/DcTracker.java
48cff98227be0a9164a2d807bb8067c3d38279dd 25-Apr-2016 Tyler Gunn <tgunn@google.com> Merge "Move initialization of Multiendpoint interface into getImsService()." into nyc-mr1-dev am: efd9689
am: a0623f7

* commit 'a0623f722740f065b349f81cc4bcb1c33d640ef9':
Move initialization of Multiendpoint interface into getImsService().

Change-Id: I1df0df6957e6bd97e18e84993c4b5206b474640f
a0623f722740f065b349f81cc4bcb1c33d640ef9 25-Apr-2016 Tyler Gunn <tgunn@google.com> Merge "Move initialization of Multiendpoint interface into getImsService()." into nyc-mr1-dev
am: efd9689

* commit 'efd96897feaba34bb8b90b6064ced23e33fb462a':
Move initialization of Multiendpoint interface into getImsService().

Change-Id: I359d0ca5ae07b6476a6ddf006fba080b7f802b22
efd96897feaba34bb8b90b6064ced23e33fb462a 25-Apr-2016 Tyler Gunn <tgunn@google.com> Merge "Move initialization of Multiendpoint interface into getImsService()." into nyc-mr1-dev
b25b43f0497f1a476598a0277e109f786ed3f817 23-Apr-2016 Tyler Gunn <tgunn@google.com> Move initialization of Multiendpoint interface into getImsService().

I previously had the setup of the multiendpoint interface in ImsPhone,
however at that point ImsManager was not yet configured.
I have moved the multiendpoint interface initialization into the
ImsPhoneCallTracker#getImsService() method (similar to the ECBM interface
setup).

Bug: 27458894
Change-Id: I2b2ba9637686bb01fb38e3195e60ae151bf9adb6
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
b293cb2c05454b3f645e68fca16c791d0f90f057 23-Apr-2016 Amit Mahajan <amitmahajan@google.com> Merge "Use getFullIccId() in SubscriptionInfoUpdater." into nyc-dev am: edebaf3 am: 8c10795
am: 688bfc4

* commit '688bfc4381d51f1bf7e1db6784749bd0af6bed5a':
Use getFullIccId() in SubscriptionInfoUpdater.

Change-Id: If0e3177004f36eabce4dd4b88e20d0b0719e1a3c
6afbdae3fb054f8714d118125ed5d546f4efe0ed 23-Apr-2016 Nathan Harold <nharold@google.com> Merge "Remove synthesized CellInfo reports from ServiceStateTracker" into nyc-dev am: 60e096b am: 009523c
am: bf19702

* commit 'bf19702fe9fe8cf3b3b32c3ff8d2ff0e1c406e72':
Remove synthesized CellInfo reports from ServiceStateTracker

Change-Id: Ibdd524fa686493561ef71473bb84d921ecb10051
8c10795cbb01cc82cfdd49e69653030e5ca2ead4 23-Apr-2016 Amit Mahajan <amitmahajan@google.com> Merge "Use getFullIccId() in SubscriptionInfoUpdater." into nyc-dev
am: edebaf3

* commit 'edebaf37a58e4ebee4b70c674d42cb458caec171':
Use getFullIccId() in SubscriptionInfoUpdater.

Change-Id: I184f8b7caf31df7dfd2d6eaa16f1fb225816904e
edebaf37a58e4ebee4b70c674d42cb458caec171 23-Apr-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Use getFullIccId() in SubscriptionInfoUpdater." into nyc-dev
009523cca232947db5f8ee6f212827d0fc3b169a 22-Apr-2016 Nathan Harold <nharold@google.com> Merge "Remove synthesized CellInfo reports from ServiceStateTracker" into nyc-dev
am: 60e096b

* commit '60e096bac3278674b854a3264f9b86a3b56215a5':
Remove synthesized CellInfo reports from ServiceStateTracker

Change-Id: Id587d51951760aa7dcccdb2d6f3793029f5a5746
60e096bac3278674b854a3264f9b86a3b56215a5 22-Apr-2016 Nathan Harold <nharold@google.com> Merge "Remove synthesized CellInfo reports from ServiceStateTracker" into nyc-dev
202a635a13483c144e9063bf610f26979a54501f 21-Apr-2016 Nathan Harold <nharold@google.com> Remove synthesized CellInfo reports from ServiceStateTracker

This CL removes the legacy code from ServiceStateTracker that
was synthesizing highly incomplete CellInfo reports under very
specific conditions (only in LTE-CDMA mode). This was causing
CellInfo to be sent that consisted of a single LTE Cell Info
report that was missing information. Because this only worked
when the serving cell was LTE / the device was in LTE-CDMA mode
it was also inconsistent.

-Remove the hack to update CellInfo on unsolicited SignalStrength
change reported by RIL (only active in LTE+CDMA mode).
-Remove the hack to update CellInfo on Data Registration State
change.
-Remove the now-unneeded mCellInfo and mCellInfoLte structures
from SST.
-Remove the obsolete decoding for the LTE Cell Info in the
DATA_REGISTRATION_STATE message.

Bug: 27949013
Change-Id: I0ac6f8f93a1d1177a246d5cd2843025b8f9b34a9
erviceStateTracker.java
f98a9600061bbad20eb8828d8a768fee894f351d 22-Apr-2016 Jack Yu <jackyu@google.com> Fixed that data call setup failed after default data SIM switches am: 0979b71e48 am: 9c819ed064
am: 342b7a6405

* commit '342b7a6405a0bda0de6b8da222ab1e799a74b57c':
Fixed that data call setup failed after default data SIM switches

Change-Id: Ife4c6335c56d1b2cea3a24b890533b3bc6af9164
9c819ed064c3abd543aaf2c38bc9a5252a523d42 22-Apr-2016 Jack Yu <jackyu@google.com> Fixed that data call setup failed after default data SIM switches
am: 0979b71e48

* commit '0979b71e48405cab10bdf1d1b4170cfce72838a7':
Fixed that data call setup failed after default data SIM switches

Change-Id: I91ae8f6437a457c3bfa786af3be639bdff8e480f
0979b71e48405cab10bdf1d1b4170cfce72838a7 21-Apr-2016 Jack Yu <jackyu@google.com> Fixed that data call setup failed after default data SIM switches

Need to reset the auto attach flag when DDS occurs.

bug: 28181225
Change-Id: Ib4405b94ac3085e48cb029451cc44f4eee6408c2
ubscriptionController.java
ataconnection/DcTracker.java
f75f1bc2f1b6d77c9b5a732ced6a59adc3f1eb9a 21-Apr-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Dump NITZ time info contents in bugreport instead of printing array object." into nyc-dev am: ed70f6a am: 2da8ae5
am: c02dfe1912

* commit 'c02dfe1912bb8201d21a8d836173f437103f9100':
Dump NITZ time info contents in bugreport instead of printing array object.

Change-Id: I7eedd344bf2a95528f089bfab79cfa9b954cc7e6
862286222955ea0b67764b0fcae5eeb65000d6fa 21-Apr-2016 Amit Mahajan <amitmahajan@google.com> Use getFullIccId() in SubscriptionInfoUpdater.

It already uses bchToString() to parse ICCID. It should also use
getFullIccId() when querying ICCID directly from IccRecords.

Bug: 25410213
Change-Id: I26fe470810821b7bd9cdd014ba4e1b8c63464a48
ubscriptionInfoUpdater.java
c02dfe1912bb8201d21a8d836173f437103f9100 20-Apr-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Dump NITZ time info contents in bugreport instead of printing array object." into nyc-dev am: ed70f6a
am: 2da8ae5

* commit '2da8ae5cb05238af18732474bfe45cf60914ba43':
Dump NITZ time info contents in bugreport instead of printing array object.

Change-Id: I77b8c31dd6399199af503ecd675e38847a130699
113a46264c002d54c015788f63a124e168c0ceac 20-Apr-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Dump NITZ time info contents in bugreport instead of printing array object." into nyc-dev
am: ed70f6a

* commit 'ed70f6a938e3e2dd7fe6b917d2f1003967c91d29':
Dump NITZ time info contents in bugreport instead of printing array object.

Change-Id: I688bf5543fb51bba3eeb7acfea778941cda1a589
ed70f6a938e3e2dd7fe6b917d2f1003967c91d29 20-Apr-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Dump NITZ time info contents in bugreport instead of printing array object." into nyc-dev
d39109502855e8d81e45e21161d8bf0cfacf42e0 20-Apr-2016 Sanket Padawe <sanketpadawe@google.com> Dump NITZ time info contents in bugreport instead of printing array object.

Bug: 28266018
Change-Id: I0ec7b187523db095eb6d1af4ba4bbc7f23a9bbbb
IL.java
d55f799c369e380e56ae2e8e29a35723d9d01e79 20-Apr-2016 fionaxu <fionaxu@google.com> Merge "Cold Sim fix for DataConnection and DCT" into nyc-dev am: aa4b4df0d1 am: 2eb76ee3df
am: f5b7265b1e

* commit 'f5b7265b1e5b51990405b720bd38276181e1413b':
Cold Sim fix for DataConnection and DCT

Change-Id: Ibf0884f186715c97bc1887ef6b281878d81acf54
2eb76ee3dff2062ee1a53ac2747e9deed5918615 20-Apr-2016 fionaxu <fionaxu@google.com> Merge "Cold Sim fix for DataConnection and DCT" into nyc-dev
am: aa4b4df0d1

* commit 'aa4b4df0d128b8705c38c5f54dde798721f4cc56':
Cold Sim fix for DataConnection and DCT

Change-Id: I99303a3b9fffa96e07e8af09e45edbf16f902da1
aa4b4df0d128b8705c38c5f54dde798721f4cc56 20-Apr-2016 Chen Xu <fionaxu@google.com> Merge "Cold Sim fix for DataConnection and DCT" into nyc-dev
3b551219fb2ee47ca5bd77c315d1287ffcb2c413 20-Apr-2016 Amit Mahajan <amitmahajan@google.com> Merge "Delete PhoneBase and PhoneProxy." into nyc-dev am: f889d7d am: fe87423
am: 81e834d

* commit '81e834d579734365717258c08e5c1a251e61221e':
Delete PhoneBase and PhoneProxy.

Change-Id: I9b4f4fb966a06d37d6f3d87b19544aa3b09d81ef
81e834d579734365717258c08e5c1a251e61221e 19-Apr-2016 Amit Mahajan <amitmahajan@google.com> Merge "Delete PhoneBase and PhoneProxy." into nyc-dev am: f889d7d
am: fe87423

* commit 'fe874238c82eb64c4656ff34ba3a820fb3681551':
Delete PhoneBase and PhoneProxy.

Change-Id: I2abb9889425496e6b05d615b4e6e3075bf389453
c88c6cad048a97cfd1acc1d36fe212980e072a4d 19-Apr-2016 Amit Mahajan <amitmahajan@google.com> Merge "Delete PhoneBase and PhoneProxy." into nyc-dev
am: f889d7d

* commit 'f889d7da70408c4724623965ee877f065222faf0':
Delete PhoneBase and PhoneProxy.

Change-Id: I567890b6860d5707dbdf6967ecf46e0974ebaa54
f889d7da70408c4724623965ee877f065222faf0 19-Apr-2016 Amit Mahajan <amitmahajan@google.com> Merge "Delete PhoneBase and PhoneProxy." into nyc-dev
a02b6fd88953d783c32e6d7f84b7eddbc0d1faf1 08-Apr-2016 fionaxu <fionaxu@google.com> Cold Sim fix for DataConnection and DCT

Bug: 25203607
Change-Id: I3bbef77edf57eaa8d7da24d687cc9b5ab0ef111b
erviceStateTracker.java
ubscriptionController.java
ataconnection/DataConnection.java
ataconnection/DcTracker.java
e4426489a0c696cd554018545fe0e36e96db71d6 19-Apr-2016 Brad Ebinger <breadley@google.com> Merge "Use correct isEmergencyNumber for multi-SIM devices"
a589001018b10091ec722c87b228ade1754ace8a 19-Apr-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Tidy up uses of Integer.valueOf." into nyc-dev am: 0884e25
am: 78c9e59

* commit '78c9e5948adbccfd9bb811ac5495767560869f7e':
Tidy up uses of Integer.valueOf.

Change-Id: I05c30c5e9cdb849df52a3f8527eeb29573090a9f
614d4a91a0f9d217984a2d9c6bd02312f585eb80 19-Apr-2016 Narayan Kamath <narayan@google.com> Merge "Tidy up uses of Integer.valueOf." into nyc-dev
am: 0884e25

* commit '0884e25cecf4145dfe72059802ac16e0c859e94a':
Tidy up uses of Integer.valueOf.

Change-Id: I65c7ea29af16da12b14b3afc89dfa73d5bb66fd2
0884e25cecf4145dfe72059802ac16e0c859e94a 19-Apr-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Tidy up uses of Integer.valueOf." into nyc-dev
fc240dcd9b7f40b78913f18663809d683c6dbe65 19-Apr-2016 Narayan Kamath <narayan@google.com> Tidy up uses of Integer.valueOf.

Use parseInt when the result is assigned to an int. Allocates fewer
objects.

bug: 28078871
Change-Id: I8219141b8a18d2bc575fd75aaa4552e15bd68d1f
msNumberUtils.java
ee4ef17e117ed7887d6bf0195df65994b6dc0f92 19-Apr-2016 fionaxu <fionaxu@google.com> Fix the bug introduced by 27788524 am: c77a3b8
am: e7a54e2

* commit 'e7a54e2a70a2b0b0c1a6b9f2904e7b731fe7bc7d':
Fix the bug introduced by 27788524

Change-Id: I830659df74d03cf03f4cf6ff7e554a9330637fac
4c4b5028071928c00d49078a48f044bec5058126 19-Apr-2016 fionaxu <fionaxu@google.com> Fix the bug introduced by 27788524
am: c77a3b8

* commit 'c77a3b8bdf96f1486753689898b04d9de325d8d8':
Fix the bug introduced by 27788524

Change-Id: I2b1de13b75108dc167d77f4c81a2973dde2f2019
c77a3b8bdf96f1486753689898b04d9de325d8d8 19-Apr-2016 fionaxu <fionaxu@google.com> Fix the bug introduced by 27788524

Change-Id: I07aa3d4e56051183d02a8878bcbef3f447a522b2

Bug: 28251633
ataconnection/DcTracker.java
21a25775ff6645eb5ba2ce3d7d5ae726cc1cbe1e 19-Apr-2016 Brad Ebinger <breadley@google.com> Use correct isEmergencyNumber for multi-SIM devices

GsmCdmaPhone.dial is using the defaultVoiceSubId() to get the
ril.ecclist instead of the actual phone's subId in isEmergencyNumber().
In multi-SIM devices, the phone will then check the default ril.ecclist
instead of the phone's ril.ecclist to see if the emergency number is
correct.

Change-Id: I65a3dd7cd5812a7925c752c4683d2f9b001d6459
Fixes: 28251277
smCdmaPhone.java
0f7d1220e8584c7f227e6c6c0be0e26d1c6b7de1 15-Apr-2016 Amit Mahajan <amitmahajan@google.com> Delete PhoneBase and PhoneProxy.

Bug: 26544841
Change-Id: If95584d81f28829faf7bd91f88af2c0a60aad69f
honeBase.java
honeFactory.java
honeProxy.java
5f385b5883177ede1f3445e7d0f7f9b873bc8ad6 18-Apr-2016 Shishir Agrawal <shishir@google.com> Merge "Adding slotId to certain Telephony broadcasts." into nyc-dev
am: 2707808

* commit '2707808f0b185b05d536d6c2e593d4950d575817':
Adding slotId to certain Telephony broadcasts.

Change-Id: Ifd268f15f64b4c5a5c082678d6b99217fec4ad2a
2707808f0b185b05d536d6c2e593d4950d575817 18-Apr-2016 Shishir Agrawal <shishir@google.com> Merge "Adding slotId to certain Telephony broadcasts." into nyc-dev
eec0c114f64c243cc8f32749d969e9023584c0a2 16-Apr-2016 Nathan Harold <nharold@google.com> Merge "Limit Blocking Time for TelephonyManager.getModemActivityInfo" into nyc-dev
am: 1356857

* commit '135685746932a2ce010e3de2204fa2af8f86a21e':
Limit Blocking Time for TelephonyManager.getModemActivityInfo

Change-Id: I0e0e139d4bad3c47dd1b317a05319db0cf6b615b
135685746932a2ce010e3de2204fa2af8f86a21e 16-Apr-2016 Nathan Harold <nharold@google.com> Merge "Limit Blocking Time for TelephonyManager.getModemActivityInfo" into nyc-dev
ef8f7f7a90938180d6efaab8fae442f3752cb88c 15-Apr-2016 Tyler Gunn <tgunn@google.com> Merge "Wire up IMS framework APIs and call pull." into nyc-dev
am: 7fb2782

* commit '7fb27824b96569c8f8d5ed7c6122ace40340da20':
Wire up IMS framework APIs and call pull.

Change-Id: I3d20b5c64298b51a0c8727c929666c3f39e7f6d1
7fb27824b96569c8f8d5ed7c6122ace40340da20 15-Apr-2016 Tyler Gunn <tgunn@google.com> Merge "Wire up IMS framework APIs and call pull." into nyc-dev
bec89b128410a086bc58e23f07df2cd29d1fc62c 15-Apr-2016 fionaxu <fionaxu@google.com> Merge "Infer Zero Rating based on NetworkCapabilities" into nyc-dev
am: 500c6ff

* commit '500c6ff35876773ddc5750d737542e0a435c0118':
Infer Zero Rating based on NetworkCapabilities

Change-Id: I99480339f1e9d92acd58f133b2c6587873e7de3a
500c6ff35876773ddc5750d737542e0a435c0118 15-Apr-2016 Chen Xu <fionaxu@google.com> Merge "Infer Zero Rating based on NetworkCapabilities" into nyc-dev
783061ca03572618c01ce244d70d82fa4328d45f 01-Apr-2016 fionaxu <fionaxu@google.com> Infer Zero Rating based on NetworkCapabilities

when user toggle Disabled Cellular Data, we teared down all
DataConnections which are Metered(every APN type in the APN settings
are non-metered otherwise metered).

bug: 27788524
Change-Id: I0228e6ca166516f4f43e1c15d505fc29c31356df
ataconnection/ApnSetting.java
ataconnection/DcTracker.java
32c5d16886f6ae4f250e4597fe5e70583ea5d912 04-Apr-2016 Nathan Harold <nharold@google.com> Limit Blocking Time for TelephonyManager.getModemActivityInfo

-Add new delayed message handler EVENT_BLOCKING_RESPONSE_TIMEOUT
that will ensure a specific REQUEST sent to RIL is no longer
pending for a response. If a response is pending, this timeout
will generate and return a default error response to unblock
blocking calls. If RIL subsequently returns a response for the
request, it will be discarded.

-Create a default blocking timeout of 2 seconds

Bug: 28007638
Bug: 26842468
Change-Id: I92e028476522f7604626f3670f2f63e5bb64deec
IL.java
elephonyEventLog.java
5b3c3e5c438e8ede755637bf061007d8adf7bbb2 15-Apr-2016 Jack Yu <jackyu@google.com> Merge "Fixed that data retry didn\'t happen issue" into nyc-dev
am: b7a9a23

* commit 'b7a9a233cd69bf5f059092350b761302de3de6cd':
Fixed that data retry didn't happen issue

Change-Id: Ibd166e8d0a2f20b0b6ab4eb0e6851d88806ae2e2
b7a9a233cd69bf5f059092350b761302de3de6cd 15-Apr-2016 Jack Yu <jackyu@google.com> Merge "Fixed that data retry didn't happen issue" into nyc-dev
93da8529345711fd1a5617f3c8b15c0921eececb 15-Apr-2016 Tyler Gunn <tgunn@google.com> Wire up IMS framework APIs and call pull.

1. Wired up the IMS framework APIs so that the modem can inform us of new
dialog event package changes.
2. Wired up the call pull API so that calls to it make it down to an
ImsExternalConnection.
3. In ImsExternalCallTracker, listen to the call pull requests on the
external connections, and use this to trigger the actual pull of the call,
which is essentially a dial with an extra specified (per QCOM).
I abstracted away the idea of pulling the call using the ImsPullCall
interface, which ImsPhoneCallTracker implements.

Bug: 27458894
Change-Id: Idd20a95c2993b29dcd0a7e6c71fb6232cff88736
onnection.java
elephonyComponentFactory.java
msphone/ImsExternalCallTracker.java
msphone/ImsExternalConnection.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
msphone/ImsPullCall.java
3c7fb627dfe03004c12c230fd6509d6f05e84bfa 15-Apr-2016 Anju Mathapati <anjucm@codeaurora.org> Merge "IMS: During a call swap, handle the resume failure" into nyc-dev
am: b3a89f5

* commit 'b3a89f53603f828acf1c8b530cedffe20e253d77':
IMS: During a call swap, handle the resume failure

Change-Id: Ia2d4508f7e764f3ff9378336509f38f0283f3fe3
b3a89f53603f828acf1c8b530cedffe20e253d77 15-Apr-2016 Santos Cordon <santoscordon@google.com> Merge "IMS: During a call swap, handle the resume failure" into nyc-dev
afb0fad639cdaff9abb4d405e039bd61cd8d3cb6 26-Feb-2016 Anju Mathapati <anjucm@codeaurora.org> IMS: During a call swap, handle the resume failure

During a call swap, the active call is first placed on hold,
followed by the resume of the already held call. If this
resume attempt fails, then try to recover by resuming the
original active call.

Fix: 25498498
Change-Id: I9dc83e95e79fd04f9a080572ac861d30dd916c5c
msphone/ImsPhoneCallTracker.java
a1dc4d24a50f567633f542030517db563b826dec 14-Apr-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "TelephonyEventLog: Don\'t send duplicate IMS Capabilities Changed events" into nyc-dev
am: e70c15e

* commit 'e70c15eeef76c62070acc1c05dc3779157f37756':
TelephonyEventLog: Don't send duplicate IMS Capabilities Changed events

Change-Id: Iebee87175706a0c648e396651461f56e119dc77d
e70c15eeef76c62070acc1c05dc3779157f37756 14-Apr-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "TelephonyEventLog: Don't send duplicate IMS Capabilities Changed events" into nyc-dev
17e632afaf74873525bb9f6140c986e577b70cdd 14-Apr-2016 Garik Badalyan <garikb@codeaurora.org> Merge "IMS-VT: Set video call provider on call update." into nyc-dev
am: 2c7c4b6

* commit '2c7c4b693e6772342620c41e94b159bd495fa7c1':
IMS-VT: Set video call provider on call update.

Change-Id: I2e0fb9daba8b9b1ed58ca0c5df660ab85c43abe4
2c7c4b693e6772342620c41e94b159bd495fa7c1 14-Apr-2016 Tyler Gunn <tgunn@google.com> Merge "IMS-VT: Set video call provider on call update." into nyc-dev
07ecdd0b169f03dda4233ba8d2244f1509a2c206 14-Apr-2016 fionaxu <fionaxu@google.com> Merge "Update OTASP status correctly" into nyc-dev
am: bd937c1

* commit 'bd937c188c09bbd7f3d6ad62f2e4c6d28ab48de2':
Update OTASP status correctly

Change-Id: I92ae79dc523370d408d276501c995aa3276b06d3
bd937c188c09bbd7f3d6ad62f2e4c6d28ab48de2 14-Apr-2016 Chen Xu <fionaxu@google.com> Merge "Update OTASP status correctly" into nyc-dev
3ec3d688f20f425a7176fd1fe08134d7c2d4b1da 07-Apr-2016 fionaxu <fionaxu@google.com> Update OTASP status correctly

fix the scenario: ICC records are loaded and OTASP_NEEDED, and then
we switch from CDMA->GSM->CDMA. In that case we end up sending
NOT_NEEDED and UNINITIALIZED, or just UNINITIALIZED -- and in either
case we don't send NEEDED again.

Bug: 28056182
Change-Id: I56d16fe68aeb69f333e53f4a4cd643c2143d39f5
erviceStateTracker.java
ab381fc54a2415baf31121c9a3a7eeeb0f058f38 14-Apr-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "Don\'t use overlays for WFC error messages and SPN formats" into nyc-dev
am: 6caa786

* commit '6caa786236a1b2793f0969a72fbbad3f59067dd9':
Don't use overlays for WFC error messages and SPN formats

Change-Id: Id2fd26567279e85f641f51786c358bfabdc5711d
6caa786236a1b2793f0969a72fbbad3f59067dd9 14-Apr-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "Don't use overlays for WFC error messages and SPN formats" into nyc-dev
028644820afe75cbb0f94601f73c0a019fb73ae8 14-Apr-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Update cached user-data-enabled on changes." into nyc-dev
am: 7ea1f4e

* commit '7ea1f4eca1963d725b235b0b61bffe3da4d4624f':
Update cached user-data-enabled on changes.

Change-Id: I36603f01b7705ec09340bfc6e8d10e18e5d92a81
7ea1f4eca1963d725b235b0b61bffe3da4d4624f 14-Apr-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Update cached user-data-enabled on changes." into nyc-dev
0b3486d09474a1d6b6696ee7d635d63bb847a428 13-Apr-2016 Pavel Zhamaitsiak <pavelz@google.com> TelephonyEventLog: Don't send duplicate IMS Capabilities Changed events

Bug: 27856524
Change-Id: Ib53d0a38b79d2f20616c27e1b53720a61f0cdbd6
elephonyEventLog.java
2eb1468dc91f06dabe69d6db6c1c4dd42debbe74 14-Apr-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "Switch TelephonyEventLog from using ITelephonyDebug to ConnectivityMetricsLogger" into nyc-dev
am: 9e51994

* commit '9e51994d8ccf00bf56f54d5875e77732c4558480':
Switch TelephonyEventLog from using ITelephonyDebug to ConnectivityMetricsLogger

Change-Id: I69631bbb56d281f6cef49c866b90326c192eb5a0
9e51994d8ccf00bf56f54d5875e77732c4558480 14-Apr-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Switch TelephonyEventLog from using ITelephonyDebug to ConnectivityMetricsLogger" into nyc-dev
80d38fe5c8f18997623b1133e4650c4a9a6e299c 14-Apr-2016 Robert Greenwalt <rgreenwalt@google.com> Update cached user-data-enabled on changes.

Otherwise things don't work.

bug:28176543
Change-Id: I8bf97dc593d2327293ca0a1f9938f50ce1ec9d90
ataconnection/DcTracker.java
3652067799a38973435c8663ab9cdb2a8290e48f 06-Apr-2016 Garik Badalyan <garikb@codeaurora.org> IMS-VT: Set video call provider on call update.

VideoCallProvider is set upon creation of ImsPhoneConnection.
If creation of video provider is delayed in vendor code, e.g.
because UE is not video capable at that moment, then video
features will be disabled for the lifetime of that session.
This change checks and sets the video provider if it's not already
set upon receiving an update from vendor code.

BUG=25696226
Change-Id: I33bfde75726f64ead87f0b1e4b4005e4ddd90619
msphone/ImsPhoneCallTracker.java
0852a954be5937a1b0bca94df0c2007d7ee3c0c7 13-Apr-2016 Jack Yu <jackyu@google.com> Fixed that data retry didn't happen issue

When modem return -1 as the retry value in setup data call response,
we should interpret it correctly and retry the data connection.

bug: 27787361
Change-Id: I0a3e442f5125730dd9a196ce632120b44b880090
etryManager.java
ataconnection/DataConnection.java
ataconnection/DcFailBringUp.java
ataconnection/DcTracker.java
9d7d9b467793a72666d8d2027567af928b093bb9 13-Apr-2016 Amit Mahajan <amitmahajan@google.com> Merge "Changes to de-dup messages in SMS raw table." into nyc-dev
am: afcf730

* commit 'afcf73091e9634596770ff925ba928481247a8ba':
Changes to de-dup messages in SMS raw table.

Change-Id: I3d96dd61cddef77f7f1b3bba6b8c88865097279f
afcf73091e9634596770ff925ba928481247a8ba 13-Apr-2016 Amit Mahajan <amitmahajan@google.com> Merge "Changes to de-dup messages in SMS raw table." into nyc-dev
6e4abd849e12860a7459f7ec74496ca02b9d7ee0 28-Mar-2016 Amit Mahajan <amitmahajan@google.com> Changes to de-dup messages in SMS raw table.

Bug: 27820591
Change-Id: Ie3a28cdbbb533c74f456b7e942ddfc2cd0d66bb0
nboundSmsHandler.java
nboundSmsTracker.java
msBroadcastUndelivered.java
msMessageBase.java
elephonyComponentFactory.java
dma/CdmaInboundSmsHandler.java
bd3158360ca73324921350a1c61336af7f9c6d8d 13-Apr-2016 Shishir Agrawal <shishir@google.com> Adding slotId to certain Telephony broadcasts.

These particular boradcasts need to expose phoneId since they are valid even
when there is no SIM.

ACTION_SERVICE_STATE_CHANGED
- Added phoneId to broadcast.
- Removed TelephonyRegistry non subId call.
ACTION_SIGNAL_STRENGTH_CHANGED
- Added phoneId to broadcast.
- Removed TelephonyRegistry non subId call.
ACTION_PHONE_STATE_CHANGED
- Added phoneId to broadcast.
- The non-subId version is called by Telecomm to communicate overall state.
Telephony sends its own version, so only the Telephony call needs to add
phoneId.

Bug: 27378995
Change-Id: Ib24ea6accc265170c5d3938e2cb2c518edfcf8a8
efaultPhoneNotifier.java
482fa7bca2940d8447006cd4961f103b25e0cf7c 13-Apr-2016 Jack Yu <jackyu@google.com> Merge "Moved ERI configuration files from resoures to Carrier Config." into nyc-dev
am: f83b2ff

* commit 'f83b2ff83d82e570a3a3011df7b566c477d687cd':
Moved ERI configuration files from resoures to Carrier Config.

Change-Id: I767223f658fc054dc954164fb7345bdfc56943b1
f83b2ff83d82e570a3a3011df7b566c477d687cd 13-Apr-2016 Jack Yu <jackyu@google.com> Merge "Moved ERI configuration files from resoures to Carrier Config." into nyc-dev
2dd874066ed871c8adf50f58e4b025d525db78eb 09-Apr-2016 Jack Yu <jackyu@google.com> Moved ERI configuration files from resoures to Carrier Config.

Used Carrier Config to load correct ERI configuration file since
there are MCC/MNC shared by different carriers.

bug: 23887558
Change-Id: Ibe2ff7862bf50e31b52fb783c49bda993f8d2ca7
smCdmaPhone.java
erviceStateTracker.java
dma/EriManager.java
8bdaf14a878f6d41d8e2bff0ab24bb380668b94f 13-Apr-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Note when we don\'t know a default phoneId" into nyc-dev
am: 0579827

* commit '0579827c22bd005a989fed714c541d734e83a28a':
Note when we don't know a default phoneId

Change-Id: I5358fb015f62ab30d950c937e8e6b79a33dc2431
0579827c22bd005a989fed714c541d734e83a28a 13-Apr-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Note when we don't know a default phoneId" into nyc-dev
6899928dded685d401dcd010132fb9fc30ce3745 12-Apr-2016 Robert Greenwalt <rgreenwalt@google.com> Note when we don't know a default phoneId

Otherwise we don't notice the new default on sim swap.
On a single-sim device the default phoneId will be
the same again but if we don't notice it's loss
we won't notice its gain. The pattern:
initial condition
phone[0] subId 1
default subId 1

sim removal
subId changes 1 -> -2 (invalid)
this causes both subId notification and default notification
prior to this change this did both, but left the SubMonitor
thinking the default phoneId was still 0. After this CL
it changes that to INVALID

sim insert
subId changes -2 -> 2
this causes a subId change notification
default changes 1 -> 2
this should cause a default notification, but before this CL
we though the default phoneId was 0 and now it's again 0, so
no notification. With this CL it'll be a INVALID -> 0 change
and the notification will go out

bug:27425942
Change-Id: I2875a223fbf298d23037875302e25816fe19a52e
ubscriptionMonitor.java
af060eee085e90a2979a392384ccad368e92fc7a 12-Apr-2016 Pavel Zhamaitsiak <pavelz@google.com> Don't use overlays for WFC error messages and SPN formats

- Error alert and notification messages are stored as string arrays in
resources. CarrierConfig stores carrier-specific error codes and corresponding
index which is used to get appropriate messages.
- Supported SPN formats are stored as string arrays in resources. CarrierConfig
stores index used to get appropriate SPN format.

Bug: 27170754
Change-Id: I7f3635ec0ae73d6190b4b73b11ad13058fc25d54
erviceStateTracker.java
msphone/ImsPhone.java
969c2048a87663532017d7dc66ef616b7f1c98b9 11-Apr-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Add settings for SUW data control." into nyc-dev
am: d3587db

* commit 'd3587db85c53018b38d47fce8cb9c31df2d0361b':
Add settings for SUW data control.

Change-Id: I4845d39a2bd6d2d9b88b6897f2c975721cb3a528
d3587db85c53018b38d47fce8cb9c31df2d0361b 11-Apr-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Add settings for SUW data control." into nyc-dev
9eb85feb9ae938a51af4e248f4e3331b1157c6c8 11-Apr-2016 Jeff Davidson <jpd@google.com> Merge changes from topic \'carrier-app-race\' into nyc-dev
am: 8cdef4c

* commit '8cdef4cbdcfe8d159b905647605b135c950ec20d':
Test disabling carrier apps with null TelephonyManager.
Move CarrierAppUtils to frameworks/base/telephony.

Change-Id: I81ead6892d84e992e58287fbf63e0357d1ab4f50
8cdef4cbdcfe8d159b905647605b135c950ec20d 11-Apr-2016 Jeff Davidson <jpd@google.com> Merge changes from topic 'carrier-app-race' into nyc-dev

* changes:
Test disabling carrier apps with null TelephonyManager.
Move CarrierAppUtils to frameworks/base/telephony.
8537919217faf4965cdd3e3446fef6811936b088 11-Apr-2016 Yifan Bai <yifan.bai@spreadtrum.com> Merge "DcTracker registers listener for multiple times." into nyc-dev
am: d04d67e

* commit 'd04d67e4024e857d6e467198a80bfb7e3b62c8cb':
DcTracker registers listener for multiple times.

Change-Id: I465700187a2174ce72b4336239bf120c5d5b5f96
d04d67e4024e857d6e467198a80bfb7e3b62c8cb 11-Apr-2016 Amit Mahajan <amitmahajan@google.com> Merge "DcTracker registers listener for multiple times." into nyc-dev
c374098c17a81f73f51e9d7df99eba574882949b 01-Apr-2016 Yifan Bai <yifan.bai@spreadtrum.com> DcTracker registers listener for multiple times.

When new sub info records are added, the SubscriptionController will
update all DcTrackers. The DcTracker registers listeners in its update()
method. If the update() method is called multiple times, the listener
will be registered for multiple times too.

Bug: 27953753
Change-Id: I66b947236f40135c45151f0f713dc88959392c48
ataconnection/DcTracker.java
12d2f929a998a496632f377f6c75847f6d822253 11-Apr-2016 Amit Mahajan <amitmahajan@google.com> Merge "For CDMA phone return MDN as line1Number instead of MSISDN." into nyc-dev
am: d1a8569

* commit 'd1a856989a73b0012df31bab494a7b40fc4c68ae':
For CDMA phone return MDN as line1Number instead of MSISDN.

Change-Id: I3bbd1d6271a21ebbbb33bd7aea3a6dd36f06e453
d1a856989a73b0012df31bab494a7b40fc4c68ae 11-Apr-2016 Amit Mahajan <amitmahajan@google.com> Merge "For CDMA phone return MDN as line1Number instead of MSISDN." into nyc-dev
12744a4a172dd6087b8b3c6bd75da7a478de3546 11-Apr-2016 Omkar Kolangade <omkark@codeaurora.org> Merge "IMS: Allow DTMF Pause-Dialing" into nyc-dev
am: 51ec7e6

* commit '51ec7e6edccfb9d281d32c3c90b1133003c63e3a':
IMS: Allow DTMF Pause-Dialing

Change-Id: I6a0902af266a5a7ac712e70e88495c7807f2d18c
51ec7e6edccfb9d281d32c3c90b1133003c63e3a 11-Apr-2016 Tyler Gunn <tgunn@google.com> Merge "IMS: Allow DTMF Pause-Dialing" into nyc-dev
dc356362be35e3de28f12a105fe8c771cdcfb4fe 09-Apr-2016 Jack Yu <jackyu@google.com> Merge "Excluded certain APNs (e.g. IMS) from mobile data usage." into nyc-dev
am: 45955dc

* commit '45955dc98ef7c5a02508bb0be5cbc0130a94ba1d':
Excluded certain APNs (e.g. IMS) from mobile data usage.

Change-Id: Iac3cc7e303e1d16ff49693396256bdcf7bb760ee
45955dc98ef7c5a02508bb0be5cbc0130a94ba1d 09-Apr-2016 Jack Yu <jackyu@google.com> Merge "Excluded certain APNs (e.g. IMS) from mobile data usage." into nyc-dev
620f420c78c9c7df60064e3cd8572b41fd9ddd09 09-Apr-2016 Shriram Ganesh <sganesh@codeaurora.org> IMS: Start connect time, if call is connected during SRVCC transfer.
am: a374c57

* commit 'a374c57705a7a9ff7ffa89f1d220fa4be3bc5897':
IMS: Start connect time, if call is connected during SRVCC transfer.

Change-Id: I1fc0ea2b6d852f3a3e5a1757425408b1d7d9de08
a374c57705a7a9ff7ffa89f1d220fa4be3bc5897 29-Mar-2016 Shriram Ganesh <sganesh@codeaurora.org> IMS: Start connect time, if call is connected during SRVCC transfer.

For a dialing / alerting / incoming call, start the connect time
of the call only if the call is connected during SRVCC transfer
i.e. call state is indicated as active after SRVCC transfer

Bug: 27879470
Change-Id: I4519f32ed1ca45e2247f07c9f993287d75288192
smCdmaCallTracker.java
b5245ec56c5ecf8387499be08c8d3f7621a48203 25-Jan-2016 Omkar Kolangade <omkark@codeaurora.org> IMS: Allow DTMF Pause-Dialing

Adding a check to correctly identify and
differentiate MMI codes from pause-dial
DTMF dial strings. This check is based on
3GPP TS 22.030 6.5.2.
Lack of this check was causing dial strings
to be incorrectly identified as USSD codes,
to be sent over IMS UT.

Change-Id: I7e5cae31580ebff76b84b59ca9795cae06171821
smCdmaPhone.java
7a1c1b02c8603c2bf2f3b401facb389528180eed 08-Apr-2016 Pavel Zhamaitsiak <pavelz@google.com> Switch TelephonyEventLog from using ITelephonyDebug to ConnectivityMetricsLogger

Bug: 28026463
Change-Id: I3c4f14e8a6611f0cb5c52eb24573621d3a13c4cb
smCdmaCallTracker.java
IL.java
erviceStateTracker.java
elephonyEventLog.java
msphone/ImsPhoneCallTracker.java
cdd5f79eb9fba7c526bbd351b8527f6c374a8445 07-Apr-2016 Jeff Davidson <jpd@google.com> Move CarrierAppUtils to frameworks/base/telephony.

Note that the test is being left behind, as the test target is
configured here, and none is configured in frameworks/base/telephony.
It can still compile and run fine from here.

Bug: 27821069
Change-Id: I1cfa3a28c2801d737f4ec44a6c02c96683b4f78b
arrierAppUtils.java
808e8bbbeda1f0894fafd2a91bcc095048734499 07-Apr-2016 Amit Mahajan <amitmahajan@google.com> For CDMA phone return MDN as line1Number instead of MSISDN.

Bug was introduced when GSM, CDMA and CDMALte phones were merged.

Bug: 26032015
Change-Id: I3853c4502445f2b8254868d6fd1610bd2cefccb9
smCdmaPhone.java
8b0a1cbd24977a1abbba79736cf9f481ced0703a 30-Mar-2016 Jack Yu <jackyu@google.com> Excluded certain APNs (e.g. IMS) from mobile data usage.

Added not_metered capability to a mobile network if none
of its associated APN types are metered. Also used not_metered
capability to determine if a network should be accounted for
data usage or not instead of using network type, which is
always MOBILE after refactoring. Will add VT usage support
in next phase.

bug: 20888836
Change-Id: Ic39c9ffc84e27566a5b10ebf9aaa4ee3d6bd3e49
ataconnection/ApnSetting.java
ataconnection/DataConnection.java
70713acfdf306ba6f20713fe1815834eefdd3aec 07-Apr-2016 Sandeep Gutta <sangutta@codeaurora.org> Notify call state when phone app starts and SIM is loaded. am: 9dd3a9f
am: 98510b9

* commit '98510b979842f032c62853b568f5f7d76547e4ff':
Notify call state when phone app starts and SIM is loaded.

Change-Id: I2197becd634bb0f75795547a82e88c8e45a3beba
98510b979842f032c62853b568f5f7d76547e4ff 07-Apr-2016 Sandeep Gutta <sangutta@codeaurora.org> Notify call state when phone app starts and SIM is loaded.
am: 9dd3a9f

* commit '9dd3a9fff75ee1d6aceff626126f6e3324f20ddb':
Notify call state when phone app starts and SIM is loaded.

Change-Id: I016c765ef34dac41dd8245c16fdb877fefbe1c81
9dd3a9fff75ee1d6aceff626126f6e3324f20ddb 05-Feb-2016 Sandeep Gutta <sangutta@codeaurora.org> Notify call state when phone app starts and SIM is loaded.

If phone process crashed during an active voice call, even after restart
of phone app, clients still get call state as OFFHOOK since
TelephonyRegistry has the old infomration and whenever new client is
registered that old infomration is given resulting in erroneous UI
behavior. Present fix sends call state update when phone app
starts so that TelephonyRegistry resets its information.

Bug: 27903802
Change-Id: Ia606b79f5646863187af6f3e22ca9aa8edc2bdf1
erviceStateTracker.java
609dc16d3ae012983207a3a37cf8b8c9feb49b47 06-Apr-2016 Yifan Bai <yifan.bai@spreadtrum.com> Fix data connection issue when built connection with proxy APN.

When building data connection with proxy APN, DC did not set proxy to
ConnectivityService, therefore, proxy broadcast cannot be sent and data
service would be unavailable.

Change-Id: I65b3685a813efc375999c52ddd6299f2a2baab3f
ataconnection/DataConnection.java
00d7d0c2751a6656ade0a2e155a7deef2b4311ee 06-Apr-2016 Amit Mahajan <amitmahajan@google.com> Merge "Changes to decode and store hex digits in ICC ID." into nyc-dev
am: 3868142

* commit '386814212ffe9e06475fb3e9ee9dbe7957cd9373':
Changes to decode and store hex digits in ICC ID.

Change-Id: Ic24a2d2effe26e352133361baa00a91c65193daa
386814212ffe9e06475fb3e9ee9dbe7957cd9373 06-Apr-2016 Amit Mahajan <amitmahajan@google.com> Merge "Changes to decode and store hex digits in ICC ID." into nyc-dev
d0ad1bee396d4512fce3f4f69618390c7d829b08 05-Apr-2016 Junda Liu <junda@google.com> Merge "support authType for sim challenge." into nyc-dev
am: 102289f

* commit '102289f90426461d3f63bff791f06c7c5a49e008':
support authType for sim challenge.

Change-Id: I07229b0e969b907881d9afb535af313233eabb27
102289f90426461d3f63bff791f06c7c5a49e008 05-Apr-2016 Junda Liu <junda@google.com> Merge "support authType for sim challenge." into nyc-dev
48bf2dfd42765d5e2b44985605f1f3e3eef3a53b 05-Apr-2016 Junda Liu <junda@google.com> Merge "No unbind if carrier app is the same." into nyc-dev
am: c77603f

* commit 'c77603fefc09b85a526d5d6277a9838fcf8e93f2':
No unbind if carrier app is the same.

Change-Id: Ie83bdbefc6942aeeedd9734130372780b5d05530
c77603fefc09b85a526d5d6277a9838fcf8e93f2 05-Apr-2016 Junda Liu <junda@google.com> Merge "No unbind if carrier app is the same." into nyc-dev
f6fc5b56770a0dc53c2d15064f19ee4cc2a8fbdb 05-Apr-2016 chao.bi <chao.bi@intel.com> Merge "Fix bug in CallManager unregisterForPhoneStates()" into nyc-dev
am: c19eaf8

* commit 'c19eaf8ae5157a25801e2e5eb4bb555b7641f6e4':
Fix bug in CallManager unregisterForPhoneStates()

Change-Id: I0caf8045ebcb85f06f9ea07a0411f52d280e9d98
c19eaf8ae5157a25801e2e5eb4bb555b7641f6e4 05-Apr-2016 Santos Cordon <santoscordon@google.com> Merge "Fix bug in CallManager unregisterForPhoneStates()" into nyc-dev
eae666ec25a681683b572b2a16ff8b55c511c761 30-Mar-2016 chao.bi <chao.bi@intel.com> Fix bug in CallManager unregisterForPhoneStates()

In this function, it asserts the handler pointer by mistake,
so it should stop&release related resources but actually not.
Therefore, when the Phone instance is registerred again, it
will hit mess due to old resources are not cleared. One example
of issue is for IMS Phone: when enter/exit flight mode, IMS
Phone instance will be unregistered and registered again, but
IMS phone registration will fail due to this bug, thus blocks IMS
functions.

Fix: 28003885
Change-Id: I84ff4dcdddf6a8b0d52b5f3bec4ced008cc79fe3
Signed-off-by: chao.bi <chao.bi@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
allManager.java
6b2eb496d7a7e082d1b44728da25eafa8c5b4543 04-Apr-2016 Amit Mahajan <amitmahajan@google.com> Merge "Revert "Changes to de-dup messages in SMS raw table."" into nyc-dev
am: 18c35e9

* commit '18c35e9b2beea918e6cea687514fc8af4ea6a759':
Revert "Changes to de-dup messages in SMS raw table."

Change-Id: I995203c263e15f4e9830383ae1a22fb7751f9ace
18c35e9b2beea918e6cea687514fc8af4ea6a759 04-Apr-2016 Amit Mahajan <amitmahajan@google.com> Merge "Revert "Changes to de-dup messages in SMS raw table."" into nyc-dev
0acde342e973a838a46eebf57a03a5fcad12708e 04-Apr-2016 Amit Mahajan <amitmahajan@google.com> Revert "Changes to de-dup messages in SMS raw table."

This reverts commit 8fe2baabaae75ab2975fb642db9a91db75d1a11e.

Bug: 27974596
Change-Id: Id5284e9f3da34b028e0097dc8f0e43a98e3a7a86
nboundSmsHandler.java
msBroadcastUndelivered.java
msMessageBase.java
cc6b30f98ece26b03bc7f0dd0aa776be2e6d7596 01-Apr-2016 Tyler Gunn <tgunn@google.com> Merge "Add ImsExternalCallTracker and support for multiendpoint." into nyc-dev
am: 04e731b

* commit '04e731bb4af38a3b535cdefb0347085d0b341c13':
Add ImsExternalCallTracker and support for multiendpoint.

Change-Id: I670f3d4520e808a02126e0d2a3465e6f45e5ef91
04e731bb4af38a3b535cdefb0347085d0b341c13 01-Apr-2016 Tyler Gunn <tgunn@google.com> Merge "Add ImsExternalCallTracker and support for multiendpoint." into nyc-dev
976973b877baebd7a9447128602cc025eb047796 10-Mar-2016 Junda Liu <junda@google.com> support authType for sim challenge.

Bug: b/27360179
Change-Id: I0196dc98c7f295baafd1dfb205245365647c1c74
honeSubInfoController.java
icc/UiccCardApplication.java
fec523bdc5d2b6dd90212c8076bf34bcc2ab08b2 01-Apr-2016 Tyler Gunn <tgunn@google.com> Add ImsExternalCallTracker and support for multiendpoint.

- Adding new ImsExternalCallTracker which is responsible for responding to
dialog event package information received via IMS framework.
- Added TelephonyTester intents so that I can inject fake dialog event
package data into the ImsExternalCallTracker.

Bug: 27458894
Change-Id: Icc7c4f9e25ad553107fc1cb9d5501ba45c5a1e45
onnection.java
elephonyComponentFactory.java
elephonyTester.java
msphone/ImsExternalCall.java
msphone/ImsExternalCallTracker.java
msphone/ImsExternalConnection.java
msphone/ImsPhone.java
2bef5bad45459ccdd3028fa3a3cc7ca73ddb8b61 01-Apr-2016 Junda Liu <junda@google.com> Merge "Add forground flag to carrierservice binder." into nyc-dev
am: c334d3e

* commit 'c334d3e3ececb4fbe52fbad1df656fe0599cea13':
Add forground flag to carrierservice binder.

Change-Id: Icda51952ed08d6df84fea975081e2ab0929a3d3a
c334d3e3ececb4fbe52fbad1df656fe0599cea13 01-Apr-2016 Junda Liu <junda@google.com> Merge "Add forground flag to carrierservice binder." into nyc-dev
5fdecd63b3cc2845fbc96b9a1cf44aedb06f64ce 01-Apr-2016 Amit Mahajan <amitmahajan@google.com> Merge "Set isGsm flag in SignalStrength correctly." into nyc-dev
am: fe51ed1

* commit 'fe51ed106cd3ec081bac54ded1bfb314d14fa926':
Set isGsm flag in SignalStrength correctly.

Change-Id: I6120f4b68f39b76e00b8fcb61dd41e4e2dc8860e
0b24cf9fa32362616f3c55da9c0ec768c4bd174b 31-Mar-2016 Amit Mahajan <amitmahajan@google.com> Set isGsm flag in SignalStrength correctly.

Bug: 27541623
Change-Id: Id399f67e0d1a73e9485b71a5907e716a79297b2b
erviceStateTracker.java
est/SimulatedCommands.java
5c1ddc684185b37cdb79533b95d73e636e38e586 31-Mar-2016 Junda Liu <junda@google.com> Add forground flag to carrierservice binder.

The persistent carrier binding is made with only the BIND_AUTO_CREATE flag, not the BIND_FOREGROUND_SERVICE flag. Without this flag, the binding alone is not enough to keep the application from being restricted in various power saving modes, which is a major purpose of the binding.

Bug: b/27853835
Change-Id: I03c36e886fb03d8a410913eaf4bffa38c12a4499
arrierServiceBindHelper.java
c2b8480b55b57e1bd6f1a15d2b96fa237ea44a7d 30-Mar-2016 chao.bi <chao.bi@intel.com> Fix bug in CallManager unregisterForPhoneStates()

In this function, it asserts the handler pointer by mistake,
so it should stop&release related resources but actually not.
Therefore, when the Phone instance is registerred again, it
will hit mess due to old resources are not cleared. One example
of issue is for IMS Phone: when enter/exit flight mode, IMS
Phone instance will be unregistered and registered again, but
IMS phone registration will fail due to this bug, thus blocks IMS
functions.

Change-Id: I84ff4dcdddf6a8b0d52b5f3bec4ced008cc79fe3
Signed-off-by: chao.bi <chao.bi@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
allManager.java
0527c02ee823d57dd007441402cd35193dbb135c 30-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "Changes to de-dup messages in SMS raw table." into nyc-dev
am: 9fff811

* commit '9fff811825dcc1f44b67e735733547fc44069f3a':
Changes to de-dup messages in SMS raw table.

Change-Id: I62dd900c16feb205a61f53ccfa1516abb0d441ae
9fff811825dcc1f44b67e735733547fc44069f3a 30-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "Changes to de-dup messages in SMS raw table." into nyc-dev
e9ffc8687f4226c5436f245f2a69a86d44265603 30-Mar-2016 Ye Wen <ywen@google.com> Merge "Assign WRITE_SMS to UID 1001" into nyc-dev
am: d5d54d1

* commit 'd5d54d19e78417ee7733a7ab2945823643bc5814':
Assign WRITE_SMS to UID 1001

Change-Id: If383e630a00f680059db100b14952bd4c367a19b
d5d54d19e78417ee7733a7ab2945823643bc5814 30-Mar-2016 Ye Wen <ywen@google.com> Merge "Assign WRITE_SMS to UID 1001" into nyc-dev
b106d4b199e84a5a8f6f0309c86f2fab6fdd4816 30-Mar-2016 Hung-ying Tyan <tyanh@google.com> Fix potential hang in getIccSimChallengeResponse

When calling TelephonyManager.getIccSimChallengeResponse with appType
APPTYPE_ISIM, the Phone process will hang in
IccRecords.getIccSimChallengeResponse because the response event 90
(i.e., EVENT_AKA_AUTHENTICATE_DONE) collides with the ISIM authentication
response event in IsimUiccRecords and thus it will be wrongly handled in
IsimUiccRecords instead of IccRecords.

Change-Id: I485fef52144fd011d9d1ef6eaf3625fc320c8980
icc/IsimUiccRecords.java
ad57f63e04902b9a2ebac178d19e53250cf73ce2 30-Mar-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Unit tests for ServiceStateTracker" into nyc-dev
am: f9a7f1f

* commit 'f9a7f1f9eb901ee109a6ee5e9cd885e09c6cb478':
Unit tests for ServiceStateTracker

Change-Id: Ib61f8fee355d87553193283359cfdc27ecc2a545
f9a7f1f9eb901ee109a6ee5e9cd885e09c6cb478 30-Mar-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Unit tests for ServiceStateTracker" into nyc-dev
8fe2baabaae75ab2975fb642db9a91db75d1a11e 28-Mar-2016 Amit Mahajan <amitmahajan@google.com> Changes to de-dup messages in SMS raw table.

Bug: 27820591
Change-Id: I6b071ec99a90d9f5195825ba3cd73cb54f61631b
nboundSmsHandler.java
msBroadcastUndelivered.java
msMessageBase.java
f32222bd7bf1e3e619b1451b46f7f4aa94474ba1 29-Mar-2016 Sanket Padawe <sanketpadawe@google.com> Unit tests for ServiceStateTracker

+ Adding unit tests testing public functions in ServiceStateTracker

Bug: 25691379
Change-Id: If99e7df70f1168124b361cc5e406a01021024136
erviceStateTracker.java
est/SimulatedCommands.java
f00ca0403ca9670d417f70e97e1df03a11c719db 29-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "Change to dispose GsmCdmaConnection objects on GSM<->CDMA switches." into nyc-dev
am: 3a8b577

* commit '3a8b5774b3e2110d8b7f92318f31f4e23a133668':
Change to dispose GsmCdmaConnection objects on GSM<->CDMA switches.
f299322eabb18e1234c81fe1e356b550b6687772 29-Mar-2016 Robert Greenwalt <rgreenwalt@google.com> Add settings for SUW data control.

While the device is being provisioned we can default to
mobile-data-off and let the provisioning app turn mobile
data back on if the user wants it. After provisioning
control is restored.

Settings in play:
Settings.Global.DEVICE_PROVISIONED (existing)
SystemProperty ro.com.android.mobiledata (existing)
Settings.Global.MOBILE_DATA (existing)

SystemProperty ro.com.android.prov_mobiledata (new)
Settings.Global.DEVICE_PROVISIONING_MOBILE_DATA_ENABLED (new)

If the new settings aren't used, the old behvior is used.

bug:26638209
Change-Id: I4bac52632f757f7132c69c427226ce1cdaccfd44
ataconnection/DcTracker.java
3a8b5774b3e2110d8b7f92318f31f4e23a133668 29-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "Change to dispose GsmCdmaConnection objects on GSM<->CDMA switches." into nyc-dev
896df3cf5a3d1830ec46e78cce04e43ed6b61281 28-Mar-2016 Ye Wen <ywen@google.com> Assign WRITE_SMS to UID 1001

The write permission check in telephony provider requires any packages
in UID 1001 to have WRITE_SMS AppOps permission. Instead of assigning
this to packages one by one, use the new AppOpsManager.setUidMode to
give permission to the UID.

b/27831867

Change-Id: I7a28d1ffe73339b9de23605fb0e4f0c857509996
msApplication.java
fa77d101a89df78c3fb655c101b3ee1f0ebb7134 15-Mar-2016 Junda Liu <junda@google.com> No unbind if carrier app is the same.

Previously unbind is called first within bind, this will briefly
disconnect carrier app even though the new one is the same. This change
checks current binding and keep it if package is the same.

Bug: b/27499289
Change-Id: Ie5887d385a50818722116691424fb87bb928efa4
arrierServiceBindHelper.java
f123d6219af2dfbde398345e53b6a0e1c8feeee0 25-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "Change to make pause dialing same for GSM and CDMA." into nyc-dev
am: a7f4d2d

* commit 'a7f4d2d6d2510f9b43349afd4720b306b86d3d71':
Change to make pause dialing same for GSM and CDMA.
a7f4d2d6d2510f9b43349afd4720b306b86d3d71 25-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "Change to make pause dialing same for GSM and CDMA." into nyc-dev
a2df69ceec27f7f35d7e8a840218f30b01dd4f21 25-Mar-2016 Amit Mahajan <amitmahajan@google.com> Changes to decode and store hex digits in ICC ID.

Bug: 25410213
Change-Id: I521976d4fe1aa815da2c6f7eb8e6bc1e7b912eab
smCdmaPhone.java
hone.java
ubscriptionInfoUpdater.java
icc/IccRecords.java
icc/IccUtils.java
icc/RuimRecords.java
icc/SIMRecords.java
41275eccc4c234daec3ea54f7990100fbe1e7342 23-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "Change to release wakelock on ECM exit in ImsPhone." into nyc-dev
am: 8af04cc

* commit '8af04cc88ca58ca8ffd4d558dbfce738d3b0aa09':
Change to release wakelock on ECM exit in ImsPhone.
7d00b6f964cca1a1ce14919de01fd18cd6584321 23-Mar-2016 Tyler Gunn <tgunn@google.com> Merge "Fix issue where audio calls have "supports downgrade to voice" capability." into nyc-dev
am: c69a267

* commit 'c69a267a29079cb1b49587d48a13d210ab7cc8f4':
Fix issue where audio calls have "supports downgrade to voice" capability.
8af04cc88ca58ca8ffd4d558dbfce738d3b0aa09 23-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "Change to release wakelock on ECM exit in ImsPhone." into nyc-dev
c69a267a29079cb1b49587d48a13d210ab7cc8f4 23-Mar-2016 Tyler Gunn <tgunn@google.com> Merge "Fix issue where audio calls have "supports downgrade to voice" capability." into nyc-dev
ffb90b77322fa64adbe79b976f1c16f3c9441753 19-Mar-2016 Amit Mahajan <amitmahajan@google.com> Change to release wakelock on ECM exit in ImsPhone.

Includes ImsPhone ECBM unit test.

Bug: 27378459
Change-Id: I71da054e303d0a88ee79b6429fc3a154121efe46
msphone/ImsPhone.java
msphone/ImsPhoneBase.java
msphone/ImsPhoneCallTracker.java
9b5cbeae3034cbeb658e9ff29c5b7d1ae780d5f6 23-Mar-2016 Tyler Gunn <tgunn@google.com> Fix issue where audio calls have "supports downgrade to voice" capability.

In reality, the capability isn't really required if either end only
supports voice calls.

Bug: 27354235
Change-Id: I9cd97cb2d3deba26d659c302d5c82a753d5c7699
msphone/ImsPhoneConnection.java
acf5e7e3f4b3c3d672cbbd8838552bfb4ba22755 22-Mar-2016 Amit Mahajan <amitmahajan@google.com> Mark updatePhoneType() as @VisibleForTesting.
am: 542e661

* commit '542e6616bc1f24be11e48816ab9359af9e77907e':
Mark updatePhoneType() as @VisibleForTesting.
542e6616bc1f24be11e48816ab9359af9e77907e 22-Mar-2016 Amit Mahajan <amitmahajan@google.com> Mark updatePhoneType() as @VisibleForTesting.

Since function is changed to public only for testing.

Bug: 27746848
Change-Id: I654965885e41a15706538fa2ee0b609e5a1db2bc
erviceStateTracker.java
ce86f3f624c6a8fd2c58e93a7b76989b3eaa8208 22-Mar-2016 Amit Mahajan <amitmahajan@google.com> Change to dispose GsmCdmaConnection objects on GSM<->CDMA switches.

Bug: 26760145
Change-Id: I745566eb239b62e464ab03dcbd09052c6ac54af9
smCdmaCallTracker.java
6e6f574dc54803b3e1812ca01d188787580a4ccc 22-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "Change to handle RUIM_RECORDS_LOADED only if phone type is CDMA" into nyc-dev
am: 55ff0eb

* commit '55ff0eb7c2f9910c13f03f63514198b95e382973':
Change to handle RUIM_RECORDS_LOADED only if phone type is CDMA
86ab6968a950b56a682da335ff73243f35cb8485 22-Mar-2016 Amit Mahajan <amitmahajan@google.com> Change to make pause dialing same for GSM and CDMA.

Earlier this change was made only for CDMA. GSM should also have
those changes and this helps simplify the code too.

Bug: 27790907
Change-Id: I83bdb239813f93251a25d563d2a7129566e0a604
smCdmaConnection.java
55ff0eb7c2f9910c13f03f63514198b95e382973 22-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "Change to handle RUIM_RECORDS_LOADED only if phone type is CDMA" into nyc-dev
9fb5593fa75d8c867037991090b0a73d159b241b 22-Mar-2016 Shriram Ganesh <sganesh@codeaurora.org> Merge "IMS: During SRVCC, mark dropped incoming call as missed call" into mm-wireless-dev am: 4a7398a
am: c4e1843

* commit 'c4e18430d05fd720f13fd96653096a8196299dd3':
IMS: During SRVCC, mark dropped incoming call as missed call
c4e18430d05fd720f13fd96653096a8196299dd3 22-Mar-2016 Shriram Ganesh <sganesh@codeaurora.org> Merge "IMS: During SRVCC, mark dropped incoming call as missed call" into mm-wireless-dev
am: 4a7398a

* commit '4a7398aa18dba870ebcf067333d2fc4405e9e800':
IMS: During SRVCC, mark dropped incoming call as missed call
4a7398aa18dba870ebcf067333d2fc4405e9e800 22-Mar-2016 Tyler Gunn <tgunn@google.com> Merge "IMS: During SRVCC, mark dropped incoming call as missed call" into mm-wireless-dev
e46129687ad568fa20dbd3d331c73c0be7af1b99 22-Mar-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Refine pollState when the modem is off." into nyc-dev
am: 9383ca3

* commit '9383ca3f4c1522129927e1c7196f00de3900a3b9':
Refine pollState when the modem is off.
9383ca3f4c1522129927e1c7196f00de3900a3b9 22-Mar-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Refine pollState when the modem is off." into nyc-dev
9a4169b63680a06f015a52f5c47d9c57d38c07b4 21-Mar-2016 Ian Rogers <irogers@google.com> Merge "Fix self assignment bugs."
am: 78232be

* commit '78232be37113b144fcc55ff175d6f8d7e838621e':
Fix self assignment bugs.
e845acaa2b6b7c4508081e688fdad754e6792679 21-Mar-2016 fionaxu <fionaxu@google.com> Merge "Handled Pkcs15 load file failure" into nyc-dev
am: ac4aeda

* commit 'ac4aeda5b89417d77b2769bc828951a757299693':
Handled Pkcs15 load file failure
ac4aeda5b89417d77b2769bc828951a757299693 21-Mar-2016 Chen Xu <fionaxu@google.com> Merge "Handled Pkcs15 load file failure" into nyc-dev
dbe4d7749d5524be575f629486874acdae721138 19-Mar-2016 Amit Mahajan <amitmahajan@google.com> Change to handle RUIM_RECORDS_LOADED only if phone type is CDMA

Same for EVENT_POLL_STATE_CDMA_SUBSCRIPTION, and similarly
EVENT_RESTRICTED_STATE_CHANGED only on GSM.
CL also includes change to update icc related info after RAT
specific initializations are done (on phone type switch).

Bug: 27746848
Change-Id: Ia25e1219ab473b6542ffc40d27dae1719b370660
erviceStateTracker.java
dma/EriManager.java
ba9959f795bbe14a58f11a49b3e0db9b59014078 21-Mar-2016 Tyler Gunn <tgunn@google.com> Merge "Rename carrier config option." into nyc-dev
am: 66c9225

* commit '66c92257d2798059af324f6d20e8f8ff04d7e47d':
Rename carrier config option.
66c92257d2798059af324f6d20e8f8ff04d7e47d 21-Mar-2016 Tyler Gunn <tgunn@google.com> Merge "Rename carrier config option." into nyc-dev
df3c262824b7e791027d2ec24c4f5d3040d21286 21-Mar-2016 fionaxu <fionaxu@google.com> Handled Pkcs15 load file failure

Bug: 27556007
Change-Id: Ib05a4cecf843ca6f18c211ee93dcae97d68937d4
icc/UiccPkcs15.java
08f623e38de5eafe678f86b26b93b69910749782 21-Mar-2016 Ajay Nambi <anambi@codeaurora.org> Ril Error codes: Voice related messages am: dcbe2c1
am: 8bf362e

* commit '8bf362e8bb88d454f3eaa50a288b5a505b20b38f':
Ril Error codes: Voice related messages
8bf362e8bb88d454f3eaa50a288b5a505b20b38f 21-Mar-2016 Ajay Nambi <anambi@codeaurora.org> Ril Error codes: Voice related messages
am: dcbe2c1

* commit 'dcbe2c1a0bbc3c07effa30461ba1e764141c0a5f':
Ril Error codes: Voice related messages
dcbe2c1a0bbc3c07effa30461ba1e764141c0a5f 19-Mar-2016 Ajay Nambi <anambi@codeaurora.org> Ril Error codes: Voice related messages

This change adds new error codes for messages
related to voice

Bug: 27038563
Change-Id: I16ccccbfd1b86f487f70f13aaaae80f0e768c84f
ommandException.java
b9e8a7d21c671240b387bb6b8e8314aa710c0d57 18-Mar-2016 Robert Greenwalt <rgreenwalt@google.com> Refine pollState when the modem is off.

It had been fixed to not ask the RIL for state if the modem was off
unless we're on IWLAN. However, the first indication we're on
IWLAN comes via a pollState response. Modified to also poll
if the pollState trigger came from the RIL (ie, a network state change
notification).

bug:27486486
Change-Id: Ibaed6e2e98d27e651faeeccf71d43e7ff77c938b
erviceStateTracker.java
est/SimulatedCommands.java
cdd7d65fd00e01503cccf8814d6c32890867a7c6 18-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "Unit tests for SmsBroadcastUndelivered." into nyc-dev
am: 7ad2541

* commit '7ad25414ae9b67dc1dec116e3867c44689861dd9':
Unit tests for SmsBroadcastUndelivered.
7ad25414ae9b67dc1dec116e3867c44689861dd9 18-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "Unit tests for SmsBroadcastUndelivered." into nyc-dev
871a2ec0bc8e8198aeb1913e7bf6cb22a7ff3604 18-Mar-2016 Amit Mahajan <amitmahajan@google.com> Unit tests for SmsBroadcastUndelivered.

The behavior that needs to be verified is strongly tied to
InboundSmsHandler so adding the tests in GsmInboundSmsHandlerTest.

Bug: 25691379
Change-Id: Icf62bf50c417964bb3a27587ec03452ea34c1cbd
msBroadcastUndelivered.java
elephonyComponentFactory.java
edc8df4a78dbdbff72c21711d7dd613a68269046 18-Mar-2016 Jack Yu <jackyu@google.com> Fixed that bad address returned from network crashes the phone.
am: 4698f5c

* commit '4698f5cc8dcf0f31a03c64f90e5faa1b4ffed5fc':
Fixed that bad address returned from network crashes the phone.
eb35d8b496888d501defc556289dc35cdd5f0d48 18-Mar-2016 Tyler Gunn <tgunn@google.com> DO NOT MERGE Inform registrants of which connection started or stopped the hold tone.

When receiving a hold tone signal and informing registrants via
startOnHoldTone/stopOnHoldTone, also include the connection which initiated
the start/stop. This is necessray to ensure only the TelephonyConnection
which initiated a hold tone issues a Connection Event.

Bug: 25357778
Change-Id: I1590b61affb28c40173f08a8f6233d8efe6a5e6e
msphone/ImsPhoneBase.java
msphone/ImsPhoneCallTracker.java
4698f5cc8dcf0f31a03c64f90e5faa1b4ffed5fc 17-Mar-2016 Jack Yu <jackyu@google.com> Fixed that bad address returned from network crashes the phone.

Added bad address handler to prevent the crash.

bug: 26920352
Change-Id: I58734b0fc08507ec18170a888b26347870214c66
ataconnection/DataCallResponse.java
729c8fc5b99f0ee1fdb30d671d470b582f020704 17-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "Some more unit tests for ImsPhone." into nyc-dev
am: 6dea04a

* commit '6dea04ab6f8e9ac605b292778a98d25226a9355a':
Some more unit tests for ImsPhone.
cc8ea4abbe4f1f755dc5cf1b576d51ceb24fe79d 17-Mar-2016 Amit Mahajan <amitmahajan@google.com> Some more unit tests for ImsPhone.

Bug: 25691379
Change-Id: Iafbe34b0b7edc8a53c0607b46f5abf8618f3768a
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
35f662ec7f55f0d0ab495b4b329e22eab84a0ad8 17-Mar-2016 Amit Mahajan <amitmahajan@google.com> Fix for failing ImsPhone unit test.
am: 9f5345c

* commit '9f5345c094210aa5d6606b7705a85a7bc17e831d':
Fix for failing ImsPhone unit test.
9f5345c094210aa5d6606b7705a85a7bc17e831d 17-Mar-2016 Amit Mahajan <amitmahajan@google.com> Fix for failing ImsPhone unit test.

Bug: 25691379
Change-Id: I035cc0fb5c5ce17bfc111e1faf6ff41fd80b701f
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
e03ff14a70b20f5b97db39c1ac2341d319743c97 16-Mar-2016 Jack Yu <jackyu@google.com> Merge "Fixed that setup wizard sometimes report en-GB as default language." into nyc-dev
am: ec2ebba

* commit 'ec2ebbaecd22cfb661fb1bf70dafe953a0d595ff':
Fixed that setup wizard sometimes report en-GB as default language.
ec2ebbaecd22cfb661fb1bf70dafe953a0d595ff 16-Mar-2016 Jack Yu <jackyu@google.com> Merge "Fixed that setup wizard sometimes report en-GB as default language." into nyc-dev
ac2672b837715cdcbe10edcd72379a77d7557e92 16-Mar-2016 Ian Rogers <irogers@google.com> Fix self assignment bugs.

Bugs detected by error prone.

Change-Id: Ie8162c0716d49cac14f0a70bfbcdb85d801362a8
ardwareConfig.java
517a9b682f976d9df627c2f4c05c7edb07fca3c3 16-Mar-2016 Tyler Gunn <tgunn@google.com> Rename carrier config option.

Renaming BOOL_ALLOW_EMERGENCY_VIDEO_CALLS to
KEY_ALLOW_EMERGENCY_VIDEO_CALLS_BOOL.

Bug: 27346047
Change-Id: I628075814510abfe9d2c0aecad3abd0069932bff
msphone/ImsPhoneCallTracker.java
67a05da3e56c7fe2372e583e83823734dfe57701 15-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge changes Id438132b,I9d0c6c45 into nyc-dev
am: f3a8202e74

* commit 'f3a8202e74cb4de79626e143acde42f1f4ff3fd9':
Better fix for intermittently failing tests for InboundSmsHandler.
More ImsPhone unit tests.
1e87aee815459cacf3a335ab2a3ba17667f369a4 15-Mar-2016 fionaxu <fionaxu@google.com> Merge "First Unit test for DefaultPhoneNotifier" into nyc-dev
am: db0b156c2a

* commit 'db0b156c2a1bd84d3076af9990042524c8c600c9':
First Unit test for DefaultPhoneNotifier
f3a8202e74cb4de79626e143acde42f1f4ff3fd9 15-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge changes Id438132b,I9d0c6c45 into nyc-dev

* changes:
Better fix for intermittently failing tests for InboundSmsHandler.
More ImsPhone unit tests.
1573c17cbeab5a41936d369cb05cb7c0b0299ca1 14-Mar-2016 Jack Yu <jackyu@google.com> Fixed that setup wizard sometimes report en-GB as default language.

The incorrect language was caused by the incorrect MCC/MNC reported
by CSIM application. Fixed by retrieving the correct MCC/MNC from the
telephony manager public API, which internall pulls out the correct
MCC/MNC from the USIM application.

bug: 26963170
Change-Id: I7a2f9fc7761364f52c2caa1668d4086ede9d210d
smCdmaPhone.java
ubscriptionInfoUpdater.java
icc/SIMRecords.java
db0b156c2a1bd84d3076af9990042524c8c600c9 15-Mar-2016 Chen Xu <fionaxu@google.com> Merge "First Unit test for DefaultPhoneNotifier" into nyc-dev
ec6e2f9f13bac23cdfa0de0a56826b21050b6487 14-Mar-2016 fionaxu <fionaxu@google.com> First Unit test for DefaultPhoneNotifier

bug: 25691379
Change-Id: I3e2c6c94fec10f3f4ec37cb4b06e837c9bbf28b7
efaultPhoneNotifier.java
93c62c8a71821f46194e16ca3e84f95e101edb90 15-Mar-2016 Amit Mahajan <amitmahajan@google.com> More ImsPhone unit tests.

Bug: 25691379
Change-Id: I9d0c6c45def7cf60228ea86412cf38d55068a6ff
smCdmaConnection.java
smCdmaPhone.java
hone.java
honeInternalInterface.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
b6924ab423c7701dd0984b0809eed6ceedd9111c 15-Mar-2016 fionaxu <fionaxu@google.com> Clear MWI notification for Sim removal
am: 7a537e99ff

* commit '7a537e99ff1c0dee1dbf18f844ea128cb0557de3':
Clear MWI notification for Sim removal
7a537e99ff1c0dee1dbf18f844ea128cb0557de3 14-Mar-2016 fionaxu <fionaxu@google.com> Clear MWI notification for Sim removal

bug: 27650018
Change-Id: Ideda175a45d5c4f354303fb09d6001cc5a2b7174
hone.java
erviceStateTracker.java
9eac510b5d8646f7c0d3ec5bfd8eee970a0e9d44 14-Mar-2016 Ajay Nambi <anambi@codeaurora.org> New error codes for SMS/other messages am: 8461e8bca2
am: 8b7c9964a3

* commit '8b7c9964a3873c92abd160641229d666552bb1c1':
New error codes for SMS/other messages
8b7c9964a3873c92abd160641229d666552bb1c1 14-Mar-2016 Ajay Nambi <anambi@codeaurora.org> New error codes for SMS/other messages
am: 8461e8bca2

* commit '8461e8bca26872ab91f25daa2c89cc0cc49bc077':
New error codes for SMS/other messages
8461e8bca26872ab91f25daa2c89cc0cc49bc077 11-Mar-2016 Ajay Nambi <anambi@codeaurora.org> New error codes for SMS/other messages

This change adds error codes for messages related
to SMS and set_mute, get_mute requests

Bug: 27038563
Change-Id: I3614123e7dcbc29105e64a85cce588d36d49e69d
ommandException.java
0170cb267c6aa8b62de7f933386a9e3cf0c1005b 14-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "More unit tests for ImsPhone." into nyc-dev
am: 0d25406d3f

* commit '0d25406d3f2dcef4d78355ef52af3b4d441fbf0d':
More unit tests for ImsPhone.
0d25406d3f2dcef4d78355ef52af3b4d441fbf0d 14-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "More unit tests for ImsPhone." into nyc-dev
7dc57a87610b8f203605639338c5aca12886ec53 12-Mar-2016 Amit Mahajan <amitmahajan@google.com> More unit tests for ImsPhone.

Bug: 25691379
Change-Id: I32e96837df872eec6671b46f5e5d1b2b4a3bc665
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
3d27d51a819d2e2608216a34a0987ce4b3f127cd 14-Mar-2016 Sungmin Choi <sungmin.choi@lge.com> Merge "Use Telephony.Carriers variables, instead of explicit word"
am: 22a17f5f54

* commit '22a17f5f54296f2522790c9faef497e066a8248d':
Use Telephony.Carriers variables, instead of explicit word
22a17f5f54296f2522790c9faef497e066a8248d 14-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "Use Telephony.Carriers variables, instead of explicit word"
5fe7347e0edcd7e994b14f66b0af6a8de875d25e 12-Mar-2016 Junda Liu <junda@google.com> Merge "Fix carrier service binding." into nyc-dev
am: 7d617543c0

* commit '7d617543c0621a34f873c613b357784c57f1f373':
Fix carrier service binding.
5cd38f6414d6e671fc3716651ac4067c3bf12140 12-Mar-2016 fionaxu <fionaxu@google.com> Merge "First ImsSMSDispatcher Unit Test" into nyc-dev
am: 95ec763edb

* commit '95ec763edbf8bb5b8484c1460897c0ba279b03a3':
First ImsSMSDispatcher Unit Test
7d617543c0621a34f873c613b357784c57f1f373 11-Mar-2016 Junda Liu <junda@google.com> Merge "Fix carrier service binding." into nyc-dev
3de2956a41a987a00932eeb5dd25b66279f6094a 11-Mar-2016 Junda Liu <junda@google.com> Fix carrier service binding.

Ignore duplicated simstate and no more unbind when sim is unknown.

Bug: b/27499289
Change-Id: I37036f3f9ac55c035250f03c2fdab30366a2aaa7
arrierServiceBindHelper.java
95ec763edbf8bb5b8484c1460897c0ba279b03a3 11-Mar-2016 Chen Xu <fionaxu@google.com> Merge "First ImsSMSDispatcher Unit Test" into nyc-dev
f06b7cffd2240725be159097be048fc1d3a7653c 10-Mar-2016 fionaxu <fionaxu@google.com> First ImsSMSDispatcher Unit Test

bug: 2569137
Change-Id: Ibc64fb14459b062e05968212774612f7c2b2dbc0
msSMSDispatcher.java
dma/SmsMessage.java
est/SimulatedCommands.java
0b8a2a9763be214049d27aaf8aad71456454aaad 11-Mar-2016 fionaxu <fionaxu@google.com> Merge "fix the issue of ussd not working under GSM" into nyc-dev
am: 9e0a64204f

* commit '9e0a64204f5f502ed393260d32a71e8719dcb04a':
fix the issue of ussd not working under GSM
9e0a64204f5f502ed393260d32a71e8719dcb04a 11-Mar-2016 Chen Xu <fionaxu@google.com> Merge "fix the issue of ussd not working under GSM" into nyc-dev
8210310c0b03a6091c37c28b55007377baf1051a 11-Mar-2016 twen.chang <twen.chang@mediatek.com> Merge changes from topics \'Add RIL Error code list\', \'Fix bug of getRingingCall\' into mm-wireless-dev am: dd72615553
am: 29f2f99949

* commit '29f2f99949b5d64559928240417331982249e2ab':
Add RIL Error code list
Fix bug of getRingingCall
29f2f99949b5d64559928240417331982249e2ab 11-Mar-2016 twen.chang <twen.chang@mediatek.com> Merge changes from topics \'Add RIL Error code list\', \'Fix bug of getRingingCall\' into mm-wireless-dev
am: dd72615553

* commit 'dd72615553339740e6e67e96ea277cdc74a1b8d9':
Add RIL Error code list
Fix bug of getRingingCall
dd72615553339740e6e67e96ea277cdc74a1b8d9 11-Mar-2016 Sanket Padawe <sanketpadawe@google.com> Merge changes from topics 'Add RIL Error code list', 'Fix bug of getRingingCall' into mm-wireless-dev

* changes:
Add RIL Error code list
Fix bug of getRingingCall
702f07cf67cb60b2f827a5602c6db5f76cdf2061 04-Mar-2016 twen.chang <twen.chang@mediatek.com> Add RIL Error code list

BUG: 27589497

Change-Id: I20ca5a8773a9b358f2c5b25493e00ae6b382e903
ommandException.java
6916d439438ba49e9612977c572c07711228d8a1 11-Mar-2016 fionaxu <fionaxu@google.com> fix the issue of ussd not working under GSM

bug: 27530386
Change-Id: Id2880adb3e926ae2eaea6a27926a92c76f7ca1df
smCdmaPhone.java
eae5b58239b62cf870c3caab421bfbca360b284e 10-Mar-2016 Jack Yu <jackyu@google.com> Merge "Added unit test cases for DataConnection" into nyc-dev
am: b40308275e

* commit 'b40308275e70d445c62fd9da062443dbbc53e513':
Added unit test cases for DataConnection
b40308275e70d445c62fd9da062443dbbc53e513 10-Mar-2016 Jack Yu <jackyu@google.com> Merge "Added unit test cases for DataConnection" into nyc-dev
45d0087df8517e3c19d4a92ee897fe33fb55fa56 10-Mar-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Improve TelephonyNetworkRequest logs." into nyc-dev
am: 78d81cfb7e

* commit '78d81cfb7ebcf0470e3d7a6196aca6c930d553a1':
Improve TelephonyNetworkRequest logs.
78d81cfb7ebcf0470e3d7a6196aca6c930d553a1 10-Mar-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Improve TelephonyNetworkRequest logs." into nyc-dev
4d7f0d9b6b2451b60268c907b3b3c9ac2754151d 10-Mar-2016 Ajay Nambi <anambi@codeaurora.org> Merge "Fix emergency ims pdn setup issue" into mm-wireless-dev am: 32971f02fc
am: 7004114547

* commit '7004114547f7e99d6774ac518b98ee8d5738cf9f':
Fix emergency ims pdn setup issue
7004114547f7e99d6774ac518b98ee8d5738cf9f 10-Mar-2016 Ajay Nambi <anambi@codeaurora.org> Merge "Fix emergency ims pdn setup issue" into mm-wireless-dev
am: 32971f02fc

* commit '32971f02fc9b0290df0f33c3146a5fe643b76681':
Fix emergency ims pdn setup issue
32971f02fc9b0290df0f33c3146a5fe643b76681 10-Mar-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix emergency ims pdn setup issue" into mm-wireless-dev
7e9ad5ceb9baf57f94408fd2d2b23b9963e58d39 10-Mar-2016 Jack Yu <jackyu@google.com> Merge "Improved data call setup failure logging." into nyc-dev
am: 84cbfb36bb

* commit '84cbfb36bbf27be9a0de324f6f4aee388f4257a9':
Improved data call setup failure logging.
84cbfb36bbf27be9a0de324f6f4aee388f4257a9 10-Mar-2016 Jack Yu <jackyu@google.com> Merge "Improved data call setup failure logging." into nyc-dev
579935a70e7bca31aac51a48fbf8cab928637824 10-Mar-2016 Ye Wen <ywen@google.com> Use foreground intent for received SMS and MMS WAP Push
am: f307663682

* commit 'f307663682427b9b0602ed827759aef63bd3c9e9':
Use foreground intent for received SMS and MMS WAP Push
f307663682427b9b0602ed827759aef63bd3c9e9 10-Mar-2016 Ye Wen <ywen@google.com> Use foreground intent for received SMS and MMS WAP Push

b/27471638

Change-Id: I400f0b27768468962a2394dc84bd37029c26b53b
nboundSmsHandler.java
9521f8c043c167e3a3fa97ea50bf1e2e0cd188a1 09-Mar-2016 Robert Greenwalt <rgreenwalt@google.com> Improve TelephonyNetworkRequest logs.

Preserve historic logs and list them in bugreports.
General aid to debugging.

bug:27517447
Change-Id: I5d82047b9c0a84edb9ae40782fd6868360bebeaf
honeFactory.java
etryManager.java
ubscriptionMonitor.java
ataconnection/ApnContext.java
ataconnection/TelephonyNetworkFactory.java
4a2acc7448e8ba4a91b8d48eef63198106b959dd 01-Feb-2016 Ajay Nambi <anambi@codeaurora.org> Fix emergency ims pdn setup issue

Add network capability EIMS for emergency apn type

Change-Id: I6ddc23c656fb2fc8e208f093879a2b5b1bc9f701
ataconnection/DataConnection.java
f3e017f7f9a0c2ce84ffb87889b969292c3e3913 09-Mar-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Timeout associated with ack wakelock should be 200ms instead of 20sec." into mm-wireless-dev am: 07ff9887e5
am: 162e0d5088

* commit '162e0d508828357ba6ef37bb1616fbbeca4f4aa5':
Timeout associated with ack wakelock should be 200ms instead of 20sec.
162e0d508828357ba6ef37bb1616fbbeca4f4aa5 09-Mar-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Timeout associated with ack wakelock should be 200ms instead of 20sec." into mm-wireless-dev
am: 07ff9887e5

* commit '07ff9887e50f01ece18e24df9352faea546ea0b4':
Timeout associated with ack wakelock should be 200ms instead of 20sec.
07ff9887e50f01ece18e24df9352faea546ea0b4 09-Mar-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Timeout associated with ack wakelock should be 200ms instead of 20sec." into mm-wireless-dev
2e3470722434dbc91dcc2095f5a410f6aaad620a 04-Mar-2016 Jack Yu <jackyu@google.com> Improved data call setup failure logging.

bug: 27430679
Change-Id: I5131acf69d5774f907a5b957d33c3469b2a2aa35
ataconnection/DcTracker.java
ba8ddf12c59e647ce1482be26f4b6f84e21e4c3a 09-Mar-2016 Jack Yu <jackyu@google.com> Added unit test cases for DataProfile
am: 4b2613ad8d

* commit '4b2613ad8d9825c892a03558a227c2cee71473d7':
Added unit test cases for DataProfile
4b2613ad8d9825c892a03558a227c2cee71473d7 07-Mar-2016 Jack Yu <jackyu@google.com> Added unit test cases for DataProfile

bug: 25691379
Change-Id: I56f60c410244707af8db3b7606b0a891009dfbf4
ataconnection/DataProfile.java
e3f497323441d0c9215f6cbad9ce950f054cce72 09-Mar-2016 Jack Yu <jackyu@google.com> Added unit test cases for DataConnection

bug: 25691077
Change-Id: I90920c7625ec7f8f716fbab15f65c7f4323628cc
ataconnection/DataConnection.java
ataconnection/DcFailBringUp.java
ataconnection/DcTesterFailBringUpAll.java
est/SimulatedCommands.java
b1c843b6bd15d07bf8e783032076edfdad37b1e6 08-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "New permission to bypass premium short code check" into nyc-dev
am: bc7737272e

* commit 'bc7737272e9951ccb9344c7b68263dcc3376fb43':
New permission to bypass premium short code check
bc7737272e9951ccb9344c7b68263dcc3376fb43 08-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "New permission to bypass premium short code check" into nyc-dev
61877e235c8c734bda7e13e7ba551bbb99f9a236 08-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "Support for call forwarding status for multi-sim." into nyc-dev
am: 9b745eec57

* commit '9b745eec57bcd55e1a33cfe9f20cbd8125286e91':
Support for call forwarding status for multi-sim.
bd5e7244c02d3af32ac260d6d240006a49b3a694 12-Feb-2016 Amit Mahajan <amitmahajan@google.com> New permission to bypass premium short code check

Bug: 18326557
Change-Id: Iefe319646c5e0d108b925609bba6597e8663ec4a
MSDispatcher.java
9b745eec57bcd55e1a33cfe9f20cbd8125286e91 08-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "Support for call forwarding status for multi-sim." into nyc-dev
638ea55f00fb4cf4f12e4413a4a6dca8ac97d933 08-Mar-2016 Omkar Kolangade <omkark@codeaurora.org> Merge "IMS-VT: Update video state of the connection first." into mm-wireless-dev am: 2e4144afaf
am: 6882f480d0

* commit '6882f480d0141b3a111a340309147e74458f4eda':
IMS-VT: Update video state of the connection first.
6882f480d0141b3a111a340309147e74458f4eda 08-Mar-2016 Omkar Kolangade <omkark@codeaurora.org> Merge "IMS-VT: Update video state of the connection first." into mm-wireless-dev
am: 2e4144afaf

* commit '2e4144afaf7c62fb7cfacb094c94a63d6e32a8c7':
IMS-VT: Update video state of the connection first.
2e4144afaf7c62fb7cfacb094c94a63d6e32a8c7 08-Mar-2016 Tyler Gunn <tgunn@google.com> Merge "IMS-VT: Update video state of the connection first." into mm-wireless-dev
d520d895c1af9974f61235bdf35cf5221abbe98a 05-Mar-2016 Amit Mahajan <amitmahajan@google.com> Support for call forwarding status for multi-sim.

Includes changes for multi-sim voicemail count support and
unit test.

Bug: 18108420
Change-Id: I8d7a4e796491c8d90ad213242ff37747043c72a1
hone.java
3464cbb60f1bf1127fd9e10efb05925f6f911b37 07-Mar-2016 Sanket Padawe <sanketpadawe@google.com> Timeout associated with ack wakelock should be 200ms instead of 20sec.

Bug: 22127517
Change-Id: I7384edb12fd11f5b44e2995589146db364143d0a
IL.java
125c7df258659501098f63ae823757c421e147e6 07-Mar-2016 Jack Yu <jackyu@google.com> Merge "Added unit test cases for ApnContext" into nyc-dev
am: 3aec0aa89b

* commit '3aec0aa89b62081c25552cd57f89c543d2c48059':
Added unit test cases for ApnContext
3aec0aa89b62081c25552cd57f89c543d2c48059 07-Mar-2016 Jack Yu <jackyu@google.com> Merge "Added unit test cases for ApnContext" into nyc-dev
e4f89bfb02ecb0a921131b6f1f02ec390f57a59e 07-Mar-2016 fionaxu <fionaxu@google.com> Merge "PhoneSubInfoControllerTest Unit Test" into nyc-dev
am: 228be51419

* commit '228be5141913bf0f89fa23cdafdc86e20d6974b1':
PhoneSubInfoControllerTest Unit Test
d97189628c77d6257455958b4ce9937618f0c7ac 07-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "Phone-switch cleanup: remove updateParentPhone()." into nyc-dev
am: c1128c76f1

* commit 'c1128c76f1afc3f01c735eeca951045f701a68ed':
Phone-switch cleanup: remove updateParentPhone().
228be5141913bf0f89fa23cdafdc86e20d6974b1 07-Mar-2016 Chen Xu <fionaxu@google.com> Merge "PhoneSubInfoControllerTest Unit Test" into nyc-dev
9e0be93719c4de0cedec33508c799f3b2f223454 05-Mar-2016 Jack Yu <jackyu@google.com> Added unit test cases for ApnContext

bug: 25691379
Change-Id: I1a4a10dd6594b8a102ff6af5674ab899bad6f338
ataconnection/ApnContext.java
18ad8bf07feb9f6a9d187da236f3e56c055e941a 04-Mar-2016 fionaxu <fionaxu@google.com> PhoneSubInfoControllerTest Unit Test

bug: 2569137
Change-Id: I39f8d3ddf16e5b3dcb61a11fc22003a41c81fe2c
honeSubInfoController.java
c1128c76f1afc3f01c735eeca951045f701a68ed 07-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "Phone-switch cleanup: remove updateParentPhone()." into nyc-dev
d1d673d28b2cf14e21e50868e05d96ff73e951af 05-Mar-2016 Amit Mahajan <amitmahajan@google.com> Phone-switch cleanup: remove updateParentPhone().

This is not needed as the parent phone object never changes with
the phone-switch refactor.

Bug: 25793157
Change-Id: If1cf30bc9f35a23cf7fc1c713517e99cbaa063b1
smCdmaPhone.java
hone.java
msphone/ImsPhone.java
57d5bd9f23c9b380ddd205665758ece8784578a4 21-Aug-2015 Omkar Kolangade <omkark@codeaurora.org> IMS-VT: Update video state of the connection first.

Video state is used to determine if connection modification
happened. Delaying video state updates confuses other layers,
which use the video state notification to determine if session
upgrade/downgrade happened.

Bug: 27477899
Change-Id: Ibc5f89dc631625322b04f8f68686877a2b25999b
msphone/ImsPhoneCallTracker.java
0b50cc9f975e5d9a031ac662876c27eb8cd78f39 04-Mar-2016 Junda Liu <junda@google.com> Merge "Support file based carrier privilege rules." into nyc-dev
am: f55a9e37e8

* commit 'f55a9e37e8ffecc163c1515c93b8cebe88cbbebf':
Support file based carrier privilege rules.
f55a9e37e8ffecc163c1515c93b8cebe88cbbebf 04-Mar-2016 Junda Liu <junda@google.com> Merge "Support file based carrier privilege rules." into nyc-dev
a3e96a42d9f83a649c4edf7dc07b1f0977efd393 04-Mar-2016 twen.chang <twen.chang@mediatek.com> Fix bug of getRingingCall

It returns the ringing call of ImsPhone if the ringing call of GSMPhone
isn't ringing. In CallManager.registerPhone(), it always registers ringing
call of ImsPhone, because the ringing call of GSMPhone isn't ringing.
Consequently, it can't answer GSM call successfully by invoking
TelephonyManager.answerRingingCall() since the implementation in
PhoneInterfaceManager.answerRingingCallInternal() could not get the correct
ringing call from CallManager.

We check the ringing call state of imsPhone first as accpetCall() does.
smCdmaPhone.java
8e7cda909db72fc1e343e72f73cf51852bd30c27 04-Mar-2016 fionaxu <fionaxu@google.com> Merge "move Uicc TCs to UICC subfoler and code cleanup" into nyc-dev
am: 1eddcf6a62

* commit '1eddcf6a62fc3db378fed63256dc50f0128f514d':
move Uicc TCs to UICC subfoler and code cleanup
c0f80bee21419c72ef4c52f3f2a7ca2060ae37d1 04-Mar-2016 Ji Yang <yangji@google.com> Merge "Adapt to carrier message service API change." into nyc-dev
am: 6c68ad8882

* commit '6c68ad888284b1ac5b3f149a4a4b4c7d477b6ab9':
Adapt to carrier message service API change.
bedf51be360fb074850435426b6e20cf050bfa05 04-Mar-2016 fionaxu <fionaxu@google.com> Merge "First Unit test on UiccCardApplication" into nyc-dev
am: 7215585b3e

* commit '7215585b3e1d0b0745ba999d04a5f4fb082d786b':
First Unit test on UiccCardApplication
1eddcf6a62fc3db378fed63256dc50f0128f514d 04-Mar-2016 Chen Xu <fionaxu@google.com> Merge "move Uicc TCs to UICC subfoler and code cleanup" into nyc-dev
9a2d68f18b4441404eaa4d1cb45d9b457915b234 03-Mar-2016 fionaxu <fionaxu@google.com> move Uicc TCs to UICC subfoler and code cleanup

bug: 2569137
Change-Id: I0afcbc570fa04326d319788fbaa3217d413144f8
est/SimulatedCommands.java
6c68ad888284b1ac5b3f149a4a4b4c7d477b6ab9 03-Mar-2016 Ji Yang <yangji@google.com> Merge "Adapt to carrier message service API change." into nyc-dev
7215585b3e1d0b0745ba999d04a5f4fb082d786b 03-Mar-2016 Chen Xu <fionaxu@google.com> Merge "First Unit test on UiccCardApplication" into nyc-dev
4145d45a5e3076a88e27a3af35c2827a25c413b9 02-Mar-2016 fionaxu <fionaxu@google.com> First Unit test on UiccCardApplication

bug: 25691379

Change-Id: I897a2485ec45285146a122f2717fe7daab334d54
est/SimulatedCommands.java
icc/UiccCardApplication.java
ab540cddadae2c2b98c5648617a902d3705a49bf 03-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "Remove unused functions from PhoneFactory." into nyc-dev
am: 52b742670e

* commit '52b742670ebb42f511e518243ef280d663797b38':
Remove unused functions from PhoneFactory.
52b742670ebb42f511e518243ef280d663797b38 03-Mar-2016 Amit Mahajan <amitmahajan@google.com> Merge "Remove unused functions from PhoneFactory." into nyc-dev
3fcaeac48c45f7fbefd2aeee8fe3094f40f9bf84 24-Feb-2016 Ji Yang <yangji@google.com> Adapt to carrier message service API change.

Check message filter callback result to decide whether to
show new message notificaiton.

BUG: 27292180

Change-Id: Idbf9715e16d099dbdd9f832821e613ca704720df
nboundSmsHandler.java
MSDispatcher.java
43bc691fbb0fbb39507458c5d64a8088650255c4 03-Mar-2016 Amit Mahajan <amitmahajan@google.com> Remove unused functions from PhoneFactory.

Also added a simple unit test.

Bug: 25691379
Change-Id: I39b7dbe3914b0821a3f8aa31fe057d54ea5455da
honeFactory.java
5e2f6bd7553cc0752c4055542a7b6bc25323c2fa 03-Mar-2016 Amit Mahajan <amitmahajan@google.com> First unit test for ImsPhone.
am: ecac744a4e

* commit 'ecac744a4e585e3c7af95ffa06fa3e711131200c':
First unit test for ImsPhone.
ecac744a4e585e3c7af95ffa06fa3e711131200c 02-Mar-2016 Amit Mahajan <amitmahajan@google.com> First unit test for ImsPhone.

Bug: 25691379
Change-Id: I61a2f0805220782e7dbebaf50604b596ef3ba24b
elephonyComponentFactory.java
sm/GsmInboundSmsHandler.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
d788031bc1287dfbdec9decf830ca6244869635b 02-Mar-2016 fionaxu <fionaxu@google.com> Merge "First Unit test for IccPhoneBookInterfManager" into nyc-dev
am: 3e1a34f254

* commit '3e1a34f254d7e6a5a2cd58a753e1ae2c5900f889':
First Unit test for IccPhoneBookInterfManager
ce000ddfbb615f873e9fc0a4c68f992b12d3f82f 01-Mar-2016 fionaxu <fionaxu@google.com> First Unit test for IccPhoneBookInterfManager

bug: 25691379
Change-Id: I96ca9db99ec10affa044a7373fb0acfd836a62ae
ccPhoneBookInterfaceManager.java
hone.java
msphone/ImsPhone.java
msphone/ImsPhoneMmiCode.java
icc/AdnRecordCache.java
81a40c94d5b0f2463cacc950fe48268195926da6 01-Mar-2016 fionaxu <fionaxu@google.com> Merge "Fix the issue of reading ADN EF failure" into mm-wireless-dev am: 72623efde6
am: eb02449cd3

* commit 'eb02449cd321389a8fbe2926eb5e28472ded09c2':
Fix the issue of reading ADN EF failure
eb02449cd321389a8fbe2926eb5e28472ded09c2 01-Mar-2016 fionaxu <fionaxu@google.com> Merge "Fix the issue of reading ADN EF failure" into mm-wireless-dev
am: 72623efde6

* commit '72623efde6278ac8607cd07df1f82ad6489297a9':
Fix the issue of reading ADN EF failure
72623efde6278ac8607cd07df1f82ad6489297a9 01-Mar-2016 Chen Xu <fionaxu@google.com> Merge "Fix the issue of reading ADN EF failure" into mm-wireless-dev
3be9fb032307d7586b32dc57ddd486e8e9d43bd2 01-Mar-2016 fionaxu <fionaxu@google.com> Fix the issue of reading ADN EF failure

BUG: 22828728
related cc:
https://partner-android-review.googlesource.com/#/c/220023/
Change-Id: If1eb675508f80abdd76695f4aaf5445a0c1f24b3
ccPhoneBookInterfaceManager.java
ccSmsInterfaceManager.java
a967adab653335f6a8ac7faa1dbe8b936e88c16d 01-Mar-2016 Jack Yu <jackyu@google.com> First unit test for DcController am: 3a5b9323f4
am: 4e80126eb0

* commit '4e80126eb068e873f749d33b37072a64cd98510f':
First unit test for DcController
4e80126eb068e873f749d33b37072a64cd98510f 01-Mar-2016 Jack Yu <jackyu@google.com> First unit test for DcController
am: 3a5b9323f4

* commit '3a5b9323f422134b68a92c36813001ec8bed2866':
First unit test for DcController
3a5b9323f422134b68a92c36813001ec8bed2866 26-Feb-2016 Jack Yu <jackyu@google.com> First unit test for DcController

bug: 25691379
Change-Id: I11d0a55f8efd1510478bd8dc6965a26118457802
ataconnection/DataConnection.java
ataconnection/DcController.java
a4113cd06d2932658ee9e38500a84c1459e27cb8 22-Jan-2016 Junda Liu <junda@google.com> Support file based carrier privilege rules.

PKCS15-based ARF is a fallback mechanism for carrier privilege rules,
when ARA applet is not found on UICC.

Because many carriers are still using ARF as primary method for access
control, supporting ARF lowers the adoption barrier for carrier
privileges.

Detailed data formats are specified in the secure element access control
spec, see link in the source code.

Bug: b/22863855
Change-Id: I0f2e87d4a6bf08a9cbea5629a9b04c6c33374700
(cherry picked from commit 2b8ae414983c111ddeccc56e2e2d3baa7357209c)
icc/UiccCarrierPrivilegeRules.java
icc/UiccPkcs15.java
0ea2c69405438e027a87c709373e0df87bf113bf 27-Feb-2016 Jack Yu <jackyu@google.com> Reduced more verbose Rlog. am: 092e6bd60f
am: 3cc885934b

* commit '3cc885934be46ee7ab7913076e6d7bf23f2b822b':
Reduced more verbose Rlog.
3cc885934be46ee7ab7913076e6d7bf23f2b822b 27-Feb-2016 Jack Yu <jackyu@google.com> Reduced more verbose Rlog.
am: 092e6bd60f

* commit '092e6bd60f1a4a3a55fb73ad0efca1122b8e15e2':
Reduced more verbose Rlog.
092e6bd60f1a4a3a55fb73ad0efca1122b8e15e2 24-Feb-2016 Jack Yu <jackyu@google.com> Reduced more verbose Rlog.

bug: 25956251
Change-Id: I53573bc7470783d4b5cfa8eca0f80118e3ff18ed
ccSmsInterfaceManager.java
elephonyEventLog.java
ataconnection/DcTracker.java
4f928ed2959c0692ba33d70e67be6c65deabdcea 26-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Get rid of telephony/IccUtils since it has been moved to uicc folder." into nyc-dev
am: 3a24871ae2

* commit '3a24871ae2c6ec822cc4d15688c995c39a6bc822':
Get rid of telephony/IccUtils since it has been moved to uicc folder.
3a24871ae2c6ec822cc4d15688c995c39a6bc822 26-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Get rid of telephony/IccUtils since it has been moved to uicc folder." into nyc-dev
17a3c8b39f73dac470b53934191679899450d97a 26-Feb-2016 Amit Mahajan <amitmahajan@google.com> Get rid of telephony/IccUtils since it has been moved to uicc folder.

Bug: 27380348
Change-Id: I5846f092c8825fbdec71b8c46346d3eb8217c3f7
ccSmsInterfaceManager.java
ccUtils.java
a320ad4a2c39dd84e5f27ee23c4bb6b25df5b2d2 26-Feb-2016 Abhijith Shastry <ashastry@google.com> Merge "Suppress blocks after texting emergency services." into nyc-dev
am: 6fd2229711

* commit '6fd2229711f75f686ce6254e6c9859247310598d':
Suppress blocks after texting emergency services.
6fd2229711f75f686ce6254e6c9859247310598d 26-Feb-2016 Abhijith Shastry <ashastry@google.com> Merge "Suppress blocks after texting emergency services." into nyc-dev
5d8aaa5120e880684086511276eca30d59849f40 26-Feb-2016 fionaxu <fionaxu@google.com> Merge "Fix UiccCard Test Failure" into nyc-dev
am: 4552b1f4f3

* commit '4552b1f4f3d7d2f6a19e19cbbc5dcbdacf64cf39':
Fix UiccCard Test Failure
4552b1f4f3d7d2f6a19e19cbbc5dcbdacf64cf39 26-Feb-2016 Chen Xu <fionaxu@google.com> Merge "Fix UiccCard Test Failure" into nyc-dev
0733f7c3d11fd183eb617b4460fae1a3da1ca59b 26-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Unit test for emergency callback mode start/end." into mm-wireless-dev am: d02f796963
am: ed1effde1e

* commit 'ed1effde1e208e805b7722d397ea00050306aa38':
Unit test for emergency callback mode start/end.
ed1effde1e208e805b7722d397ea00050306aa38 26-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Unit test for emergency callback mode start/end." into mm-wireless-dev
am: d02f796963

* commit 'd02f796963420fd100a77c8a8cf196b5ce44d2b0':
Unit test for emergency callback mode start/end.
d02f796963420fd100a77c8a8cf196b5ce44d2b0 26-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Unit test for emergency callback mode start/end." into mm-wireless-dev
f21d2289021a94fc74023e2b5987d236df354fe1 26-Feb-2016 fionaxu <fionaxu@google.com> Fix UiccCard Test Failure

BUG=25691379
Change-Id: Ib68920f2369217220282b8338f141b24fb24c334
icc/UiccCard.java
de9c22e95d4e2797076db0c6b798e54f0638b7f0 26-Feb-2016 Amit Mahajan <amitmahajan@google.com> Unit test for emergency callback mode start/end.

Bug: 25691379
Bug: 27378459
Change-Id: I5c93f6bb6f5e9c9b0da8851c8461c378c18c8c58
smCdmaPhone.java
est/SimulatedCommands.java
ae57a2a482c77d0e3a284070d0fba9cdaa220a5a 26-Feb-2016 Jack Yu <jackyu@google.com> resolve merge conflicts of 5ba11026cb to nyc-dev
am: 1bcd7a866d

* commit '1bcd7a866ddf8f6f63370c70972f057a4a1ba057':
resolve merge conflicts of 5ba11026cb to nyc-dev
1bcd7a866ddf8f6f63370c70972f057a4a1ba057 26-Feb-2016 Jack Yu <jackyu@google.com> resolve merge conflicts of 5ba11026cb to nyc-dev

Change-Id: I578f88ca57a85c796c6cc5506617d9627c42d0dd
etryManager.java
ataconnection/DataConnection.java
ataconnection/DcTesterDeactivateAll.java
ataconnection/DcTracker.java
est/SimulatedCommands.java
e7be4fa6a817c4fc697f446dfbea2dccfbb4e930 26-Feb-2016 Raph Levien <raph@google.com> Merge "Finer grained character boundaries in computing SMS fragment lengths" into nyc-dev
am: c68860fc5a

* commit 'c68860fc5a345ec1eedfec93314e8177f4e787b0':
Finer grained character boundaries in computing SMS fragment lengths
b367158cc845444b3e4ffad6b75da3041e7943e8 26-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "resolve mrege conflicts of 6a49b2401a to nyc-dev" into nyc-dev
am: 6ad751d89a

* commit '6ad751d89aa0d0c9d8ce88b5458a3740391e64a0':
Don't let other networks fool the Switcher
c68860fc5a345ec1eedfec93314e8177f4e787b0 26-Feb-2016 Raph Levien <raph@google.com> Merge "Finer grained character boundaries in computing SMS fragment lengths" into nyc-dev
6ad751d89aa0d0c9d8ce88b5458a3740391e64a0 26-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "resolve mrege conflicts of 6a49b2401a to nyc-dev" into nyc-dev
d2ffcaf3bee89edd228d6a9d603df8d6c434ea67 26-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> resolve mrege conflicts of 6a49b2401a to nyc-dev

Change-Id: I61ec6a761ea05c9437aea3000f65909c440aaf9c
5ba11026cbe45b32a4a37292f9b47c4585ced72f 25-Feb-2016 Jack Yu <jackyu@google.com> Merge "Fixed data retry issues." into mm-wireless-dev
97e65e99fd4084223008d158c4c4f6577948dac9 25-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Upgrade logging in PhoneSwitcher." into nyc-dev
am: 33b79f2339

* commit '33b79f2339dbf56ab99735a63dcccc3df2f005a4':
Upgrade logging in PhoneSwitcher.
33b79f2339dbf56ab99735a63dcccc3df2f005a4 25-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Upgrade logging in PhoneSwitcher." into nyc-dev
189aeda832a4bcc6f7086cc5803aa98bd3b77727 25-Feb-2016 Brad Ebinger <breadley@google.com> Merge "Prevent spamming hold/unhold requests in SIP" into nyc-dev
am: 4be73d0727

* commit '4be73d07271c42e6554c4349290ae6682a70499d':
Prevent spamming hold/unhold requests in SIP
4be73d07271c42e6554c4349290ae6682a70499d 25-Feb-2016 Brad Ebinger <breadley@google.com> Merge "Prevent spamming hold/unhold requests in SIP" into nyc-dev
6a49b2401a25858891398d8bcaffeb989de68ab2 25-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Don't let other networks fool the Switcher" into mm-wireless-dev
87c2958ce9e74b35ca6ef36f0b5caaaac8d5b008 25-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> Upgrade logging in PhoneSwitcher.

Bug shows that PhoneSwitcher doesn't think phone0 is default,
but all of that action happened 30-60 minutes ago. Upgrade
PhoneSwitchers local log to capture this info.

bug:27344401
Change-Id: Ide4f26f73ecaeb807aae7715ea59f6fb78ae86de
honeSwitcher.java
5eccb26b2bcf3a51326596e1b0bb49b073d2f9fc 23-Feb-2016 Abhijith Shastry <ashastry@google.com> Suppress blocks after texting emergency services.

BUG: 26989170
Change-Id: I73216e5c433ba4ffb613d88b1d3fe3c81f3acba9
syncEmergencyContactNotifier.java
MSDispatcher.java
sm/GsmSMSDispatcher.java
est/SimulatedCommands.java
3baedf2ead743a2c67dcac03733cec52bcef5636 25-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> Don't let other networks fool the Switcher

It needs to be aware of all NetworkRequests regardless of whether
higher-scored NetworkFactories are satisfying them so we don't
switch off a phone just because we're on wifi.

Note that this behavior isn't necessarily bad, just a policy change,
unexpected and unwanted.

bug:27340021
Change-Id: I10a8d66c4117cbcb5db898c47f7cbdb1e2beb45b
honeSwitcher.java
2a3e89598f9e79dc89a453d24161b9c6451c798e 25-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Ignore case in ONS when setting roaming" into mm-wireless-dev am: c34634fa2a
am: 7824c73128

* commit '7824c7312847d7367885501ac481c39c15edee3a':
Ignore case in ONS when setting roaming
7824c7312847d7367885501ac481c39c15edee3a 25-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Ignore case in ONS when setting roaming" into mm-wireless-dev
am: c34634fa2a

* commit 'c34634fa2aa3d76d5fcc5a6b3ace28a78c3aa145':
Ignore case in ONS when setting roaming
c34634fa2aa3d76d5fcc5a6b3ace28a78c3aa145 25-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Ignore case in ONS when setting roaming" into mm-wireless-dev
860cf5f92bb7aa0bf8ff12a13e79cc980c0db471 25-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> Fix ServiceStateTracker.pollState with radio-off. am: 7d592679b9
am: f3c2b6b93f

* commit 'f3c2b6b93f3e0b649a16c1f3a7cf4272aab7f649':
Fix ServiceStateTracker.pollState with radio-off.
4d57312df1bc062e63790f776a5f06faa3211d85 25-Feb-2016 Amit Mahajan <amitmahajan@google.com> Ignore case in ONS when setting roaming

When home vs roaming is decided, roaming could have been set
instead of home because isSameNamedOperators checked
if spn is equal to onsl and onss so something like this could
happen:
SPN=carrier vs ONS=carrier => home
SPN=Carrier vs ONS=carrier => roaming

Ignore case.

Bug: 26321337
Change-Id: I92a7b8b1ebdc22968a2856a6694d487607546303
erviceStateTracker.java
f3c2b6b93f3e0b649a16c1f3a7cf4272aab7f649 25-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> Fix ServiceStateTracker.pollState with radio-off.
am: 7d592679b9

* commit '7d592679b92a2fb35514193f2f95cd0138035050':
Fix ServiceStateTracker.pollState with radio-off.
7d592679b92a2fb35514193f2f95cd0138035050 18-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> Fix ServiceStateTracker.pollState with radio-off.

IWLAN change dropped the "break" line causing us to always send
another round of ril requests even when the radio is off.

Change-Id: If838438c742abb4056a64fc7ae30afd53e7e229e
erviceStateTracker.java
est/SimulatedCommands.java
1fd046ca1d23986f31159272a4355ef5727a4df0 24-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Unit test for GsmCdmaPhone (handling of messages rcvd on creation)" into mm-wireless-dev am: ab57df1198
am: d4d5c4cf2a

* commit 'd4d5c4cf2a49a413113febb9bf159906d0a47441':
Unit test for GsmCdmaPhone (handling of messages rcvd on creation)
75f7e5c004c78c40d08605439e2b85cab32bc5cf 24-Feb-2016 Amith Yamasani <yamasani@google.com> Merge "Optimizations for upstream calls" into nyc-dev
am: b09dd51e98

* commit 'b09dd51e9813fbacf6cbf3b14304f1db600d0899':
Optimizations for upstream calls
d4d5c4cf2a49a413113febb9bf159906d0a47441 24-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Unit test for GsmCdmaPhone (handling of messages rcvd on creation)" into mm-wireless-dev
am: ab57df1198

* commit 'ab57df1198ac3b7876e7c62a5c7a393e5bad3681':
Unit test for GsmCdmaPhone (handling of messages rcvd on creation)
b09dd51e9813fbacf6cbf3b14304f1db600d0899 24-Feb-2016 Amith Yamasani <yamasani@google.com> Merge "Optimizations for upstream calls" into nyc-dev
ab57df1198ac3b7876e7c62a5c7a393e5bad3681 24-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Unit test for GsmCdmaPhone (handling of messages rcvd on creation)" into mm-wireless-dev
14bdfdca7a5412edf5fbdd6573e0f608233a5ae8 24-Feb-2016 Amit Mahajan <amitmahajan@google.com> Unit test for GsmCdmaPhone (handling of messages rcvd on creation)

Includes access modifier cleanup in Phone

Bug: 25691379
Change-Id: If14eba8665f031c866a5d199078317d9d9e1291d
hone.java
MSDispatcher.java
est/SimulatedCommands.java
99a3e79b952978f781c1178010129231701e231b 22-Feb-2016 Brad Ebinger <breadley@google.com> Prevent spamming hold/unhold requests in SIP

Currently, the SipPhone class assumes that a hold/unhold request is
completed successfully and does not wait for the callback from the
SipAudioCall. Since the SipCall goes into the HOLDING state without
confirmation, an unhold request may be sent before the SipAudioCall
state machine completes its transition into the HOLDING state. If an
unhold is sent to the state machine before the request completes, the
state machine will move into an invalid state and create an error,
disconnecting the call.

Until the SIP telephony code can be refactored, a temporary solution
has been added that waits for a timeout to be reached before another
request can be sent to hold/unhold a call.

Bug: 18383178
Change-Id: I540a14c0709a97dc01ef0d26d8c41712dd8c8525
ip/SipPhone.java
7a4b7b44bc3a911715469a1d079bd8dbee158fcc 24-Feb-2016 fionaxu <fionaxu@google.com> ImsPhoneCallTracker Test
am: 75ba09a17a

* commit '75ba09a17a669f4906268088a769836aa87d8241':
ImsPhoneCallTracker Test
75ba09a17a669f4906268088a769836aa87d8241 19-Feb-2016 fionaxu <fionaxu@google.com> ImsPhoneCallTracker Test

bug: 25691379
Change-Id: Iaa258417cea39e82325fa812fc7b6fdce4bd5cfc
msphone/ImsPhone.java
msphone/ImsPhoneBase.java
msphone/ImsPhoneCallTracker.java
cdf88c789b01e7b98ef9c27c7ebc5050d217cf3f 24-Feb-2016 Tyler Gunn <tgunn@google.com> Merge "Inform registrants of which connection started or stopped the hold tone." into nyc-dev
am: f4d5de9849

* commit 'f4d5de98490b7b1a9dcea8df4e10a13315a71403':
Inform registrants of which connection started or stopped the hold tone.
f4d5de98490b7b1a9dcea8df4e10a13315a71403 24-Feb-2016 Tyler Gunn <tgunn@google.com> Merge "Inform registrants of which connection started or stopped the hold tone." into nyc-dev
c15be995d7293bab0c6f5fcc70604c247dc3c38a 23-Feb-2016 Pankaj Kanwar <pkanwar@google.com> Merge "Changing string in notification when data is blocked. b/25209821" into mm-wireless-dev am: 38ae1f3fe1
am: 67897e8bd1

* commit '67897e8bd1873b7476e414e59be04b0e04e65700':
Changing string in notification when data is blocked. b/25209821
67897e8bd1873b7476e414e59be04b0e04e65700 23-Feb-2016 Pankaj Kanwar <pkanwar@google.com> Merge "Changing string in notification when data is blocked. b/25209821" into mm-wireless-dev
am: 38ae1f3fe1

* commit '38ae1f3fe18087d3fa061b4065ceda3204fd6100':
Changing string in notification when data is blocked. b/25209821
38ae1f3fe18087d3fa061b4065ceda3204fd6100 23-Feb-2016 Pankaj Kanwar <pkanwar@google.com> Merge "Changing string in notification when data is blocked. b/25209821" into mm-wireless-dev
7d6d7d6cb68ee37b4bee33588ba2594e9cf0c197 23-Feb-2016 Jack Yu <jackyu@google.com> Fixed data retry issues.

1. Fixed that data retry does not happen on time. Now we use the
exact timer to make sure retry will happen on time.
2. Fixed that data retry timer got started twice every time when retry
should happen.

bug: 27293537, 27158552
Change-Id: I05bbf0cb2717269984f3dc892af2a7a438ffd8f0
etryManager.java
ataconnection/DataConnection.java
ataconnection/DcTesterDeactivateAll.java
ataconnection/DcTracker.java
est/SimulatedCommands.java
aeb6df6edf6902d1919bb712fd62bc10f1c623cc 19-Feb-2016 Amith Yamasani <yamasani@google.com> Optimizations for upstream calls

Have a way to check if there are any access rules worth checking.
Overload getCarrierPrivilegeStatus() to take a PackageInfo object
directly for use when a list of packages with signatures are available.

Bug: 27271861
Change-Id: I54f03093033fda3333d4ade9f0588044a35fd431
icc/UiccCard.java
icc/UiccCarrierPrivilegeRules.java
a6460a065dd3a6813e28e0325affd6750f417fd9 23-Feb-2016 Abhijith Shastry <ashastry@google.com> Merge "Switch BlockCheck to hidden API that suppresses blocking after emergency contact." into nyc-dev
am: a87e59d363

* commit 'a87e59d3634f58ad26fd15d0d1f426048535aedf':
Switch BlockCheck to hidden API that suppresses blocking after emergency contact.
a87e59d3634f58ad26fd15d0d1f426048535aedf 23-Feb-2016 Abhijith Shastry <ashastry@google.com> Merge "Switch BlockCheck to hidden API that suppresses blocking after emergency contact." into nyc-dev
7861c529f50a16dc33c0045592df25c39bbd90c3 22-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Fix bug when restoring operator info" into mm-wireless-dev am: b24d183c67
am: 560bdb5328

* commit '560bdb5328abcdecbbb32a437fffa23aab32b1e9':
Fix bug when restoring operator info
560bdb5328abcdecbbb32a437fffa23aab32b1e9 22-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Fix bug when restoring operator info" into mm-wireless-dev
am: b24d183c67

* commit 'b24d183c67bf164698149b54642090cdd0f69246':
Fix bug when restoring operator info
b24d183c67bf164698149b54642090cdd0f69246 22-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Fix bug when restoring operator info" into mm-wireless-dev
b9373f7f562c6f64b2a3ed3b20a7ca74fa81373a 22-Feb-2016 Tyler Gunn <tgunn@google.com> Merge "IMS: Initiate Video Lte and Wifi calls over IMS" into mm-wireless-dev am: 683a71848d
am: bfca7e6074

* commit 'bfca7e60747fe8d540478587f21be3106a561545':
IMS: Initiate Video Lte and Wifi calls over IMS
bfca7e60747fe8d540478587f21be3106a561545 22-Feb-2016 Tyler Gunn <tgunn@google.com> Merge "IMS: Initiate Video Lte and Wifi calls over IMS" into mm-wireless-dev
am: 683a71848d

* commit '683a71848d4ca2e153fb0c286793abbc436e7c99':
IMS: Initiate Video Lte and Wifi calls over IMS
8597332d611116fb7055d1e84149937f3cc822ec 22-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> Merge changes from topic \'DCT_refactor_nyc\' into nyc-dev
am: 7c6359fc07

* commit '7c6359fc07840f8ed59161a7caf51634115a5d7e':
Remove DctController
Create TelephonyNetworkFactory.
Make PhoneSwitcher class.
Create the new SubscriptionMonitor
683a71848d4ca2e153fb0c286793abbc436e7c99 22-Feb-2016 Tyler Gunn <tgunn@google.com> Merge "IMS: Initiate Video Lte and Wifi calls over IMS" into mm-wireless-dev
5d3ff3cf62037c91a72d9677e16a5a705f7a995d 05-Feb-2016 Omkar Kolangade <omkark@codeaurora.org> IMS: Initiate Video Lte and Wifi calls over IMS

If video call is enabled on a device i.e. if either video
over LTE or video over Wifi is supported and we are trying
to initiate a video call, initiate the call on IMS pipe.

Bug: 27254385
Change-Id: Ifebf69fc12d0148b21133cf9970481e970f2311e
smCdmaPhone.java
1fad11a91545bc35ce886195c07c5a74d8a47a88 22-Feb-2016 Amit Mahajan <amitmahajan@google.com> Fix bug when restoring operator info

When doing manual network search, framework stores the opertor info
including Long-operator name, Short-operator name, operator numeric (MCCMNC).
However, it saves these 3 parameters in a wrong sequence, thus lead to mess
of logic, it will cause manual network search failure occasionally.

Change-Id: Ia0c2e1f51ebffef5be7c0343937f79c93045b8a6
hone.java
85953e2a7e5bc75cf1f5353feee97b3993dad5b3 10-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> Remove DctController

Replaced by SubscriptionMonitor, PhoneSwitcher and TelephonyNetworkFactory.

Change-Id: I1b86349caf9ce43e27fac266d3b916669d29911e
honeFactory.java
roxyController.java
ataconnection/DcSwitchAsyncChannel.java
ataconnection/DcSwitchStateMachine.java
ataconnection/DcTracker.java
ataconnection/DctController.java
e9bf1f44cc6a888fff8419c8f35612d503ba3216 05-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> Create TelephonyNetworkFactory.

It replaces DctController. Also adds tests.

Change-Id: I7cff9197fe26dee3eb7df9be166b92e4c26e8970
honeFactory.java
honeSwitcher.java
roxyController.java
ubscriptionMonitor.java
ataconnection/ApnContext.java
ataconnection/DcTracker.java
ataconnection/TelephonyNetworkFactory.java
6bfc71d2b5340f6274b3e63926a7068e364fc9ff 28-Jan-2016 Robert Greenwalt <rgreenwalt@google.com> Make PhoneSwitcher class.

Monitors subscription->phone mapping, default subscription setting and
all mobile network requests to prioritize things, activate/deactivate phones
and also notify the curious about which phones are currently active.

Change-Id: I0ee67e6b05a5571b2f3c4e641823cf029420cb50
honeFactory.java
honeSwitcher.java
ataconnection/ApnContext.java
ataconnection/DcRequest.java
est/SimulatedCommands.java
7a477263108748903cf5a4151a4e8b739f12264a 16-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> Create the new SubscriptionMonitor

Add some unit tests too.

Change-Id: I9e40be14d61f8f43d6bd37915f0c2ab5b3bf8289
honeFactory.java
ubscriptionController.java
ubscriptionMonitor.java
7689ce9431fabd95e1abe1d78231e2117e059cd4 10-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> DO NOT MERGE - Remove DctController

Change-Id: I8d2c3b54b36f73b0a008876ce3633733f173f19e
honeFactory.java
roxyController.java
ataconnection/DcSwitchAsyncChannel.java
ataconnection/DcSwitchStateMachine.java
ataconnection/DcTracker.java
ataconnection/DctController.java
af5593594070f825032be46dced573cd195956e1 05-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> DO NOT MERGE - Create TelephonyNetworkFactory.

It replaces DctController. Also adds tests.

Change-Id: Ib2dd309bd9f87f9b9d4ca114440e6251c562e925
honeFactory.java
honeSwitcher.java
roxyController.java
ubscriptionMonitor.java
ataconnection/ApnContext.java
ataconnection/DcTracker.java
ataconnection/TelephonyNetworkFactory.java
bc2eba9036e430ea40a47ab708c0386fa567ec9c 28-Jan-2016 Robert Greenwalt <rgreenwalt@google.com> DO NOT MERGE - Make PhoneSwitcher class.

Monitors subscription->phone mapping, default subscription setting and
all mobile network requests to prioritize things, activate/deactivate phones
and also notify the curious about which phones are currently active.

Change-Id: I933876a018aebbbcfd86f48451d8b6e47646266e
honeFactory.java
honeSwitcher.java
ataconnection/ApnContext.java
ataconnection/DcRequest.java
est/SimulatedCommands.java
e5e4b94927937ac5cbc83ac577d4a572fa412784 16-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> DO NOT MERGE - Create the new SubscriptionMonitor

Add some unit tests too.

Change-Id: I2b8d36ccd254a8b6743137dcc8593fb8171de6d3
honeFactory.java
ubscriptionController.java
ubscriptionMonitor.java
8d01f92026c98b4fb235e70555c57261ea01e02f 19-Feb-2016 Abhijith Shastry <ashastry@google.com> Switch BlockCheck to hidden API that suppresses blocking after emergency contact.

BUG: 26989170
Change-Id: Ib6b4f5e41b28fab9d81417d068e6e8e7deb48bbc
lockChecker.java
bee1df883d3770c0edc5c171435641a82c9e8a81 18-Feb-2016 Raph Levien <raph@google.com> Finer grained character boundaries in computing SMS fragment lengths

The standard Java character iterator has potentially unbounded
distance between character boundaries, meaning that when breaking an
SMS message into fragments it's not safe to assume that the fragment
will contain such a boundary. This patch special-cases flags (pairs of
Regional Indicator Symbols) and also guarantees some progress in the
case of no boundary found.

Bug: 26210851
Change-Id: Ic16637a834af0dfe40197fbcdb3471c1bf5cd6d2
msMessageBase.java
610d54e99a6387ebfed40dd53463d269f9fdec09 19-Feb-2016 Jack Yu <jackyu@google.com> First DcTracker unit test case. am: 27b650c406
am: 468dcf57c0

* commit '468dcf57c026a5eebac700479b518ed8c35f4c6b':
First DcTracker unit test case.
468dcf57c026a5eebac700479b518ed8c35f4c6b 19-Feb-2016 Jack Yu <jackyu@google.com> First DcTracker unit test case.
am: 27b650c406

* commit '27b650c406018355a88a41528db7859e232728a0':
First DcTracker unit test case.
27b650c406018355a88a41528db7859e232728a0 18-Feb-2016 Jack Yu <jackyu@google.com> First DcTracker unit test case.

bug: 25691379
Change-Id: Ic091ae4d92d0ef1f3eaa9b3d0736545edb2f359f
ataconnection/DcTracker.java
est/SimulatedCommands.java
df713b330ac4a95ec43d4a3eadd4713d6aed6c0f 19-Feb-2016 Amit Mahajan <amitmahajan@google.com> New unit tests for InboundSmsHandler.
am: 27f471647b

* commit '27f471647b2da3ff50620a766c048ebef8d45ae1':
New unit tests for InboundSmsHandler.
27f471647b2da3ff50620a766c048ebef8d45ae1 18-Feb-2016 Amit Mahajan <amitmahajan@google.com> New unit tests for InboundSmsHandler.

Bug: 25691379
Change-Id: I5fcbc95467cc7bd75f3f8a7da42c3814c1d2dac8
nboundSmsHandler.java
elephonyComponentFactory.java
dma/CdmaInboundSmsHandler.java
ad03bd3454a9dd0e8edb61b8794f07d8a26f8187 18-Feb-2016 Tyler Gunn <tgunn@google.com> Inform registrants of which connection started or stopped the hold tone.

When receiving a hold tone signal and informing registrants via
startOnHoldTone/stopOnHoldTone, also include the connection which initiated
the start/stop. This is necessray to ensure only the TelephonyConnection
which initiated a hold tone issues a Connection Event.

Bug: 25357778
Change-Id: I1590b61affb28c40173f08a8f6233d8efe6a5e6e
msphone/ImsPhoneBase.java
msphone/ImsPhoneCallTracker.java
69ef3a70a6503aec158ee1dfb87bafd2a28b986c 18-Feb-2016 Chen Xu <fionaxu@google.com> Merge "ImsPhoneConnection Unit Test" into mm-wireless-dev am: 0c0e3fa5a5
am: b456cd0d47

* commit 'b456cd0d4709a7a4d6eb7f35394ebba00895b133':
ImsPhoneConnection Unit Test
b456cd0d4709a7a4d6eb7f35394ebba00895b133 18-Feb-2016 Chen Xu <fionaxu@google.com> Merge "ImsPhoneConnection Unit Test" into mm-wireless-dev
am: 0c0e3fa5a5

* commit '0c0e3fa5a512ef858a0713bb2d4320ad05968b3a':
ImsPhoneConnection Unit Test
0c0e3fa5a512ef858a0713bb2d4320ad05968b3a 18-Feb-2016 Chen Xu <fionaxu@google.com> Merge "ImsPhoneConnection Unit Test" into mm-wireless-dev
f9b150b221db15e88b97a0b9c0971ca3c71c0313 17-Feb-2016 fionaxu <fionaxu@google.com> ImsPhoneConnection Unit Test

bug: 25691379

Change-Id: I97709053f4f1265646c4b8a03c314b3fc88caf4a
msphone/ImsPhoneBase.java
msphone/ImsPhoneCall.java
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
89edc00dd111426b2ab5fe11069aeb6972912ab0 17-Feb-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Additions to ril wakelock symantics." into mm-wireless-dev am: c629786a69
am: eccaa0cfb4

* commit 'eccaa0cfb4c553b3f244edbaf0b2db93b7e839ab':
Additions to ril wakelock symantics.
eccaa0cfb4c553b3f244edbaf0b2db93b7e839ab 17-Feb-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Additions to ril wakelock symantics." into mm-wireless-dev
am: c629786a69

* commit 'c629786a6945942c286e513e36dd6a7e44e37771':
Additions to ril wakelock symantics.
c629786a6945942c286e513e36dd6a7e44e37771 17-Feb-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Additions to ril wakelock symantics." into mm-wireless-dev
a05275d90833d2ff26a2571e2cc0f2ea91fd2b43 17-Feb-2016 Sanket Padawe <sanketpadawe@google.com> Additions to ril wakelock symantics.

+ Add logs for ack
+ Use different wakelock instance for ack sent.
+ Send ack only for unsolicited messages which have taken wakelock in ril.cpp

Bug: 22127517

Change-Id: I74767ae788d7cba9aeedbfdf7e00746565c7fdc1
IL.java
dd6b98fbe79c46648c28602d017a42b780786735 17-Feb-2016 Bill Yi <byi@google.com> Merge commit '4a34069a9eed8557eb905b8bcb6a46f5524d5b20' into HEAD
4d6e927a64e40273f1ac649a0733406468258825 17-Feb-2016 Nathan Harold <nharold@google.com> Merge "Update Band Mode Constants" into mm-wireless-dev am: 285d26b2ec
am: 11407cfeb7

* commit '11407cfeb70da38e29bd92151846b133216b81a0':
Update Band Mode Constants
11407cfeb70da38e29bd92151846b133216b81a0 17-Feb-2016 Nathan Harold <nharold@google.com> Merge "Update Band Mode Constants" into mm-wireless-dev
am: 285d26b2ec

* commit '285d26b2ec02c39c264f5acabe40c533eca4d1c2':
Update Band Mode Constants
285d26b2ec02c39c264f5acabe40c533eca4d1c2 17-Feb-2016 Nathan Harold <nharold@google.com> Merge "Update Band Mode Constants" into mm-wireless-dev
a1df79bc8becf102dd32ce21e648225185734d66 17-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Updates to InboundSmsHandler tests and sendOrderedBroadcast support" into nyc-dev
am: 41700dcc15

* commit '41700dcc15f0e9d31ba94422c47243ff432aa372':
Updates to InboundSmsHandler tests and sendOrderedBroadcast support
84a01f2e8ea1cb5b8d4e2346b530a35aaf48a12a 16-Feb-2016 Omkar Kolangade <omkark@codeaurora.org> IMS-VT: Update videoProvider in main thread am: ee275ae7d4
am: f066553c79

* commit 'f066553c79b2c022a238037f7182e4d60193375d':
IMS-VT: Update videoProvider in main thread
41700dcc15f0e9d31ba94422c47243ff432aa372 16-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Updates to InboundSmsHandler tests and sendOrderedBroadcast support" into nyc-dev
f066553c79b2c022a238037f7182e4d60193375d 16-Feb-2016 Omkar Kolangade <omkark@codeaurora.org> IMS-VT: Update videoProvider in main thread
am: ee275ae7d4

* commit 'ee275ae7d45847e3eb84ce7725df3717d3addee3':
IMS-VT: Update videoProvider in main thread
ee275ae7d45847e3eb84ce7725df3717d3addee3 20-Nov-2015 Omkar Kolangade <omkark@codeaurora.org> IMS-VT: Update videoProvider in main thread

Setting video provider in seperate thread is causing timing
issues due to which media signalling is happening on
video provider of closed session. So, process merge complete
indication after video provider is updated to ensure that
media signalling happens on video provider attached with
conference imscallsession.

Bug: 27170551
Change-Id: I9a5ca67402effbf22135addcbd3be240d36669b8
msphone/ImsPhoneCallTracker.java
05ce040e990b396a4273dc9c8efde364a2afb5bc 12-Feb-2016 Amit Mahajan <amitmahajan@google.com> Updates to InboundSmsHandler tests and sendOrderedBroadcast support

Bug: 25691379

Change-Id: I49b06a5223f1e9693e747282f7a83a1322bb887f
nboundSmsTracker.java
2ff12ad3c8be78a3c9f284dd1961c2d17cb69183 16-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge changes Ic8e5b8c9,I08edb714 into mm-wireless-dev am: 7efd41c8db
am: 0c342d95e0

* commit '0c342d95e06f85fa56e576025ebcf4f70bc04d67':
Unit tests for CallForwardingOption in GsmCdmaPhone
Support for storing voicemail count for multi-sim.
0c342d95e06f85fa56e576025ebcf4f70bc04d67 16-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge changes Ic8e5b8c9,I08edb714 into mm-wireless-dev
am: 7efd41c8db

* commit '7efd41c8dbd2822c53bfddeb10a612c916a7daff':
Unit tests for CallForwardingOption in GsmCdmaPhone
Support for storing voicemail count for multi-sim.
7efd41c8dbd2822c53bfddeb10a612c916a7daff 16-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge changes Ic8e5b8c9,I08edb714 into mm-wireless-dev

* changes:
Unit tests for CallForwardingOption in GsmCdmaPhone
Support for storing voicemail count for multi-sim.
2d6df73e3bebb7d6aebd628730b9d20b23f1637a 11-Feb-2016 Amit Mahajan <amitmahajan@google.com> Unit tests for CallForwardingOption in GsmCdmaPhone

Bug: 25691379
Change-Id: Ic8e5b8c96d93f9c3a09b0a2f7a22e9357372ba9c
est/SimulatedCommands.java
aaa1c3a12afceacce3648abebdbf00fec2f8cc8b 13-Feb-2016 pkanwar <pkanwar@google.com> Changing string in notification when data is blocked.
b/25209821

Change-Id: Ifb1609ad8b8da87eef1511944214be04e6f5d6f5
erviceStateTracker.java
c823b11be1844c5ef7c5a660a97e60ae6b899229 13-Feb-2016 Chen Xu <fionaxu@google.com> Merge "Subscription related Unit test with code cleanup" into mm-wireless-dev am: 3d141ae13b
am: 2cc7f47624

* commit '2cc7f4762438942b0c6b098fa9bd248c29fbd471':
Subscription related Unit test with code cleanup
2cc7f4762438942b0c6b098fa9bd248c29fbd471 13-Feb-2016 Chen Xu <fionaxu@google.com> Merge "Subscription related Unit test with code cleanup" into mm-wireless-dev
am: 3d141ae13b

* commit '3d141ae13bb5b109f831c16bfd886cfef649958e':
Subscription related Unit test with code cleanup
3d141ae13bb5b109f831c16bfd886cfef649958e 13-Feb-2016 Chen Xu <fionaxu@google.com> Merge "Subscription related Unit test with code cleanup" into mm-wireless-dev
35b0a8a40df77125a319d52fb25b0114d922be30 12-Feb-2016 Nathan Harold <nharold@google.com> Update Band Mode Constants

Bug: 27145805
Change-Id: I81a4855663818dab0f76ae2dc2af3a201ccf172c
honeInternalInterface.java
655bae990bdd7e4584491def4d30692e6173779c 11-Feb-2016 fionaxu <fionaxu@google.com> Subscription related Unit test with code cleanup

bug: 25691379

Change-Id: Ib31b34b3d1116cf714717f5742095de7aa4c0a13
ubscriptionController.java
aa4e815a99f6aa49f7d2244a45aa3ec5dbef1b11 12-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Telephony: CDMA: allow MT SMS when in ECBM" into mm-wireless-dev am: 5684a737ec
am: 3e313f1281

* commit '3e313f1281df7c69eccfb5d7448a8a3dead85580':
Telephony: CDMA: allow MT SMS when in ECBM
3e313f1281df7c69eccfb5d7448a8a3dead85580 12-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Telephony: CDMA: allow MT SMS when in ECBM" into mm-wireless-dev
am: 5684a737ec

* commit '5684a737ec9a2210c0c8633d463388daff69bb06':
Telephony: CDMA: allow MT SMS when in ECBM
5684a737ec9a2210c0c8633d463388daff69bb06 12-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Telephony: CDMA: allow MT SMS when in ECBM" into mm-wireless-dev
97b3c4e45f156d8d5ae25a32357c9b31e018da32 10-Feb-2016 Amit Mahajan <amitmahajan@google.com> Support for storing voicemail count for multi-sim.

Bug: 18108420
Change-Id: I08edb714b839b44472b3b7a4d0aba287da2969d3
smCdmaPhone.java
nboundSmsHandler.java
hone.java
erviceStateTracker.java
dma/CdmaInboundSmsHandler.java
sm/GsmInboundSmsHandler.java
dc31e8326bce55aa62af49b8b80be68caa2036f5 11-Feb-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Add OEM specific error code space which can by used to replace Generic errors." into mm-wireless-dev am: fd063e7716
am: 4781339206

* commit '47813392065eab45b4ec5036fd54f5ecc392b715':
Add OEM specific error code space which can by used to replace Generic errors.
47813392065eab45b4ec5036fd54f5ecc392b715 11-Feb-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Add OEM specific error code space which can by used to replace Generic errors." into mm-wireless-dev
am: fd063e7716

* commit 'fd063e7716f8e2eaed618d67cb1b0d03789befd3':
Add OEM specific error code space which can by used to replace Generic errors.
fd063e7716f8e2eaed618d67cb1b0d03789befd3 11-Feb-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Add OEM specific error code space which can by used to replace Generic errors." into mm-wireless-dev
2d23ed780498ed7e7365235825753c7daf0dd5e9 11-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Change to move postDial related info up to parent Connection class." into mm-wireless-dev am: 9af2d6870b
am: 9a63a4470a

* commit '9a63a4470a3cd7e6db47d9856db2e698e17bdab3':
Change to move postDial related info up to parent Connection class.
9a63a4470a3cd7e6db47d9856db2e698e17bdab3 11-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Change to move postDial related info up to parent Connection class." into mm-wireless-dev
am: 9af2d6870b

* commit '9af2d6870b662c84ae521944ac054c583a7b4cf6':
Change to move postDial related info up to parent Connection class.
9af2d6870b662c84ae521944ac054c583a7b4cf6 10-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Change to move postDial related info up to parent Connection class." into mm-wireless-dev
de2d31f4469812ed3194844772881259e719eda4 10-Feb-2016 Amit Mahajan <amitmahajan@google.com> resolve merge conflicts of 3ece113cce to nyc-dev.
am: 85c521be47

* commit '85c521be473eb6745375076fbcec93bac2331833':
Update voicemail number related unit test.
85c521be473eb6745375076fbcec93bac2331833 10-Feb-2016 Amit Mahajan <amitmahajan@google.com> resolve merge conflicts of 3ece113cce to nyc-dev.

Change-Id: Iebb82d498d6e203376e2abd25f51ef5092529035
eb1c2a0f325fd248169a967a26f242cd10d53620 10-Feb-2016 Ji Yang <yangji@google.com> Send EVENT_START_ACCEPTING_SMS to all inbound SMS handlers.
am: dc7411e9fc

* commit 'dc7411e9fc8ac029a7bad8b85b0f24642a1774b6':
Send EVENT_START_ACCEPTING_SMS to all inbound SMS handlers.
dc7411e9fc8ac029a7bad8b85b0f24642a1774b6 10-Feb-2016 Ji Yang <yangji@google.com> Send EVENT_START_ACCEPTING_SMS to all inbound SMS handlers.

BUG: 26871989.

Change-Id: I077b9b43d63dcbfca4a58596151bc3c0ea761738
msBroadcastUndelivered.java
3ece113cce3947feb2a7236b17f0acdd5c6286bb 10-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Update voicemail number related unit test." into mm-wireless-dev
153077e0b2d9ff6f115a0739dac1d64931bffb91 10-Feb-2016 Amit Mahajan <amitmahajan@google.com> Update voicemail number related unit test.

Bug: 25691379
Change-Id: Ia80a455c99a21f50348d9ca3ef2b3e69179c93e7
icc/IsimUiccRecords.java
icc/RuimRecords.java
2225b2929a93497e56a4328b5985995d298ec768 10-Feb-2016 Sanket Padawe <sanketpadawe@google.com> Set user callback message in setInitialAttachApn am: 4d3af373fc
am: e7374e46d7

* commit 'e7374e46d72d3298e695eb4067895d1779a2f969':
Set user callback message in setInitialAttachApn
e7374e46d72d3298e695eb4067895d1779a2f969 10-Feb-2016 Sanket Padawe <sanketpadawe@google.com> Set user callback message in setInitialAttachApn
am: 4d3af373fc

* commit '4d3af373fc074bdde5e6ceb521b5e7e19bbbd8ae':
Set user callback message in setInitialAttachApn
4d3af373fc074bdde5e6ceb521b5e7e19bbbd8ae 10-Feb-2016 Sanket Padawe <sanketpadawe@google.com> Set user callback message in setInitialAttachApn

Set user callback message in setInitialAttachApn instead of
setting null

Bug: 22849023

Change-Id: I576ac109ef8230e91b075770f3da97f08f1744d0
IL.java
95c9fed62e498b8ce83f3890c2e78ba8305f14cb 25-Jan-2016 Ajay Nambi <anambi@codeaurora.org> Telephony: CDMA: allow MT SMS when in ECBM

Currently CDMA telephony ignores MT SMS when phone is in Emergency
Callback Mode (ECBM), so app layer won't be able to receive SMS. This
may not be desired when a carrier requires app to receive MT SMS in
ECBM. This change allows ECBM MT SMS from ril on telephony side.

Change-Id: I43cd4fd97bdede931864ef29cfc65c7e0573c022
dma/CdmaInboundSmsHandler.java
2a0190cd8f508eae1a1a9653fe7dd3143c324708 10-Feb-2016 Tyler Gunn <tgunn@google.com> Merge "Fix issue where mSwitchingFgAndBgCalls was not cleared after swap." into nyc-dev
am: c871e25bc8

* commit 'c871e25bc84b7726adf8d7a37ac6ed6c62fef425':
Fix issue where mSwitchingFgAndBgCalls was not cleared after swap.
c871e25bc84b7726adf8d7a37ac6ed6c62fef425 09-Feb-2016 Tyler Gunn <tgunn@google.com> Merge "Fix issue where mSwitchingFgAndBgCalls was not cleared after swap." into nyc-dev
0ae749285976deff6f73db0d414f36548c5682b3 09-Feb-2016 Tyler Gunn <tgunn@google.com> Fix issue where mSwitchingFgAndBgCalls was not cleared after swap.

The mSwitchingFgAndBgCalls flag is used when performing a call swap along
with mCallExpectedToResume to determine if if the call swap was successful.
The existing code in onCallResumed handled the case where the wrong call
has resumed, which indicates that the swap failed. It did not, however
handle the case where the call which was expected to resume did resume.
In this case the mSwitchingFgAndBgCalls was left set to TRUE.

In the case of this bug, after 2 swaps, a remotely disconnected fg call
would cause the bg call to auto-resume, which it should not. This is due
to the fact the mSwitchingFgAndBgCalls flag was left TRUE from the last
swap.

Bug: 26115831
Change-Id: I934f2eff54365b5e92b56299a6692857faf617bf
msphone/ImsPhoneCallTracker.java
5c28eab944bedd9860375b99862d91e134753b4f 09-Feb-2016 Amit Mahajan <amitmahajan@google.com> New unit test for GsmCdmaPhone and fixes for some existing tests
am: 306ab2c93d

* commit '306ab2c93d1a1102c3029fd95e2c586a0f82091e':
New unit test for GsmCdmaPhone and fixes for some existing tests
306ab2c93d1a1102c3029fd95e2c586a0f82091e 09-Feb-2016 Amit Mahajan <amitmahajan@google.com> New unit test for GsmCdmaPhone and fixes for some existing tests

Bug: 25691379
Change-Id: I323fdef84792459db312df7bd58917e52a1a995e
smCdmaPhone.java
9d9fbd051bf607147fe1064d6016c118b2b28dc5 09-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix getActiveSubscriptionInfoForIccId iccId comparison"
am: af300d9c18

* commit 'af300d9c18ddf6d780d8708f3a4f2af2864b0437':
Fix getActiveSubscriptionInfoForIccId iccId comparison
9b50e7a6c040523e99ca5d997bd1fd3d95b40d0f 09-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix check of the size of the alpha identifier"
am: 52d980e681

* commit '52d980e681ae3a2e01545f78f8a3d328d256abd7':
Fix check of the size of the alpha identifier
cd3800ef6d32f5173e647924620501f7b5fcdb3f 09-Feb-2016 Sanket Padawe <sanketpadawe@google.com> Add OEM specific error code space which can by used to replace Generic errors.

BUG=27038563

Change-Id: Iecd3d3d5301b1ad924936c8fbfa300964d5cc200
ommandException.java
ataconnection/DcFailCause.java
af300d9c18ddf6d780d8708f3a4f2af2864b0437 09-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix getActiveSubscriptionInfoForIccId iccId comparison"
abb3502255794a3ae7631b77fc23367a68f0c952 09-Feb-2016 Brian Carlstrom <bdc@google.com> Revert "New unit test for GsmCdmaPhone and fixes for some existing tests"

This reverts commit a57aed75dc5d8546afd8b88eab11cc5591068b69, reversing
changes made to eaa22b28cdb10244865e8d163c19ff27d0c9c5e2.
smCdmaPhone.java
a57aed75dc5d8546afd8b88eab11cc5591068b69 09-Feb-2016 Amit Mahajan <amitmahajan@google.com> New unit test for GsmCdmaPhone and fixes for some existing tests
am: 7886780382

* commit '78867803826b15ff95c8ee8c7c6f65dfb7ad258f':
New unit test for GsmCdmaPhone and fixes for some existing tests
78867803826b15ff95c8ee8c7c6f65dfb7ad258f 09-Feb-2016 Amit Mahajan <amitmahajan@google.com> New unit test for GsmCdmaPhone and fixes for some existing tests

Bug: 25691379
Change-Id: I323fdef84792459db312df7bd58917e52a1a995e
smCdmaPhone.java
e20cc9c9d7c77b93b3e9df1f6d05d1c0481d4bdb 08-Feb-2016 Chen Xu <fionaxu@google.com> Merge "handle diff systemproperties to fix Test failures" into mm-wireless-dev
am: 3166507c08

* commit '3166507c08e05fc6e8cef024705f1a710e9ce0e2':
handle diff systemproperties to fix Test failures
3166507c08e05fc6e8cef024705f1a710e9ce0e2 08-Feb-2016 Chen Xu <fionaxu@google.com> Merge "handle diff systemproperties to fix Test failures" into mm-wireless-dev
b9d551db1795b30598e2ce98cfae7106788c12d6 05-Feb-2016 fionaxu <fionaxu@google.com> handle diff systemproperties to fix Test failures

BUG=25691379

Change-Id: I13c079a26dc1c1a971471bef55770b97d489e39f
est/SimulatedCommands.java
83d54a44ffbd19bb35599fb6483233e1e3751852 19-Jan-2016 Yuta Ui <yuta.x.ui@sonymobile.com> Fix check of the size of the alpha identifier

This change fixes an issue that FDN number is unexpectedly overwritten
by wrongly encoded FDN name. The issue can happen if user enter FDN name
which contains multibyte character.

That is because AdnRecord does not check the length of the alpha
identifier correctly. mAlphaTag.length() does not return the size of the
alpha identifier but returns the number of characters.

Change-Id: I109a01eea6519a6a09a8bf7a143eaafd8c04025e
icc/AdnRecord.java
3176d2b5ad62bc72437c4880d7929a5d0670ade4 27-Jan-2016 Jonas Claeson <jonas.claeson@sonymobile.com> Fix getActiveSubscriptionInfoForIccId iccId comparison

The function compared references instead of strings.

Introduced by:

commit c22e8507402956a747469208bd1aa43dbd683e21
Author: Svet Ganov <svetoslavganov@google.com>
Date: Wed Apr 22 13:09:14 2015 -0700

Change-Id: Ib5bb464f708ff548588c2af30e14ea559cf45333
ubscriptionController.java
98dabb4505f072a7997ded2a1db47748f5032485 05-Feb-2016 Amit Mahajan <amitmahajan@google.com> Unit test for WapPushOverSms
am: 60a81bdb47

* commit '60a81bdb47cf64972c8edf5b0c51e8059765e5a0':
Unit test for WapPushOverSms
60a81bdb47cf64972c8edf5b0c51e8059765e5a0 28-Jan-2016 Amit Mahajan <amitmahajan@google.com> Unit test for WapPushOverSms

Bug: 25691379
Change-Id: I26eebb8711c9369c5ab85e740254a86483125bf5
elephonyComponentFactory.java
apPushOverSms.java
b2f7e96a44601bcb79aaeaf9de4170a05373c3f8 05-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Do not accept incoming SMS when device is in cryptkeeper."
250eb25b03c992049bff818c4762c45b44110fb4 17-Feb-2014 Fredrik Henricsson <fredrik.henricsson@sonymobile.com> Do not accept incoming SMS when device is in cryptkeeper.

When an SMS message is received while the user is making an
emergency call from the Cryptkeeper screen, all incoming SMS
messages will be lost. This fix results in the device responding
to the network that the SMS message could not be delivered.

Explanation:
When a user makes a call from the Cryptkeeper screen there is no
broadcast receiver that can handle the incoming message. In this case
telephony will try to persist the message in the database, but as the
phone is encrypted it silently fails, while responding to the network
that the message has been received and processed.

Bug: 26981948
Change-Id: Ib3f7e749b7734a5957383b03049a7a5b463915f4
nboundSmsHandler.java
dma/CdmaInboundSmsHandler.java
a239d9cc29b24fe23ede09e3a5ed774a6ef459c0 05-Feb-2016 Nathan Harold <nharold@google.com> Merge "Obfuscate the ICCID in addSubInfoRecord()"
e1eef7656d072baac2a2baee08363dc2b8f960dc 05-Feb-2016 Nathan Harold <nharold@google.com> Obfuscate the ICCID in addSubInfoRecord()

Bug: 26989987
Change-Id: I18b1e556eb6c37442c870155299f5f30a2a2c603
ubscriptionController.java
2bbdc86ba710b7d7263f28cb7ca01592bd8b439c 05-Feb-2016 Jack Yu <jackyu@google.com> Added FDN handling in AdnRecordLoader class.
am: 3c9400dc00

* commit '3c9400dc00a58004f55effe34de8a751659bf567':
Added FDN handling in AdnRecordLoader class.
3c9400dc00a58004f55effe34de8a751659bf567 29-Jun-2015 Jack Yu <jackyu@google.com> Added FDN handling in AdnRecordLoader class.

bug: 21851547
Change-Id: Ibfc12a872a7643013ff207641f2254af3d24b3cd
icc/IccFileHandler.java
032d73c15281387a97cdb91c6f0c7c3a1b1b230e 04-Feb-2016 Amit Mahajan <amitmahajan@google.com> Change to move postDial related info up to parent Connection class.

This is so that it can be easily migrated between different phone
types.

Bug: 24146109
Change-Id: I14c8016426d86e655b9ed3ed1dbc3c1eba4ede8f
onnection.java
smCdmaConnection.java
msphone/ImsPhoneConnection.java
ip/SipConnectionBase.java
e9c269de6e4db5889ae11d5b853b35b51becf87b 04-Feb-2016 Chen Xu <fionaxu@google.com> Merge "UICC card and UICC controller Unit test mergeback"
81ac1628af572ffc3f3bd466327754e56fca5e92 04-Feb-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Add new error codes to CommandException.java" into mm-wireless-dev
am: 3ff5bef0e7

* commit '3ff5bef0e79c92d0e888b09d0289ba1878e0dc61':
Add new error codes to CommandException.java
3ff5bef0e79c92d0e888b09d0289ba1878e0dc61 04-Feb-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Add new error codes to CommandException.java" into mm-wireless-dev
6fa55254bb98131d8aff306f27c0c86410c3349e 04-Feb-2016 Sanket Padawe <sanketpadawe@google.com> Add new error codes to CommandException.java

Bug: 23216719
Change-Id: Id5ba0c2005e172794212d9e9b6e7166e6df8127b
ommandException.java
0a589b526040a348782f64b04084cb5fa955ff3e 01-Feb-2016 fionaxu <fionaxu@google.com> UICC card and UICC controller Unit test mergeback

BUG=25691379

Change-Id: Iefb6c01b6cbb7544f4a5a06ef3a44e0c0dcc89b8
est/SimulatedCommands.java
c0b04ba6904d774e929645c95f7b85aebccff4df 04-Feb-2016 Ed Heyl <edheyl@google.com> revert fc8b5386 and 9bf2a929; broke the build.

Change-Id: I3a2dc4cded1cd6572e21994cb6da3e7e7bbc3502
est/SimulatedCommands.java
08de0e2dd4414051a3ac28907a5e22ed19f6ff83 04-Feb-2016 Chen Xu <fionaxu@google.com> Merge "UICC card and UICC controller Unit test" into mm-wireless-dev
am: ffe9936d2d

* commit 'ffe9936d2dc65d0a84c309cb8292680328d98018':
UICC card and UICC controller Unit test
ffe9936d2dc65d0a84c309cb8292680328d98018 04-Feb-2016 Chen Xu <fionaxu@google.com> Merge "UICC card and UICC controller Unit test" into mm-wireless-dev
80366f5ff8b0b653f2544ddc582628b1f447f39d 04-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Cleanup the StateMachine thread during RilMessageDecoder dispose." into mm-wireless-dev
am: 73cd461e0c

* commit '73cd461e0cdf8870b017e37d738d9a93eeba2de6':
Cleanup the StateMachine thread during RilMessageDecoder dispose.
73cd461e0cdf8870b017e37d738d9a93eeba2de6 04-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Cleanup the StateMachine thread during RilMessageDecoder dispose." into mm-wireless-dev
a56b6d1a581ebd4b6356a879308f77d30dcbb16d 22-Sep-2014 Rakesh Pallerla <rakeshp@qti.qualcomm.com> Cleanup the StateMachine thread during RilMessageDecoder dispose.

Currently the dispose() method in RilMessageDecoder wont stop the
state machine thread, and each time a new state Machine thread is
created which causes the file descriptor leakage.

Add quitNow() method in dispose() of RilMessageDecoder to stop the
state machine thread.

bug:22992703
Change-Id: I83f773adf7f5fc0b82abf912f2db7fec8a0aa87b
at/RilMessageDecoder.java
722b1b5403842bf0595ba8c11e7f01fdb9844518 04-Feb-2016 Abhijith Shastry <ashastry@google.com> Catch all PDU parsing errors so that the phone process does not crash on invalid PDU's.

BUG: 26918719
Change-Id: I6286d17b2e2bd9f6fd0cb18d0cfd217f1055eacf
apPushOverSms.java
90e3fedce79c37345d8bdb846dcbf1bbef94768c 04-Feb-2016 Jack Yu <jackyu@google.com> Merge "Fix the neighboring CID on GSM(GPRS) network." into mm-wireless-dev
am: 716376f58f

* commit '716376f58f1ab675f56b967323d8073b4cf5be40':
Fix the neighboring CID on GSM(GPRS) network.
716376f58f1ab675f56b967323d8073b4cf5be40 04-Feb-2016 Jack Yu <jackyu@google.com> Merge "Fix the neighboring CID on GSM(GPRS) network." into mm-wireless-dev
66fb0378fd913dfe564c8e31b5ef379592242615 04-Feb-2016 Jack Yu <jackyu@google.com> Fix the neighboring CID on GSM(GPRS) network.

Set the data network type system properties with the correct RAT.

bug: 26956224
Change-Id: I2a046c3974930c25a2fb3c98cbfef76b83a0d8a3
erviceStateTracker.java
est/SimulatedCommands.java
71254c78051fc5e1ed204e99efceeec2a42287f8 03-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Unit tests for GsmCdmaPhone." into mm-wireless-dev
am: ac529d09c1

* commit 'ac529d09c18fdec5a9a186b025aa2047dff5a0e4':
Unit tests for GsmCdmaPhone.
ac529d09c18fdec5a9a186b025aa2047dff5a0e4 03-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Unit tests for GsmCdmaPhone." into mm-wireless-dev
32b5fbb1a340fa16e2c37c276517ef10a4934500 03-Feb-2016 Amit Mahajan <amitmahajan@google.com> Unit tests for GsmCdmaPhone.

Also creating abstract class TelephonyTest that can be extended
by other unit tests.

Bug: 25691379
Change-Id: I9437642a0bab68c6b573954e587181ff7d04d217
smCdmaCallTracker.java
smCdmaPhone.java
erviceStateTracker.java
est/SimulatedCommands.java
967ead0803034a873559d06e38c2f4104b7e46a1 03-Feb-2016 Jack Yu <jackyu@google.com> Merge "Added SMS number conversion unit tests." into mm-wireless-dev
am: d4d52e2ba0

* commit 'd4d52e2ba02224f53a5759b262614a06eb1c2d2c':
Added SMS number conversion unit tests.
d4d52e2ba02224f53a5759b262614a06eb1c2d2c 03-Feb-2016 Jack Yu <jackyu@google.com> Merge "Added SMS number conversion unit tests." into mm-wireless-dev
76ab58dd7f833c4cf275f778abae8bf3ed9227c0 02-Feb-2016 Jack Yu <jackyu@google.com> Added SMS number conversion unit tests.

Added unit test cases for 12 different types of number conversion.
Also deleted a non-valid service state tracker test.

bug: 25691379
Change-Id: I72afe8bf30237e10cc760b195d983c732210cdfa
msNumberUtils.java
4d08cf9c93ee762a345aa64c292ca065aa5e51c2 03-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Unit test for CdmaInboundSmsHandler" into mm-wireless-dev
am: 73ea88040f

* commit '73ea88040f7b17b3d0799c5918349adb68df3902':
Unit test for CdmaInboundSmsHandler
52f23cd068ffc05a2aaa101472d36a2861e55f29 27-Jan-2016 Amit Mahajan <amitmahajan@google.com> Unit test for CdmaInboundSmsHandler

Bug: 25691379
Change-Id: I523a9ccace6e00d4865cd682f242ed5a1d7e9afe
nboundSmsHandler.java
dma/SmsMessage.java
9bf2a9297d37cdba05b023189c7a10357d8b0eee 01-Feb-2016 fionaxu <fionaxu@google.com> UICC card and UICC controller Unit test

BUG=25691379

Change-Id: Iefb6c01b6cbb7544f4a5a06ef3a44e0c0dcc89b8
est/SimulatedCommands.java
14f6f4a9cf75a64346e9e2967b2e8d56228b3d71 03-Feb-2016 Amit Mahajan <amitmahajan@google.com> Handle EVENT_CHECK_REPORT_GPRS only for GSM.
am: 3f0470d534

* commit '3f0470d534641b1c2e2da720516261852a95a36e':
Handle EVENT_CHECK_REPORT_GPRS only for GSM.
b4a8cf80a4b329658228adbd6399c72487dfabfb 02-Feb-2016 Junda Liu <junda@google.com> Merge "Prompt dialog for carrier app."
3f0470d534641b1c2e2da720516261852a95a36e 02-Feb-2016 Amit Mahajan <amitmahajan@google.com> Handle EVENT_CHECK_REPORT_GPRS only for GSM.

The message is sent only for GSM and is sent with a delay. By the
time it is received the phone type may have changed.

Bug: 26906366
Change-Id: I34ab7dda5e5e299c810e6134aeec9ea3df099dea
erviceStateTracker.java
53588b5659e0804c4da677e9062338caf2b26e42 02-Feb-2016 Tyler Gunn <tgunn@google.com> Merge "Fix potential NPE in TelephonyEventLog." into mm-wireless-dev
am: 82fa82ca8f

* commit '82fa82ca8fa10abe33d94137cbeb74c227a72f2e':
Fix potential NPE in TelephonyEventLog.
82fa82ca8fa10abe33d94137cbeb74c227a72f2e 02-Feb-2016 Tyler Gunn <tgunn@google.com> Merge "Fix potential NPE in TelephonyEventLog." into mm-wireless-dev
3c89e23cf33c3c7f795554b29cd926219f28fe34 01-Feb-2016 Sungmin Choi <sungmin.choi@lge.com> Use Telephony.Carriers variables, instead of explicit word

Change-Id: I667e087a405899ccdd63da12833b70b6982c71c9
ataconnection/DcTracker.java
88151624f06b1a3c7d75d68e2a87cd6c04aab996 20-Jan-2016 Junda Liu <junda@google.com> Prompt dialog for carrier app.

If carrier privilege rule specifies package name, show dialog to prompt install it.

Bug: b/22863855
Change-Id: I16eeab860493e0757eef65522766ab2db109fb69
icc/UiccCard.java
icc/UiccCarrierPrivilegeRules.java
e9588c0a57063074f99c2b596760610aa2898b14 01-Feb-2016 Tyler Gunn <tgunn@google.com> Fix potential NPE in TelephonyEventLog.

I ran into a case in VT testing where the session.getCallId() was
throwing an NPE.
This code cleans up that potential source of an NPE and also protects
against the fact that a call ID in an ImsCallSession is a string and
could technically not contain a number.
Better than crashing telephony.

Bug: 26909254
Change-Id: Id6fe0b46c6c2b46fac29b2e04384bd69e8944373
elephonyEventLog.java
d2ef08b831579cf78dbb0262abf5f04ae7e2698b 01-Feb-2016 Chen Xu <fionaxu@google.com> Merge "GsmCdmaConnection Unit Test" into mm-wireless-dev
am: 60dccc84d1

* commit '60dccc84d100201cb0593397c159b4799efb7f5d':
GsmCdmaConnection Unit Test
15c3f35b47d556463a6c47fb9eefc985e086d0aa 01-Feb-2016 Chen Xu <fionaxu@google.com> Merge "Unit test for GsmCdmaCallTracker" into mm-wireless-dev
am: e3b8bf78b6

* commit 'e3b8bf78b63c45806f28812a66174aa8222c2973':
Unit test for GsmCdmaCallTracker
60dccc84d100201cb0593397c159b4799efb7f5d 01-Feb-2016 Chen Xu <fionaxu@google.com> Merge "GsmCdmaConnection Unit Test" into mm-wireless-dev
e3b8bf78b63c45806f28812a66174aa8222c2973 01-Feb-2016 Chen Xu <fionaxu@google.com> Merge "Unit test for GsmCdmaCallTracker" into mm-wireless-dev
270e2658281af04247c4fca07a60c39f37f37199 01-Feb-2016 Amit Mahajan <amitmahajan@google.com> resolve merge conflicts of 003753ff3b to master.

Change-Id: I75538817050719a9bede694e9a42a2eebcfe83d2
003753ff3b4cc82bdeee91a17aa862402f8bcddd 01-Feb-2016 Amit Mahajan <amitmahajan@google.com> Merge "Cleanup access modifiers." into mm-wireless-dev
604d70ccbf958d1abd92b128fa18a9f17b42b133 30-Jan-2016 Amit Mahajan <amitmahajan@google.com> Cleanup access modifiers.

This is useful for tests. CL also includes minor cleanup in SST.

Bug: 25793157
Change-Id: I068af6bfd9ea9e04e95244d23f830731aef38ee1
smCdmaPhone.java
nboundSmsHandler.java
nboundSmsTracker.java
erviceStateTracker.java
d644316d756599be40e240594858a4cee7316de3 30-Jan-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "Modify CommandsInterface.setupDataCall()" into mm-wireless-dev
am: 874b62e43a

* commit '874b62e43a2390c8b07cbbab40675a6c9a387398':
Modify CommandsInterface.setupDataCall()
874b62e43a2390c8b07cbbab40675a6c9a387398 30-Jan-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "Modify CommandsInterface.setupDataCall()" into mm-wireless-dev
29761e2efa6f68b32f102eda45daffb9b163ca77 30-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "Unit tests for SmsStorageMonitor" into mm-wireless-dev
am: 2a70348811

* commit '2a703488110cac77b05d9106afbc24cfb57fb8e3':
Unit tests for SmsStorageMonitor
2a703488110cac77b05d9106afbc24cfb57fb8e3 30-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "Unit tests for SmsStorageMonitor" into mm-wireless-dev
5d65624eb9189b0369bf1d914a9fb7e141284226 28-Jan-2016 fionaxu <fionaxu@google.com> GsmCdmaConnection Unit Test

BUG=25691379
Change-Id: I66679fdf5a9bd591e240b320a9ec9c565a5b4f46
smCdmaConnection.java
ceea0fa1248e326663ac56e5ba37b0633f8adacc 29-Jan-2016 Amit Mahajan <amitmahajan@google.com> Unit tests for SmsStorageMonitor

Bug: 25691379
Change-Id: Iab7080afcd422d642b6d1be6d49e4f16ccf461fd
est/SimulatedCommands.java
5755ef622fec6f3c592467c685503826862a7536 26-Jan-2016 fionaxu <fionaxu@google.com> Unit test for GsmCdmaCallTracker

BUG=25691379
Change-Id: Ic588ed4b78d645008698bff73a2995bdfd15e064
smCdmaCallTracker.java
est/SimulatedCommands.java
5d5ec64fcd293928776aebe5c92278afb5bc019d 29-Jan-2016 Pavel Zhamaitsiak <pavelz@google.com> Modify CommandsInterface.setupDataCall()

- Change numeric parameters from String to int
- Move inside conversion of radioTechnology from RIL_RADIO_TECHNOLOGY_*
constants to values expected in RIL_REQUEST_SETUP_DATA_CALL parameter

Change-Id: I12e98c59ef115ee8d2454560a7a787e74dc95f49
ommandsInterface.java
IL.java
ataconnection/DataConnection.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
35d8adbb974b03946d2dac4b9ae45a70b1d4b8ef 29-Jan-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Wakelock needs to be decremented for solicited response." into mm-wireless-dev
am: 7d905156e7

* commit '7d905156e7cd4262812c26b7199cc4f761032c9b':
Wakelock needs to be decremented for solicited response.
8164ed3cf55162f10ff43608a4df794a1de34055 29-Jan-2016 Jack Yu <jackyu@google.com> Merge "Fixed two flacky service state tracker tests." into mm-wireless-dev
am: 5f2bc5e7b3

* commit '5f2bc5e7b344e32f1542e21b7f46939ad86195da':
Fixed two flacky service state tracker tests.
7d905156e7cd4262812c26b7199cc4f761032c9b 29-Jan-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Wakelock needs to be decremented for solicited response." into mm-wireless-dev
5f2bc5e7b344e32f1542e21b7f46939ad86195da 29-Jan-2016 Jack Yu <jackyu@google.com> Merge "Fixed two flacky service state tracker tests." into mm-wireless-dev
44b9d5b470fb45c0f59073f56cb48a2501996259 29-Jan-2016 Jack Yu <jackyu@google.com> Fixed two flacky service state tracker tests.

Also fix the inconsistent way to get carrier config service
in service state tracker.

bug: 25691379
Change-Id: Ib725954d10d5515ac395a595df744353e788afe5
erviceStateTracker.java
2af618a3becdcbbd49a1339d68e0ef8f35890a27 29-Jan-2016 Sanket Padawe <sanketpadawe@google.com> Wakelock needs to be decremented for solicited response.

Bug: 26832978
Change-Id: I68e309745471132230ecbf2489b64d30f0770dca
IL.java
30c1dfa4580f7133392a345ea2dcd527b72fa70f 29-Jan-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "TelephonyEventLog: Add some unit tests and missing log events" into mm-wireless-dev
am: a8b33dee0b

* commit 'a8b33dee0bc27112a4c6cc9f8f733b03eb4ae3d0':
TelephonyEventLog: Add some unit tests and missing log events
a8b33dee0bc27112a4c6cc9f8f733b03eb4ae3d0 29-Jan-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "TelephonyEventLog: Add some unit tests and missing log events" into mm-wireless-dev
9746fca2d7389f0fce6d5d031d87acd87b9de723 28-Jan-2016 Pavel Zhamaitsiak <pavelz@google.com> TelephonyEventLog: Add some unit tests and missing log events

Also some code cleanup and minor bug fixes.

Change-Id: I327566f8c3839bf64aebc4db0c6170ba2bd7de87
smCdmaCallTracker.java
IL.java
elephonyEventLog.java
msphone/ImsPhoneCallTracker.java
f83df11772fcf7f2aae0d9179b4d36eba92ad74e 22-Jan-2016 Tyler Gunn <tgunn@google.com> DO NOT MERGE IMS: Capabilities propagation

Propagating capabilities for voice and
video, based on which upgrade/downgrade
will be allowed.

BUG=22728624

Change-Id: If276c23849f64a5e6cbeae798a1c74efe79922a5
onnection.java
msphone/ImsPhoneConnection.java
e3f0fe453b4e77c43564d65f2d0e0631fe596112 28-Jan-2016 Amit Mahajan <amitmahajan@google.com> Register broadcastReceiver listening to ECM changes only once.
am: 5c1251a7bd

* commit '5c1251a7bd7dceba6203722f0bf0fb6062732da2':
Register broadcastReceiver listening to ECM changes only once.
5c1251a7bd7dceba6203722f0bf0fb6062732da2 28-Jan-2016 Amit Mahajan <amitmahajan@google.com> Register broadcastReceiver listening to ECM changes only once.

Since phone object is not disposed now (after phone switch refactor),
CallTracker needs to register receiver only once and not deregister/
re-register.
This is needed to fix a crash seen on trying to deregister an
unregistered receiver.

Bug: 25871221
Change-Id: Id057030f827a9cfd44584ef095a1297f6f8c1fae
smCdmaCallTracker.java
b171129a8027f9f1a0eeaf3837055cfad5c182cb 28-Jan-2016 Ji Yang <yangji@google.com> Merge "Check wap push type before showing new message notification"
bec09b7aa38d96260ce3619aa21d16b5e4e1f103 28-Jan-2016 Jack Yu <jackyu@google.com> Merge "Reduced more radio log spam." into mm-wireless-dev
am: fe9640472a

* commit 'fe9640472a78ae5aee7676ad6682e0a99ae81107':
Reduced more radio log spam.
72f7fc997b09204bf01ccaac34ac4b9bd91d954b 27-Jan-2016 Ji Yang <yangji@google.com> Check wap push type before showing new message notification

Bug: 26232405
Change-Id: Id8dc622dd058856c70d20de0fe879711c3048a04
nboundSmsHandler.java
apPushOverSms.java
fe9640472a78ae5aee7676ad6682e0a99ae81107 28-Jan-2016 Jack Yu <jackyu@google.com> Merge "Reduced more radio log spam." into mm-wireless-dev
89b9ae10ff672679a723c1fa3051357183a2390b 28-Jan-2016 Jack Yu <jackyu@google.com> Merge "Added few more unit tests for ServiceStateTracker" into mm-wireless-dev
am: 8472a8b04b

* commit '8472a8b04be0575ea3afc16e1a58e2431fc58d93':
Added few more unit tests for ServiceStateTracker
8472a8b04be0575ea3afc16e1a58e2431fc58d93 28-Jan-2016 Jack Yu <jackyu@google.com> Merge "Added few more unit tests for ServiceStateTracker" into mm-wireless-dev
e5e0593e54a4e1009190dab5d6fd507dca0e341e 27-Jan-2016 Jack Yu <jackyu@google.com> Added few more unit tests for ServiceStateTracker

bug: 25691379
Change-Id: I405522b6b41d53ffcd5fae0fb261115e5d69b059
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
9f69a420a2979b7488d3ac5f867f7fd63ce9f3b3 28-Jan-2016 Jack Yu <jackyu@google.com> Merge "Fixed crash when creating bugreport" into mm-wireless-dev
am: f08e165538

* commit 'f08e165538c25eab329d2c441c838ef105468597':
Fixed crash when creating bugreport
f08e165538c25eab329d2c441c838ef105468597 28-Jan-2016 Jack Yu <jackyu@google.com> Merge "Fixed crash when creating bugreport" into mm-wireless-dev
947a43ffd0df49d34ff73abeb56c0b64f0981db3 28-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "Initialize phone type before initializing other objects." into mm-wireless-dev
am: 92a2eb9c87

* commit '92a2eb9c87a0570db42607f83a83c86d41c1d9e6':
Initialize phone type before initializing other objects.
92a2eb9c87a0570db42607f83a83c86d41c1d9e6 28-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "Initialize phone type before initializing other objects." into mm-wireless-dev
6ff4a2ec888c433bd6bf4b56407241f55c0c3505 28-Jan-2016 Jack Yu <jackyu@google.com> Fixed crash when creating bugreport

ImsPhone has several null member variables. Check null before
calling into each member's dump.

bug: 26828927
Change-Id: Ie08fe36827ddbb17bff00995c19b42915b3ff6fc
hone.java
etryManager.java
89656c760722affc02c64d365ea83474ab392078 28-Jan-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Improve wakelock symantics" into mm-wireless-dev
am: 77d2a7310d

* commit '77d2a7310d1a8c9dfe1c5c8a29c01ca1707e58ff':
Improve wakelock symantics
77d2a7310d1a8c9dfe1c5c8a29c01ca1707e58ff 28-Jan-2016 Sanket Padawe <sanketpadawe@google.com> Merge "Improve wakelock symantics" into mm-wireless-dev
9e138a3360f5e22b1fda9a7b1422f678c3b4d702 27-Jan-2016 Tyler Gunn <tgunn@google.com> Merge "IMS:Exit ECBM before dialing pending non-e911 call" into mm-wireless-dev
am: 836576ff59

* commit '836576ff591cd4fcbfafbc89154009a6f587f070':
IMS:Exit ECBM before dialing pending non-e911 call
836576ff591cd4fcbfafbc89154009a6f587f070 27-Jan-2016 Tyler Gunn <tgunn@google.com> Merge "IMS:Exit ECBM before dialing pending non-e911 call" into mm-wireless-dev
67e0eff10a285793b58027ebe2dcbf1ccbbce7b1 27-Jan-2016 Amit Mahajan <amitmahajan@google.com> Unit test for CdmaSmsDispatcher
am: 5d5ca33a24

* commit '5d5ca33a24e6b73a48b575a0e1a5e790784d0bb7':
Unit test for CdmaSmsDispatcher
6302bef1a5eafe5d4bc56c433463098bae3a4ea5 27-Jan-2016 Chris Wren <cwren@android.com> move telephony metrics over to new proto

Change-Id: I00c09c8d0178b44a5b8b6e31e6abeaf530c620a5
msApplication.java
5d5ca33a24e6b73a48b575a0e1a5e790784d0bb7 27-Jan-2016 Amit Mahajan <amitmahajan@google.com> Unit test for CdmaSmsDispatcher

Bug: 25691379
Change-Id: I9d4f209ad1a20435ae8841e5f15ce8a94b52fa42
msSMSDispatcher.java
MSDispatcher.java
dma/CdmaSMSDispatcher.java
sm/GsmSMSDispatcher.java
est/SimulatedCommands.java
a31649954ec89e53b7012ed4c4a304f2142f8c3f 27-Jan-2016 Jack Yu <jackyu@google.com> Added cell info unit tests.
am: e2507b5326

* commit 'e2507b53266017e219a079f514801fe72ee90229':
Added cell info unit tests.
e2507b53266017e219a079f514801fe72ee90229 27-Jan-2016 Jack Yu <jackyu@google.com> Added cell info unit tests.

bug: 25691379
Change-Id: I4186ad702f9a701e7e882b16e54609124bb3568d
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
c33ffc6d7d7236b108f85d90fe2b7955f578d71c 27-Jan-2016 Ji Yang <yangji@google.com> Merge "Postpone inbound SMS processing until credential-encrypted storage is unlocked."
1e7c950418dcc4132136eee3c4834e1a758e48e9 27-Jan-2016 Amit Mahajan <amitmahajan@google.com> Initialize phone type before initializing other objects.

Bug: 25871221
Change-Id: I84f9d35c618da36d6eb60d131cd302f23f19e9ff
smCdmaPhone.java
0b109c5f050cd64da76977ee6006090fbf06cecc 27-Jan-2016 Shishir Agrawal <shishir@google.com> Merge "Unhiding MSIM APIs."
3021a805d589c66cd774a388a61635396bf2f3a2 27-Jan-2016 Tyler Gunn <tgunn@google.com> Merge "IMS: Notify supplementary service failed for call hold failures" into mm-wireless-dev
am: 791a8f50cc

* commit '791a8f50cc8af712c92c79b576a6c90326c1df60':
IMS: Notify supplementary service failed for call hold failures
791a8f50cc8af712c92c79b576a6c90326c1df60 27-Jan-2016 Tyler Gunn <tgunn@google.com> Merge "IMS: Notify supplementary service failed for call hold failures" into mm-wireless-dev
28bfd178f78a76ca2615f561cab2e57d1eb64c2f 26-Jan-2016 Tyler Gunn <tgunn@google.com> Merge "IMS: Capabilities propagation"
960c250fc2afee078852df1f37a887cec848ec5d 25-Jan-2016 Shishir Agrawal <shishir@google.com> Unhiding MSIM APIs.

1. Unhide MSIM APIs in TelephonyManager that already have non-MSIM equivalent
APIs public.
2. Make MSIM API naming consistent (overloaded, no suffix).
3. Unhide APIs in SubscriptionManager that are necessary for MSIM.

Bug: 26772894
Change-Id: I9e623100358d65f1ab853c33599cb78f100f7e3a
efaultPhoneNotifier.java
smCdmaPhone.java
ccProvider.java
erviceStateTracker.java
ubscriptionController.java
ubscriptionInfoUpdater.java
ataconnection/DcTracker.java
957b0e12ff2f97d115db7918a8df19f72770257e 26-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "Get rid of code to allow bypassing short-code confirmation dialog." into mm-wireless-dev
am: 46125b6582

* commit '46125b6582f09855d6133c2ba33056c3d97c2f41':
Get rid of code to allow bypassing short-code confirmation dialog.
46125b6582f09855d6133c2ba33056c3d97c2f41 26-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "Get rid of code to allow bypassing short-code confirmation dialog." into mm-wireless-dev
c272b2356589b568f660ff594f0ddffa2f30b970 26-Jan-2016 Nathan Harold <nharold@google.com> Merge "Remove Data RealTime Info Listener Support"
194586befdeee9d84edfb31747548e5c8d339b92 26-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "IMS: Fix ClassCastException" into mm-wireless-dev
am: e018fd6dcd

* commit 'e018fd6dcd17af3890ad481eeaad1f70417543f7':
IMS: Fix ClassCastException
e018fd6dcd17af3890ad481eeaad1f70417543f7 26-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "IMS: Fix ClassCastException" into mm-wireless-dev
9c32a1e9495f06905377c9e2b91c0ef9cdb0528f 26-Jan-2016 Jack Yu <jackyu@google.com> Reduced more radio log spam.

Reduced more radio log spam by some code path optimization.

bug: 25956251
Change-Id: If040543d0eb8e03a814225aa6694e22818c1d357
ccSmsInterfaceManager.java
erviceStateTracker.java
ataconnection/DataConnection.java
ataconnection/DcSwitchStateMachine.java
ataconnection/DcTracker.java
38ca51d0f643405df51e78fce6c546424e9f410d 25-Jan-2016 Shishir Agrawal <shishir@google.com> DO NOT MERGE : Unhiding MSIM APIs.

1. Unhide MSIM APIs in TelephonyManager that already have non-MSIM equivalent
APIs public.
2. Make MSIM API naming consistent (overloaded, no suffix).
3. Unhide APIs in SubscriptionManager that are necessary for MSIM.

Bug: 26772894
Change-Id: I9e623100358d65f1ab853c33599cb78f100f7e3a
efaultPhoneNotifier.java
smCdmaPhone.java
ccProvider.java
erviceStateTracker.java
ubscriptionController.java
ubscriptionInfoUpdater.java
ataconnection/DcTracker.java
5326ba5f8e9488416fd7160680dc6b6319c6b00e 10-Oct-2015 Anju Mathapati <anjucm@codeaurora.org> IMS: Notify supplementary service failed for call hold failures

- We need to notify supplementary service failed in case call
hold fails.

Change-Id: I46548397e726f621776ea8f37dca0ad28af70554
BUG=26770582
honeInternalInterface.java
msphone/ImsPhoneCallTracker.java
8f21e0c6528f015924d153350dd2a717d3b51f66 21-Jan-2016 Ji Yang <yangji@google.com> Postpone inbound SMS processing until credential-encrypted storage is unlocked.

A notification will be shown to the user and the inbound SMS will be kept
inside the raw table until credentail-encrypted storage is unlocked.

Bug: 26232405
Change-Id: I2854ced55d911ccaf61df908d7c00f8acd5fae51
msSMSDispatcher.java
nboundSmsHandler.java
msBroadcastUndelivered.java
e5c2995cec720cb3f0ba6609378574683770108d 10-Dec-2015 Anju Mathapati <anjucm@codeaurora.org> IMS:Exit ECBM before dialing pending non-e911 call

When the device is in Emergency CallBack Mode, then exit the
ECBM before dialing a pending non-emergency mobile originating call.

Change-Id: I22cf3540dbff7630203feca13c255e61ec2500d4
BUG=26719991
msphone/ImsPhoneCallTracker.java
b88ccd9f208e48f7e5154d9c831dcaaf4e67beb7 25-Jan-2016 Abhijith Shastry <ashastry@google.com> Merge "Block SMS, and MMS from blocked numbers."
e70ab2abc90253d3dd3921ad7bd9e8b86ada5112 25-Jan-2016 Tyler Gunn <tgunn@google.com> Merge "IMS: Display caller name for MT VoLTE call" into mm-wireless-dev
am: 54cbd3249f

* commit '54cbd3249f084e6cefe2cbb6a4dff9ac4803046f':
IMS: Display caller name for MT VoLTE call
54cbd3249f084e6cefe2cbb6a4dff9ac4803046f 25-Jan-2016 Tyler Gunn <tgunn@google.com> Merge "IMS: Display caller name for MT VoLTE call" into mm-wireless-dev
ba51280f53e677ac527b11bd9a5dfa819740f70a 22-Jan-2016 Abhijith Shastry <ashastry@google.com> Block SMS, and MMS from blocked numbers.

BUG: 26682753
Change-Id: I464c04466d3a936d2d611cbaf791490340a9f515
lockChecker.java
nboundSmsHandler.java
nboundSmsTracker.java
apPushOverSms.java
d252e0e07be71fd28b2fa390ecc0efdf7cba886a 25-Jan-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "IMS: Handle exception for an invalid service class" into mm-wireless-dev
am: 47db466cba

* commit '47db466cbaddb873534c8be0687f78562b472c1a':
IMS: Handle exception for an invalid service class
47db466cbaddb873534c8be0687f78562b472c1a 25-Jan-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "IMS: Handle exception for an invalid service class" into mm-wireless-dev
08af54260f11a28bd76beea7b96227b91002c359 25-Jan-2016 Jack Yu <jackyu@google.com> Merge "Added NITZ update test case." into mm-wireless-dev
am: 20c965e505

* commit '20c965e505306ebb6e2d06f1a0abe3cd3eadbd6e':
Added NITZ update test case.
20c965e505306ebb6e2d06f1a0abe3cd3eadbd6e 25-Jan-2016 Jack Yu <jackyu@google.com> Merge "Added NITZ update test case." into mm-wireless-dev
42f23fb1ff632d23fe7fae0b6900cf6e2da97de1 25-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "First unit test for GsmCellBroadcastHandler" into mm-wireless-dev
am: 339fadff86

* commit '339fadff86dd1add253a7571c8be35e51489111e':
First unit test for GsmCellBroadcastHandler
339fadff86dd1add253a7571c8be35e51489111e 25-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "First unit test for GsmCellBroadcastHandler" into mm-wireless-dev
cbed9a14fe1cde45719cf859b4bde1ec1c2c0bd8 25-Jan-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "IMS: Propagating MMI error string to UI" into mm-wireless-dev
am: dd3baca3db

* commit 'dd3baca3db563e3b636f2e597b7588e1372342c3':
IMS: Propagating MMI error string to UI
dd3baca3db563e3b636f2e597b7588e1372342c3 25-Jan-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "IMS: Propagating MMI error string to UI" into mm-wireless-dev
62f7e2b54fb3ad9f1139ceaf3b15966c000a9135 24-Jan-2016 Jack Yu <jackyu@google.com> Added NITZ update test case.

Added NITZ update test case.

bug: 25691379
Change-Id: I636e973daa81e2cf0f1cab67877535ec444f0bcc
est/SimulatedCommands.java
3c7c2c2dfecfe11991f707a09ce79863e0ffdaa7 23-Jan-2016 Amit Mahajan <amitmahajan@google.com> First unit test for GsmCellBroadcastHandler

Bug: 25691379
Change-Id: I9e32eb7b55cf1f4edf35bf4c6786e5cc00db7870
est/SimulatedCommands.java
b36fbb7cf37ecb49c74e17e13c34dfea3f2e31f8 23-Jan-2016 Jack Yu <jackyu@google.com> Added unit test for ServiceStateTracker.
am: 59d1e823d9

* commit '59d1e823d9aa8bc80ec6fd552fd85384bdfa75cd':
Added unit test for ServiceStateTracker.
fb753fce2d3bd61564b7639d3b28a46cb926ca83 22-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "First unit test for GsmSMSDispatcher." into mm-wireless-dev
am: 6258465b55

* commit '6258465b5586a704a7762cb5c3e7bd3b66cca649':
First unit test for GsmSMSDispatcher.
59d1e823d9aa8bc80ec6fd552fd85384bdfa75cd 22-Jan-2016 Jack Yu <jackyu@google.com> Added unit test for ServiceStateTracker.

Added testSpnUpdateShowPlmnOnly test which simulates the scenario
that only PLMN is shown but not SPN.

bug: 25691379
Change-Id: I65ae7d59d1fe6039997631152997dca17c8f390f
est/SimulatedCommands.java
6258465b5586a704a7762cb5c3e7bd3b66cca649 22-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "First unit test for GsmSMSDispatcher." into mm-wireless-dev
91680ad599f9e15a32c3a9798021778e8d4eab6e 22-Jan-2016 Amit Mahajan <amitmahajan@google.com> First unit test for GsmSMSDispatcher.

This includes a verifier class that can be used to check if a
function in RIL was called by the class under test.

Bug: 25691379
Change-Id: I187fe6c482dd6f32fbc4bdadb90e7a4412d7d795
msSMSDispatcher.java
est/SimulatedCommands.java
est/SimulatedCommandsVerifier.java
28fe81843471da5a97beb0d3e946a6b41b47279a 22-Jan-2016 Tyler Gunn <tgunn@google.com> IMS: Capabilities propagation

Propagating capabilities for voice and
video, based on which upgrade/downgrade
will be allowed.

BUG=22728624

Change-Id: If276c23849f64a5e6cbeae798a1c74efe79922a5
onnection.java
msphone/ImsPhoneConnection.java
060a6f0ba56dde532a9b9b28d4302df86a556691 22-Jan-2016 Sanket Padawe <sanketpadawe@google.com> Improve wakelock symantics

Bug: 22127517
Change-Id: I7c0c669bc133b7334becc454e6a80a1638ebae6f
IL.java
da4199c4dff44a4256f93e9dfe317764760714c6 21-Jan-2016 Nathan Harold <nharold@google.com> Remove Data RealTime Info Listener Support

-Remove Notifier functions from PhoneNotifier, and Phone
-Remove synthesis of the RealTime Info signal from DcController

Because of intractable problems with power consumption and
consistency, this signal is removed and should not be used.

Bug: 23319188

Change-Id: I63df8909ec9c328fa7d0ed89384806362f54744a
efaultPhoneNotifier.java
hone.java
honeNotifier.java
ataconnection/DcController.java
06f20acc9d20307b2c3e66686d1eb86f676d8834 22-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "IMS: Add null-check for call forwarding" into mm-wireless-dev
am: c93745fefc

* commit 'c93745fefcb15b5698e9d0a604ff4f004e0cec6a':
IMS: Add null-check for call forwarding
e12a56f2331dc49271b50c8ca12c0c17e324a187 22-Jan-2016 Shriram Ganesh <sganesh@codeaurora.org> IMS: During SRVCC, mark dropped incoming call as missed call

During SRVCC, if an incoming call is dropped / ended, then
identify that call as a missed call.

Bug: 26729809
Change-Id: Iaba4aee8e295dddaca8be7704fca63139cfdae9c
smCdmaCallTracker.java
27e0378194d55fdcb23f4a3a85dc620a234b5855 25-Sep-2015 Anju Mathapati <anjucm@codeaurora.org> IMS: Display caller name for MT VoLTE call

Caller display name is not getting updated on UI if Telephony
doesn't receive the caller information in the first incoming
notification from RIL.

Update the caller display name received in the subsequent
incoming notifications from RIL.

Bug: 26718453
Change-Id: I706b08c0bdba199400d1fd6a7e8cd780878e495f
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
90301a65da12d775be85d08ef3ccd0aa980e25e4 23-Mar-2015 Anju Mathapati <anjucm@codeaurora.org> IMS: Propagating MMI error string to UI

Whenever there is a exception from lower
layer for MMI request, propagate error
string that comes from lower layer.

Bug: 26717217
Change-Id: I117a5c69949c254229334228e62247eb14f15680
msphone/ImsPhoneMmiCode.java
340a263442798f3d959bc443375ab9a5c6654441 30-Nov-2015 Anju Mathapati <anjucm@codeaurora.org> IMS: Handle exception for an invalid service class

When an invalid service class is dialed via MMI code, catch the
runtime exception and return as unsupported.

Bug: 26713792
Change-Id: Idd6c50dd4d156998d1072dc04fab0cc42665e5a4
msphone/ImsPhoneMmiCode.java
6e5c70b724b1900d3c689f254cc1fb04e080ac07 11-Sep-2015 Anju Mathapati <anjucm@codeaurora.org> IMS: Fix ClassCastException

- ClassCastException is due to calling
AsyncResult.forMessage twice.

bug: 26716329
Change-Id: I9f90c740d1a8442c462419f9ab2c7bdc2ada036a
msphone/ImsPhone.java
3230afe5bbd993387bfd2f2adc09cefe0c3b8729 21-Jan-2016 Omkar Kolangade <omkark@codeaurora.org> IMS: Add null-check for call forwarding

Check if ICCrecords are present, before setting the call
forwarding flag in ICCrecrods.

Change-Id: I21afcdcd8b3cd974c7b2c008a5e2ebc8af595dd3
hone.java
2747875b004bbce8442f00ff2adcd8fc5b5be49a 21-Jan-2016 Jack Yu <jackyu@google.com> Data call retry refactoring
am: 0e664d8c9f

* commit '0e664d8c9ff3a1f2ab03d2bef4268615335ea1a2':
Data call retry refactoring
0e664d8c9ff3a1f2ab03d2bef4268615335ea1a2 17-Dec-2015 Jack Yu <jackyu@google.com> Data call retry refactoring

Moved retry manager from DataConnection to ApnContext.

bug: 22208242
Change-Id: I0baa80e06e6d815643782c2b549460547d0bfef9
etryManager.java
ataconnection/ApnContext.java
ataconnection/ApnSetting.java
ataconnection/DataConnection.java
ataconnection/DcAsyncChannel.java
ataconnection/DcFailBringUp.java
ataconnection/DcRetryAlarmController.java
ataconnection/DcTracker.java
1abe42986e600832f0d7275d08e9b68cc0a156c7 21-Jan-2016 Amit Mahajan <amitmahajan@google.com> First unit test for SMS (EVENT_NEW_SMS in GsmInboundSmsHandler).
am: ec334adf40

* commit 'ec334adf4017ca172f44612d01456e671f922344':
First unit test for SMS (EVENT_NEW_SMS in GsmInboundSmsHandler).
ec334adf4017ca172f44612d01456e671f922344 19-Jan-2016 Amit Mahajan <amitmahajan@google.com> First unit test for SMS (EVENT_NEW_SMS in GsmInboundSmsHandler).

Bug: 25691379
Change-Id: Iacb24b23c224a8889cc549d02aa0dbd415e3c3d7
nboundSmsHandler.java
msStorageMonitor.java
elephonyComponentFactory.java
cda298868a7add3f74c24e16fa6fe16c8ab4e7bc 20-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "Unregister for CallWaitingInfo on switching from CDMA to GSM." into mm-wireless-dev
am: 46d25cf021

* commit '46d25cf021c41dc54c4ac98e104a34fd1b9d017f':
Unregister for CallWaitingInfo on switching from CDMA to GSM.
46d25cf021c41dc54c4ac98e104a34fd1b9d017f 20-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "Unregister for CallWaitingInfo on switching from CDMA to GSM." into mm-wireless-dev
345f914bd36dae2940cd7369d4f1e68b92348cf1 20-Jan-2016 Junda Liu <junda@google.com> Merge "Make getIccSimChallengeResponse a carrier API."
f53f9dc08f4a2758f88f10e3ea351303effdb628 20-Jan-2016 Jack Yu <jackyu@google.com> Fixed the broken testSetRadioPower test.
am: b6514b21f3

* commit 'b6514b21f3d8ed47a088b741a18fe0b1de2308ea':
Fixed the broken testSetRadioPower test.
b6514b21f3d8ed47a088b741a18fe0b1de2308ea 15-Jan-2016 Jack Yu <jackyu@google.com> Fixed the broken testSetRadioPower test.

Fixed the broken testSetRadioPower test due to telephony debug
service change.

bug: 25691379
Change-Id: I1fb25671eda2ae53ba2165a0e0c64cc4525ac81b
erviceStateTracker.java
est/SimulatedCommands.java
5f6ea8a0105a163b801b82f1af22174f855086f4 19-Jan-2016 Amit Mahajan <amitmahajan@google.com> Unregister for CallWaitingInfo on switching from CDMA to GSM.

This is to avoid second registration which happens without this
change on switching back to CDMA.

Bug: 25871221
Change-Id: Ibd303efb1e5dd8969a7572200c18a63f2a776cf8
smCdmaCallTracker.java
be931d5b8c0b9856f365fb34cc3d16605948f996 19-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "Added unit tests for GsmCdmaPhone" into mm-wireless-dev
am: aeff825792

* commit 'aeff825792fe1f828fb310464923a6f4eb69be78':
Added unit tests for GsmCdmaPhone
aeff825792fe1f828fb310464923a6f4eb69be78 19-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "Added unit tests for GsmCdmaPhone" into mm-wireless-dev
a3fe7fb4e2c6df661f6ecbf333afa222c9bb6ede 05-Jan-2016 Junda Liu <junda@google.com> Make getIccSimChallengeResponse a carrier API.

Bug: b/22863855
Change-Id: Ia230fb9d098fa14d8c7b34a176e0d30795548ab1
honeSubInfoController.java
0c3ec24396bb8c21b4d89f743b626c13dd35ba7b 15-Jan-2016 Amit Mahajan <amitmahajan@google.com> Added unit tests for GsmCdmaPhone

Bug: 25691379
Change-Id: Ide4d50b10da332334fc4717ff1e7428f8b158056
smCdmaPhone.java
hone.java
ataconnection/DcTracker.java
83cd746e984ad7e0c9251309c33b55f4f4dd8942 15-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "Mark internally used functions private in GsmCdmaPhone." into mm-wireless-dev
am: 4b876512ae

* commit '4b876512ae8e9253de3344c312d99e63f6fcc246':
Mark internally used functions private in GsmCdmaPhone.
4b876512ae8e9253de3344c312d99e63f6fcc246 15-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "Mark internally used functions private in GsmCdmaPhone." into mm-wireless-dev
e36f59c8a17246eb7924ba1d2bf70f6a2eead1e2 12-Jan-2016 Amit Mahajan <amitmahajan@google.com> Mark internally used functions private in GsmCdmaPhone.

Includes some (mostly cosmetic) code cleanup too.

Bug: 25793157
Change-Id: I8f0eb8b3ead18f29ca146637dca6ffd659a9f699
efaultPhoneNotifier.java
smCdmaPhone.java
hone.java
erviceStateTracker.java
ataconnection/DcTracker.java
eb22157432a74601afc76f16aaf842c2b8204b10 15-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "Send emergency call state change intent on emergency call start/end" into mm-wireless-dev
am: a57b6e4196

* commit 'a57b6e419678ea9db7455cf4abc90b2f085e8852':
Send emergency call state change intent on emergency call start/end
a57b6e419678ea9db7455cf4abc90b2f085e8852 15-Jan-2016 Amit Mahajan <amitmahajan@google.com> Merge "Send emergency call state change intent on emergency call start/end" into mm-wireless-dev
d1e1ef20799b3d6290523b613b5189dd3fe4812f 15-Jan-2016 Amit Mahajan <amitmahajan@google.com> Get rid of code to allow bypassing short-code confirmation dialog.

It was allowed based on permission SEND_RESPOND_VIA_MESSAGE but that
permission is used for other purposes and should not be used for this.
No app seems to require the ability to bypass the check so removing the
check altogether. If that ability is needed, a separate permission
should be added for it.

Bug: 23766433
Change-Id: Ie93f75725c316b39684cf740dfd161c084c60181
MSDispatcher.java
a579e9c631d70bb6dbd39283438212d5ff8f19c0 14-Jan-2016 Amit Mahajan <amitmahajan@google.com> Send emergency call state change intent on emergency call start/end

Bug: 24147407
Change-Id: I2517daf2bde95a95c68b2c74225fad7004bd73c5
smCdmaCallTracker.java
smCdmaPhone.java
hone.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
ip/SipPhoneBase.java
befc36a49e2242700868de8e5f32c8449ae3ba1a 14-Jan-2016 Amit Mahajan <amitmahajan@google.com> DO NOT MERGE Send emergency call state change intent on emergency call start/end
am: 509e0e4244

* commit '509e0e42442ec0c0f702cd052b498c75f4e8390f':
DO NOT MERGE Send emergency call state change intent on emergency call start/end
509e0e42442ec0c0f702cd052b498c75f4e8390f 13-Jan-2016 Amit Mahajan <amitmahajan@google.com> DO NOT MERGE Send emergency call state change intent on emergency call start/end

Change-Id: I953f0b28b8cd6b5ab7944dc8c6217041c214e86e
hone.java
honeBase.java
honeProxy.java
dma/CdmaCallTracker.java
msphone/ImsPhoneCallTracker.java
a869ba18916fa5661eb9a636e49055924fe67e97 13-Jan-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "Use TelephonyEventLog to send events to TelephonyDebugService" into mm-wireless-dev
am: dd10548e98

* commit 'dd10548e98d52fb6cc20a18ad3b3f77eff79591f':
Use TelephonyEventLog to send events to TelephonyDebugService
dd10548e98d52fb6cc20a18ad3b3f77eff79591f 13-Jan-2016 Pavel Zhamaitsiak <pavelz@google.com> Merge "Use TelephonyEventLog to send events to TelephonyDebugService" into mm-wireless-dev
e9edc0718faecadc46a81835b8b2dd61e7e1972b 13-Jan-2016 Amit Mahajan <amitmahajan@google.com> Use mainLooper for OnSubscriptionsChangedListener in SST.
am: b47b0e2bbf

* commit 'b47b0e2bbff98fb3eb4cd6d66887cbea220e1b9e':
Use mainLooper for OnSubscriptionsChangedListener in SST.
b47b0e2bbff98fb3eb4cd6d66887cbea220e1b9e 13-Jan-2016 Amit Mahajan <amitmahajan@google.com> Use mainLooper for OnSubscriptionsChangedListener in SST.

This is needed only for tests. In real scenarios this change is
no-op.

Bug: 25691379
Change-Id: I367956feaea2bda35a795184ef71b7871664e380
erviceStateTracker.java
5054dfa7fd9b0520d30a102ed5a2107af11590c8 12-Jan-2016 Pavel Zhamaitsiak <pavelz@google.com> Use TelephonyEventLog to send events to TelephonyDebugService

Send following:
- RIL Data call events
- RIL Voice call events
- RIL SMS events
- Service State changes
- IMS call events

Change-Id: I865d8852982aca03b770e8712aac707afecb0f79
IL.java
erviceStateTracker.java
elephonyEventLog.java
msphone/ImsPhoneCallTracker.java
3b8f7cc9061c927a54ec8a4c5e37a554ab9090cf 06-Jan-2016 Jeff Sharkey <jsharkey@android.com> Follow PackageManager refactoring.

Change-Id: I477cc5bca1753afa6355cf12ab0606da5ea88991
msApplication.java
89676e66ea7b559c0ecd0c564df38ccd33a1f7a2 05-Jan-2016 Jack Yu <jackyu@google.com> Merge "Removed the usage of setState, which is a deprecated API." into mm-wireless-dev
am: 7041d1d6b4

* commit '7041d1d6b4daaad78f04c40d93756d990b13f93d':
Removed the usage of setState, which is a deprecated API.
7041d1d6b4daaad78f04c40d93756d990b13f93d 05-Jan-2016 Jack Yu <jackyu@google.com> Merge "Removed the usage of setState, which is a deprecated API." into mm-wireless-dev
1b2a08283c3cdb8cf61faa53653fb844811e0171 05-Jan-2016 Jack Yu <jackyu@google.com> Reduced the radio log
am: a66fedecfe

* commit 'a66fedecfef55cb94ef0bd2fb1cb9dc8b51eda3d':
Reduced the radio log
a66fedecfef55cb94ef0bd2fb1cb9dc8b51eda3d 30-Dec-2015 Jack Yu <jackyu@google.com> Reduced the radio log

Reduced the radio log by moving some to VDBG or merging few lines
into one.

bug: 25956251
Change-Id: I7f7888e3952827cf7bc6d5eabfeb93720d2c6fb3
hone.java
410298cb95b110609193941807aff6c9676d2304 05-Jan-2016 Jack Yu <jackyu@google.com> Removed the usage of setState, which is a deprecated API.

The caller should call setVoiceRegState instead. This also helps
reduce Rlog since we will not see the complaining debug message
about using this deprecated API anymore.

bug: 26404646
Change-Id: I4562ef9b088ab051a291fe1b5ad29216fe5c33e7
erviceStateTracker.java
msphone/ImsPhone.java
msphone/ImsPhoneBase.java
ip/SipPhoneBase.java
0aac92dae499e4cc5ba7d3f0846febc3b21d4281 04-Jan-2016 Jack Yu <jackyu@google.com> Fixed the incorrect cdma RAT detection logic.
am: 89eb8ad788

* commit '89eb8ad7886b14133990da5e7e43d2990436dbec':
Fixed the incorrect cdma RAT detection logic.
89eb8ad7886b14133990da5e7e43d2990436dbec 04-Jan-2016 Jack Yu <jackyu@google.com> Fixed the incorrect cdma RAT detection logic.

Used the correct CDMA bitmask to determine if the bearer services
are based on 3GPP2 radio technologies.

bug: 26318528
Change-Id: I60edb2e1c79a61fd3034a1ffe0058f0646693ff7
ataconnection/DataProfile.java
0730ce9ff06301f68f78efad791d2823d3374800 30-Dec-2015 Jack Yu <jackyu@google.com> Reduced the radio log
am: c1b229b738

* commit 'c1b229b7389e4cd682452c8d662afa1b3af14345':
Reduced the radio log
c1b229b7389e4cd682452c8d662afa1b3af14345 30-Dec-2015 Jack Yu <jackyu@google.com> Reduced the radio log

Reduced the radio log by moving some to VDBG or merging few lines
into one.

bug: 25956251
Change-Id: I6a18b6f101ac5bb9aff40c2223fc72034e0cf5bf
ubscriptionController.java
ataconnection/DcController.java
ataconnection/DcTracker.java
msphone/ImsPhoneCallTracker.java
icc/IccCardProxy.java
icc/IccRecords.java
icc/IsimUiccRecords.java
icc/RuimRecords.java
icc/SIMRecords.java
b5aa143eb009662f1be6a76a4a97de8226c8bcf0 30-Dec-2015 Jack Yu <jackyu@google.com> Added dump support to more telephony components.
am: dc3b93d593

* commit 'dc3b93d59312b84dcfa776f7691f6a87462b45a2':
Added dump support to more telephony components.
7afeaaa0f78caf43f3345eb6fc84fc9fe998649b 30-Dec-2015 Hyejin Kim <hyejin.kim@lge.com> When Wi-Fi calling is available, be able to display only "Wi-Fi"
am: 77a4ce6c68

* commit '77a4ce6c6896b15ca32f8d1958f184e0c1eedddc':
When Wi-Fi calling is available, be able to display only "Wi-Fi"
dc3b93d59312b84dcfa776f7691f6a87462b45a2 29-Dec-2015 Jack Yu <jackyu@google.com> Added dump support to more telephony components.

Added dump support to Ims components and also improved service
state tracker dump support.

bug: 25955373
Change-Id: I295ac57be70303b072069dca70fd3b8827461cfc
hone.java
honeFactory.java
erviceStateTracker.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
77a4ce6c6896b15ca32f8d1958f184e0c1eedddc 10-Dec-2015 Hyejin Kim <hyejin.kim@lge.com> When Wi-Fi calling is available, be able to display only "Wi-Fi"

Some operator want to show "Wi-Fi Calling" only without SPN.

BUG=25498707
Change-Id: I7428fc586054c9c6956f9e6c04c58c5b1e6c856e
sm/GsmServiceStateTracker.java
30646d039eb54def9efd55fc54772e111b5ef115 17-Dec-2015 Amit Mahajan <amitmahajan@google.com> Removed unnecessary proxies.

Bug: 25793157
Change-Id: I692f140b89d23448a5261fec8cdeb60305287662
smCdmaPhone.java
ccPhoneBookInterfaceManagerProxy.java
hone.java
honeFactory.java
honeInternalInterface.java
honeSubInfo.java
honeSubInfoController.java
honeSubInfoProxy.java
roxyController.java
elephonyComponentFactory.java
iccPhoneBookController.java
msphone/ImsPhoneBase.java
ip/SipPhoneBase.java
b72f642fc20c7d888bde697924724a6375b42bf9 04-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> Check permissions on getDeviceId. DO NOT MERGE

bug:25778215
Change-Id: I73833db6b7c32121b14a6cfea81c21ed22e94ffc
honeSubInfoController.java
honeSubInfoProxy.java
0ee29881c709d57034c75fb08c418e661750b1f7 21-Dec-2015 Jack Yu <jackyu@google.com> Changed the country iso code for The Democratic Republic of Congo.

Changed the iso country code from "cg" to "cd", which is the correct
one.

bug: 25785921
Change-Id: I2ad7525a107370ff31468939e166114dfbcbf8bf
ccTable.java
8751a9db17041c7de3102c253ea24b0a46f88c1c 21-Dec-2015 Jack Yu <jackyu@google.com> Merge "Changed the country iso code for The Democratic Republic of Congo."
88c4df5614b61958aa0995eba7fd0ad6eaae2b50 21-Dec-2015 Jack Yu <jackyu@google.com> Changed the country iso code for The Democratic Republic of Congo.

Changed the iso country code from "cg" to "cd", which is the correct
one.

bug: 25785921
Change-Id: I2ad7525a107370ff31468939e166114dfbcbf8bf
ccTable.java
5c0073b59d357744c18213b8855ec599c4e1b623 18-Dec-2015 Amit Mahajan <amitmahajan@google.com> Merge "Removed unnecessary proxies."
2549bbfd0439b8b549712a2d255dcf05bca7f1eb 17-Dec-2015 Amit Mahajan <amitmahajan@google.com> Removed unnecessary proxies.

Bug: 25793157
Change-Id: I692f140b89d23448a5261fec8cdeb60305287662
smCdmaPhone.java
ccPhoneBookInterfaceManagerProxy.java
hone.java
honeFactory.java
honeInternalInterface.java
honeSubInfo.java
honeSubInfoController.java
honeSubInfoProxy.java
roxyController.java
elephonyComponentFactory.java
iccPhoneBookController.java
msphone/ImsPhoneBase.java
ip/SipPhoneBase.java
b7e8762fa12f0a7f7237f2e7926b03a025bd259f 18-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> Check permissions on getDeviceId. am: 79eecef63f am: a924220685 am: 9c3a86f07d am: 4d096cf5f7 am: cec298e194 am: 78e309f8e4 am: 3230d5cdc5
am: a23d91f3f2

* commit 'a23d91f3f2e04e76beae1625ae8a62167e715d7d':
Check permissions on getDeviceId.
a23d91f3f2e04e76beae1625ae8a62167e715d7d 18-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> Check permissions on getDeviceId. am: 79eecef63f am: a924220685 am: 9c3a86f07d am: 4d096cf5f7 am: cec298e194 am: 78e309f8e4
am: 3230d5cdc5

* commit '3230d5cdc501735528575348b74d0be26297a469':
Check permissions on getDeviceId.
3230d5cdc501735528575348b74d0be26297a469 18-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> Check permissions on getDeviceId. am: 79eecef63f am: a924220685 am: 9c3a86f07d am: 4d096cf5f7 am: cec298e194
am: 78e309f8e4

* commit '78e309f8e4ad8d680ee08e96d42de302d21b6c93':
Check permissions on getDeviceId.
78e309f8e4ad8d680ee08e96d42de302d21b6c93 18-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> Check permissions on getDeviceId. am: 79eecef63f am: a924220685 am: 9c3a86f07d am: 4d096cf5f7
am: cec298e194

* commit 'cec298e194ad1b41ed75704b931f2173e9aef834':
Check permissions on getDeviceId.
cec298e194ad1b41ed75704b931f2173e9aef834 18-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> Check permissions on getDeviceId. am: 79eecef63f am: a924220685 am: 9c3a86f07d
am: 4d096cf5f7

* commit '4d096cf5f795b2b8262d60789288dab588db8dbd':
Check permissions on getDeviceId.
4d096cf5f795b2b8262d60789288dab588db8dbd 18-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> Check permissions on getDeviceId. am: 79eecef63f am: a924220685
am: 9c3a86f07d

* commit '9c3a86f07d00c32f29869b8a24626ef67038acd2':
Check permissions on getDeviceId.
f516ad4dee3fe4b8e7e7a57d6b78bff2c63c1170 18-Dec-2015 Jack Yu <jackyu@google.com> Merge changes from topic \'cphs\' am: 271ffade05
am: fb6432ed2b

* commit 'fb6432ed2bbabc86567f5294d3f4f5d8eb41cab9':
Make FSM for loading SPN more robust
Always display CPHS Operator Name when not roaming
9c3a86f07d00c32f29869b8a24626ef67038acd2 18-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> Check permissions on getDeviceId. am: 79eecef63f
am: a924220685

* commit 'a9242206850a72bffefbd8665c2b159aaa9ecdf1':
Check permissions on getDeviceId.
51b12bc71cb99eb92288115f8c792acd3040c7fa 18-Dec-2015 Jack Yu <jackyu@google.com> Merge "Make FSM for loading SPN more robust" into mm-wireless-dev
8072b2f2ad6f8ba35f8c21bd317a8eea7e0a8f83 18-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> Merge commit 'a8ba76ad403ad6483232fe7d6007ecfd2159dfb4' into manual_merge_a8ba76ad40
aaf0f945f69fb613792594bf42cf349276c59168 18-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> Revert "Remove unused class PhoneSubInfoController"

This is actually making the system service for a binder interface used by TelephonyManager.

This reverts commit 65360f2ec619b9816e301712e94d10d596ccd6b8.

Change-Id: Id5abeb0b060ab3bf63c573a262f7a9cb947b94fb
honeSubInfoController.java
roxyController.java
aafbd32090b579c35d886b8e5f9b73fab85f7a8f 18-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Revert "Remove unused class PhoneSubInfoController""
7d20b8389d9cea119de54526665672deedab0f3b 18-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> Revert "Remove unused class PhoneSubInfoController"

This is actually making the system service for a binder interface used by TelephonyManager.

This reverts commit 65360f2ec619b9816e301712e94d10d596ccd6b8.

Change-Id: I1d76932b5a69c40f4c02db299d1550189bad03cb
honeSubInfoController.java
roxyController.java
4f0cbdf141f851c8bbe9d4ec4f73e808236003f7 16-Apr-2015 Zoran Jovanovic <zoran.jovanovic@sonymobile.com> Make FSM for loading SPN more robust

Let FSM for loading SPN continue if the loaded
data is null or empty.

Change-Id: Ie0a138edb62a02761108b9dbf117d9199ef8354b
icc/SIMRecords.java
fb6432ed2bbabc86567f5294d3f4f5d8eb41cab9 18-Dec-2015 Jack Yu <jackyu@google.com> Merge changes from topic \'cphs\'
am: 271ffade05

* commit '271ffade05ec4afd059af495b8f24384cf95de47':
Make FSM for loading SPN more robust
Always display CPHS Operator Name when not roaming
a8ba76ad403ad6483232fe7d6007ecfd2159dfb4 18-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> Check permissions on getDeviceId. am: e61ea8c4e0
am: bc2f08fccb

* commit 'bc2f08fccb590fd990dcfa75a51bab9a9a3ee9b0':
Check permissions on getDeviceId.
bc2f08fccb590fd990dcfa75a51bab9a9a3ee9b0 17-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> Check permissions on getDeviceId.
am: e61ea8c4e0

* commit 'e61ea8c4e059bf9141c9f737c0db876a706c9c93':
Check permissions on getDeviceId.
a9242206850a72bffefbd8665c2b159aaa9ecdf1 17-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> Check permissions on getDeviceId.
am: 79eecef63f

* commit '79eecef63f3ea99688333c19e22813f54d4a31b1':
Check permissions on getDeviceId.
58b99bb51947053296d003d59c02670b7f90754f 17-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Check permissions on getDeviceId."
dd4b0f4b5a2def03bd45637be5ceed3e86781f68 16-Dec-2015 Amit Mahajan <amitmahajan@google.com> Added isPhoneTypeCdma() and isPhoneTypeCdmaLte()

Also includes:
- Removed unnecessary unreg/reg of phone with CallManager on
voice radio tech change. This is needed as otherwise Ims Phone may
get unreg but not reg again (on radio tech change).
- Allowing reg/unreg in GsmCdmaPhone regardless of phone type
- Removed unused Call.mIsGeneric

Bug: 25793157
Change-Id: Ie2093a50c1cf64918782076127decff90968fe72
all.java
allManager.java
smCdmaCall.java
smCdmaCallTracker.java
smCdmaConnection.java
smCdmaPhone.java
hone.java
erviceStateTracker.java
4726c1e12514d9b76f351bede5f6a6373df5574e 16-Dec-2015 Amit Mahajan <amitmahajan@google.com> Added isPhoneTypeCdma() and isPhoneTypeCdmaLte()

Also includes:
- Removed unnecessary unreg/reg of phone with CallManager on
voice radio tech change. This is needed as otherwise Ims Phone may
get unreg but not reg again (on radio tech change).
- Allowing reg/unreg in GsmCdmaPhone regardless of phone type
- Removed unused Call.mIsGeneric

Bug: 25793157
Change-Id: Ie2093a50c1cf64918782076127decff90968fe72
all.java
allManager.java
smCdmaCall.java
smCdmaCallTracker.java
smCdmaConnection.java
smCdmaPhone.java
hone.java
erviceStateTracker.java
612c77f3d365392a956ce423273449a7468c2e55 16-Apr-2015 Zoran Jovanovic <zoran.jovanovic@sonymobile.com> Make FSM for loading SPN more robust

Let FSM for loading SPN continue if the loaded
data is null or empty.

Change-Id: Ie0a138edb62a02761108b9dbf117d9199ef8354b
icc/SIMRecords.java
f214d9e52fdd08adf6786c727307af4c0b8e5c40 16-Apr-2015 Ulf Andersson <ulf4.andersson@sonymobile.com> Always display CPHS Operator Name when not roaming

According to CPHS spec (section B 4.1.1) the operator name
should be displayed when in HPLMN, otherwise only current
PLMN should be used. Adjust SPN display condition accordingly.

Change-Id: Ib760acc3a36a4a5b16c957cbca4397953ce5e4ca
icc/SIMRecords.java
c2b66d57e16623dffc2fe6d02ded4f24c014b6c8 14-Dec-2015 Amit Mahajan <amitmahajan@google.com> Code cleanup including removing direct references to IMS classes.

Bug: 25793157
Change-Id: I45ab1394d8585ae3d649f1bb8f67bcd16a946a85
all.java
allManager.java
onnection.java
smCdmaCall.java
smCdmaCallTracker.java
smCdmaConnection.java
smCdmaPhone.java
hone.java
honeFactory.java
erviceStateTracker.java
msphone/ImsPhone.java
msphone/ImsPhoneBase.java
msphone/ImsPhoneCall.java
msphone/ImsPhoneConnection.java
msphone/ImsPhoneMmiCode.java
ip/SipCallBase.java
ip/SipConnectionBase.java
ip/SipPhoneBase.java
0a567c9ed954f295df83c753239646c6f6a04128 24-Nov-2015 Amit Mahajan <amitmahajan@google.com> Adding initial tests for GsmCdmaCall and GsmCdmaPhone.

Also includes:
- Changes to fix/comment out failing tests
- Some cleanup in CallManager related to deletion of PhoneBase and
PhoneProxy
- ContextFixture containing mock Context for all telephony tests
- Phone test that exercises BroadcastReceiver support in the mock
Context
- Test showing how static function can be mocked

Bug: 25691379
Change-Id: Ia38423cef3cfb86389d044cac4e601983fae1192
allManager.java
smCdmaCall.java
smCdmaCallTracker.java
smCdmaConnection.java
smCdmaPhone.java
hone.java
honeBase.java
honeFactory.java
honeProxy.java
erviceStateTracker.java
elephonyComponentFactory.java
est/SimulatedCommands.java
772b718fd55ac6a13ab2f7a8b5997ab469bb7f65 14-Dec-2015 Amit Mahajan <amitmahajan@google.com> Code cleanup including removing direct references to IMS classes.

Bug: 25793157
Change-Id: I45ab1394d8585ae3d649f1bb8f67bcd16a946a85
all.java
allManager.java
onnection.java
smCdmaCall.java
smCdmaCallTracker.java
smCdmaConnection.java
smCdmaPhone.java
hone.java
honeFactory.java
erviceStateTracker.java
msphone/ImsPhone.java
msphone/ImsPhoneBase.java
msphone/ImsPhoneCall.java
msphone/ImsPhoneConnection.java
msphone/ImsPhoneMmiCode.java
ip/SipCallBase.java
ip/SipConnectionBase.java
ip/SipPhoneBase.java
e5468b6b0242c072d0b7eea7e6c75a536cb650df 24-Nov-2015 Amit Mahajan <amitmahajan@google.com> Adding initial tests for GsmCdmaCall and GsmCdmaPhone.

Also includes:
- Changes to fix/comment out failing tests
- Some cleanup in CallManager related to deletion of PhoneBase and
PhoneProxy
- ContextFixture containing mock Context for all telephony tests
- Phone test that exercises BroadcastReceiver support in the mock
Context
- Test showing how static function can be mocked

Bug: 25691379
Change-Id: Ia38423cef3cfb86389d044cac4e601983fae1192
allManager.java
smCdmaCall.java
smCdmaCallTracker.java
smCdmaConnection.java
smCdmaPhone.java
hone.java
honeBase.java
honeFactory.java
honeProxy.java
erviceStateTracker.java
elephonyComponentFactory.java
est/SimulatedCommands.java
31baa629e6d1afe981002be95d5287f23af46a67 11-Dec-2015 Tyler Gunn <tgunn@google.com> Merge commit '5e135330856f187b160cc0c235afc1aafdba2099' into mncvtdev-to-mmwirelessdev-merge-2015-12-10

Change-Id: Iee290e7651cf059cf660b056866337eb311738b7
1a87ab3d7170d618f048c4f5af8c7504a587aaa5 10-Dec-2015 Jack Yu <jackyu@google.com> Merge from master

Change-Id: Ifbd86600111d2c444031ff608fab62fb2ee4b236
aseCommands.java
allFailCause.java
allManager.java
allTracker.java
ellBroadcastHandler.java
ommandsInterface.java
onnection.java
efaultPhoneNotifier.java
smCdmaCall.java
smCdmaCallTracker.java
smCdmaConnection.java
smCdmaPhone.java
ccPhoneBookInterfaceManager.java
ccProvider.java
ccSmsInterfaceManager.java
msSMSDispatcher.java
nboundSmsHandler.java
miCode.java
hone.java
honeBase.java
honeFactory.java
honeInternalInterface.java
honeProxy.java
honeSubInfo.java
honeSubInfoController.java
roxyController.java
IL.java
MSDispatcher.java
erviceStateTracker.java
msApplication.java
msNumberUtils.java
msStorageMonitor.java
ubscriptionController.java
ubscriptionInfoUpdater.java
elephonyTester.java
iccPhoneBookController.java
iccSmsController.java
akeLockStateMachine.java
apPushOverSms.java
dma/CDMALTEPhone.java
dma/CDMAPhone.java
dma/CallFailCause.java
dma/CdmaCall.java
dma/CdmaCallTracker.java
dma/CdmaConnection.java
dma/CdmaInboundSmsHandler.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaMmiCode.java
dma/CdmaSMSDispatcher.java
dma/CdmaServiceStateTracker.java
dma/CdmaSubscriptionSourceManager.java
dma/EriManager.java
dma/RuimPhoneBookInterfaceManager.java
dma/SmsMessage.java
ataconnection/ApnContext.java
ataconnection/DataConnection.java
ataconnection/DcController.java
ataconnection/DcRetryAlarmController.java
ataconnection/DcSwitchStateMachine.java
ataconnection/DcTesterDeactivateAll.java
ataconnection/DcTesterFailBringUpAll.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
ataconnection/DctController.java
sm/CallFailCause.java
sm/GSMPhone.java
sm/GsmCall.java
sm/GsmCallTracker.java
sm/GsmCellBroadcastHandler.java
sm/GsmConnection.java
sm/GsmInboundSmsHandler.java
sm/GsmMmiCode.java
sm/GsmSMSDispatcher.java
sm/GsmServiceStateTracker.java
sm/GsmSmsCbMessage.java
sm/SimPhoneBookInterfaceManager.java
sm/SmsCbConstants.java
sm/SmsCbHeader.java
sm/SsData.java
sm/UsimPhoneBookManager.java
msphone/ImsPhone.java
msphone/ImsPhoneBase.java
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneCommandInterface.java
msphone/ImsPhoneConnection.java
msphone/ImsPhoneMmiCode.java
ip/SipCommandInterface.java
ip/SipPhone.java
ip/SipPhoneBase.java
est/SimulatedCommands.java
icc/AdnRecord.java
icc/AdnRecordCache.java
icc/AdnRecordLoader.java
icc/IccFileHandler.java
icc/IccRecords.java
icc/SIMRecords.java
icc/UiccCard.java
28fe36a7cb4eda42e5701daa4b5ed1590c88951b 10-Dec-2015 Vineeta Srivastava <vsrivastava@google.com> Merge "Revert "Revert "Fix problem with cell data service after SIM swap""" into mnc-dr1.5-dev
am: b5a56d1ddb

* commit 'b5a56d1ddb7081014910b379d7291f2a44ac7178':
Revert "Revert "Fix problem with cell data service after SIM swap""
b5a56d1ddb7081014910b379d7291f2a44ac7178 10-Dec-2015 Vineeta Srivastava <vsrivastava@google.com> Merge "Revert "Revert "Fix problem with cell data service after SIM swap""" into mnc-dr1.5-dev
06849843ff5567a70fa7d342642119a20d30ff52 10-Dec-2015 Vineeta Srivastava <vsrivastava@google.com> Revert "Revert "Fix problem with cell data service after SIM swap""

This reverts commit 39f58e35ce1615ebef918562299b8c349a68f463.

Bug: 25602190
Bug: 25953443
Change-Id: Iae0dea164d6c25771e79759715f4e39d13303949
ataconnection/DctController.java
f5d8153e332656fb541746ae266ee1b1ccf75f7a 10-Dec-2015 Vineeta Srivastava <vsrivastava@google.com> Merge "Revert "Fix problem with cell data service after SIM swap"" into mnc-dr1.5-dev
am: c220e7f628

* commit 'c220e7f6285b28720f1a1e718b7d073054307fb3':
Revert "Fix problem with cell data service after SIM swap"
fef63feee92c791a6b50b09b6e224d4af4c73f45 09-Dec-2015 Amit Mahajan <amitmahajan@google.com> Merge "Re-init variables and trigger other init actions on RAT change"
c220e7f6285b28720f1a1e718b7d073054307fb3 09-Dec-2015 Vineeta Srivastava <vsrivastava@google.com> Merge "Revert "Fix problem with cell data service after SIM swap"" into mnc-dr1.5-dev
39f58e35ce1615ebef918562299b8c349a68f463 08-Dec-2015 Vineeta Srivastava <vsrivastava@google.com> Revert "Fix problem with cell data service after SIM swap"

This reverts commit de5bdca0e91d156f1cc02ece70166db633cb1fa2.

Bug: 26039698
Change-Id: Ie29e021984f6abd412068f5b48866af3efab525a
ataconnection/DctController.java
3a94f7b73d8f601e3136e7a33f2da9e594715ad3 04-Dec-2015 Amit Mahajan <amitmahajan@google.com> Re-init variables and trigger other init actions on RAT change

In order to not change the functionality due to phone refactor,
some variables should be reset to initial values on RAT change
otherwise stale values may be used.
Earlier some registrations were done (like for radio state) in
Phone constructors for which a response was expected right away.
Since that does not happen with the refactor, this CL also
includes changes to proactively query radio state.

Bug: 25793157
Change-Id: I33d1d5ea003c5abb69aad291f1903864c8a8f116
smCdmaCallTracker.java
smCdmaPhone.java
hone.java
erviceStateTracker.java
67ab62214b6faaa307b74d11f189a15f8d50fbd0 08-Dec-2015 Amit Mahajan <amitmahajan@google.com> Merge "Use new StateMachine apis to check if a message is pending" into mnc-dr1.5-dev am: 97cb5ed3a7
am: e43f7b879a

* commit 'e43f7b879a3a7572b3f072b4965782ddf2afd8ba':
Use new StateMachine apis to check if a message is pending
e43f7b879a3a7572b3f072b4965782ddf2afd8ba 08-Dec-2015 Amit Mahajan <amitmahajan@google.com> Merge "Use new StateMachine apis to check if a message is pending" into mnc-dr1.5-dev
am: 97cb5ed3a7

* commit '97cb5ed3a793927d20061e8590e133912cf03d2e':
Use new StateMachine apis to check if a message is pending
e61ea8c4e059bf9141c9f737c0db876a706c9c93 04-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> Check permissions on getDeviceId.

bug:25778215
Change-Id: Id0f166ae61f6228a639188112d30c0c66820ee02
honeSubInfoController.java
honeSubInfoProxy.java
97cb5ed3a793927d20061e8590e133912cf03d2e 07-Dec-2015 Amit Mahajan <amitmahajan@google.com> Merge "Use new StateMachine apis to check if a message is pending" into mnc-dr1.5-dev
461ef2820ff56847929e18bd430fd849ec4a6ea3 05-Dec-2015 Tyler Gunn <tgunn@google.com> Revert "Revert "Merge commit '6aa3318' into merge""

This reverts commit 6aa8cf6d4d8ebb9efa76e18b2ea274a4a62020cf.

Change-Id: Ib0e1eca38b2e0d15bd94745aa9c27dd18df49295
msphone/ImsPhoneCallTracker.java
a9084521d46a0e8575a6faa5efdf130c43e32ca3 05-Dec-2015 Pavel Zhamaitsiak <pavelz@google.com> Fix problem with cell data service after SIM swap am: de5bdca0e9
am: 82c68d2538

* commit '82c68d253891b57d0c9197c6205290ca11ed5bd8':
Fix problem with cell data service after SIM swap
f5bd5e9b92cc9e42a65ad3b18f74ee6c72fd0394 04-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> Check permissions on getDeviceId.

bug:25778215
Change-Id: I93c79170dc9639f9c7ea3529b3770c75f97c354a
honeSubInfoController.java
honeSubInfoProxy.java
79eecef63f3ea99688333c19e22813f54d4a31b1 05-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> Check permissions on getDeviceId.

bug:25778215
Change-Id: Ie27d69e558a8132f6e0c5058aaad1a4ae02bf82f
honeSubInfoController.java
b5920b37e35723309f8b50787dc544a34b453194 04-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> Check permissions on getDeviceId.

bug:25778215
Change-Id: I99abe0744a1bfe6172e6409a9c491c3f23ed3d37
honeSubInfoController.java
honeSubInfoProxy.java
ebe349e63b759ca37932e324acfbd91aefecfbe2 04-Dec-2015 Amit Mahajan <amitmahajan@google.com> Merge "Cleanup related to files removed in Phone refactor."
58dd6858dc8013b680ea003d22063fd65ed5fe1c 03-Dec-2015 Amit Mahajan <amitmahajan@google.com> Cleanup related to files removed in Phone refactor.

Mostly just updating comments to remove names of old classes.

Bug: 25793157
Change-Id: I2f4d48b2f6428f78475652060a471a7c69ef7dd0
aseCommands.java
ommandsInterface.java
smCdmaCallTracker.java
smCdmaPhone.java
hone.java
honeFactory.java
IL.java
erviceStateTracker.java
ubscriptionInfoUpdater.java
dma/CdmaSubscriptionSourceManager.java
sm/GsmInboundSmsHandler.java
sm/GsmMmiCode.java
msphone/ImsPhone.java
ip/SipCommandInterface.java
ip/SipPhone.java
icc/IccRecords.java
icc/SIMRecords.java
beaae9a70080e68121920e87a102fb6cb28c0edf 03-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Fixed the crash occured when importing contacts from SIM."
96cf37fcb4f67cbf52df84ca307c76ff9f463791 03-Dec-2015 Jack Yu <jackyu@google.com> Fixed the crash occured when importing contacts from SIM.

Added invalid PBR record check before adding it into the PBR
records. Also added EF_ADN tag check before we build the SFI
table because theoratically it is possible that EF_ADN tag
does not exist in EF_PBR.

bug: 25942553
Change-Id: I446f5d081902f5e0ab6d6fe406c6ebd5d3edc03e
sm/UsimPhoneBookManager.java
a635fd92e8022f103fde2e8728b312b2cb8fa0c6 04-Jan-2013 Preeti Ahuja <preetia@codeaurora.org> Don't assume 3GPP as active app on CDMA with LTE device

IccCardProxy assumes, that on a CDMA+LTE device, the active app
is the SIM/USIM and not the RUIM/CSIM. However, for voice RUIM/CSIM
is the active app on such a device. All services, like FDN,etc. should
be tied to the active voice app.

Bug: 22931195
Change-Id: Ib1a3440c01b55a3be6ec8271dc69b3001ea65861
icc/IccCardProxy.java
82c68d253891b57d0c9197c6205290ca11ed5bd8 03-Dec-2015 Pavel Zhamaitsiak <pavelz@google.com> Fix problem with cell data service after SIM swap
am: de5bdca0e9

* commit 'de5bdca0e91d156f1cc02ece70166db633cb1fa2':
Fix problem with cell data service after SIM swap
ec2e4a8f12e5b67b1116e0c655a08c0216b8cd07 26-Nov-2015 Amit Mahajan <amitmahajan@google.com> Phone Refactor Phase 3. Moved Gsm/Cdma/CdmaLte SST code to parent.

Getting rid of separate SSTs. This helps avoid disposing and
reinstantiating objects on switching voice tech.

Bug: 25793157
Change-Id: I7097efd90ab8b6a4891d66b8b6d74446f091a6f0
aseCommands.java
smCdmaPhone.java
hone.java
erviceStateTracker.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
sm/GsmServiceStateTracker.java
de5bdca0e91d156f1cc02ece70166db633cb1fa2 25-Nov-2015 Pavel Zhamaitsiak <pavelz@google.com> Fix problem with cell data service after SIM swap

Bug: 25602190
Bug: 25953443
Change-Id: Ic0b12522df9e6effad3918a540fcece30f61523d
ataconnection/DctController.java
9ee6b71bbb0b0cddf5f9a3d6a21b42afedfebcb5 01-Dec-2015 Tom Taylor <tomtaylor@google.com> TRON: log changes to the default SMS app

Bug 25929677

Log the action when the user changes the default SMS app.

Change-Id: I5c4867f41c99583c505e3a8bee86c0c0fd8ef455
msApplication.java
7a68be31d1fedbc97d712c6114d4585370f0c399 30-Nov-2015 Tom Taylor <tomtaylor@google.com> Add two new intents

Add an ACTION_DEFAULT_SMS_PACKAGE_CHANGED intent to notify the old and
the new default sms app of the change. Add an ACTION_EXTERNAL_PROVIDER_CHANGE
intent used to notify the default SMS app when another whitelisted app
(such as AndroidAuto [via bluetooth] or the phone) changes the SmsProvider
or MmsProvider behind the default SMS's back.

Change-Id: Id036b1313124f08ff1d48b306e68b5f457d235c7
msApplication.java
6c806ef816f8ae0a1849ba05f3128a04577b32d0 25-Nov-2015 Amit Mahajan <amitmahajan@google.com> Phone refactor Phase II. Renamed PhoneBase to Phone.

Phone interface has been renamed to PhoneInternalInterface. For
outside world, Phone is now the only handle that should be used
for phone related classes (earlier there were Phone, PhoneBase,
GSMPhone, etc.). Some cleanup is still pending to make sure
technology specific phone is not used outside of telephony at all
(and even within telephony as much as possible).

Bug: 25793157
Change-Id: Ic19b286e6d2580e5537f4f6a8dc8afe39d80a803
allManager.java
allTracker.java
ellBroadcastHandler.java
smCdmaPhone.java
ccPhoneBookInterfaceManager.java
ccSmsInterfaceManager.java
msSMSDispatcher.java
nboundSmsHandler.java
hone.java
honeBase.java
honeFactory.java
honeInternalInterface.java
honeProxy.java
honeSubInfoController.java
roxyController.java
MSDispatcher.java
erviceStateTracker.java
msNumberUtils.java
msStorageMonitor.java
ubscriptionController.java
elephonyTester.java
iccPhoneBookController.java
iccSmsController.java
akeLockStateMachine.java
dma/CdmaInboundSmsHandler.java
dma/CdmaSMSDispatcher.java
dma/EriManager.java
ataconnection/DataConnection.java
ataconnection/DcController.java
ataconnection/DcRetryAlarmController.java
ataconnection/DcSwitchStateMachine.java
ataconnection/DcTesterDeactivateAll.java
ataconnection/DcTesterFailBringUpAll.java
ataconnection/DcTracker.java
ataconnection/DctController.java
sm/GsmCellBroadcastHandler.java
sm/GsmInboundSmsHandler.java
sm/GsmSMSDispatcher.java
msphone/ImsPhone.java
msphone/ImsPhoneBase.java
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
ip/SipPhoneBase.java
icc/UiccCard.java
404c14997656207f5da849224bb130d45dc94536 24-Nov-2015 Amit Mahajan <amitmahajan@google.com> Adding handling for newUnknownConnection on GSM.

This was missed during initial merge.

Bug: 25793157
Change-Id: I25a3e87681fcadcd5e22b860533868a6ae6af747
smCdmaCallTracker.java
aa0721e50a56115b751b1c14dc7c2341caf4ec67 24-Nov-2015 Amit Mahajan <amitmahajan@google.com> Ignore messages in SST if phone type does not match to fix crash

Other cleanup:
1. Removed mIsTheCurrentActivePhone
2. Call unregisterForAllDataDisconnected() and
unregisterForImsNetworkStateChanged() on SST dispose()

Bug: 25844814
Change-Id: I408de35b8875cec1bec9f0690053b90f3076d88d
smCdmaCallTracker.java
smCdmaPhone.java
honeBase.java
erviceStateTracker.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
ataconnection/DcTracker.java
sm/GsmServiceStateTracker.java
fd34e37f6663cfe673cd5ec7985bf4427d82ad52 24-Nov-2015 Amit Mahajan <amitmahajan@google.com> Merge "Change to not unregister CallTracker for callStateChange on switching RAT"
2296527151ea6132b3e241efa398769c7b6e9a1d 24-Nov-2015 Amit Mahajan <amitmahajan@google.com> Change to not unregister CallTracker for callStateChange on switching RAT

Bug: 25836165
Change-Id: I21c61c3152762585afd9ba0c5c06a48a6381c943
smCdmaCallTracker.java
4a6854f070191becfc32a9205f2000b53e6ba5f4 04-Nov-2015 Sungmin Choi <sungmin.choi@lge.com> Fix to return mno dun apn when mvno is not matched

If different type with same apn in apns-conf.xml,
apn should merge through createApnList() -> dedupeApnSettings()
but tethering apn will be chosen by fetchDunApn().
So, apn merge does not work in spite of using same apn.

This will cause make a another requestNetwork with same apn.
In this case, Hotspot is not working.

BUG=25331132

Change-Id: I43de74b93c919b0060b3ecc473b048f3c917e729
ataconnection/DcTracker.java
3a96b0ee1d152549279c58ba24a0a035cc9a557b 03-Nov-2015 Amit Mahajan <amitmahajan@google.com> Phone refactor

This change is to replace deleteAndCreatePhone() with a simple switch
of RAT in GsmCdmaPhone. It also merges a number of other GSM and
CDMA files (Call, CallTracker, Connection, Phone,
PhoneBookIntefaceManager, CallFailCause), and gets rid of PhoneProxy.

Main pending items:
1. General cleanup of merged code
2. Sanity, regression testing by test team

Bug: 25793157
Change-Id: I08f55b325992fdc0f568d42433507b70b6ceb06d
allFailCause.java
allManager.java
smCdmaCall.java
smCdmaCallTracker.java
smCdmaConnection.java
smCdmaPhone.java
ccPhoneBookInterfaceManager.java
miCode.java
hone.java
honeBase.java
honeFactory.java
honeProxy.java
honeSubInfoController.java
roxyController.java
ubscriptionController.java
iccPhoneBookController.java
iccSmsController.java
dma/CDMALTEPhone.java
dma/CDMAPhone.java
dma/CallFailCause.java
dma/CdmaCall.java
dma/CdmaCallTracker.java
dma/CdmaConnection.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaMmiCode.java
dma/CdmaSMSDispatcher.java
dma/CdmaServiceStateTracker.java
dma/EriManager.java
dma/RuimPhoneBookInterfaceManager.java
dma/SmsMessage.java
ataconnection/DcSwitchStateMachine.java
ataconnection/DcTracker.java
ataconnection/DctController.java
sm/CallFailCause.java
sm/GSMPhone.java
sm/GsmCall.java
sm/GsmCallTracker.java
sm/GsmConnection.java
sm/GsmMmiCode.java
sm/GsmServiceStateTracker.java
sm/GsmSmsCbMessage.java
sm/SimPhoneBookInterfaceManager.java
sm/SmsCbHeader.java
sm/SsData.java
msphone/ImsPhone.java
msphone/ImsPhoneBase.java
msphone/ImsPhoneMmiCode.java
ip/SipPhoneBase.java
est/SimulatedCommands.java
icc/UiccCard.java
70be89e9c7f9a9109d2388b44807c50e81c623c4 20-Nov-2015 Sungmin Choi <sungmin.choi@lge.com> Fix to return mno dun apn when mvno is not matched
am: 2df8a14c75

* commit '2df8a14c753742562962a5edcd5088f28f51615d':
Fix to return mno dun apn when mvno is not matched
ae982547df8032d2142fe1079661e765dfb058fb 19-Nov-2015 Amit Mahajan <amitmahajan@google.com> Merge "Revert "Remove unused PhoneSubInfoController.""
aa48e77d9b817a4749c49551632bd8eb7888d121 19-Nov-2015 Amit Mahajan <amitmahajan@google.com> Revert "Remove unused PhoneSubInfoController."

This reverts commit de2028f31d22a143858c998c5c618380730f3f8d.

PhoneSubInfoController provides the iphonesubinfo service so it is not
directly referenced anywhere but is still used.

Bug: 25751658
Change-Id: Ia2fcae4c66d879aeea953d0c46932f3316435475
honeSubInfoController.java
roxyController.java
6238b409d1d05b6a0c131a9ec020cdf33b46bd26 03-Nov-2015 Amit Mahajan <amitmahajan@google.com> Use new StateMachine apis to check if a message is pending

Bug: 23067429
Change-Id: Ic64a749eee6c13d3619549d4dd5e07307e2cfac0
ataconnection/DataConnection.java
438e1504e13d3a83ff2f9aee38c54bb0c79d1135 18-Nov-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Remove unused class PhoneSubInfoController" am: 8f799629d9
am: 8dc729a5f5

* commit '8dc729a5f5f170f97798b2167e432926a2c9f94a':
Remove unused class PhoneSubInfoController
8dc729a5f5f170f97798b2167e432926a2c9f94a 18-Nov-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Remove unused class PhoneSubInfoController"
am: 8f799629d9

* commit '8f799629d9d4955e5930c97f8960ac70e8d14901':
Remove unused class PhoneSubInfoController
65360f2ec619b9816e301712e94d10d596ccd6b8 18-Nov-2015 Zoran Jovanovic <zoran.jovanovic@sonymobile.com> Remove unused class PhoneSubInfoController

Change-Id: Ia3ac6d6b90b0c25f2ba056ad8f0348e077ab0c09
honeSubInfoController.java
roxyController.java
3eec24264e965e5ad89963dda1a6b8ed71e6f3cb 17-Nov-2015 Jack Yu <jackyu@google.com> Merge "Added additional CMAS channels for Taiwan."
2df8a14c753742562962a5edcd5088f28f51615d 04-Nov-2015 Sungmin Choi <sungmin.choi@lge.com> Fix to return mno dun apn when mvno is not matched

If different type with same apn in apns-conf.xml,
apn should merge through createApnList() -> dedupeApnSettings()
but tethering apn will be chosen by fetchDunApn().
So, apn merge does not work in spite of using same apn.

This will cause make a another requestNetwork with same apn.
In this case, Hotspot is not working.

BUG=25331132

Change-Id: I43de74b93c919b0060b3ecc473b048f3c917e729
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
7e9b726788dff57196b4b6046987f22e1881e613 09-Jan-2013 Preeti Ahuja <preetia@codeaurora.org> Specify path when reading contacts from EF_ADN

Some cards, like RUIM and UICC with CSIM, have the same file ID for
multiple EFs. e.g. EF_ADN and EF_CSIM_LI. When trying to retrieve
the EF_ADN from such a card, the path gets mapped to that of
EF_CSIM_LI resulting in incorrect behavior.

To avoid this, specify the EF Id and the path to uniquely identify
EF_ADN, when reading contacts.

Bug: 21268058
Change-Id: If7052e640810e89ec3ff13169c6166b500b0ed46
(cherry picked from commit cfa6dbeaf46193dae1be6779783f6ec2dc09b7ab)
icc/AdnRecordLoader.java
icc/IccFileHandler.java
442aede68fcf94c31cdfa7f2fb831811d76a240a 14-Nov-2015 Jack Yu <jackyu@google.com> Added additional CMAS channels for Taiwan.

1. Added CMAS additional languages support for Taiwan.
2. Added channel 911 and 919 for Taiwan.

bug: 25417989
Change-Id: Ibf4e2cdc2fdb90b3f996a1da827594522bf12b50
sm/SmsCbConstants.java
sm/SmsCbHeader.java
34a193da2093b5e6facb6ea94fd0331c8b5b2cdb 13-Nov-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Restore dumpsys iphonesubinfo" am: 0f5e02ddde am: 7cf9268112
am: 8ba361aad9

* commit '8ba361aad94fa19cafde723871b442ff55799cf3':
Restore dumpsys iphonesubinfo
8ba361aad94fa19cafde723871b442ff55799cf3 13-Nov-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Restore dumpsys iphonesubinfo" am: 0f5e02ddde
am: 7cf9268112

* commit '7cf9268112a7e014ab649ed6d8a16b8053567be4':
Restore dumpsys iphonesubinfo
7cf9268112a7e014ab649ed6d8a16b8053567be4 13-Nov-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Restore dumpsys iphonesubinfo"
am: 0f5e02ddde

* commit '0f5e02ddde4c4f84d77e02892badb6a857f674bd':
Restore dumpsys iphonesubinfo
0f5aa609061d4bbe76a5cd24c889793c8598d19e 08-Oct-2015 Zoran Jovanovic <zoran.jovanovic@sonymobile.com> Restore dumpsys iphonesubinfo

When Multi SIM was implemented, that broke dumpsys for several
telephony related services. The class that registers the service
does not override dump, though, but the info is available
in PhoneFactory and can be dumped via TelephonyDebugService.

Note: This change only fixes iphonesubinfo. Imms, isms and others are
still broken.

Change-Id: Ie5b8600c40b07c49c28b3df8a3c0d56527434710
honeFactory.java
de2028f31d22a143858c998c5c618380730f3f8d 12-Nov-2015 Robert Greenwalt <rgreenwalt@google.com> Remove unused PhoneSubInfoController.

Change-Id: I781e8c3f48e293f5880bf021593e977f5eafefbc
honeSubInfoController.java
roxyController.java
43b4cb5c76ad0fa22e4aa6919512505f4eccc472 06-Nov-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Flatten DcTracker and DcTrackerBase."
987760f08328b4e58142577df887fd9bed2447d5 04-Nov-2015 Robert Greenwalt <rgreenwalt@google.com> Flatten DcTracker and DcTrackerBase.

Nobody else subclassed the parent so it simplifies the code a bit
to combine the two.

Change-Id: I3df96ceca75218712dcb1e87fbac13df5631e534
honeBase.java
erviceStateTracker.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
ataconnection/ApnContext.java
ataconnection/DataConnection.java
ataconnection/DcController.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
ataconnection/DctController.java
sm/GsmServiceStateTracker.java
22ad41fdcfc6e2776f2df942854a3e8223203e6b 03-Nov-2015 Tyler Gunn <tgunn@google.com> Merge "Set WIFI icon for connection based on connection extra." into mnc-dr-dev am: d9fb1fe293 am: 809adf2edc am: 10aac5c04c
am: bc16cf9520

* commit 'bc16cf9520c994f0908cacd3a2b5a06765bf4846':
Set WIFI icon for connection based on connection extra.
801e1c26e6caf18f4290779d81735a258b8b60e3 03-Nov-2015 Sanket Padawe <sanketpadawe@google.com> Fix a crash while printing ICCID because of alphabets in UICC. am: 6d7e8df926 am: 7db0d30735 am: d9a19d1151
am: b7059ce95d

* commit 'b7059ce95d5fd72d96622f760b150c1fd16738d1':
Fix a crash while printing ICCID because of alphabets in UICC.
10aac5c04c8d08f07e10b83d8e4d14d025c77560 03-Nov-2015 Tyler Gunn <tgunn@google.com> Merge "Set WIFI icon for connection based on connection extra." into mnc-dr-dev am: d9fb1fe293
am: 809adf2edc

* commit '809adf2edcfb628c7dd06ca5fa95009b045cea0c':
Set WIFI icon for connection based on connection extra.
809adf2edcfb628c7dd06ca5fa95009b045cea0c 03-Nov-2015 Tyler Gunn <tgunn@google.com> Merge "Set WIFI icon for connection based on connection extra." into mnc-dr-dev
am: d9fb1fe293

* commit 'd9fb1fe293c3832666755f1ed478671698a16bd5':
Set WIFI icon for connection based on connection extra.
d9fb1fe293c3832666755f1ed478671698a16bd5 03-Nov-2015 Tyler Gunn <tgunn@google.com> Merge "Set WIFI icon for connection based on connection extra." into mnc-dr-dev
d9a19d11511ff78cb9426d005530c35f98000a39 03-Nov-2015 Sanket Padawe <sanketpadawe@google.com> Fix a crash while printing ICCID because of alphabets in UICC. am: 6d7e8df926
am: 7db0d30735

* commit '7db0d3073570214fc09d2f0a8b5922eea5288f04':
Fix a crash while printing ICCID because of alphabets in UICC.
7db0d3073570214fc09d2f0a8b5922eea5288f04 03-Nov-2015 Sanket Padawe <sanketpadawe@google.com> Fix a crash while printing ICCID because of alphabets in UICC.
am: 6d7e8df926

* commit '6d7e8df9269a2f05db250145532fd4ce9de6bbad':
Fix a crash while printing ICCID because of alphabets in UICC.
6d7e8df9269a2f05db250145532fd4ce9de6bbad 03-Nov-2015 Sanket Padawe <sanketpadawe@google.com> Fix a crash while printing ICCID because of alphabets in UICC.

Bug: 25401769
Change-Id: Ibe521237989b7f640cafcf8c21a5b8ff6b87d723
ubscriptionController.java
icc/IccRecords.java
2e66c6325d321e41b8851da9a4596f7a745c7b1e 02-Nov-2015 Tyler Gunn <tgunn@google.com> Set WIFI icon for connection based on connection extra.

Previous methodology looked for changes in the Ims feature availability
in the ImsPhoneCallTracker. I.e. there was an assumption made that if
the IMS stack had VoWIFI enabled that we were using it.

A new extra was added for the 3 nexus devices,
ImsCallProfile.EXTRA_CALL_RAT_TYPE. This determines the radio technology
in use for a call, which we can then use to accurately show the WIFI
calling icon.

Bug: 20144385
Change-Id: I5aee9a571c7458f576a9208b81bed9781046a39a
msphone/ImsPhoneConnection.java
65573168d2e3cd43869076a3a28a86ff4c25edad 28-Oct-2015 Vineeta Srivastava <vsrivastava@google.com> Merge "Change gid-matching process" into mnc-dr-dev am: 91a47f416f am: 54562b6480 am: 05644d94df
am: 45029f56d3

* commit '45029f56d3e9b168563a01a3f7ca075a404389a8':
Change gid-matching process
cdbe81f3a8c4924045e3a6409a7541a0538a17a0 28-Oct-2015 Amit Mahajan <amitmahajan@google.com> Merge "Save call forwarding flag in SharedPreference." into mnc-dr-dev am: 5bb5a8e73f am: f5030327eb am: 69e0f24216
am: b51c0df15d

* commit 'b51c0df15d56eff6b59b63bbcdb448a4a934a375':
Save call forwarding flag in SharedPreference.
05644d94df4a0b0c374a42e724fab14fafdb6064 28-Oct-2015 Vineeta Srivastava <vsrivastava@google.com> Merge "Change gid-matching process" into mnc-dr-dev am: 91a47f416f
am: 54562b6480

* commit '54562b6480f60f5034cfdf44f3bee18048540eca':
Change gid-matching process
69e0f24216f11ea8b6454d7fb0ddce9f713e4865 28-Oct-2015 Amit Mahajan <amitmahajan@google.com> Merge "Save call forwarding flag in SharedPreference." into mnc-dr-dev am: 5bb5a8e73f
am: f5030327eb

* commit 'f5030327eb677a36d6f25169b90b1f86488ab555':
Save call forwarding flag in SharedPreference.
54562b6480f60f5034cfdf44f3bee18048540eca 28-Oct-2015 Vineeta Srivastava <vsrivastava@google.com> Merge "Change gid-matching process" into mnc-dr-dev
am: 91a47f416f

* commit '91a47f416f3135223e69b2b4d0c8c6b8e92cd36b':
Change gid-matching process
91a47f416f3135223e69b2b4d0c8c6b8e92cd36b 28-Oct-2015 Vineeta Srivastava <vsrivastava@google.com> Merge "Change gid-matching process" into mnc-dr-dev
30c5eb9807510ff568b24b68912b200bfd2c1c39 27-Oct-2015 Sungmin Choi <sungmin.choi@lge.com> Change gid-matching process

Before: support only full gid match
After: support configured gid match like ApnSettings

BUG: 25264265
Change-Id: I0d8de93a7519a3a840642c513845aefba1aa1423
honeBase.java
dma/CDMAPhone.java
sm/GSMPhone.java
f5030327eb677a36d6f25169b90b1f86488ab555 28-Oct-2015 Amit Mahajan <amitmahajan@google.com> Merge "Save call forwarding flag in SharedPreference." into mnc-dr-dev
am: 5bb5a8e73f

* commit '5bb5a8e73f4ff2cca480cec3d296b4ccf254580e':
Save call forwarding flag in SharedPreference.
5bb5a8e73f4ff2cca480cec3d296b4ccf254580e 27-Oct-2015 Amit Mahajan <amitmahajan@google.com> Merge "Save call forwarding flag in SharedPreference." into mnc-dr-dev
fdd04d44512ee615ff3c0faa71e2e7747072967f 27-Oct-2015 Bryce Lee <brycelee@google.com> DO NOT MERGE ANYWHERE

Revert "Fix data connection issues introduced in a7228870"

This reverts commit 92760e1668917ad234d7283fc47d4c99f8c427c8.

Bug: 25272633
Change-Id: Iac5fdbb77a07f5e128d007b8fdc66b91c23e1454
ataconnection/DctController.java
b4ba14c13e789c75484904ed363988c8c05d4c3e 26-Oct-2015 Paul Jensen <pauljensen@google.com> Merge "Remove dead ACTION_DATA_CONNECTION_CONNECTED_TO_PROVISIONING_APN"
eadee84166d397b6425cfd56f89fa1569f6a93f5 22-Oct-2015 Amit Mahajan <amitmahajan@google.com> Save call forwarding flag in SharedPreference.

Bug: 22822731
Change-Id: I801738685b65fc0ee0410c1ad4925d15694c81f4
honeBase.java
sm/GSMPhone.java
sm/GsmMmiCode.java
msphone/ImsPhone.java
msphone/ImsPhoneMmiCode.java
icc/IccRecords.java
icc/SIMRecords.java
512762941c66e40cde13116a7e17fa425576f3bd 23-Oct-2015 Tyler Gunn <tgunn@google.com> Merge "Add ECM exit listener."
14dc37293eff7ed8db96f7535f489a18ced9fc6c 23-Oct-2015 Tyler Gunn <tgunn@google.com> Merge "Ensure connection extras set before connection start are passed through." into mnc-dr-dev am: 43e3657696 am: 3f1fba095d
am: 949d907a72

* commit '949d907a7211f232b07e793a54ca3a5a3b7b50de':
Ensure connection extras set before connection start are passed through.
3f1fba095dd2a03f9a44fff2e1af0177c5731469 23-Oct-2015 Tyler Gunn <tgunn@google.com> Merge "Ensure connection extras set before connection start are passed through." into mnc-dr-dev
am: 43e3657696

* commit '43e3657696efff11ff8eb40ecb0a7364103b50f4':
Ensure connection extras set before connection start are passed through.
43e3657696efff11ff8eb40ecb0a7364103b50f4 23-Oct-2015 Tyler Gunn <tgunn@google.com> Merge "Ensure connection extras set before connection start are passed through." into mnc-dr-dev
553db651cd5a51eedde0259d5a25e91700ef96c5 23-Oct-2015 Tyler Gunn <tgunn@google.com> Ensure connection extras set before connection start are passed through.

In ImsPhoneConnection, the extras pertaining to a "Child number" were
set on the ImsCallProfile prior to the connection being created. Turns
out we only pass along extras when they're changed. However, when the
connection is new we never call the callback to indicate the connection
extras changed.

Added code in ImsPhoneConnection to set the extras when the connection
is first created.

This ensures the extras make it to InCall for incoming calls.

Bug: 24585039
Change-Id: I90993a278b76371bf514fd332adf78bc58505357
onnection.java
msphone/ImsPhoneConnection.java
36db898db399b3ee6eaf776185ba1c6fc028eaa6 22-Oct-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "Fix data connection issues introduced in a7228870" into mnc-dr-dev am: 1c0adee03c am: cc27ffa986
am: 9199ed986f

* commit '9199ed986f2a13e7195f4a10b89806a53c886624':
Fix data connection issues introduced in a7228870
cc27ffa98690eb53ffaad7c3f9467fc04ba22356 22-Oct-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "Fix data connection issues introduced in a7228870" into mnc-dr-dev
am: 1c0adee03c

* commit '1c0adee03c15bd8ebda98853f055eef1f01d85ec':
Fix data connection issues introduced in a7228870
92760e1668917ad234d7283fc47d4c99f8c427c8 21-Oct-2015 Pavel Zhamaitsiak <pavelz@google.com> Fix data connection issues introduced in a7228870

Bug: 25026240
Change-Id: Ia6c8c84106efd519abe42d2e7c24674bcb901125
ataconnection/DctController.java
9a6ccba4a81c3cbae55e79ef7afde55a60cfbcf0 19-Oct-2015 Bart Sears <bsears@google.com> Revert "Revert "Fix HD icon shown for MO VoLTE call when it shouldn't""

This reverts commit 583b14cd5e8f3047ff68cb4c4a6ca39f2c754b79.

Change-Id: I5763228af157e7d003bcaaeefd2977b7ed4a3e17
msphone/ImsPhoneConnection.java
583b14cd5e8f3047ff68cb4c4a6ca39f2c754b79 19-Oct-2015 Bart Sears <bsears@google.com> Revert "Fix HD icon shown for MO VoLTE call when it shouldn't"

This reverts commit 309bfd91645d4da1a7becbf2e6b2dc3f865ca0b5.

Change-Id: I5da64fd85283d57d667702d04591aa1b1deebe30
msphone/ImsPhoneConnection.java
c402231fc36a412dcdc52f5a6d2544eedb9fcae6 16-Oct-2015 Tyler Gunn <tgunn@google.com> am 47460f47: Merge "DO NOT MERGE Add delay between postdial DTMF tones for CDMA." into mnc-dr-dev

* commit '47460f471b00b1d0a80d207ca5c020bc58eeb274':
DO NOT MERGE Add delay between postdial DTMF tones for CDMA.
47460f471b00b1d0a80d207ca5c020bc58eeb274 16-Oct-2015 Tyler Gunn <tgunn@google.com> Merge "DO NOT MERGE Add delay between postdial DTMF tones for CDMA." into mnc-dr-dev
059a9a5494e190d940ce9728cb1b821c2fe04788 16-Oct-2015 Tyler Gunn <tgunn@google.com> DO NOT MERGE Add delay between postdial DTMF tones for CDMA.

Adding a delay between the postdial DTMF char tones sent out to the
network for CDMA phones.
This is based on a similar set of changes for IMS calls: ag/747687.

BUG: 19118840
Change-Id: Ifcd70bb44da5fba808f31b3021f063b545a1b740
dma/CdmaCallTracker.java
dma/CdmaConnection.java
c95e295a043ca4e717edbdcf18780d6bd9e3276e 16-Oct-2015 Sanket Padawe <sanketpadawe@google.com> am 62f5c51d: am 49d9a18a: am 497d54c0: Mask IccId which gets printed in bug reports & radio logs.

* commit '62f5c51d9ccc720d8c9d1354944ab2ca85f10445':
Mask IccId which gets printed in bug reports & radio logs.
0f79fcd2f95556505df002f20171eef49dd35a39 16-Oct-2015 Sanket Padawe <sanketpadawe@google.com> am 3a1490b7: am 65dae77a: am edd4a385: Hide IccId from SubscriptionController logs.

* commit '3a1490b74d401f59c9a65a2ee1a6e754b9cad08f':
Hide IccId from SubscriptionController logs.
49d9a18a4fa81bc7d09ad65e82cdc66734476ed7 16-Oct-2015 Sanket Padawe <sanketpadawe@google.com> am 497d54c0: Mask IccId which gets printed in bug reports & radio logs.

* commit '497d54c0f337bd71165122d2e2c54ec826f4fb17':
Mask IccId which gets printed in bug reports & radio logs.
65dae77a6a7529ea6956610da0b37f8941bed309 16-Oct-2015 Sanket Padawe <sanketpadawe@google.com> am edd4a385: Hide IccId from SubscriptionController logs.

* commit 'edd4a385f41a7fb765c0cbbc19b0fa6c0b2a1281':
Hide IccId from SubscriptionController logs.
497d54c0f337bd71165122d2e2c54ec826f4fb17 16-Oct-2015 Sanket Padawe <sanketpadawe@google.com> Mask IccId which gets printed in bug reports & radio logs.

Bug: 24941148
Change-Id: Ic26c657529def04cdd34cfd9d78a35ae3ef52d15
icc/IccRecords.java
edd4a385f41a7fb765c0cbbc19b0fa6c0b2a1281 16-Oct-2015 Sanket Padawe <sanketpadawe@google.com> Hide IccId from SubscriptionController logs.

Bug: 24941148
Change-Id: I53a36b390eb74fba8e6086f8b1102ace435592b5
ubscriptionController.java
f694b52d7d928b2058abda4b44b05d7dc4ae47c3 16-Oct-2015 Tyler Gunn <tgunn@google.com> Add ECM exit listener.

- Add ECM exist listener which listens for the
ACTION_EMERGENCY_CALLBACK_MODE_CHANGED intent; use this to trigger
notification to the current connections so that they can update themselves
to indicate they support Mute if ECM mode is disabled.
- Fixes a bug where ECM exits after a non-emerg connection starts; the
connection does not update itself to allow mute now that ECM is disabled.
- Also, fixed minor bug in CallTracker which would cause a crash when
trying to test emergency calls on IMS which does not have a
CommandInterface (mCI) instance.

Bug: 23044098
Change-Id: I3aef7b2f7e73d3496aac21a0e910316eee6ec22a
allTracker.java
onnection.java
dma/CdmaCallTracker.java
df876e1babb19ba928ef267967563ed0835d5e2e 15-Oct-2015 Paul Jensen <pauljensen@google.com> Remove dead ACTION_DATA_CONNECTION_CONNECTED_TO_PROVISIONING_APN

I centralized all the provisioning APN logic in Telephony back in
89e0f09 so this intent is now unused.

Bug:24451710
Change-Id: I401ac3e46442c8921545c88fee228873261ebd2b
ataconnection/DcTracker.java
f2ff28a3b1e5e7da0291da3bdb78b7cdbfe14ce2 15-Oct-2015 Robert Greenwalt <rgreenwalt@google.com> am 32d8f62f: am 27381de9: am 37a18425: Merge "Fix handling for no default phone." into mnc-dr-dev

* commit '32d8f62f24abfc0b1694ecf37de09e47e68da8f7':
Fix handling for no default phone.
27381de904a81f6c55e80a5fdbb514a6d9c4a782 15-Oct-2015 Robert Greenwalt <rgreenwalt@google.com> am 37a18425: Merge "Fix handling for no default phone." into mnc-dr-dev

* commit '37a18425e4d75e48a3f73e1c8a835f7b0b92d20f':
Fix handling for no default phone.
682afe07527c6042e34b14fc29bf058e5b2cd7cc 15-Oct-2015 Robert Greenwalt <rgreenwalt@google.com> Fix handling for no default phone.

When there's no sub available the SubscriptionManager gives
DEFAULT_PHONE_INDEX when asking for the default phone. Handle
that (gracefully do nothing).

bug:24939067
Change-Id: I43211b3026d358ec915d3426b0d89a1ac54c3cd5
ataconnection/DctController.java
ba798021d26fc3690a16a2c9b4f41f44a1122b49 13-Oct-2015 Amit Mahajan <amitmahajan@google.com> Require receivers of WAP_PUSH_RECEIVED to have MMS/WAP_PUSH permission

Earlier the permission was RECEIVE_SMS which was incorrect.

Bug: 24806190
Change-Id: I6805c7ccb2e5b30bfdf4914014de94db7b841539
nboundSmsHandler.java
apPushOverSms.java
33c00017eea5e4ce58d2cda95a1a6264d2dffe53 14-Oct-2015 Pavel Zhamaitsiak <pavelz@google.com> am ab78aedb: am 34294619: am 2cde5544: Merge "IMS: Fix ArrayIndexOutOfBoundsException" into mnc-dr-dev

* commit 'ab78aedb6f85e7fa921b376fcb43b3e3b0d30c39':
IMS: Fix ArrayIndexOutOfBoundsException
34294619d132c08e4337008a96f9f4150638056a 14-Oct-2015 Pavel Zhamaitsiak <pavelz@google.com> am 2cde5544: Merge "IMS: Fix ArrayIndexOutOfBoundsException" into mnc-dr-dev

* commit '2cde5544479b08fba863e0c7f009f495b38f5250':
IMS: Fix ArrayIndexOutOfBoundsException
2cde5544479b08fba863e0c7f009f495b38f5250 14-Oct-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "IMS: Fix ArrayIndexOutOfBoundsException" into mnc-dr-dev
57a8555b66821437a668277be991025fa61728a8 14-Oct-2015 Jack Yu <jackyu@google.com> Merge "Fixed that sometimes ETWS messages are not spoken."
9bfc5001ba45c501e3aaea39fd49f05eb824ee86 14-Oct-2015 Robert Greenwalt <rgreenwalt@google.com> am fd465386: am 2a1c58e5: am 0613e459: Merge "Fix handling of connect req while connected." into mnc-dr-dev

* commit 'fd465386072aedcbb50d518a75e72b041f46290c':
Fix handling of connect req while connected.
2a1c58e53b02d953c5b6a612ce48e17106c68773 14-Oct-2015 Robert Greenwalt <rgreenwalt@google.com> am 0613e459: Merge "Fix handling of connect req while connected." into mnc-dr-dev

* commit '0613e459d9f483186eacdae74ce87b4a4a7278ea':
Fix handling of connect req while connected.
0613e459d9f483186eacdae74ce87b4a4a7278ea 14-Oct-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix handling of connect req while connected." into mnc-dr-dev
08111609eb4e838de7bff4960bbbd7f9c54a060e 14-Oct-2015 Pavel Zhamaitsiak <pavelz@google.com> IMS: Fix ArrayIndexOutOfBoundsException

On some configurations IMS service is not reporting UT capabilities.
We should correctly handle such shorter feature capability list.

Bug: 24882289
Change-Id: I96a2c5d09b4e83bdcd5e8b31a5bb1446638757a5
msphone/ImsPhoneCallTracker.java
676ce5bf8deef79a06d8a22b7b8e22e1aaaecbd3 13-Oct-2015 Wei Liu <luciferleo@google.com> am e40dd5b3: am 3bb51b42: Merge "Use wear style dialog for ICC hotswap restart dialog." into cw-e-dev

* commit 'e40dd5b3ab496b6dac8168e348323c3496bd56b2':
Use wear style dialog for ICC hotswap restart dialog.
3bb51b42e40a57cb72825749d1223e02b64031c9 13-Oct-2015 Wei Liu <luciferleo@google.com> Merge "Use wear style dialog for ICC hotswap restart dialog." into cw-e-dev
3f545d699edbff59ac301f3a47ead0ea223323fe 13-Oct-2015 Robert Greenwalt <rgreenwalt@google.com> Fix handling of connect req while connected.

Without this our generation number gets out of sync and
we ignore disconnection results.

bug:24462721
Change-Id: I348c70c4368c4d4d9ad466e4a6803f935bb43bc1
ataconnection/DataConnection.java
314030298ab01ddbaacd34b709776337f5bea6d6 13-Oct-2015 Wei Liu <luciferleo@google.com> Use wear style dialog for ICC hotswap restart dialog.

b/24719054

Change-Id: If341828ef3de7f6afb955f2e5be3c6901f21c169
icc/UiccCard.java
a70f0f988006a531667d9c43d98a882e85f4718d 13-Oct-2015 Vineeta Srivastava <vsrivastava@google.com> am 141d1be5: am 3e5f7e51: am 19922eb9: Merge "Get display manager state after registering with DisplayManager" into mnc-dr-dev

* commit '141d1be5b1d4a0b258ebc123b62ff4f443de0263':
Get display manager state after registering with DisplayManager
508b515b637e933d51bd2b7c8724fd55183cb08a 13-Oct-2015 Robert Greenwalt <rgreenwalt@google.com> am 8fe7fa21: am d4bce703: am 56b2bc4e: Merge "Fix use of memorized phoneId." into mnc-dr-dev

* commit '8fe7fa21733991c007ca7fcbdc33f3344d761958':
Fix use of memorized phoneId.
3e5f7e512abeba4fa0ed9b7b067594f199245e7e 13-Oct-2015 Vineeta Srivastava <vsrivastava@google.com> am 19922eb9: Merge "Get display manager state after registering with DisplayManager" into mnc-dr-dev

* commit '19922eb9664db6fbeda2c1410cade88106ab7dd8':
Get display manager state after registering with DisplayManager
19922eb9664db6fbeda2c1410cade88106ab7dd8 13-Oct-2015 Vineeta Srivastava <vsrivastava@google.com> Merge "Get display manager state after registering with DisplayManager" into mnc-dr-dev
bdbd98133976d44126008a745eda8c0309bce6f5 08-Oct-2015 Sungmin Choi <sungmin.choi@lge.com> Get display manager state after registering with DisplayManager

RSSI bar and Signal Strength are not changed when power up.
In booting time, RILJ does not receive any onDisplayChanged().
Thus ScreenState send false in updateScreenState() even if screen on.
So get display manager state after registering with DisplayManager.
As a result, mDefaultDisplayState set proper value.

Bug: 24748088
Change-Id: I8a56810a2a1e6b294d2ce2f3bc5837114312fc49
IL.java
d4bce703261593781bca3a95c8cb3cb4932d837c 12-Oct-2015 Robert Greenwalt <rgreenwalt@google.com> am 56b2bc4e: Merge "Fix use of memorized phoneId." into mnc-dr-dev

* commit '56b2bc4ecb54ccb0b498c7d1a524dc79d0489a28':
Fix use of memorized phoneId.
56b2bc4ecb54ccb0b498c7d1a524dc79d0489a28 12-Oct-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix use of memorized phoneId." into mnc-dr-dev
a7228870e5203c8c0d73ea506ebac0a34e25b78a 09-Oct-2015 Robert Greenwalt <rgreenwalt@google.com> Fix use of memorized phoneId.

We remember the phoneId we used to make the request so when the request is released we can
talk to the proper DcTracker even if the subId -> phoneId mapping is lost (removed the sim).
However the list of requests is a singleton and entries are stored per requestId so
a request that applies to multiple phones only has a single entry - we can't record
the phone id at request submission time.

Change it to store the phoneId at request execution time. This also removes the need
for a separate "has been executed" boolean since we won't have an executed-phoneId if
it's not been executed.

In the future we should get rid of multiple TelephonyNetworkFactories, simplifying all
this.

bug:24411288
Change-Id: Ie430e0a9251c3ae09384e1a4e29b65fe90f46740
ataconnection/DcSwitchAsyncChannel.java
ataconnection/DctController.java
db2e012f5843255064f927f323bde20cdc2d7ef6 07-Oct-2015 Jack Yu <jackyu@google.com> Fixed that sometimes ETWS messages are not spoken.

Now we will use the language specified in ETWS/CMAS messages. If
the language is not specified in ETWS, or the device does not support
that language, we use Japanese for ETWS. If the language is not
specified in CMAS, or the device does not support that language, we
use device's default language for CMAS.

Also we found that sometimes ETWS primary and secondary messages come
back to back. Also there should not be any text in the primary message
so there is no point to play TTS for that. So we disable the TTS
for ETWS primary message and only let the secondary one played out.
Also change the TTS parameter from QUEUE_FLUSH (only flush the queue
from the same caller) to QUEUE_DESTROY (flush all queues from all
caller) since this is for emergency.

bug: 24341917

Change-Id: Ide58c9b8ee101bca0b3ab0699a4839bfc56eccbc
sm/GsmSmsCbMessage.java
sm/SmsCbHeader.java
77b5f034d79b5e81d27a14ca39b2698dfefd9e07 07-Oct-2015 Santos Cordon <santoscordon@google.com> am bf343015: am ff4077f5: am 14282b8f: Merge "No notifications for disconnected unknown calls." into mnc-dr-dev

* commit 'bf34301508127c4f1ba7b44bf2a655e187627b5f':
No notifications for disconnected unknown calls.
ff4077f5e2c63be29df4dcf3a664e4c1c694f4f5 07-Oct-2015 Santos Cordon <santoscordon@google.com> am 14282b8f: Merge "No notifications for disconnected unknown calls." into mnc-dr-dev

* commit '14282b8f455ab98b3752c8ffe1a3f6e34982fa9c':
No notifications for disconnected unknown calls.
14282b8f455ab98b3752c8ffe1a3f6e34982fa9c 07-Oct-2015 Santos Cordon <santoscordon@google.com> Merge "No notifications for disconnected unknown calls." into mnc-dr-dev
3505bfdad2363eaed46d44d5c96899021ddd1d3d 04-Oct-2015 Junda Liu <junda@google.com> am b50ed8e2: am 062f3f80: am 5dea1bc7: Merge "Add forground flag for retry intent to avoid long delayed cellular data setup." into mnc-dr-dev

* commit 'b50ed8e24ab132976ad72b4070cbc1420c13a890':
Add forground flag for retry intent to avoid long delayed cellular data setup.
062f3f80ef034463d3bfa24e044a007c59837edb 04-Oct-2015 Junda Liu <junda@google.com> am 5dea1bc7: Merge "Add forground flag for retry intent to avoid long delayed cellular data setup." into mnc-dr-dev

* commit '5dea1bc73c0be0d5ba9f88fc70207283d1bea781':
Add forground flag for retry intent to avoid long delayed cellular data setup.
5dea1bc73c0be0d5ba9f88fc70207283d1bea781 04-Oct-2015 Junda Liu <junda@google.com> Merge "Add forground flag for retry intent to avoid long delayed cellular data setup." into mnc-dr-dev
f77612abdb6de211f33d5b3598d269b291c1d4a8 02-Oct-2015 Santos Cordon <santoscordon@google.com> No notifications for disconnected unknown calls.

Bug: 24469962
Change-Id: Iab43684169f9ea6abe7c4844cb8b0173bedb100b
dma/CdmaCallTracker.java
633526aa672b6f6cefdc8406b9e37f6d05c76670 02-Oct-2015 Robert Greenwalt <rgreenwalt@google.com> am 64a03f78: am f799d668: am b290ce3d: Make DcTracker RetryFailures.ONLY_ON_CHANGE work.

* commit '64a03f785049f96dcde5f99227207cd2ce68d01a':
Make DcTracker RetryFailures.ONLY_ON_CHANGE work.
f799d6689bf2f8268f7b8b72b62b6859fd76bc3d 02-Oct-2015 Robert Greenwalt <rgreenwalt@google.com> am b290ce3d: Make DcTracker RetryFailures.ONLY_ON_CHANGE work.

* commit 'b290ce3d172215e5ab7cd43c8e7bbee9551ab29e':
Make DcTracker RetryFailures.ONLY_ON_CHANGE work.
b290ce3d172215e5ab7cd43c8e7bbee9551ab29e 02-Oct-2015 Robert Greenwalt <rgreenwalt@google.com> Make DcTracker RetryFailures.ONLY_ON_CHANGE work.

We should only be retrying things if there was a substantial change.

Don't call trySetupData from Dct.setupDataOnConnectableApns when
in ONLY_ON_CHANGE mode unless there was a change for the FAILED
APN.

bug:24179336
Change-Id: Ia65dbd9789978548b70fb990ccfd5c55dcc51163
ataconnection/DcTracker.java
35bd762108c6d3e07b487b05717bc55bd6b6ed24 02-Oct-2015 Jack Yu <jackyu@google.com> Merge "Fixed that bad ADN record loading caused all other good records dropped."
67d43cfed4b996c20780bfec8fde1ae8c1391779 30-Sep-2015 Junda Liu <junda@google.com> Add forground flag for retry intent to avoid long delayed cellular data setup.

Bug: b/24151359
Change-Id: I9e0231f1ecb8ddccf5fee3071fc0327568918887
ataconnection/DcTracker.java
440c27dcfb62351fe9aa184a4abb344aab767732 28-Aug-2015 Wei Liu <luciferleo@google.com> roamingProtocol should be used for roaming.

b/24215857

Change-Id: Ic7371b4e84a19d095f3e544c94658456184cb4ea
(cherry picked from commit 4c3aa35e868f94a49b962bf9e9fb9ba423451065)
ataconnection/DataProfile.java
9492190f797698c86a63ea021237bd674cc785d0 25-Sep-2015 Jack Yu <jackyu@google.com> Merge "Fixed the race condition that ICC records unavailable when initializing phonebook."
8822bd5c52f320837dc93186f93b5a3336a11a75 25-Sep-2015 Jack Yu <jackyu@google.com> Merge "Fixed that email import did not work"
5003d3ea151f2f9fb95ab249ea9e687e619d932d 21-Sep-2015 Jack Yu <jackyu@google.com> Fixed the race condition that ICC records unavailable when initializing phonebook.

We need to do the same thing as we do in GSMPhone.onUpdateIccAvailability(), which
is updating the ICC record reference in phonebook manager once ICC record becomes
available.

bug: 22547525
Change-Id: I7e62c585d7acdd40142b6cdfb236d7c374c67b65
ccPhoneBookInterfaceManager.java
ccProvider.java
dma/CDMAPhone.java
icc/AdnRecordCache.java
icc/AdnRecordLoader.java
157f10ba54f5de2b896872dd3605ac989b84aa96 25-Sep-2015 Roshan Pius <rpius@google.com> Merge "Handle call termination in midst of call switching"
879c5974ff77085a6fd15f0f5e303c4144eb6720 24-Sep-2015 Sungmin Choi <sungmin.choi@lge.com> am 9405d340: am 570f5619: am 84d51c67: Fix automatic network selection mode issue

* commit '9405d340c5d6955f2d8e6b7db80bd243311276ac':
Fix automatic network selection mode issue
570f5619c0efba1e2ba8c9257d0944d6e513ba61 24-Sep-2015 Sungmin Choi <sungmin.choi@lge.com> am 84d51c67: Fix automatic network selection mode issue

* commit '84d51c67e63bf64cf8d569306c5d332f5fe700b6':
Fix automatic network selection mode issue
84d51c67e63bf64cf8d569306c5d332f5fe700b6 21-Sep-2015 Sungmin Choi <sungmin.choi@lge.com> Fix automatic network selection mode issue

Currently, if user selects "Choose automatically"
in Settings > More > Cellular networks > Network operators,
dialog is shown infinitely, and user can not cancel with back key.
Because COMPLETE message is not sent in case of already automatic mode.
To fix it, change to send COMPLETE message even if already automatic mode.

Bug: 24270612
Change-Id: Id312ac846c95a32337aebbd815de03416f2b614f
honeBase.java
e41af732a14811de6de2482ad28403115da2196d 23-Sep-2015 Robert Greenwalt <rgreenwalt@google.com> am 6be0c2d1: am 3af6bd5e: am 9cbd33d7: Merge "Fix connect during retry." into mnc-dr-dev

* commit '6be0c2d191002b64fe534903f3f54420efa351e5':
Fix connect during retry.
3af6bd5e8046d32bf92987b6af8d6d8e5860134b 23-Sep-2015 Robert Greenwalt <rgreenwalt@google.com> am 9cbd33d7: Merge "Fix connect during retry." into mnc-dr-dev

* commit '9cbd33d76e56f5ea0aa285471e75cc424b224825':
Fix connect during retry.
9cbd33d76e56f5ea0aa285471e75cc424b224825 23-Sep-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix connect during retry." into mnc-dr-dev
e284082595370a1ff990b4582dabd22f4a84e204 23-Sep-2015 Paul Jensen <pauljensen@google.com> am 1904f9d4: am aa1b0618: am b7710d07: resolved conflicts for 70dd1f77 to lmp-sprout-dev

* commit '1904f9d49bc9432d195a8f63139ebc0cd815e0fa':
Fix NOT_RESTRICTED network capability and enforce it.
1904f9d49bc9432d195a8f63139ebc0cd815e0fa 23-Sep-2015 Paul Jensen <pauljensen@google.com> am aa1b0618: am b7710d07: resolved conflicts for 70dd1f77 to lmp-sprout-dev

* commit 'aa1b0618a847ee1365c1e9810f085214c717a27e':
Fix NOT_RESTRICTED network capability and enforce it.
aa1b0618a847ee1365c1e9810f085214c717a27e 23-Sep-2015 Paul Jensen <pauljensen@google.com> am b7710d07: resolved conflicts for 70dd1f77 to lmp-sprout-dev

* commit 'b7710d07a501d5514f1242cb586aaeb53ac3ad2d':
Fix NOT_RESTRICTED network capability and enforce it.
b7710d07a501d5514f1242cb586aaeb53ac3ad2d 23-Sep-2015 Paul Jensen <pauljensen@google.com> resolved conflicts for 70dd1f77 to lmp-sprout-dev

Change-Id: I6998f13b2c3b76315c285e85f3ae485f83e418d0
08f1d589074486f06b60c7519f9cf13012e117e0 23-Sep-2015 Pavel Zhamaitsiak <pavelz@google.com> am f42eae05: am 3bca34b9: am b07bb3ea: Register for intent CARRIER_CONFIG_CHANGED when PhoneProxy is created

* commit 'f42eae0555c68c776ffc4db0cb8c25f7f1811c62':
Register for intent CARRIER_CONFIG_CHANGED when PhoneProxy is created
3bca34b9cf71f74a0bd36fd4c67a60beb185a0fb 23-Sep-2015 Pavel Zhamaitsiak <pavelz@google.com> am b07bb3ea: Register for intent CARRIER_CONFIG_CHANGED when PhoneProxy is created

* commit 'b07bb3ea93cacd17d32cf58657c781cf3c0f33fb':
Register for intent CARRIER_CONFIG_CHANGED when PhoneProxy is created
1a1cc3f5759471edcf51294439f0e0b71922d6a0 23-Sep-2015 Robert Greenwalt <rgreenwalt@google.com> Fix connect during retry.

A previous fix to help us ignore obsolete messages introduced a bug:
in the DataConnection.mRetryingState if we get a request to CONNECT
we noted we already had that apnContext in our list and would not re-add.
This was a loose translation from when the list really was a list,
but now that it's a map we need to update the ConnectionParams with the
latest or we'll remember the old obsolete generation number.

The fix is a simple removal of the if(contains). The rest is some logging
improvements to help out next time.

bug:24242653
bug:22776917
Change-Id: I934cc6bdb4f165e84f19f9cdb05a86a44912bdf8
ataconnection/DataConnection.java
ataconnection/DcTracker.java
b07bb3ea93cacd17d32cf58657c781cf3c0f33fb 22-Sep-2015 Pavel Zhamaitsiak <pavelz@google.com> Register for intent CARRIER_CONFIG_CHANGED when PhoneProxy is created

We rely on this intent to trigger IMS config update.

Bug: 24270744
Change-Id: I69494c5269352ed6afa567661752b484918c4b6b
honeProxy.java
309bfd91645d4da1a7becbf2e6b2dc3f865ca0b5 21-Sep-2015 Pavel Zhamaitsiak <pavelz@google.com> Fix HD icon shown for MO VoLTE call when it shouldn't

Call updateMediaCapabilities() from ImsPhoneConnection.update().
This code was accidentally deleted in d9c3a08.

Bug: 24256715
Change-Id: I65e8c39b00e3cfd9cc3bde3d7dddaba7953eb562
msphone/ImsPhoneConnection.java
d822cb60642922fad4ead72cb99397bdd257033e 21-Sep-2015 Robert Greenwalt <rgreenwalt@google.com> am ba98956e: am 92a12eaf: am 1138cd35: Merge "Don\'t allow the apn to decrement below 0." into mnc-dr-dev

* commit 'ba98956ea3ab159be57b36a63c913b7e643ce469':
Don't allow the apn to decrement below 0.
41dbb357027b08952c7d839e798c1e161ce3a49d 21-Sep-2015 Jack Yu <jackyu@google.com> Fixed that bad ADN record loading caused all other good records dropped.

Fixed the issue that while loading all ADN records from EF_ADN, if
one of the record is bad, for example, it points to an EF_EXT1 for the
rest of the phone number, but EF_EXT1 does not exist, we will skip that
bad record but still keep the rest of the good records from EF_ADN.

bug: 23163512
Change-Id: I4828f346769640f1fbc95d49849c61b52d043846
icc/AdnRecord.java
icc/AdnRecordLoader.java
92a12eaffa387ce2088eaa1da20f794c2bb21056 21-Sep-2015 Robert Greenwalt <rgreenwalt@google.com> am 1138cd35: Merge "Don\'t allow the apn to decrement below 0." into mnc-dr-dev

* commit '1138cd35542d36e50ee4744a27d07da1ecae61e9':
Don't allow the apn to decrement below 0.
1138cd35542d36e50ee4744a27d07da1ecae61e9 21-Sep-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Don't allow the apn to decrement below 0." into mnc-dr-dev
e8b308038b3449509c92478ee26096302d768855 18-Sep-2015 Robert Greenwalt <rgreenwalt@google.com> Don't allow the apn to decrement below 0.

bug:24106542
Change-Id: Ic749b05845309412804d782b242dc7ecb516c5be
ataconnection/ApnContext.java
e03bf1f81e78713e808d69c8149c3148da41ee07 18-Sep-2015 Shishir Agrawal <shishir@google.com> am b4a5bf15: am 8d1784e1: am ec15371b: Allow non-persistent manual network selection.

* commit 'b4a5bf15a4a1be153b3562f1f6d8175ca58b0f3f':
Allow non-persistent manual network selection.
8d1784e139c2a79033b3f07d6fb598dc2cecd1a7 18-Sep-2015 Shishir Agrawal <shishir@google.com> am ec15371b: Allow non-persistent manual network selection.

* commit 'ec15371b29d1016c33ba0f866f5ae6fb4ae3dbde':
Allow non-persistent manual network selection.
ec15371b29d1016c33ba0f866f5ae6fb4ae3dbde 10-Sep-2015 Shishir Agrawal <shishir@google.com> Allow non-persistent manual network selection.

Allow the API to specify if the selection should be persisted across reboots.
This also has the side affect of not notifying the user when signal is lost.

Necessary becasue the API might be used transparent to the user and the
notifications will be bizarre.

Bug: 23971948
Change-Id: Ic07d3a4b531b0bc89f26617ffae4bb678488d958
hone.java
honeBase.java
honeProxy.java
msphone/ImsPhoneBase.java
ip/SipPhoneBase.java
4a8477e5f62b56f31d58299850039b01c0812fa8 17-Sep-2015 Amit Mahajan <amitmahajan@google.com> resolved conflicts for 51dda2a2 to master

Change-Id: I6fcc47e532379a39b02bac391eeebf2c4cb83b39
2d3dc02153c7549a35385fdeaf0b8fd1c690cbb4 17-Sep-2015 Amit Mahajan <amitmahajan@google.com> am 0b8cb76f: Merge "Fix useImsForUt check" into mnc-dr-dev

* commit '0b8cb76f95d30bbde2213f989b1c721d011fe4f8':
Fix useImsForUt check
0b8cb76f95d30bbde2213f989b1c721d011fe4f8 17-Sep-2015 Amit Mahajan <amitmahajan@google.com> Merge "Fix useImsForUt check" into mnc-dr-dev
e110a72cb95f8248aade968de2403abf31a30f24 17-Sep-2015 Tyler Gunn <tgunn@google.com> Merge "Propagate telecom call ID to internal telephony connection."
ec3fe6cd37a79b3c5894b92a41fa2b79b05cb964 17-Sep-2015 Tyler Gunn <tgunn@google.com> Propagate telecom call ID to internal telephony connection.

Provide visibility of the telecom call ID in the internal telephony
connections.

Bug: 23357902
Change-Id: I6400026b6d02c7d5e740092a1736b4efbd3a3ae7
onnection.java
msphone/ImsPhoneConnection.java
1b37a4f03f668c6eb47bbde7072c54b60e822539 17-Sep-2015 Jack Yu <jackyu@google.com> am 6fde3050: am c54ed4f3: am c1e37f83: Merge "Ignore phone switching while shutting down." into mnc-dr-dev

* commit '6fde3050d2dbe87820603e6b7a9de120917a6ab2':
Ignore phone switching while shutting down.
4d75fa1da53aee1ac594e7bc96050300ea91c91f 17-Sep-2015 Amit Mahajan <amitmahajan@google.com> Fix useImsForUt check

The check was looking at last character to determine if dialed
number is UT which is not correct. Should look at the last character
of the network portion.

Bug: 24125413
Change-Id: I21e0d2ffac4548d74e68355db86a98516daee304
dma/CDMAPhone.java
sm/GSMPhone.java
c54ed4f36908f72d026b3f40d0b4e39d97618cfe 17-Sep-2015 Jack Yu <jackyu@google.com> am c1e37f83: Merge "Ignore phone switching while shutting down." into mnc-dr-dev

* commit 'c1e37f83a88f76cbfe54720f99382ab116f478b0':
Ignore phone switching while shutting down.
c1e37f83a88f76cbfe54720f99382ab116f478b0 17-Sep-2015 Jack Yu <jackyu@google.com> Merge "Ignore phone switching while shutting down." into mnc-dr-dev
819cea676c3b01656426f68a73a225bd2d39e8bf 15-Sep-2015 Roshan Pius <rpius@google.com> Handle call termination in midst of call switching

When one of the calls gets disconnected in the midst of call switching,
we need to put the remaining call back into active state.
There are a couple of scenarios that could arise which needs to be
handled:
1. The call which was supposed to become ACTIVE (and hence foreground)
gets disconnected in the midst of switch.
2. The call which was supposed to be HELD (and hence background) gets
disconnected in the midst of switch.

To handle the above 2 scenarios in the midst of a switch:
1. We need to swap back the foreground/background call if the call
expected to resume is the one that was terminated.
2. Put the foreground call to active if it is in HOLDING state and we
find that the background call is terminated in the midst of a switch.

BUG: 24066890
Change-Id: I75d41c123166be42cfc166eb3ed5e7629235c297
msphone/ImsPhoneCallTracker.java
e34012989b5c7776a6c3f73a1926ffdd47f0e0fc 17-Sep-2015 Pavel Zhamaitsiak <pavelz@google.com> am b947a5be: am 42dedba0: am d32eea77: Merge "Fix race in dafault phone creation" into mnc-dr-dev

* commit 'b947a5bede772d13f218c89a742bb2bbb0c29b51':
Fix race in dafault phone creation
83bf324967e2923a025247b21b2bccadf51e7141 16-Sep-2015 Amit Mahajan <amitmahajan@google.com> Merge "Change to update SecurityException message."
087b0f8f969456fab3b4fd4fb62e9a7b5b819ccf 16-Sep-2015 Amit Mahajan <amitmahajan@google.com> Change to update SecurityException message.

Change the message from something like "Neither user 10023 nor
current process has android.permission.READ_SMS." to
"Neither user 10023 nor current process has
android.permission.READ_PHONE_STATE or android.permission.READ_PHONE_SMS."

Bug: 23869003
Change-Id: If4713e9a876e4a4955e546ea9135ceea9aa331c9
honeSubInfo.java
42dedba0ef248b40c6dc5d55de0bb6788ba17b3b 16-Sep-2015 Pavel Zhamaitsiak <pavelz@google.com> am d32eea77: Merge "Fix race in dafault phone creation" into mnc-dr-dev

* commit 'd32eea77c5624916ec9f33caf7a9e9a60a0af507':
Fix race in dafault phone creation
d32eea77c5624916ec9f33caf7a9e9a60a0af507 16-Sep-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "Fix race in dafault phone creation" into mnc-dr-dev
0ec17755b20be2b4c398d8d6e40ca2612e2a16b0 16-Sep-2015 Robert Greenwalt <rgreenwalt@google.com> am 9a9e168a: am 5efa8304: am 37cacdfe: Fix other Disconnect msg senders

* commit '9a9e168a43fe3c17e6f5eed855bca77c12501121':
Fix other Disconnect msg senders
5efa83049423fbbfa11ecd8cbe24805c7e96b070 16-Sep-2015 Robert Greenwalt <rgreenwalt@google.com> am 37cacdfe: Fix other Disconnect msg senders

* commit '37cacdfe7ed079d89fb9e80317b5dfd2acb975e5':
Fix other Disconnect msg senders
80bd0262e4bb6dbbaf6d03dadb771ad105186e15 16-Sep-2015 Pavel Zhamaitsiak <pavelz@google.com> Fix race in dafault phone creation

ImsPhone might be created when we are starting monitoring IMS service.
When we are creating ImsPhone, we are opening IMS service.
When IMS service is being opened, it might request default phone (which
might not be ready yet).

Bug: 24130556
Change-Id: I7677b3131b15c78f6c6ac008f0cbb06b1a427b5d
honeFactory.java
honeProxy.java
37cacdfe7ed079d89fb9e80317b5dfd2acb975e5 16-Sep-2015 Robert Greenwalt <rgreenwalt@google.com> Fix other Disconnect msg senders

We changed the params on these messages from an ApnContext to a
Pair<ApnContext, Integer>. There were some call sites using the old
style and leading to errors.

bug:24115252
Change-Id: Ice3f075b3b93b9e76c0f0be7923f5ae2041f7ab1
ataconnection/DataConnection.java
ataconnection/DcTracker.java
baddbcb49f172ccbe7c022d0358083150230099b 16-Sep-2015 Robert Greenwalt <rgreenwalt@google.com> am ff040136: am fb2e6abd: am f892b4dd: Merge "Ignore obsolete disconnect_completed msgs." into mnc-dr-dev

* commit 'ff040136a159abbee3380e2a10ab9ebbb44ad987':
Ignore obsolete disconnect_completed msgs.
211ed45a3500a84a4b102e22d3235f758ac49563 15-Sep-2015 Jack Yu <jackyu@google.com> Ignore phone switching while shutting down.

Ignoring phone switching during shutdown prevents initializing
the new phone, which sends attach request to the modem.

Bug: 23508972
Change-Id: I2a7bfaaebfc9ed3bc4a265b4fa0a31384195251e
hone.java
honeBase.java
honeProxy.java
erviceStateTracker.java
fb2e6abdeb0a84a9f4bd97f1411d45491c7eb59f 15-Sep-2015 Robert Greenwalt <rgreenwalt@google.com> am f892b4dd: Merge "Ignore obsolete disconnect_completed msgs." into mnc-dr-dev

* commit 'f892b4ddd020ce7876c7455572063756bce58e4e':
Ignore obsolete disconnect_completed msgs.
a61a2087f36dfec30da1b0db262c731aa03a4f30 04-Sep-2015 Robert Greenwalt <rgreenwalt@google.com> Let some messages get processed in emergency state

Some pings and infrastructure events were getting defered in
emergency mode. This led to hung processes.

bug:24097705
Change-Id: I5415ae69bcf17a293d5af9ae093d7346b1dc076f
ataconnection/DcSwitchStateMachine.java
f892b4ddd020ce7876c7455572063756bce58e4e 15-Sep-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Ignore obsolete disconnect_completed msgs." into mnc-dr-dev
d4604a47a42eaeaac94bc2adec1adfd92fddeae0 14-Sep-2015 Jack Yu <jackyu@google.com> am f1649e68: am ec3d9aa0: am ab88310b: Merge "Fixed the incorrect signal strength info displayed after call end." into mnc-dr-dev

* commit 'f1649e686a632cd56b46dec344c6ea3870299e0c':
Fixed the incorrect signal strength info displayed after call end.
7861a3607c68cc8325f9442629265136c87a9458 08-Sep-2015 Amit Mahajan <amitmahajan@google.com> Delay DCT initialization till subId is known.

Bug: 23372606
Change-Id: If2c5ed6aefdf246cb664656b52786158bef544ee
erviceStateTracker.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
ec3d9aa0d4d29fcb171b178b8ee9bbca1c6ce5ee 14-Sep-2015 Jack Yu <jackyu@google.com> am ab88310b: Merge "Fixed the incorrect signal strength info displayed after call end." into mnc-dr-dev

* commit 'ab88310be910813f659eac61b24f90501e757d9f':
Fixed the incorrect signal strength info displayed after call end.
ab88310be910813f659eac61b24f90501e757d9f 14-Sep-2015 Jack Yu <jackyu@google.com> Merge "Fixed the incorrect signal strength info displayed after call end." into mnc-dr-dev
b39822359961b15d8f9190bba6fcd53ecc3e7c38 12-Sep-2015 Jack Yu <jackyu@google.com> Fixed the incorrect signal strength info displayed after call end.

We should query the signal stregnth information from the modem
when RAT family changes instead of relying on the next unsolicited
signal strength information indication coming from the modem,
which might take a long time to come or even not come. By proactively
querying the info, we can make sure the up-to-date signal strength
is showing up on the UI.

bug: 22724699
Change-Id: I4c80b281cffb28a871d4e754f43c43b9809244a4
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
sm/GsmServiceStateTracker.java
c6986382ba7f3d545c71f35e5854897651515ee9 14-Sep-2015 Tyler Gunn <tgunn@google.com> am 15fd9cf0: am aa81b503: am 4677e1d9: Add early-bail in instant lettering cleanse method.

* commit '15fd9cf03009072f59ce94eef2f96e290f799f8c':
Add early-bail in instant lettering cleanse method.
aa81b503fff4338160065052339c42f7d66b40ff 14-Sep-2015 Tyler Gunn <tgunn@google.com> am 4677e1d9: Add early-bail in instant lettering cleanse method.

* commit '4677e1d9088a0cc787112b5daa0b70896021920e':
Add early-bail in instant lettering cleanse method.
4677e1d9088a0cc787112b5daa0b70896021920e 11-Sep-2015 Tyler Gunn <tgunn@google.com> Add early-bail in instant lettering cleanse method.

- This was a nit from a previous commit. Adding an early-bail in the
method which cleanses instant lettering messages.

Bug: 22779583
Change-Id: I76010fca96323284cc06e5cbe596218e30d59dcf
msphone/ImsPhoneCallTracker.java
01456aaa94cd601b69632c6f9b20bdd81a15a1c4 11-Sep-2015 Tyler Gunn <tgunn@google.com> am a0ac8316: am 8d05907a: am 746b6b52: Merge "Escape carrier-specified characters with backslash for call subject." into mnc-dr-dev

* commit 'a0ac8316bedfdf6923b5ae088d8a9aef91df41ef':
Escape carrier-specified characters with backslash for call subject.
8d05907a5ff6d61aba7446335dbdf9756c93b40d 11-Sep-2015 Tyler Gunn <tgunn@google.com> am 746b6b52: Merge "Escape carrier-specified characters with backslash for call subject." into mnc-dr-dev

* commit '746b6b52a15b53ef141c18d1a5bbb13f5fa7d10c':
Escape carrier-specified characters with backslash for call subject.
746b6b52a15b53ef141c18d1a5bbb13f5fa7d10c 11-Sep-2015 Tyler Gunn <tgunn@google.com> Merge "Escape carrier-specified characters with backslash for call subject." into mnc-dr-dev
c1b8e18d4b71c41e7528a68d20708e5f69aa87d4 11-Sep-2015 Roshan Pius <rpius@google.com> am 441ae690: am 014e3a92: am b2abde5c: Merge "Add delay between DTMF tones to meet carrier spec." into mnc-dr-dev

* commit '441ae690828f10eb4da26aa9ce86ff9f5bbb80d8':
Add delay between DTMF tones to meet carrier spec.
014e3a92818e25517af1422ec3e0bff97d53fffb 11-Sep-2015 Roshan Pius <rpius@google.com> am b2abde5c: Merge "Add delay between DTMF tones to meet carrier spec." into mnc-dr-dev

* commit 'b2abde5ce7f765c557ddca0271ee086f742b423a':
Add delay between DTMF tones to meet carrier spec.
b2abde5ce7f765c557ddca0271ee086f742b423a 11-Sep-2015 Roshan Pius <rpius@google.com> Merge "Add delay between DTMF tones to meet carrier spec." into mnc-dr-dev
86aa6575c20044586c113e88671a5bb596b60ed9 11-Sep-2015 Jack Yu <jackyu@google.com> am 29dfe2cc: am bf913f69: am e91b2247: Merge "Added CMAS monthly test additional language messages support." into mnc-dr-dev

* commit '29dfe2cc144b533f1527ca8860954e937120c823':
Added CMAS monthly test additional language messages support.
459ec3dc76b4574e7c54eff71a0c019a7ff2ef70 11-Sep-2015 Amit Mahajan <amitmahajan@google.com> am e1dbbf79: am fce78a20: am 5591557d: Merge "Check MDC_INITIAL_MAX_RETRY to use resource overlay for operators" into mnc-dr-dev

* commit 'e1dbbf79916a6fe805613b2c5d605ff2320ce679':
Check MDC_INITIAL_MAX_RETRY to use resource overlay for operators
5a83b7915604553be51d0bb62d8f6a5c9147eb07 11-Sep-2015 Nivedita Sarkar <nsarkar@codeaurora.org> am a32555d3: am 54e059a5: am 21048a2b: IMS: Decouple Call Extras from call state change notification.

* commit 'a32555d3afb42216e98ff33313b76a08dae381dd':
IMS: Decouple Call Extras from call state change notification.
bf913f69d659bcee1e91af4726a668d4c5da30e5 11-Sep-2015 Jack Yu <jackyu@google.com> am e91b2247: Merge "Added CMAS monthly test additional language messages support." into mnc-dr-dev

* commit 'e91b2247a6f1bafb27cab607c67011f4ac8b12f5':
Added CMAS monthly test additional language messages support.
fce78a203a7185c9c79289890d6ec7f37cc4fb27 11-Sep-2015 Amit Mahajan <amitmahajan@google.com> am 5591557d: Merge "Check MDC_INITIAL_MAX_RETRY to use resource overlay for operators" into mnc-dr-dev

* commit '5591557d9d2b9058ed27cdd4af07183653f11415':
Check MDC_INITIAL_MAX_RETRY to use resource overlay for operators
e91b2247a6f1bafb27cab607c67011f4ac8b12f5 11-Sep-2015 Jack Yu <jackyu@google.com> Merge "Added CMAS monthly test additional language messages support." into mnc-dr-dev
5591557d9d2b9058ed27cdd4af07183653f11415 11-Sep-2015 Amit Mahajan <amitmahajan@google.com> Merge "Check MDC_INITIAL_MAX_RETRY to use resource overlay for operators" into mnc-dr-dev
54e059a5f781c085de9637735a27d10b1975e194 11-Sep-2015 Nivedita Sarkar <nsarkar@codeaurora.org> am 21048a2b: IMS: Decouple Call Extras from call state change notification.

* commit '21048a2bc97d932a3ddecdfd79003a03f34263ec':
IMS: Decouple Call Extras from call state change notification.
86d2fb21cbf5d72fdae36dbe6566ebc6047081c7 10-Sep-2015 Sungmin Choi <sungmin.choi@lge.com> Check MDC_INITIAL_MAX_RETRY to use resource overlay for operators

Bug: 23804201
Change-Id: I62a00530200d81a7494637bc760f258219389c42
ataconnection/DcTrackerBase.java
21048a2bc97d932a3ddecdfd79003a03f34263ec 02-Sep-2015 Nivedita Sarkar <nsarkar@codeaurora.org> IMS: Decouple Call Extras from call state change notification.

Currently call extras are closely coupled with call state changes.
To propagate call extras from internal.telephony.Connection the
PRECISE_CALL_STATE_CHANGED event shall be triggered which is genarally
triggered when phone/call changes its state. This change removes the
above mentioned dependency by raising onExtrasChanged event when
changes in extras are detected.

Bug: 22329706

Change-Id: I7c0f5dc3229b2d7ae83d06a8e3fade45d1b62c90
onnection.java
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
5c0859c8c66d65f066fedf300ff75eee42114657 10-Sep-2015 Tyler Gunn <tgunn@google.com> Escape carrier-specified characters with backslash for call subject.

Added ability to escape carrier-specified characters with a backslash
in call subjects prior to sending.

Bug: 22779583
Change-Id: Iab68a1036238581a86dadccd969ffdc7e1a2fa52
msphone/ImsPhoneCallTracker.java
6fe3701df3477f7456c594e71a124bcbba926121 10-Sep-2015 Roshan Pius <rpius@google.com> Add delay between DTMF tones to meet carrier spec.

Carrier specifications require a specified minimum delay between DTMF
tones that are sent out. So, adding a carrier config param to add delay
between the end of processing a DTMF char and begining of processing
of the next DTMF char.
This is the same fix as ag/747687 ported for GSM connections.

BUG: 23064351
Change-Id: Icc297ed7e4bfd909dfd3fcf01b66552ff782bd17
sm/GsmCallTracker.java
sm/GsmConnection.java
7bb470a0b3242ea1ea801284d31e4a5d66f19605 10-Sep-2015 Jack Yu <jackyu@google.com> Added CMAS monthly test additional language messages support.

Added CMAS monthly test additional language messages support if
the SIM or current network's country is Taiwan. Allowing
users to turn on/off through
Settings->More->Emergency broadcasts->Show CMAS test broadcasts
(This hidden menu is only shown when Developer options is turned on).

bug: 23892625
Change-Id: If32a8b3ccbd4e7a724bd11006b237c3565e0ca43
sm/SmsCbConstants.java
sm/SmsCbHeader.java
7dc854ff96d4d183ad0de61ebd7f368b61f46ca1 10-Sep-2015 Jack Yu <jackyu@google.com> am 9db557c8: am 8d69df49: am f4f3b372: Merge "Fixed that the device crashes when users send SMS via STK." into mnc-dr-dev

* commit '9db557c86f1678dbd11c8e5008f01aea103087eb':
Fixed that the device crashes when users send SMS via STK.
8d69df49bb1d14b4ff3ef134bfcf5eed3abf1336 10-Sep-2015 Jack Yu <jackyu@google.com> am f4f3b372: Merge "Fixed that the device crashes when users send SMS via STK." into mnc-dr-dev

* commit 'f4f3b37232a3875cd4ce141c694e81c645efd60a':
Fixed that the device crashes when users send SMS via STK.
f4f3b37232a3875cd4ce141c694e81c645efd60a 10-Sep-2015 Jack Yu <jackyu@google.com> Merge "Fixed that the device crashes when users send SMS via STK." into mnc-dr-dev
bc70d5d3cd082c60ab8a3276fe741bc76a3fb921 09-Sep-2015 Santos Cordon <santoscordon@google.com> am 3f019a1b: am 66d23918: am c421278a: Merge "Nullify mPendingMO *before* updating the call state." into mnc-dr-dev

* commit '3f019a1bd1df0131f410692c26bb7e64528d2391':
Nullify mPendingMO *before* updating the call state.
66d239180c7dfc61b2c0ff574d373387d87447e7 09-Sep-2015 Santos Cordon <santoscordon@google.com> am c421278a: Merge "Nullify mPendingMO *before* updating the call state." into mnc-dr-dev

* commit 'c421278a6b58c0e38aac8106b38312e5a2961389':
Nullify mPendingMO *before* updating the call state.
c421278a6b58c0e38aac8106b38312e5a2961389 09-Sep-2015 Santos Cordon <santoscordon@google.com> Merge "Nullify mPendingMO *before* updating the call state." into mnc-dr-dev
5c866d5d77e6901934fef0da4f2daf685b621f30 09-Sep-2015 Tyler Gunn <tgunn@google.com> am 6aae9613: am 0505f2bd: am e60eeda2: Merge "Remove carrier-defined invalid characters from call subjects." into mnc-dr-dev

* commit '6aae961307a65f33932fde6826e5a9172180af97':
Remove carrier-defined invalid characters from call subjects.
0505f2bd1c2d83eb4737b27a57c2fc3130cc68e9 09-Sep-2015 Tyler Gunn <tgunn@google.com> am e60eeda2: Merge "Remove carrier-defined invalid characters from call subjects." into mnc-dr-dev

* commit 'e60eeda2d11680f919879d4fca2fc0f623fd546e':
Remove carrier-defined invalid characters from call subjects.
e60eeda2d11680f919879d4fca2fc0f623fd546e 09-Sep-2015 Tyler Gunn <tgunn@google.com> Merge "Remove carrier-defined invalid characters from call subjects." into mnc-dr-dev
d6345bfe54d2fa3e1e8d6997cef73105be07f660 09-Sep-2015 Tyler Gunn <tgunn@google.com> Remove carrier-defined invalid characters from call subjects.

1. Look up a regular expression containing carrier-specific invalid
characters for call subjects.
2. If found, use reg exp to cleanse the call subject prior to setting
on the dial intent.

Bug: 22779583
Change-Id: I708468294e94d5959cd2fe0f605ec0515b6e2eaf
msphone/ImsPhoneCallTracker.java
2770b0f5449670eadab1d68ea8d5fa4788f4704a 09-Sep-2015 Santos Cordon <santoscordon@google.com> Nullify mPendingMO *before* updating the call state.

The code used to null out mPendingMO after it send out the notification
and updating it's state. While mPendingMO is not null, update-state code
will always short-circuit to offhook so it is necessary to reset the
variable before updating the state (GSM & CDMA already do this).

Bug: 23530363
Change-Id: I0491b371d0de52d21fd6e0d96e2660c63c38fada
msphone/ImsPhoneCallTracker.java
e0567274e536e44b80e38bfa6000c469f491f7d3 08-Sep-2015 Amit Mahajan <amitmahajan@google.com> resolved conflicts for 7271bcbf to master

Change-Id: I69bc8f4b8e9a6a69dc52999bf307a73ae5257789
c6c214d1a8c296476738e024d9a43a0ab7512b12 08-Sep-2015 Amit Mahajan <amitmahajan@google.com> am 214f9249: am 35c72d7a: am 8bfa1b42: Adding emergency call start/end indications in ImsPhone.

* commit '214f9249de3790bc7b62fb97c3ba8fd631075874':
Adding emergency call start/end indications in ImsPhone.
d2a61495f507750d088ab1eee71f6594342284a3 08-Sep-2015 Amit Mahajan <amitmahajan@google.com> am 594d0654: Merge "Ignore isVolteEnabledByPlatform when checking useImsForEmergency" into mnc-dr-dev

* commit '594d0654d1cb627537098a0a70ca311cc172f30b':
Ignore isVolteEnabledByPlatform when checking useImsForEmergency
35c72d7aa586f8ddbbd157c4715e5823d965348f 08-Sep-2015 Amit Mahajan <amitmahajan@google.com> am 8bfa1b42: Adding emergency call start/end indications in ImsPhone.

* commit '8bfa1b42f0ffebf33239546ceaf5d6f5ca813191':
Adding emergency call start/end indications in ImsPhone.
594d0654d1cb627537098a0a70ca311cc172f30b 08-Sep-2015 Amit Mahajan <amitmahajan@google.com> Merge "Ignore isVolteEnabledByPlatform when checking useImsForEmergency" into mnc-dr-dev
8bfa1b42f0ffebf33239546ceaf5d6f5ca813191 01-Sep-2015 Amit Mahajan <amitmahajan@google.com> Adding emergency call start/end indications in ImsPhone.

This is needed to correctly support emergency callback mode.

Bug: 23704763
Change-Id: I1983987b75e055d8acf99b9e628bbcabbd41c911
honeBase.java
dma/CDMAPhone.java
dma/CdmaCallTracker.java
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
ae15c0bcadb6da117530eb5c76340d41eb91a7ef 08-Sep-2015 Amit Mahajan <amitmahajan@google.com> Ignore isVolteEnabledByPlatform when checking useImsForEmergency

Reverting ag/740815 as that is not needed now with the fix for
b/23704763. This is specifically needed for the cases when there's
no SIM in the device.

Bug: 23431773
Change-Id: I44353eb1e9c6e93838e7cab2b87e79ae39bd0fe8
dma/CDMAPhone.java
sm/GSMPhone.java
fc3ba19ad682e0d049a80719bd4e2313051510c0 08-Sep-2015 John Huang <jsh@google.com> am 81fd96f5: am c04f09d4: am 3c85e84a: Merge "Don\'t lose the apn data on RAT/DRS change" into mnc-dr-dev

* commit '81fd96f56072f87c4df76d87e87c4f347c20e9fd':
Don't lose the apn data on RAT/DRS change
c04f09d4428b9c0fd938bc4de6827ad44ce95fe8 08-Sep-2015 John Huang <jsh@google.com> am 3c85e84a: Merge "Don\'t lose the apn data on RAT/DRS change" into mnc-dr-dev

* commit '3c85e84a5ca2efdf6c7d2817981fde3e51710101':
Don't lose the apn data on RAT/DRS change
3c85e84a5ca2efdf6c7d2817981fde3e51710101 08-Sep-2015 John Huang <jsh@google.com> Merge "Don't lose the apn data on RAT/DRS change" into mnc-dr-dev
260677eff844854bbdf5359080c79cd9e0f74c52 07-Sep-2015 Pavel Zhamaitsiak <pavelz@google.com> am e753cce1: am 6ee475d3: am 6999004d: Merge "Update ImsConfig on boot up and SIM swap" into mnc-dr-dev

* commit 'e753cce119bcb1fb94f8774b965a41564abe1623':
Update ImsConfig on boot up and SIM swap
ba029432c489778d97920dc6f80b20ec66a90f3c 07-Sep-2015 Robert Greenwalt <rgreenwalt@google.com> am af4e792e: am 920049f8: am 089df9db: Merge "Let some messages get processed in emergency state" into mnc-dr-dev

* commit 'af4e792e17497c60a634c79314b7bb771912cd76':
Let some messages get processed in emergency state
7cb516625ff7abcc46a18b778bba7138b522d67c 07-Sep-2015 Jack Yu <jackyu@google.com> am 491ba0a4: am c77ef6e1: am ab800095: Fixed that device does not showing roaming icon on Sprint network

* commit '491ba0a4eb46a818fec54cf65ce3e0d0ae4c35f2':
Fixed that device does not showing roaming icon on Sprint network
6ee475d398fea5ce5911e21cc7ed992f479d1a94 05-Sep-2015 Pavel Zhamaitsiak <pavelz@google.com> am 6999004d: Merge "Update ImsConfig on boot up and SIM swap" into mnc-dr-dev

* commit '6999004db151c0bfaea4d244702818cb3fcecb10':
Update ImsConfig on boot up and SIM swap
6999004db151c0bfaea4d244702818cb3fcecb10 05-Sep-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "Update ImsConfig on boot up and SIM swap" into mnc-dr-dev
746218bf3b83cadae7b29c1b0a875e56b6ff87f1 05-Sep-2015 Pavel Zhamaitsiak <pavelz@google.com> Update ImsConfig on boot up and SIM swap

Bug: 19710775
Change-Id: I64c54a6bd2d212b6931ebe59d7174460e776bca8
honeBase.java
honeProxy.java
920049f890a0d32448143ad536537e189c0432a4 05-Sep-2015 Robert Greenwalt <rgreenwalt@google.com> am 089df9db: Merge "Let some messages get processed in emergency state" into mnc-dr-dev

* commit '089df9db638f309479a73e44f9d14f84ec41dfd2':
Let some messages get processed in emergency state
089df9db638f309479a73e44f9d14f84ec41dfd2 04-Sep-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Let some messages get processed in emergency state" into mnc-dr-dev
c77ef6e1b14a8b132474075e7581f416eae3f283 04-Sep-2015 Jack Yu <jackyu@google.com> am ab800095: Fixed that device does not showing roaming icon on Sprint network

* commit 'ab80009565d546d6a3ef1e898207d0014e9bb26a':
Fixed that device does not showing roaming icon on Sprint network
e68f7ec81d00e08196095bc41bfa6a1bc42248a3 04-Sep-2015 Jack Yu <jackyu@google.com> Fixed that the device crashes when users send SMS via STK.

If the user sends an SMS through STK menu, and the SMS encoding
is 7-bit GSM, the device will crash because of buffer overflow.
Fixed by supplying the correct buffer length while doing the
array copy.

bug: 23501570
Change-Id: I569b519a87ae693b0c35371ee160ca52fd5b6e6a
at/ResponseData.java
d5bf1b4d4c00d6065b25151130db4c6ee7d24997 04-Sep-2015 Xiaohui Chen <xiaohuic@google.com> Merge "Cleanup USER_OWNER in telephony"
ab80009565d546d6a3ef1e898207d0014e9bb26a 04-Sep-2015 Jack Yu <jackyu@google.com> Fixed that device does not showing roaming icon on Sprint network

The logic of how we determine roaming need to check if spn, long
name, short name are empty string first before comparison.

bug: 23733308
Change-Id: I4b1023b6dd7c8d050281efb6b29b3df4d49eaa96
dma/CdmaServiceStateTracker.java
sm/GsmServiceStateTracker.java
97b6057345387aa5e7c4d18436e5f2b6fb3bec7a 04-Sep-2015 Amit Mahajan <amitmahajan@google.com> am cebc7590: am a0c5c541: am 681ccc4c: Merge "STK: Image/icon related fixes" into mnc-dr-dev

* commit 'cebc759072ff5be9f7d4b12877717152f2251914':
STK: Image/icon related fixes
8bd3792e6749600ea26d10aeb33ba95e03eb847e 04-Sep-2015 Amit Mahajan <amitmahajan@google.com> am c22cdcc4: am 4152ca2b: am 201a8351: Merge "Add TDSCDMA family" into mnc-dr-dev

* commit 'c22cdcc4ea59ef51e7b4bc8676edaa76b5ff9fc1':
Add TDSCDMA family
202322c3c8be4a45520df0494e0913ef39f1fe53 04-Sep-2015 Robert Greenwalt <rgreenwalt@google.com> Let some messages get processed in emergency state

Some pings and infrastructure events were getting defered in
emergency mode. This led to hung processes.

bug:23131069
Change-Id: I5415ae69bcf17a293d5af9ae093d7346b1dc076f
ataconnection/DcSwitchStateMachine.java
65bd5856a33708f3b690dcb7703b7ce5acfd66e0 04-Sep-2015 Xiaohui Chen <xiaohuic@google.com> Cleanup USER_OWNER in telephony

Bug: 19913735
Bug: 23795305
Change-Id: Id52c4558c56d1006b975f27f65e061a623978b8f
nboundSmsHandler.java
msApplication.java
apPushOverSms.java
a0c5c541416d2e03959d903bd5357133ed61621b 04-Sep-2015 Amit Mahajan <amitmahajan@google.com> am 681ccc4c: Merge "STK: Image/icon related fixes" into mnc-dr-dev

* commit '681ccc4c9c514a43ea5cf1a5e446f5994659e59f':
STK: Image/icon related fixes
681ccc4c9c514a43ea5cf1a5e446f5994659e59f 04-Sep-2015 Amit Mahajan <amitmahajan@google.com> Merge "STK: Image/icon related fixes" into mnc-dr-dev
4152ca2b3031e616ac8bdbc7cb787a652af107bf 03-Sep-2015 Amit Mahajan <amitmahajan@google.com> am 201a8351: Merge "Add TDSCDMA family" into mnc-dr-dev

* commit '201a8351a004cb9a44f9c25b48af4d4ee85bc3f2':
Add TDSCDMA family
201a8351a004cb9a44f9c25b48af4d4ee85bc3f2 03-Sep-2015 Amit Mahajan <amitmahajan@google.com> Merge "Add TDSCDMA family" into mnc-dr-dev
5767ae41f516736b666062091d4f1948eccca8f4 27-Sep-2013 Preeti Ahuja <preetia@codeaurora.org> STK: Image/icon related fixes

1. Handle invalid images/icons
If the coding scheme of the image is not understood, then the
loading of the icon will fail.
Send a TR with ResultCode.PRFRMD_ICON_NOT_DISPLAYED back to
the card when this happens, but continue processing the command.

2. For Idle Mode Text the icon should be loaded even when text
is not present

BUG=22637125
Change-Id: Ie4199fe9ac00f14db2d6b12604fc2c9cf54208f5
at/CatCmdMessage.java
at/CatService.java
at/CommandParams.java
at/CommandParamsFactory.java
at/ImageDescriptor.java
c9ddef3f0e72e76157b7b6b540b754d798fc5ccc 03-Sep-2015 Robert Greenwalt <rgreenwalt@google.com> Don't lose the apn data on RAT/DRS change

Even if we stated connected we'd wipe the extra field
in our network info object.

bug:23406274
Change-Id: Ib1556dec19c70fce55a81d175aaa3db1d8b1887c
ataconnection/DataConnection.java
e709670fdce8bf42bdfd4756c563c3211b4050a2 03-Sep-2015 Svetoslav Ganov <svetoslavganov@google.com> am 4be30750: am a50b0842: am 2f85930c: am c46de7cd: Merge "Enable WRITE_SMS for telephony provider" into mnc-dev

* commit '4be30750fefbcdbc1b73adf997f4a1924c02f878':
Enable WRITE_SMS for telephony provider
965e381f740d36bd40005b2b40d39b662209654d 15-Jul-2015 Sungmin Choi <sungmin.choi@lge.com> Add TDSCDMA family

Bug: 22639018
Change-Id: I7a65337838ef3dfa24ce8b59564ec831c5cb5094
hone.java
a50b084237edc8b71e6e3095637d54b4b1c4e2cf 03-Sep-2015 Svetoslav Ganov <svetoslavganov@google.com> am 2f85930c: am c46de7cd: Merge "Enable WRITE_SMS for telephony provider" into mnc-dev

* commit '2f85930c1f9a48de580a93d6816dccd72204615e':
Enable WRITE_SMS for telephony provider
75e1c664f9199a98b730d6ca7dd601ab0ba7dd79 03-Sep-2015 Robert Greenwalt <rgreenwalt@google.com> am eedb48e7: am b56c6665: am 3b869643: am f4e42037: Merge "Don\'t send unnecessary setNetworkSelectionMode cmd" into mnc-dev

* commit 'eedb48e7db6dda5d70095833f45a1d657071fdcc':
Don't send unnecessary setNetworkSelectionMode cmd
71e46a1f78685ad871dfcea530832402f34ed7d8 03-Sep-2015 Tyler Gunn <tgunn@google.com> Trigger onConferenceMergeFailed for GSM conference failures.

This ensures Telecom is informed of the failure and can inform the
InCall UI.

Bug: 23693013
Change-Id: I2079d6f6cd42090dd9d8d3d3d81df00ceabd234b
sm/GsmCallTracker.java
2f85930c1f9a48de580a93d6816dccd72204615e 03-Sep-2015 Svetoslav Ganov <svetoslavganov@google.com> am c46de7cd: Merge "Enable WRITE_SMS for telephony provider" into mnc-dev

* commit 'c46de7cdc571ead54369efc8dfcff32405f91cca':
Enable WRITE_SMS for telephony provider
c46de7cdc571ead54369efc8dfcff32405f91cca 03-Sep-2015 Svetoslav Ganov <svetoslavganov@google.com> Merge "Enable WRITE_SMS for telephony provider" into mnc-dev
cfef2b5aef82310e034b3ad743ebbd1c5ed27043 03-Sep-2015 Svetoslav <svetoslavganov@google.com> Enable WRITE_SMS for telephony provider

WRITE_SMS app op is explicitly granted to some system components
like bluetooh, phone, mms service. It is however no granted to the
telephony provider. The latter is the one storing the SMS data and
should always have the app op enabled. Content providers perform
proxy app op updates (taking a note they perform an operation on
behalf of another app) which requires the proxy package, the provider,
to have the app op allowed.

bug:23017449

Change-Id: Ic0c6865a616b6f3997a64d390699e9fd86c4ae2e
msApplication.java
b56c666555033d9464294ccead28934ab27a34d5 03-Sep-2015 Robert Greenwalt <rgreenwalt@google.com> am 3b869643: am f4e42037: Merge "Don\'t send unnecessary setNetworkSelectionMode cmd" into mnc-dev

* commit '3b86964349787e9d423f09d326ac401e56d6c451':
Don't send unnecessary setNetworkSelectionMode cmd
3b86964349787e9d423f09d326ac401e56d6c451 03-Sep-2015 Robert Greenwalt <rgreenwalt@google.com> am f4e42037: Merge "Don\'t send unnecessary setNetworkSelectionMode cmd" into mnc-dev

* commit 'f4e4203734db9d3a5c64a23ba9fe6855129bc4b7':
Don't send unnecessary setNetworkSelectionMode cmd
f4e4203734db9d3a5c64a23ba9fe6855129bc4b7 03-Sep-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Don't send unnecessary setNetworkSelectionMode cmd" into mnc-dev
a9031ce0193506e102156fc6ea2983361737a3df 02-Sep-2015 Robert Greenwalt <rgreenwalt@google.com> Don't send unnecessary setNetworkSelectionMode cmd

This RIL command requires the radio restart network selection.
It's poorly named in that regard. Check if we're already in
automatic mode before pushing automatic down again.

bug:23678158
Change-Id: I47301218279ef20c8db5e9c41c62d011b6a60820
honeBase.java
56f004ca3abb79609cd6bd72aa5fc2f732284d49 19-Aug-2015 Amit Mahajan <amitmahajan@google.com> Store phoneId in network requestInfo.

If the SIM is removed, phoneId returned by subscription controller
based on subId is MAX_INT leading to a crash.

Bug: 23315629
Change-Id: I8809cfaaeb6ff78b1e24915e350329b8133d99e9
ataconnection/DcSwitchAsyncChannel.java
ataconnection/DctController.java
6a2990c5ca9d6a31f75e6c20eacac4a4d84d9ac4 13-Aug-2015 Robert Greenwalt <rgreenwalt@google.com> Cleanup network release

Fixes a handful of issues. PendingRequests were getting touched on
random threads, so moved to handler thread. Release could get
confused by state changes, so made it depend only on state set
during the request (if it's in the pending list, remove it, if it's
on the request list, release it).

bug:23080486
Change-Id: I62d3e279a34f3f3eac122842faa2abc8cb52b54c
ataconnection/DctController.java
cff1be7ced1e2f2ae09291ff2fc8749e3650af98 01-Sep-2015 Vineeta Srivastava <vsrivastava@google.com> am f2ac3652: am 869d0366: am 02d0fde7: Merge "telephony: PreferredAPN is not set correctly while device is booting" into mnc-dr-dev

* commit 'f2ac36525ebc862d4ec6cea9e3ac4f065fcda060':
telephony: PreferredAPN is not set correctly while device is booting
869d036608d9af78acffd8bc8ba1d3cd257c0a6c 01-Sep-2015 Vineeta Srivastava <vsrivastava@google.com> am 02d0fde7: Merge "telephony: PreferredAPN is not set correctly while device is booting" into mnc-dr-dev

* commit '02d0fde7044b1144efcf798a7cd65276e320396e':
telephony: PreferredAPN is not set correctly while device is booting
02d0fde7044b1144efcf798a7cd65276e320396e 01-Sep-2015 Vineeta Srivastava <vsrivastava@google.com> Merge "telephony: PreferredAPN is not set correctly while device is booting" into mnc-dr-dev
cd36d78913ba9cd4947dcc2bc5a71600d5a8728b 01-Sep-2015 Amit Mahajan <amitmahajan@google.com> am b1bb6b5a: am e3b2126f: am 6f3dba01: In PhoneProxy query voice RAT after CarrierConfig is loaded.

* commit 'b1bb6b5a1f932b8516b288929bb18e757458ccc6':
In PhoneProxy query voice RAT after CarrierConfig is loaded.
e3b2126f9fbb98a5adfddb2cdc4db3f4a2d8f274 01-Sep-2015 Amit Mahajan <amitmahajan@google.com> am 6f3dba01: In PhoneProxy query voice RAT after CarrierConfig is loaded.

* commit '6f3dba0134ff47f9808dcaa8bcbb537ffb8b748a':
In PhoneProxy query voice RAT after CarrierConfig is loaded.
aa863054476b152fe9323defd197fa946a47033f 25-Aug-2015 Sungmin Choi <sungmin.choi@lge.com> telephony: PreferredAPN is not set correctly while device is booting

When device is booting, mPhone.getSubId() return -2.
It makes device get the wrong preferredAPN.

Bug: 23367895
Change-Id: Ieadab013521e81d224ff08e4a60c2d9222cd6578
Signed-off-by: wooje.shim <wooje.shim@lge.com>
Signed-off-by: Sungmin Choi <sungmin.choi@lge.com>
ataconnection/DcTracker.java
a62d723815dad650884714e801421b6d7cb34f91 31-Aug-2015 Jack Yu <jackyu@google.com> Fixed that email import did not work

Email import did not work if thre contacts stored in the
same record number of two different EF_ADN. In this case
the UE needs to identify the correct EF_ADN to apply based
on the SFI specified in EF_EMAIL.

Also fixed few unreported bugs including importing emails
will fail if there are more than 254 contacts and emails.

bug: 23089733
Change-Id: I309f7cdd711103c8c10ace9ead7d515428bc063b
sm/UsimPhoneBookManager.java
icc/AdnRecord.java
ea763d93b231bccf7e476b625fa028bef7874bf8 26-Aug-2015 Robert Greenwalt <rgreenwalt@google.com> Ignore obsolete disconnect_completed msgs.

Msg passing meant the disconnect_completed was getting processed after
a new connect request was received and acted on, so the disc_completed
would causes us to mark the state incorrectly and we'd get in trouble.

bug:22776917
Change-Id: I781c0619dade00554d368a649c3e43a32cf511dc
ataconnection/ApnContext.java
ataconnection/DataConnection.java
ataconnection/DcAsyncChannel.java
ataconnection/DcController.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
6c62e6a518372fc160270ffdaf9dd5e996cde0af 28-Aug-2015 Wei Liu <luciferleo@google.com> am 7b779068: am 4c3aa35e: roamingProtocol should be used for roaming.

* commit '7b779068e320c0194bddf9e01456994bc0157237':
roamingProtocol should be used for roaming.
4c3aa35e868f94a49b962bf9e9fb9ba423451065 28-Aug-2015 Wei Liu <luciferleo@google.com> roamingProtocol should be used for roaming.

b/23605649

Change-Id: Ic7371b4e84a19d095f3e544c94658456184cb4ea
ataconnection/DataProfile.java
70dd1f77873913635288e513564a6c93ae4d0a26 28-Aug-2015 Paul Jensen <pauljensen@google.com> Fix NOT_RESTRICTED network capability and enforce it.

With this change:
1. NOT_RESTRICTED should be removed from NetworkRequests that bring up
special restricted carrier networks (e.g. IMS, FOTA).
2. NetworkRequests without NOT_RESTRICTED require CONNECTIVITY_INTERNAL
permission to register
3. Binding sockets to networks without NOT_RESTRICTED requires
CONNECTIVITY_INTERNAL permission

Bug:21637535
Change-Id: I5991d39facaa6b690e969fe15dcbeec52e918321
(cherry picked from commit af171aa4dcf294bf2d1b9bed54ef9a6b0ec76361)
ataconnection/DataConnection.java
ataconnection/DcTracker.java
6f3dba0134ff47f9808dcaa8bcbb537ffb8b748a 27-Aug-2015 Amit Mahajan <amitmahajan@google.com> In PhoneProxy query voice RAT after CarrierConfig is loaded.

Earlier query was done on SIM_RECORDS_LOADED which can be a little too
early as CarrierConfig may not be ready at that time (CarrierConfig
is queried by PhoneProxy on getting voice RAT response).

Bug: 23387502
Change-Id: I77195545c1fa4967668fff26a5641e774d31dd5c
honeProxy.java
9ae1e83888c53b32fad009ffe6c4f635956ee70a 26-Aug-2015 Jack Yu <jackyu@google.com> am 351a0ca4: am d5a0c200: am 9d19dccf: resolved conflicts for merge of ca474793 to mnc-dr-dev

* commit '351a0ca43093c7a4bfbfa4f7ca1fa427c6ce2683':
Fixed that no service was shown after boot up
d5a0c20028ad004905ae880d00081036611cfcc8 26-Aug-2015 Jack Yu <jackyu@google.com> am 9d19dccf: resolved conflicts for merge of ca474793 to mnc-dr-dev

* commit '9d19dccf1e98a12ce78ca5fa6269bd5aaf2e62d4':
Fixed that no service was shown after boot up
9d19dccf1e98a12ce78ca5fa6269bd5aaf2e62d4 26-Aug-2015 Jack Yu <jackyu@google.com> resolved conflicts for merge of ca474793 to mnc-dr-dev

Change-Id: I6887a626c296edd24f95bb8bd8b6412f7710515b
ca474793ea87ba4c92803d4aef2a4723bd1a2745 26-Aug-2015 Jack Yu <jackyu@google.com> Merge "Fixed that no service was shown after boot up" into mnc-dev
d0f42f2d9a8499cd8d9f89fef397c4f7418a35e6 26-Aug-2015 Amit Mahajan <amitmahajan@google.com> am e4ed34d3: am 3eb41388: am d7823fe6: am ea228051: Merge "Change to not dump PII in IsimUiccRecords." into mnc-dev

* commit 'e4ed34d3a373b68b0fc7a5c9f72707e8ca224df1':
Change to not dump PII in IsimUiccRecords.
3eb4138883dd03d0ae78c858f94793ae347525e5 26-Aug-2015 Amit Mahajan <amitmahajan@google.com> am d7823fe6: am ea228051: Merge "Change to not dump PII in IsimUiccRecords." into mnc-dev

* commit 'd7823fe69ce7f8f6205727fed5f2007d391c1443':
Change to not dump PII in IsimUiccRecords.
d7823fe69ce7f8f6205727fed5f2007d391c1443 26-Aug-2015 Amit Mahajan <amitmahajan@google.com> am ea228051: Merge "Change to not dump PII in IsimUiccRecords." into mnc-dev

* commit 'ea2280512403c7ad718b73fcceb8590bebf87b63':
Change to not dump PII in IsimUiccRecords.
ea2280512403c7ad718b73fcceb8590bebf87b63 26-Aug-2015 Amit Mahajan <amitmahajan@google.com> Merge "Change to not dump PII in IsimUiccRecords." into mnc-dev
4564794748296184b256da3adaabbc1e83e7ecbc 26-Aug-2015 Amit Mahajan <amitmahajan@google.com> Change to not dump PII in IsimUiccRecords.

Bug: 23531109
Change-Id: I3918eec522516d6c51fe344dbfa57c107ac5b74e
icc/IsimUiccRecords.java
3336609a90e3e186627d409e9dd880dd638ec2e7 25-Aug-2015 Etan Cohen <etancohen@google.com> Merge "Convert useImsAlwaysForEmergencyCall to carrier configuration."
90fa2bfdc6b00ffab5191ed89717398ee3aa9a3f 25-Aug-2015 Anthony Lee <anthonylee@google.com> am b9fb0d8f: am 43eb1830: am e268ec48: am 228824f6: Don\'t print PII

* commit 'b9fb0d8f9a13fbd8c56b31e867c9e1dda7ec9cf6':
Don't print PII
43eb183045e2c0688a828a2d175eb77304e894b5 25-Aug-2015 Anthony Lee <anthonylee@google.com> am e268ec48: am 228824f6: Don\'t print PII

* commit 'e268ec4827cc05a745c954f04bfdf16d7bcbf153':
Don't print PII
e268ec4827cc05a745c954f04bfdf16d7bcbf153 25-Aug-2015 Anthony Lee <anthonylee@google.com> am 228824f6: Don\'t print PII

* commit '228824f603b310707829fdd92bf8e16d8f421b58':
Don't print PII
6c497f695c5c0017c511e471d36bdfc66dbbf605 24-Aug-2015 Jack Yu <jackyu@google.com> Fixed that no service was shown after boot up

The SPN information came too early before the subscription
id is valid hence the SPN info was ignored by MobileSignalController.
We need to send the SPN update intent again after subscription info
is valid.

bug: 23366812
Change-Id: I11ab185d2ffbd34a8d0f3d4096179aee13138f3f
erviceStateTracker.java
dma/CdmaServiceStateTracker.java
sm/GsmServiceStateTracker.java
228824f603b310707829fdd92bf8e16d8f421b58 25-Aug-2015 Anthony Lee <anthonylee@google.com> Don't print PII

Bug: 22907228
Change-Id: I8a9926f5374ad4dc15c993dcfcc039852acdfb0f
icc/IccRecords.java
2e6fec28498da8d9831506f641b35ed0e51f6d03 25-Aug-2015 Robert Greenwalt <rgreenwalt@google.com> am 610ffa3c: am 5718b751: am 7606fb34: am 3f7b3ae9: Merge "Allow us back on the network after carrier-detatch" into mnc-dev

* commit '610ffa3c6830df1e5b42ac64a8efd5645489957a':
Allow us back on the network after carrier-detatch
5718b751331e04f65a0ba888c2b87fbd4855e91f 24-Aug-2015 Robert Greenwalt <rgreenwalt@google.com> am 7606fb34: am 3f7b3ae9: Merge "Allow us back on the network after carrier-detatch" into mnc-dev

* commit '7606fb348e1ce012ec0b08f397dccd65c2bd0cc5':
Allow us back on the network after carrier-detatch
7606fb348e1ce012ec0b08f397dccd65c2bd0cc5 24-Aug-2015 Robert Greenwalt <rgreenwalt@google.com> am 3f7b3ae9: Merge "Allow us back on the network after carrier-detatch" into mnc-dev

* commit '3f7b3ae9f7447623173edb435226129f3a185af7':
Allow us back on the network after carrier-detatch
3f7b3ae9f7447623173edb435226129f3a185af7 24-Aug-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Allow us back on the network after carrier-detatch" into mnc-dev
b07e108676846f8dbbcce63e3561806b228dd07b 24-Aug-2015 Amit Mahajan <amitmahajan@google.com> am aa1b1e73: am dd9929c1: am bc6aa291: Merge "Discard mnc length value received in EF_AD if invalid." into mnc-dr-dev

* commit 'aa1b1e73567e8cb3230a03513ad0d1d11da69556':
Discard mnc length value received in EF_AD if invalid.
dd9929c1edcf5c9ba01f4540aa9e4aec99231aa5 24-Aug-2015 Amit Mahajan <amitmahajan@google.com> am bc6aa291: Merge "Discard mnc length value received in EF_AD if invalid." into mnc-dr-dev

* commit 'bc6aa291b1abdfc9ea3c17c2f61e1e1442a57d5b':
Discard mnc length value received in EF_AD if invalid.
bc6aa291b1abdfc9ea3c17c2f61e1e1442a57d5b 24-Aug-2015 Amit Mahajan <amitmahajan@google.com> Merge "Discard mnc length value received in EF_AD if invalid." into mnc-dr-dev
aacc11b299ac047e73e1e712aa396ea0a6a80158 18-Aug-2015 Robert Greenwalt <rgreenwalt@google.com> Allow us back on the network after carrier-detatch

We had code in DcTracker to deal with this but the MR1-originating
DcSwitchStateMachine interceeds. Exposing the switch so
DSSM can access it and behave appropriately.

bug:23069223
Change-Id: I7a674d3b662aa0a7eec5a54889a784a2b64d662c
ataconnection/DcSwitchStateMachine.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
5e1d7edaac65d5283c37a2c0fe00ec99f7d5e7ed 21-Aug-2015 Amit Mahajan <amitmahajan@google.com> am eb1d9d63: am 84dcd59e: am fda8d6f0: Merge "Change to dispose Gsm/CdmaConnection to make sure wakelock is released" into mnc-dr-dev

* commit 'eb1d9d63ce5d06ee639839836b2df92040b72ae3':
Change to dispose Gsm/CdmaConnection to make sure wakelock is released
c2c18806d311165f57acfc49de812f4864d004b2 21-Aug-2015 Amit Mahajan <amitmahajan@google.com> am f054e1bc: am e695dad6: am d0d5f17e: Merge "Change to not notify all of connected if EVENT_DISCONNECT is pending" into mnc-dr-dev

* commit 'f054e1bc8121b721d63238b1a852591ebcbd3a1c':
Change to not notify all of connected if EVENT_DISCONNECT is pending
fd4c0d84e56a98beb0e8fec91b7dbee7e28e4a6e 21-Aug-2015 Amit Mahajan <amitmahajan@google.com> am 93e60a0f: am 23e335e1: am 7c18d275: Merge "Store phoneId in network requestInfo." into mnc-dr-dev

* commit '93e60a0f1123b699eb5af4cda3bfe6bdfaefe8c8':
Store phoneId in network requestInfo.
84dcd59ef854bdf14eb3da31e90200b3f53cf19f 20-Aug-2015 Amit Mahajan <amitmahajan@google.com> am fda8d6f0: Merge "Change to dispose Gsm/CdmaConnection to make sure wakelock is released" into mnc-dr-dev

* commit 'fda8d6f09f008a96ebb2e306cc2ffc5759c1e342':
Change to dispose Gsm/CdmaConnection to make sure wakelock is released
e695dad6dbb8c0092e5c03f148742a121c0a5219 20-Aug-2015 Amit Mahajan <amitmahajan@google.com> am d0d5f17e: Merge "Change to not notify all of connected if EVENT_DISCONNECT is pending" into mnc-dr-dev

* commit 'd0d5f17ed5796444359122ea7301d297bcfe0012':
Change to not notify all of connected if EVENT_DISCONNECT is pending
23e335e14e755fe3e275a6b5764e55f9ea6ae31b 20-Aug-2015 Amit Mahajan <amitmahajan@google.com> am 7c18d275: Merge "Store phoneId in network requestInfo." into mnc-dr-dev

* commit '7c18d2753ee86fe8deac4dc16967210b92ed2340':
Store phoneId in network requestInfo.
fda8d6f09f008a96ebb2e306cc2ffc5759c1e342 20-Aug-2015 Amit Mahajan <amitmahajan@google.com> Merge "Change to dispose Gsm/CdmaConnection to make sure wakelock is released" into mnc-dr-dev
d0d5f17ed5796444359122ea7301d297bcfe0012 20-Aug-2015 Amit Mahajan <amitmahajan@google.com> Merge "Change to not notify all of connected if EVENT_DISCONNECT is pending" into mnc-dr-dev
7c18d2753ee86fe8deac4dc16967210b92ed2340 20-Aug-2015 Amit Mahajan <amitmahajan@google.com> Merge "Store phoneId in network requestInfo." into mnc-dr-dev
558d6f408824b524d9f8d5310a772cc299ef8531 19-Aug-2015 Amit Mahajan <amitmahajan@google.com> Store phoneId in network requestInfo.

If the SIM is removed, phoneId returned by subscription controller
based on subId is MAX_INT leading to a crash.

Bug: 23315629
Change-Id: I8809cfaaeb6ff78b1e24915e350329b8133d99e9
ataconnection/DcSwitchAsyncChannel.java
ataconnection/DctController.java
5488b8a7a799bc89427a262a52cba74c26918ec3 15-Aug-2015 Amit Mahajan <amitmahajan@google.com> Change to not notify all of connected if EVENT_DISCONNECT is pending

Bug: 23067429
Change-Id: Ic3405608d7aadcf14b38e0ce4e35f7dcd1be0bf2
ataconnection/DataConnection.java
200014f52acfbff467ab92910247f81e369da7e6 20-Aug-2015 Amit Mahajan <amitmahajan@google.com> Discard mnc length value received in EF_AD if invalid.

Graceful handling instead of crashing for an error case.

Bug: 23095679
Change-Id: Iad6ff8e9530f0f96fd60d2674b4589098ce9d9e9
icc/SIMRecords.java
e7862ad83b66cc82133020420c6bdc656a57685c 20-Aug-2015 Sharvil Nanavati <sharvil@google.com> Merge "DO NOT MERGE Change auth_type value to 0 if AUTH_TYPE is -1" into cw-e-dev
32cefb74203dcc9ae0ef828e4031acc097bcb77b 13-Aug-2015 Sungmin Choi <sungmin.choi@lge.com> DO NOT MERGE Change auth_type value to 0 if AUTH_TYPE is -1

Bug: 23285878

Change-Id: I6cfad0f70a41cccb0278b7eda429ac7bb0525a26
ataconnection/DcTracker.java
f95385d44627fa16a2f9c9a70ee07c6b91f9ba1c 20-Aug-2015 Nathan Harold <nharold@google.com> am 98bef8b5: am 455b3193: am f6188dcc: am ffbf7549: Merge "Disable DataConnection RealTimeInfo" into mnc-dev

* commit '98bef8b5d66c90f7980038075dc085b0728f02b7':
Disable DataConnection RealTimeInfo
455b31939a2a1c17649cb8f711db11e689387644 20-Aug-2015 Nathan Harold <nharold@google.com> am f6188dcc: am ffbf7549: Merge "Disable DataConnection RealTimeInfo" into mnc-dev

* commit 'f6188dccaf504fa49c6beaa8e7c213ae7b463ebe':
Disable DataConnection RealTimeInfo
f6188dccaf504fa49c6beaa8e7c213ae7b463ebe 20-Aug-2015 Nathan Harold <nharold@google.com> am ffbf7549: Merge "Disable DataConnection RealTimeInfo" into mnc-dev

* commit 'ffbf754904d2ccba0c124d895d93205208a19285':
Disable DataConnection RealTimeInfo
ffbf754904d2ccba0c124d895d93205208a19285 20-Aug-2015 Nathan Harold <nharold@google.com> Merge "Disable DataConnection RealTimeInfo" into mnc-dev
ef3de20d9aa0f0d9ec59b8d5a795c67226e87e6f 20-Aug-2015 Robert Greenwalt <rgreenwalt@google.com> am 116286f9: am ba8f25a5: am 337dc6c4: am 01144882: Fix null handling of getAllCellInfo

* commit '116286f9dd5e70a02ac3d5c07d9b2bda7386c464':
Fix null handling of getAllCellInfo
ba8f25a5bde26005082ce2de66b7ee60a35001e5 20-Aug-2015 Robert Greenwalt <rgreenwalt@google.com> am 337dc6c4: am 01144882: Fix null handling of getAllCellInfo

* commit '337dc6c492cf75173e1ae434966b641dff75fbcd':
Fix null handling of getAllCellInfo
337dc6c492cf75173e1ae434966b641dff75fbcd 19-Aug-2015 Robert Greenwalt <rgreenwalt@google.com> am 01144882: Fix null handling of getAllCellInfo

* commit '01144882e1521dadd3d20fbb7aaa75758deb5285':
Fix null handling of getAllCellInfo
01144882e1521dadd3d20fbb7aaa75758deb5285 19-Aug-2015 Robert Greenwalt <rgreenwalt@google.com> Fix null handling of getAllCellInfo

ServiceStateTracker.getAllCellInfo may return null, but
PhoneBase.privatizeCellInfoList may dereference that. Check
for null rather than crash the phone.

bug:23201508
Change-Id: I26fcfc015fa1a8d1ec13e34f3369d1848954c44e
honeBase.java
8f811769f344f892056e17eb81c8d74a457cf133 19-Aug-2015 Amit Mahajan <amitmahajan@google.com> Change to dispose Gsm/CdmaConnection to make sure wakelock is released

Wakelock acq/release is done only on connection creation and
disconnect. If phone switch happens before disconnect, wakelock is not
released.

Bug: 23334669
Change-Id: Iebf34fa7b05015fec16730ec9e45635181939649
dma/CdmaCallTracker.java
dma/CdmaConnection.java
sm/GsmCallTracker.java
sm/GsmConnection.java
44ab633e2c663326be1b21cec45d8efc49ba4ab5 14-Aug-2015 Roshan Pius <rpius@google.com> Add delay between postdial DTMF tones for CDMA.

Adding a delay between the postdial DTMF char tones sent out to the
network for CDMA phones.
This is based on a similar set of changes for IMS calls: ag/747687.

BUG: 19118840
Change-Id: Ifcd70bb44da5fba808f31b3021f063b545a1b740
dma/CdmaCallTracker.java
dma/CdmaConnection.java
1d8047e082807eccca31013fa8c60db06222400d 19-Aug-2015 Jonathan Basseri <misterikkit@google.com> am a8c1a9d9: am dc4bd778: am 979d1669: am 69027fb2: Add null check

* commit 'a8c1a9d9ab7831a9d963f3864548fe650c5f54e3':
Add null check
02f33cf853eef41b7ad66f8d1eb0dc2106393ff5 18-Aug-2015 Nathan Harold <nharold@google.com> Disable DataConnection RealTimeInfo

TelephonyManager.listen() registrants will
no longer receive any events via PhoneStateListener
from LISTEN_DATA_CONNECTION_REAL_TIME_INFO.

bug: 22414044
bug: 23182647

Change-Id: If0ad88125a1e1334a3ebc86c9b03d89af6c3943c
ataconnection/DcController.java
dc4bd778b6e7b91c6b202bcb79028b3023a043ab 18-Aug-2015 Jonathan Basseri <misterikkit@google.com> am 979d1669: am 69027fb2: Add null check

* commit '979d16695cb5cc90dff520ff124bb46208237cf7':
Add null check
979d16695cb5cc90dff520ff124bb46208237cf7 18-Aug-2015 Jonathan Basseri <misterikkit@google.com> am 69027fb2: Add null check

* commit '69027fb2fbdb046467b8902ebc70120b89301cee':
Add null check
69027fb2fbdb046467b8902ebc70120b89301cee 15-Aug-2015 Jonathan Basseri <misterikkit@google.com> Add null check

resolveService() is allowed to return null, so check the return value
before using it.

Bug: 23041089
Change-Id: I75af183d551770048fa925676b9adfbd078e22ba
arrierServiceBindHelper.java
1d044a0ed0be8734121e4b40190cd50006754e24 04-Aug-2015 Etan Cohen <etancohen@google.com> Convert useImsAlwaysForEmergencyCall to carrier configuration.

Bug: 22777920
Change-Id: I0e77a7e59d7380e613c49bc64a4598d9c6f8e475
dma/CDMAPhone.java
sm/GSMPhone.java
6ee7af429b6bd4e3c7e64142761ed8eac5c9e532 14-Aug-2015 Tyler Gunn <tgunn@google.com> am d56f1da3: am ace35691: am 3ad4ada3: Merge "IMS: Call Extras Propagation To Network" into mnc-dr-dev

* commit 'd56f1da3830dca78b7ad26785d867064bcacf8bd':
IMS: Call Extras Propagation To Network
ace35691cea971a431f05b50a2767cb3df494c06 14-Aug-2015 Tyler Gunn <tgunn@google.com> am 3ad4ada3: Merge "IMS: Call Extras Propagation To Network" into mnc-dr-dev

* commit '3ad4ada3da3377ecdc7857b681069c2e115b936d':
IMS: Call Extras Propagation To Network
3ad4ada3da3377ecdc7857b681069c2e115b936d 14-Aug-2015 Tyler Gunn <tgunn@google.com> Merge "IMS: Call Extras Propagation To Network" into mnc-dr-dev
b29f024562a6445efe72054501abf63cd0e729b1 14-Aug-2015 Robert Greenwalt <rgreenwalt@google.com> am 13004b6b: am 740b1943: am 5c27d315: Merge "Cleanup network release" into mnc-dr-dev

* commit '13004b6b5f209265462cdae3314a4d89c4c8c85b':
Cleanup network release
91c21f3051fa66bbeb8fae4aad3f56286c5f038b 14-Aug-2015 Etan Cohen <etancohen@google.com> am c0e304e9: am b084d849: am 8e682f07: am 1f059ef7: Merge "UE doesn\'t make 1x call if IMS not registered." into mnc-dev

* commit 'c0e304e9b2f5843b46bd874157e658c7a8eb68ba':
UE doesn't make 1x call if IMS not registered.
955bbe9c2affde834573a0993cddc09559624a5e 14-Aug-2015 Junda Liu <junda@google.com> am e15425ee: am b8899336: am 5d268632: am 7c107e94: Merge "Don\'t set prefer network type on RIL connected." into mnc-dev

* commit 'e15425ee38dd3852b1f103da1686e6554024affc':
Don't set prefer network type on RIL connected.
e48f4a081d879377ec06ff7abe1961781976927f 14-Aug-2015 Wei Liu <luciferleo@google.com> am 86074685: am 0165a9fe: Merge "Do not turn on cellular radio if enable_cellular_on_boot is false." into cw-e-dev

* commit '8607468588287ca1b4479c8f0ca48dbf19e0c9d9':
Do not turn on cellular radio if enable_cellular_on_boot is false.
740b19437eb978d31b3c2b4c41942b94d0ee0313 14-Aug-2015 Robert Greenwalt <rgreenwalt@google.com> am 5c27d315: Merge "Cleanup network release" into mnc-dr-dev

* commit '5c27d3157cd38ddb7e30b6facce161c5e837393f':
Cleanup network release
5c27d3157cd38ddb7e30b6facce161c5e837393f 14-Aug-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Cleanup network release" into mnc-dr-dev
b084d8494e59727c4eb2ab832266e32252001276 14-Aug-2015 Etan Cohen <etancohen@google.com> am 8e682f07: am 1f059ef7: Merge "UE doesn\'t make 1x call if IMS not registered." into mnc-dev

* commit '8e682f07d3b27205dd4651b46de32405dbdc905e':
UE doesn't make 1x call if IMS not registered.
8e682f07d3b27205dd4651b46de32405dbdc905e 14-Aug-2015 Etan Cohen <etancohen@google.com> am 1f059ef7: Merge "UE doesn\'t make 1x call if IMS not registered." into mnc-dev

* commit '1f059ef79b2f119b7a6cc58192839ea50531ec72':
UE doesn't make 1x call if IMS not registered.
1f059ef79b2f119b7a6cc58192839ea50531ec72 14-Aug-2015 Etan Cohen <etancohen@google.com> Merge "UE doesn't make 1x call if IMS not registered." into mnc-dev
b88993369b41bf181e3fd15af6d7ef36f5a850fa 14-Aug-2015 Junda Liu <junda@google.com> am 5d268632: am 7c107e94: Merge "Don\'t set prefer network type on RIL connected." into mnc-dev

* commit '5d2686323b1cc6124b94dcb8dde8499f4bd5c0e0':
Don't set prefer network type on RIL connected.
5d2686323b1cc6124b94dcb8dde8499f4bd5c0e0 14-Aug-2015 Junda Liu <junda@google.com> am 7c107e94: Merge "Don\'t set prefer network type on RIL connected." into mnc-dev

* commit '7c107e949b62797e2b1d644fa6e890e5795b3b65':
Don't set prefer network type on RIL connected.
7c107e949b62797e2b1d644fa6e890e5795b3b65 14-Aug-2015 Junda Liu <junda@google.com> Merge "Don't set prefer network type on RIL connected." into mnc-dev
0165a9fe38ec13035d2162993b88395f7ea83e4f 14-Aug-2015 Wei Liu <luciferleo@google.com> Merge "Do not turn on cellular radio if enable_cellular_on_boot is false." into cw-e-dev
c02d6b7f2f48a291b42892424e6858f71c3d84a9 14-Aug-2015 Tyler Gunn <tgunn@google.com> IMS: Call Extras Propagation To Network

Adding the missing plumbing required for call
extras to be propagated to the network as part
of a Dial request.

Bug: 22685114
Change-Id: Ic5ed1757b23a0951f8fb0fb50a8d373336dc3a6b
msphone/ImsPhoneCallTracker.java
f33aaa6aef82c4faa90f8f2f595e698c3db78290 13-Aug-2015 Junda Liu <junda@google.com> Don't set prefer network type on RIL connected.

Bug: b/23187758
Change-Id: Ie60893290665f0dc670571c6eccc07040cee1e37
IL.java
c64c4048f531622ef541010325fe7f24192d9aec 13-Aug-2015 Roshan Pius <rpius@google.com> am cf58f5d6: am fe333ebe: Merge "Add delay between DTMF tones to meet carrier spec." into mnc-dr-dev

* commit 'cf58f5d68f199c228149553bd3b51837279d93f6':
Add delay between DTMF tones to meet carrier spec.
5bc4a86f7d58a18a65c71e9227b0f09a6338ce0c 13-Aug-2015 Robert Greenwalt <rgreenwalt@google.com> Cleanup network release

Fixes a handful of issues. PendingRequests were getting touched on
random threads, so moved to handler thread. Release could get
confused by state changes, so made it depend only on state set
during the request (if it's in the pending list, remove it, if it's
on the request list, release it).

bug:23080486
Change-Id: Ia5884e100394efcd0a7ca7f2821b44c647ded07a
ataconnection/DctController.java
fe333ebefe7777635027d2221f71beccef964d6d 13-Aug-2015 Roshan Pius <rpius@google.com> Merge "Add delay between DTMF tones to meet carrier spec." into mnc-dr-dev
3eb869088c0db8995e0cc6a9d8738d8ee64bbb20 07-Aug-2015 Moon Do Seo <mseo1@motorola.com> UE doesn't make 1x call if IMS not registered.

Root cause: App(telephony service) would check voice and data reg state to make MO call.
if both voice and data is out of service, Telephony service will block the call and pop
up a dialogfor user. FW only check voice reg state without data. When user make a MO
call while data in service, there is no failed notification at Telephony service layer
while the call is rejected by FW layer.

Bug: 23037591
Change-Id: I9762843326d71b801fa1a40b9832bcaea7fb7009
dma/CDMAPhone.java
sm/GSMPhone.java
349d2d2a9e49fdc8fe9ebe76a1c710c338e6de7e 30-Jul-2014 Sukanya Rajkhowa <srajkh@codeaurora.org> MSIM: Do not set data attach state to true

On MSIM devices, data attach value is set to true
always and due to that setUpData call is being triggered
even if device is not in service.

To fix this remove the code that sets attach state to true.

bug: 23092205
Change-Id: I15b13ef36983e1ea426c78fd5358ae5f85ce3428
ataconnection/DcTracker.java
ab4d24f26c38b64fcd2e40c2618591dfc550b9ef 12-Aug-2015 Jack Yu <jackyu@google.com> am 7d5c4fe7: am 71ba5719: am 4138d4a9: Merge "Fixed the incorrect operator name displayed when roaming." into mnc-dev

* commit '7d5c4fe7c92f36c76f290bef33a85aecb224f8a3':
Fixed the incorrect operator name displayed when roaming.
71ba57191b93bd1608677f3ed7c262e372ba1658 12-Aug-2015 Jack Yu <jackyu@google.com> am 4138d4a9: Merge "Fixed the incorrect operator name displayed when roaming." into mnc-dev

* commit '4138d4a94b30dbfc327d89481335246335797a15':
Fixed the incorrect operator name displayed when roaming.
4138d4a94b30dbfc327d89481335246335797a15 12-Aug-2015 Jack Yu <jackyu@google.com> Merge "Fixed the incorrect operator name displayed when roaming." into mnc-dev
6bb557b243f3fc9984b82319026519608ada2c9c 12-Aug-2015 Roshan Pius <rpius@google.com> Add delay between DTMF tones to meet carrier spec.

Carrier specifications require a minimum delay of 215ms between DTMF
tones that are sent out. So, adding a delay between the end of
processing a DTMF char and begining of processing of the next DTMF char.

BUG: 23064351
Change-Id: Ife7b9dfe99319cd3fd383034d8076dd475ad5fa0
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
3658b47647f9148d69ac7c56e40a5a2dc18c5867 12-Aug-2015 Wei Liu <luciferleo@google.com> Do not turn on cellular radio if enable_cellular_on_boot is false.

b/22804423

Change-Id: I9e4361d049aca93a44e279c901bec497ac0c161b
dma/CdmaServiceStateTracker.java
sm/GsmServiceStateTracker.java
3e70ae21a2f5be8905783734ae30cadd59f21f9a 12-Aug-2015 Chris Manton <cmanton@google.com> am 18da2cad: am 069e39ba: am 6b8e1174: Save data registration roaming state

* commit '18da2cad5b3cf1c5a6221c2953f5d93acbf6c8bf':
Save data registration roaming state
069e39ba81163a7ec6e98e2822056360cee24fe3 12-Aug-2015 Chris Manton <cmanton@google.com> am 6b8e1174: Save data registration roaming state

* commit '6b8e1174d2ef221d6eeab348a819ce0003d3d5a4':
Save data registration roaming state
27d3077d0c7baa8037c1a43f4c467243152f3e50 11-Aug-2015 Jack Yu <jackyu@google.com> Fixed the incorrect operator name displayed when roaming.

The operator name was incorrectly overwritten when roaming
on partner's LTE network. In that case, ERI roaming indicator
is off, NID/SID is zero (because LTE does not support ERI/NID/SID).

The original requirement for using the name from CSIM EF_SPN
is for CDMA only (b/5008969), therefore we need to make sure the
logic is not applied in the LTE case.

bug: 22951507
Change-Id: I3595228e1a637f4bfd05e34cf9a702bb0e1bba59
dma/CdmaLteServiceStateTracker.java
6b8e1174d2ef221d6eeab348a819ce0003d3d5a4 08-Aug-2015 Chris Manton <cmanton@google.com> Save data registration roaming state

Some carriers require different APNs based upon
the roaming state returned in a previous registration
call. The carrier config has the option to override
roaming state. This change saves the proper roaming
state before the carrier config may override in order
to select the proper APN when setting up a data connection.

bug: 22990977
Change-Id: Id22a60efcbea9637018cc47e6d97f68eb053deb0
dma/CdmaServiceStateTracker.java
ataconnection/DataConnection.java
sm/GsmServiceStateTracker.java
7dca2e6157cd8a522f17d806b98b559c4b0cb7f4 03-Aug-2015 Robert Greenwalt <rgreenwalt@google.com> Reduce some chatty radio logs

bug:22913811
Change-Id: I0b5d24ef0c65831d8ab8efb8ad0e4ee51e12eead
efaultPhoneNotifier.java
ubscriptionController.java
ataconnection/DcController.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
bf875be2205ded5297fcb10b55033a20dfc64731 11-Aug-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Update linkproperties after proxy is set"
3e0c1e692d812f64bfa32bc7cb46ddd2e852ebe4 07-Jan-2015 Rakesh Pallerla <rakeshp@qti.qualcomm.com> Update linkproperties after proxy is set

Telephony will set http proxy configured in default apn after
data call is success. NetworkAgent is updating linkproperties
as soon as data call response is received. Http proxy set later
is not updated.

Resend linkproperties after proxy is set.

cherry-pick of
https://partner-android-review.googlesource.com/#/c/219697/2

bug:22851706
Change-Id: I89452f3c1d8d339cc87812970c88a1d121132227
ataconnection/DataConnection.java
9d4d99f07f6b62878c0c0527d8645d0bbee4bfdc 11-Aug-2015 Amit Mahajan <amitmahajan@google.com> am 7f6ecaa3: am f9c52eae: am f644365c: Merge "Set ServiceState before flags are evaluated" into mnc-dev

* commit '7f6ecaa36827f4fc8edda91390ce774302d9df1d':
Set ServiceState before flags are evaluated
d3cc91de8783acb4854600c2a99625e2a48d08e0 11-Aug-2015 Amit Mahajan <amitmahajan@google.com> am 9c7c7490: am 10d1e565: am d1158a95: Merge "Adding EmergencyCall state to DcSwitch state machine." into mnc-dev

* commit '9c7c7490bdadc4baba579ce409df537668053534':
Adding EmergencyCall state to DcSwitch state machine.
f9c52eae2e4f9183c17441d34e27177eb1d51fdb 11-Aug-2015 Amit Mahajan <amitmahajan@google.com> am f644365c: Merge "Set ServiceState before flags are evaluated" into mnc-dev

* commit 'f644365c6f00700f6b553b646ff942acfd4f572a':
Set ServiceState before flags are evaluated
10d1e565e9b7446a661a2a5300b95c69817fe56b 11-Aug-2015 Amit Mahajan <amitmahajan@google.com> am d1158a95: Merge "Adding EmergencyCall state to DcSwitch state machine." into mnc-dev

* commit 'd1158a95f5b04fc3ca2ea96706f5a6065a40ad12':
Adding EmergencyCall state to DcSwitch state machine.
f644365c6f00700f6b553b646ff942acfd4f572a 11-Aug-2015 Amit Mahajan <amitmahajan@google.com> Merge "Set ServiceState before flags are evaluated" into mnc-dev
d1158a95f5b04fc3ca2ea96706f5a6065a40ad12 11-Aug-2015 Amit Mahajan <amitmahajan@google.com> Merge "Adding EmergencyCall state to DcSwitch state machine." into mnc-dev
3194ecd51b83c87fc020a72a5485044022b6fce0 09-May-2015 Sukanya Rajkhowa <srajkh@codeaurora.org> Set ServiceState before flags are evaluated

If APM is turned on while service state is OUT_OF_SERVICE and right when
polling for VOICE_REGISTRATION_STATE is being handled, the service state
change to APM is not notified to the registrants. Fix this by setting
service state before flags for change in state are evaluated

Bug: 22960426
Change-Id: I781344afe13120bc0fb8e6889c46b80f8a672db1
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
sm/GsmServiceStateTracker.java
43b5109079fe62a7feb01209a775ee6019ecc40b 10-Aug-2015 Pavel Zhamaitsiak <pavelz@google.com> am 42f86345: am a7ea072e: Merge "IMS: Set CLIR API Preference Caching" into mnc-dr-dev

* commit '42f8634551b42293e696ccabe97a3c9ed092e0e6':
IMS: Set CLIR API Preference Caching
a7ea072ebf4f5f2f60248e59b8b1bf5a60d89f25 09-Aug-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "IMS: Set CLIR API Preference Caching" into mnc-dr-dev
77d5782b4fc51d8186aa7835c02c04cbd06245ce 07-Aug-2015 Anthony Lee <anthonylee@google.com> am cf77bcea: am 58a8cae6: Merge "IMS : UT Service Capability" into mnc-dr-dev

* commit 'cf77bceaeaf6a85ba479be0759f52184f1674170':
IMS : UT Service Capability
58a8cae64aa40e07d31f2f31cdd9932df056d995 07-Aug-2015 Anthony Lee <anthonylee@google.com> Merge "IMS : UT Service Capability" into mnc-dr-dev
c9190e732a13b5a1e01c1fad8c0036c2300be604 07-Aug-2015 Tyler Gunn <tgunn@google.com> am dc885d9d: am c1d9e728: Populate EXTRA_DISPLAY_TEXT for outgoing calls with a subject.

* commit 'dc885d9d90110e807b69ed343a3c2673ea20ac25':
Populate EXTRA_DISPLAY_TEXT for outgoing calls with a subject.
164cea0175c29fa2da4652253b1f3b3c03707c3e 15-Jun-2015 Anju Mathapati <anjucm@codeaurora.org> IMS : UT Service Capability

1) When UT is enabled, storing the value in
ImsPhoneCallTracker and retrieving the same
through ImsPhone

2) When service state is OOS, check the
UT capability. If enabled, then process
the dial request

Change-Id: I88a3c3ad544e876085f108b386eb57a3bc36b488
Bug: 21850717
hone.java
honeBase.java
honeProxy.java
dma/CDMAPhone.java
sm/GSMPhone.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
99faf716a99c5eda3dc6693c5afbb94897c8cd4b 04-Aug-2015 Shriram Ganesh <sganesh@codeaurora.org> IMS: Set CLIR API Preference Caching

Set CLIR API in GSMPhone can hand over propagation
to ImsPhone; which handles success/failure response
subsequently. For a success Set CLIR response,
ImsPhone needs to cache the CLIR setting in the
SharedPreferences, similar to GSMPhone's behavior.
Moving saveClirSetting method to PhoneBase to
accommodate the same.

Bug: 22986988
Bug: 22903347
Change-Id: Ica58aee0e55d93b23f63033e817045ac0a9a3a9e
honeBase.java
sm/GSMPhone.java
msphone/ImsPhone.java
f3cb9192272e4ddd68970352e998690f6c80e393 04-Aug-2015 Amit Mahajan <amitmahajan@google.com> Adding EmergencyCall state to DcSwitch state machine.

State will be entered on making emergency call, and ended either on
emergency call end or emergency callback mode end if that is supported.
This is only for CDMA.

Bug: 22777920
Change-Id: I9cac544966b1b6be5410a40273d20e52cab8b396
honeBase.java
dma/CDMAPhone.java
dma/CdmaCallTracker.java
ataconnection/DcSwitchAsyncChannel.java
ataconnection/DcSwitchStateMachine.java
ataconnection/DctController.java
c1d9e728264af06808d4374d39c71dd81642cafc 06-Aug-2015 Tyler Gunn <tgunn@google.com> Populate EXTRA_DISPLAY_TEXT for outgoing calls with a subject.

- Ensure call intent extras are passed into dialInternal, allowing the
RIL to know the subject.
- Set the EXTRA_DISPLAY_TEXT on the imsCallProfile to the
EXTRA_CALL_SUBJECT from Telecom.

Bug: 22685114
Change-Id: If5a2c2d505a1120cdb0a6560906fa8c20e5edeb9
Signed-off-by: Tyler Gunn <tgunn@google.com>
msphone/ImsPhoneCallTracker.java
0342fc53b866c517ea02140c478b10a9a15c7078 05-Aug-2015 Makoto Onuki <omakoto@google.com> am bd0e50c9: am b319738f: am d7a35611: Merge "READ_SMS allows getLine1Number() [3/3]" into mnc-dev

* commit 'bd0e50c978823933abb62fae482a90b89e696fe4':
READ_SMS allows getLine1Number() [3/3]
b319738f2507b32ef4db69984fde05ca8ccf7755 05-Aug-2015 Makoto Onuki <omakoto@google.com> am d7a35611: Merge "READ_SMS allows getLine1Number() [3/3]" into mnc-dev

* commit 'd7a3561112b8746da20a076cb3c384eed2219570':
READ_SMS allows getLine1Number() [3/3]
d7a3561112b8746da20a076cb3c384eed2219570 05-Aug-2015 Makoto Onuki <omakoto@google.com> Merge "READ_SMS allows getLine1Number() [3/3]" into mnc-dev
71f9402e1cd4ef962aeddd51a3cdf17f79bf53b1 05-Aug-2015 Paul Jensen <pauljensen@google.com> am dd50c313: am bea14741: am 1caf59d4: Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev

* commit 'dd50c313220bceee272e772e57b3e61bf464e1db':
Fix NOT_RESTRICTED network capability and enforce it.
bea14741969f6b517ecf6390fa009d40ed36eeab 05-Aug-2015 Paul Jensen <pauljensen@google.com> am 1caf59d4: Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev

* commit '1caf59d49e4713ad122bd9147c84759fcb935176':
Fix NOT_RESTRICTED network capability and enforce it.
1caf59d49e4713ad122bd9147c84759fcb935176 05-Aug-2015 Paul Jensen <pauljensen@google.com> Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev
abfb6215bedac9781a86c75fcbc519b07521a634 04-Aug-2015 Etan Cohen <etancohen@google.com> am 5f17efbb: am 5622199f: am 7808c92b: Fix build break - typo

* commit '5f17efbbbc3442a27096181a376c8ffcedae9aa9':
Fix build break - typo
5d50aac2195c9f5408aa081a9b219abd13a4f4b6 04-Aug-2015 Etan Cohen <etancohen@google.com> am 5abd6ced: am 9f7a5e48: am 95149fde: Merge "Only use IMS for E911 if VoLTE is supported on device/carrier." into mnc-dev

* commit '5abd6cedcbb9a184c06d45871362db6c568129d1':
Only use IMS for E911 if VoLTE is supported on device/carrier.
5622199f9ad4d84df7d28959f47708bd79204417 04-Aug-2015 Etan Cohen <etancohen@google.com> am 7808c92b: Fix build break - typo

* commit '7808c92b9856924e63d1f0ccf71cd73133f21c74':
Fix build break - typo
9f7a5e48405104ee13036a5fe24d2a6ed0536194 04-Aug-2015 Etan Cohen <etancohen@google.com> am 95149fde: Merge "Only use IMS for E911 if VoLTE is supported on device/carrier." into mnc-dev

* commit '95149fde808ad76c5997154c3309a226b396a45e':
Only use IMS for E911 if VoLTE is supported on device/carrier.
7808c92b9856924e63d1f0ccf71cd73133f21c74 04-Aug-2015 Etan Cohen <etancohen@google.com> Fix build break - typo

Change-Id: Ia9ecea8a2d0cae3bf122ab6a1c89779258b06cba
sm/GSMPhone.java
95149fde808ad76c5997154c3309a226b396a45e 04-Aug-2015 Etan Cohen <etancohen@google.com> Merge "Only use IMS for E911 if VoLTE is supported on device/carrier." into mnc-dev
5f15c3f0db4c606f1c816f6c865d189f098e4f91 04-Aug-2015 Etan Cohen <etancohen@google.com> Only use IMS for E911 if VoLTE is supported on device/carrier.

Bug: 22777920
Change-Id: I5f79c36a7e9b89f70b69b0cab098d8b0a288b1b9
dma/CDMAPhone.java
sm/GSMPhone.java
beb3011cdc009ec40678d6a697a2d5ceeeb5de1d 04-Aug-2015 Makoto Onuki <omakoto@google.com> READ_SMS allows getLine1Number() [3/3]

Bug 22862050

Change-Id: I0cb90152b64508a173f51dd2b6dbaa79f4df8849
honeSubInfo.java
6ca92fe87e02d339ac3a1500de91b2bc0715a940 03-Aug-2015 Rakesh Pallerla <rakeshp@qti.qualcomm.com> am 8bb37705: am f25ac7b0: am 2dc07334: Fix CDMA data call issue after emergency call failure.

* commit '8bb37705438d64e178f558c45f41995b1d2ca508':
Fix CDMA data call issue after emergency call failure.
f25ac7b034a5e2e0ed80bc08ac89df28b197ae2d 03-Aug-2015 Rakesh Pallerla <rakeshp@qti.qualcomm.com> am 2dc07334: Fix CDMA data call issue after emergency call failure.

* commit '2dc07334e620bad492ebdd08906de1e6fbe5e51b':
Fix CDMA data call issue after emergency call failure.
2dc07334e620bad492ebdd08906de1e6fbe5e51b 13-Aug-2014 Rakesh Pallerla <rakeshp@qti.qualcomm.com> Fix CDMA data call issue after emergency call failure.

When emergency call is dialled in CDMA mode, telephony disables
data internally. Data is re enabled after call is ended if
not in ECBM. If emergency mo call is dropped by network/modem
before going to dialing state, the data is not re enabled.
Fix this scenario by explicitly re enabling data.

Bug: 22826595
Change-Id: I7a62d459dbd6ef6a833fe87e7d35e29311a515fe
dma/CdmaCallTracker.java
af171aa4dcf294bf2d1b9bed54ef9a6b0ec76361 31-Jul-2015 Paul Jensen <pauljensen@google.com> Fix NOT_RESTRICTED network capability and enforce it.

With this change:
1. NOT_RESTRICTED should be removed from NetworkRequests that bring up
special restricted carrier networks (e.g. IMS, FOTA).
2. NetworkRequests without NOT_RESTRICTED require CONNECTIVITY_INTERNAL
permission to register
3. Binding sockets to networks without NOT_RESTRICTED requires
CONNECTIVITY_INTERNAL permission

Bug:21637535
Change-Id: I5991d39facaa6b690e969fe15dcbeec52e918321
ataconnection/DataConnection.java
ataconnection/DctController.java
274c1c9e7aad556aaa31033de9f1873c899c91b8 31-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> am e282f8df: am 46c4302b: Don\'t process NetworkRequests when there are none.

* commit 'e282f8df27019ad9b81a9cbd7cbe1142d2fd1868':
Don't process NetworkRequests when there are none.
46c4302b8f52fbd62d7000848cd2bb3d36d15725 31-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Don't process NetworkRequests when there are none.

getTopPriorityRequestPhoneId was making up DEFAULT Id when
there were no requests. This bogus data was confusing onProcessRequest
and causing it to think we were working with the wrong phone, triggering
a PS detatch.

bug:21988698
Change-Id: Idf9928ac75327509f81c47ecea48d75fbabc89b2
ataconnection/DctController.java
97dd0e7cd2667acce7b507e3f8b2556dfe31d8e0 30-Jul-2015 Ian Pedowitz <ijpedowitz@google.com> am 5422a10f: am 7af2e221: am 7a384469: Merge "Revert "Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm."" into mnc-dev

* commit '5422a10fec625ad39d4604e4b4ae35e6c89a814b':
Revert "Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm."
7af2e221d12b3a7020d8825f561b4028d7e7105a 30-Jul-2015 Ian Pedowitz <ijpedowitz@google.com> am 7a384469: Merge "Revert "Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm."" into mnc-dev

* commit '7a384469c0c167b9002cae1728bc0315422d3242':
Revert "Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm."
7a384469c0c167b9002cae1728bc0315422d3242 30-Jul-2015 Ian Pedowitz <ijpedowitz@google.com> Merge "Revert "Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm."" into mnc-dev
1da27cad8b73ffdf0ab2db330b627ca68891c893 30-Jul-2015 Svetoslav Ganov <svetoslavganov@google.com> Revert "Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm."

This reverts commit b872941b01c651df631b4b4700f3493b2f517f7b.

Change-Id: Idcc5c7817ab405cec136884528238b51ef762273
honeSubInfo.java
ubscriptionController.java
215c81baa7f9fa3028ddca568dd5a61c422bf7a5 30-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> am 0f3d916d: am eaa7bc48: am 7f7f4c1b: Merge "Release DataConnection when a rety is interupted" into mnc-dev

* commit '0f3d916d668ddab01b420dc66c2b012a27a7846f':
Release DataConnection when a rety is interupted
eaa7bc48fe197994a22b9356374d7513bb5a9923 30-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> am 7f7f4c1b: Merge "Release DataConnection when a rety is interupted" into mnc-dev

* commit '7f7f4c1b0379e25c1d16e59a7028c37fe79325c5':
Release DataConnection when a rety is interupted
7f7f4c1b0379e25c1d16e59a7028c37fe79325c5 30-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Release DataConnection when a rety is interupted" into mnc-dev
f59d093c6d53b6835d7f34767b96a6218a69fc69 30-Jul-2015 Narayan Kamath <narayan@google.com> am 599416e3: am 1f3cf996: am 10788a88: Make canada use en-US by default if the LI is "en"

* commit '599416e35459c0937680d6aa9d7947ddcea44c73':
Make canada use en-US by default if the LI is "en"
1f3cf9965bb22f9837aeba061c54c22d08b24f91 30-Jul-2015 Narayan Kamath <narayan@google.com> am 10788a88: Make canada use en-US by default if the LI is "en"

* commit '10788a883039603f3fd154cae6b760a54a83d86c':
Make canada use en-US by default if the LI is "en"
10788a883039603f3fd154cae6b760a54a83d86c 29-Jul-2015 Narayan Kamath <narayan@google.com> Make canada use en-US by default if the LI is "en"

Introduce the notion of a fallback mapping to choose a fallback
locale with the same language if an exact match is found. "en-CA"
will fall back to "en-US" under this arrangement. If no fallback
is specified, we continue to arbitrarily choose the first locale
in the list where the language matches.

Also, take the SIM records (EF-LI, EF-PL) into consideration when
matching locales. If we can't find a match based on the sim language,
we fall back to the "likely" language based on ICU data.

bug: 22684963

Change-Id: I8259fd16fc45bbaf2632256cd6f29b46317a5e23
ccTable.java
ee665b78ad648abd98b019a9c9047f206ed22994 30-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Release DataConnection when a rety is interupted

We had code that simply set the ApnContexts state to IDLE, but
there was still a connection between ApnContext and DataConnection,
so when looking for a DC, we'd skip this one (it's busy) and when
the rety alarm fires we end up with a second DC attempting to connect
to the same APN.

bug:22410092
Change-Id: Id4ab6a4f1f08588e552e846a1986f93192a72568
ataconnection/ApnContext.java
ataconnection/DcTracker.java
e27c04f6fd825405ec135658efe972d8d2fafcb1 30-Jul-2015 Ji Yang <yangji@google.com> am 24d9fcec: am 9b723507: am 87c17cbc: Merge "Add API to let carrier app send SMS without auto persisting." into mnc-dev

* commit '24d9fcecf8cbec1755cd3dc81cd8f54dcd28ea2e':
Add API to let carrier app send SMS without auto persisting.
2bbd0ff7e10084abafa5943a635ce6b82a4da763 30-Jul-2015 Thierry Strudel <tstrudel@google.com> am 5eadf96a: am ae4e45e2: am 4b8b88db: Merge "Use apn id which contains default type when merging apns" into mnc-dev

* commit '5eadf96a228803775685614f196b23f3fb0d9cc9':
Use apn id which contains default type when merging apns
9b723507ce1eb590a96a9775fc00b3630b166768 30-Jul-2015 Ji Yang <yangji@google.com> am 87c17cbc: Merge "Add API to let carrier app send SMS without auto persisting." into mnc-dev

* commit '87c17cbc78891d2cc55324a13c1b6ff05d933e38':
Add API to let carrier app send SMS without auto persisting.
87c17cbc78891d2cc55324a13c1b6ff05d933e38 30-Jul-2015 Ji Yang <yangji@google.com> Merge "Add API to let carrier app send SMS without auto persisting." into mnc-dev
a8f8c5a113a66de4854f4fb13a5825eb0705bd59 23-Jul-2015 Ji Yang <yangji@google.com> Add API to let carrier app send SMS without auto persisting.

Bug: 22773702
Change-Id: Ib126e79b0d1e2f9a9a44afe2b3f1895c150bd86b
ccSmsInterfaceManager.java
msSMSDispatcher.java
MSDispatcher.java
iccSmsController.java
dma/CdmaSMSDispatcher.java
sm/GsmSMSDispatcher.java
3d7a30cea0b9801787cb71470ff80b626f818fed 30-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> am 987d6a1e: Merge "Revert "DO NOT MERGE Add logging to detect the start of a sync problem."" into mnc-dev

* commit '987d6a1e19a43e1357b1223d89dec82701c6a779':
Revert "DO NOT MERGE Add logging to detect the start of a sync problem."
ae4e45e29e8229d2ec3a578e1771e5c44cbc9588 30-Jul-2015 Thierry Strudel <tstrudel@google.com> am 4b8b88db: Merge "Use apn id which contains default type when merging apns" into mnc-dev

* commit '4b8b88db65adfddd88fb74931a60dd093dd6878e':
Use apn id which contains default type when merging apns
987d6a1e19a43e1357b1223d89dec82701c6a779 30-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Revert "DO NOT MERGE Add logging to detect the start of a sync problem."" into mnc-dev
4b8b88db65adfddd88fb74931a60dd093dd6878e 29-Jul-2015 Thierry Strudel <tstrudel@google.com> Merge "Use apn id which contains default type when merging apns" into mnc-dev
bca51fc3a191d3ca30df627b75374db0941571c5 21-Jul-2015 Sungmin Choi <sungmin.choi@lge.com> Use apn id which contains default type when merging apns

In case of the following conditions, UI does not show preferred apn.
1. there are default and mms profile, respectively.
2. apns for default and mms are same.
3. mms profile is prior to default profile.

To fix it, use apn id which contains default type when merging apns.

Bug: 22641500
Change-Id: Ieec521f715f137aa7a827ee010390e3c47b35da1
ataconnection/DcTracker.java
62aee5e015c1bfa42431707b6634c73ac95bb812 29-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> resolved conflicts for merge of 788cc1a4 to master

Change-Id: I0a40002ad0faf7c3d8e089e74831895e00a72890
2f5e0f602beab84c8ba1a9c8ee7736c9df62b0be 29-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Revert "DO NOT MERGE Add logging to detect the start of a sync problem."

This reverts commit f65485c99cf0fb0e844ae9e39c2c6cd6bae0fd2c.

bug:22632129
Change-Id: I531668bc0874c71c70773ceda071cf5a7f5c1121
honeFactory.java
ataconnection/ApnContext.java
ataconnection/DcSwitchAsyncChannel.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
ataconnection/DctController.java
4377f5e08b20281791ab462607f31d6eefdf53be 29-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> am 592359ae: Catch nulls in the new logging code.

* commit '592359ae17a17d92bdaad8fb1757a769649ee7fb':
Catch nulls in the new logging code.
592359ae17a17d92bdaad8fb1757a769649ee7fb 28-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Catch nulls in the new logging code.

bug:22723423
Change-Id: I2e019732944e4738698db828cd4620963a5791dc
ataconnection/DctController.java
0983e6725f486d336a1da0dfc1c78bfa83b2816d 27-Jul-2015 Amit Mahajan <amitmahajan@google.com> am 8093daa4: am 93bcc8e8: am 4fa569c2: Merge "Change to not delete part of multipart SMS when waiting for other parts" into mnc-dev

* commit '8093daa4d76c16a26a8ae4553595cbce7586cd6a':
Change to not delete part of multipart SMS when waiting for other parts
d339a94f5143da1842d6878648825800db37690d 27-Jul-2015 Etan Cohen <etancohen@google.com> am 97968437: am 1005e4a3: am afe1d9ac: Merge "Allow normal voice calls on CS phone only when in service." into mnc-dev

* commit '979684376650c663a1075ca1ea58087a2576976b':
Allow normal voice calls on CS phone only when in service.
93bcc8e8f21e6a1d105e1d3a4b7aeb340b417203 27-Jul-2015 Amit Mahajan <amitmahajan@google.com> am 4fa569c2: Merge "Change to not delete part of multipart SMS when waiting for other parts" into mnc-dev

* commit '4fa569c2b8a15f388c7267a0ac9de755e8b6dff1':
Change to not delete part of multipart SMS when waiting for other parts
4fa569c2b8a15f388c7267a0ac9de755e8b6dff1 27-Jul-2015 Amit Mahajan <amitmahajan@google.com> Merge "Change to not delete part of multipart SMS when waiting for other parts" into mnc-dev
c2c4cea90515e932c8afbe285f4436dbcf9dada4 27-Jul-2015 Amit Mahajan <amitmahajan@google.com> Change to not delete part of multipart SMS when waiting for other parts

Bug: 22761826
Change-Id: I947a82c15f0df50350886daceca8fa592b8bf589
nboundSmsHandler.java
1005e4a3946fbffa50177bada76e95d3e8b65d3e 27-Jul-2015 Etan Cohen <etancohen@google.com> am afe1d9ac: Merge "Allow normal voice calls on CS phone only when in service." into mnc-dev

* commit 'afe1d9ac5620de68c5b9d70831c0cbe8eb10793a':
Allow normal voice calls on CS phone only when in service.
afe1d9ac5620de68c5b9d70831c0cbe8eb10793a 27-Jul-2015 Etan Cohen <etancohen@google.com> Merge "Allow normal voice calls on CS phone only when in service." into mnc-dev
dd639815ba9156fd524da32f0adc16e67222f6ee 25-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> am 6233901b: am c1af1d39: am 5126dae3: Merge "Handle out-of-order request execution." into mnc-dev

* commit '6233901bfc4921d1db9429aac0551e97236a77e5':
Handle out-of-order request execution.
4517705bdd1a26a59934b1e73259ddadaf22a536 25-Jul-2015 Amit Mahajan <amitmahajan@google.com> am 667e41f4: am cf680fed: am 63068219: Merge "Change to make sure InboundSmsHandler stm gets out of DeliveringState" into mnc-dev

* commit '667e41f49693db721424256c35a652ccdf79e6fc':
Change to make sure InboundSmsHandler stm gets out of DeliveringState
c1af1d39879d01ae8b0564ccdd1d88b35327a011 25-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> am 5126dae3: Merge "Handle out-of-order request execution." into mnc-dev

* commit '5126dae369b7518838b9e325578208ba6742ae55':
Handle out-of-order request execution.
cf680fed33aae3f17a0f17911e93f0e5c6096250 25-Jul-2015 Amit Mahajan <amitmahajan@google.com> am 63068219: Merge "Change to make sure InboundSmsHandler stm gets out of DeliveringState" into mnc-dev

* commit '63068219ff1cd35cc856327e6c7514e8ea9e6359':
Change to make sure InboundSmsHandler stm gets out of DeliveringState
5126dae369b7518838b9e325578208ba6742ae55 25-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Handle out-of-order request execution." into mnc-dev
57da084e0a778f4c081315283bd4d14dd8289e0d 25-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Handle out-of-order request execution.

Don't process executeRequest if the request has been released.
A more comprehensive fix.

bug:22632129
Change-Id: Iadc78af0310091b962c6e803526811a243938095
ataconnection/DctController.java
63068219ff1cd35cc856327e6c7514e8ea9e6359 25-Jul-2015 Amit Mahajan <amitmahajan@google.com> Merge "Change to make sure InboundSmsHandler stm gets out of DeliveringState" into mnc-dev
22da42acec88a985c9da6aa1095e5cbb50bd5f32 24-Jul-2015 Amit Mahajan <amitmahajan@google.com> Change to make sure InboundSmsHandler stm gets out of DeliveringState

Bug: 22673185
Change-Id: Icdd972845660bab2b4b26e0c3fc3a174868dbb8b
nboundSmsHandler.java
18cfca4f614609233087b07462e669ca403eb9e3 24-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> am cfbe5842: Merge "DO NOT MERGE Add logging to detect the start of a sync problem." into mnc-dev

* commit 'cfbe584264d1ad044b08845efa46ef0b6adb8a23':
DO NOT MERGE Add logging to detect the start of a sync problem.
cfbe584264d1ad044b08845efa46ef0b6adb8a23 24-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "DO NOT MERGE Add logging to detect the start of a sync problem." into mnc-dev
f65485c99cf0fb0e844ae9e39c2c6cd6bae0fd2c 24-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> DO NOT MERGE Add logging to detect the start of a sync problem.

This should be removed prior to shipment!

The DctController is getting out of sync with the ApnContexts. Add a callback
mechanism so the ApnContexts can let DctController know when they apply a change
and then when all is quiet we can compare and verify everything is good.

Potentially can fix the problem detected too (if there should be no live requests, nuke
the ref counts) but currently turned off so people will notice problems (battery life) and
file bugreports with the data of how it started.

bug:22632129
Change-Id: I84a67687f0b6dc43b2e429943935f4045ffc51ed
honeFactory.java
ataconnection/ApnContext.java
ataconnection/DcSwitchAsyncChannel.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
ataconnection/DctController.java
9ff6605ea40d354366b626480755f62df0a28ae0 08-Jul-2015 Anju Mathapati <anjucm@codeaurora.org> Allow normal voice calls on CS phone only when in service.

If there is no service in GSM/CDMA do not allow dial requests
for non emergency CS voice calls.

Bug: 22351845
Change-Id: I7f6f196ff7975442876cb734122defebaee9f7af
dma/CDMAPhone.java
sm/GSMPhone.java
5ae5a696e72cdb9a2433dc73652c733ac9b65713 24-Jul-2015 Amit Mahajan <amitmahajan@google.com> am 35ccb8ca: am 163f3d43: am 5e9c373c: Merge "Change to read carrier specific config only after reading IMSI." into mnc-dev

* commit '35ccb8cabc4a71e251dbf7274c3feb3aa30df97c':
Change to read carrier specific config only after reading IMSI.
8336fab1eedb13c927510659403ef3a2e3683a1a 24-Jul-2015 Nathan Harold <nharold@google.com> am 0c3e371f: am dcd076fa: am 13f146ab: Merge "Improve logging in ImsPhoneCallTracker.onFeatureCapabilityChanged()" into mnc-dev

* commit '0c3e371f3708eb258fe8c272e51925f31404677e':
Improve logging in ImsPhoneCallTracker.onFeatureCapabilityChanged()
e12bb4740eb7854f6db3f8e25386bae7fbe0632c 24-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> am 328cd7fd: am 269f1a01: am e2060c20: Merge "Add logs to PhoneFactory" into mnc-dev

* commit '328cd7fdb4c1aebfd2d3481ac15fc42771a59a2d':
Add logs to PhoneFactory
323bce9b7787f3f9f157964065491952c9301253 24-Jul-2015 Dianne Hackborn <hackbod@google.com> am b13d69bb: am 74c8e1e7: am 0772582c: Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev

* commit 'b13d69bb55b2bf7466057b3f3bf4ea1386b68090':
Fix issue #22612630: Ensure SMS/Call delivery during Doze
163f3d437c6f772b683054af8ac0cff0dacb7e06 24-Jul-2015 Amit Mahajan <amitmahajan@google.com> am 5e9c373c: Merge "Change to read carrier specific config only after reading IMSI." into mnc-dev

* commit '5e9c373c7cc2ae37dee99ec8f46505d0d4849095':
Change to read carrier specific config only after reading IMSI.
5e9c373c7cc2ae37dee99ec8f46505d0d4849095 24-Jul-2015 Amit Mahajan <amitmahajan@google.com> Merge "Change to read carrier specific config only after reading IMSI." into mnc-dev
c9a55d1e545ab7bc92e14c2ca1123ac71b18f7fe 24-Jul-2015 Amit Mahajan <amitmahajan@google.com> Change to read carrier specific config only after reading IMSI.

This is to make sure we decide to use language settings from SIM
(which is controlled by a carrier specific config) only after
the mcc-mnc is known.

Bug: 22255379
Change-Id: I1e0491e9ed01fa27bcb32d6f3708e091a0e25cb5
icc/RuimRecords.java
icc/SIMRecords.java
ec8479f0130a167b0522a3bc5a8f08c55180dacd 23-Jul-2015 Vineeta Srivastava <vsrivastava@google.com> am 96c216f9: am b2e01c4f: Merge "updateSpnDisplay: When PLMN values are same for before & after SIM loading in CDMA network It happened when called twice of updateSpnDisplay() in CdmaServiceStateTracker method." into mnc-dr-dev

* commit '96c216f9d46980706dbd35aa9596f2ef3659cc72':
updateSpnDisplay: When PLMN values are same for before & after SIM loading in CDMA network It happened when called twice of updateSpnDisplay() in CdmaServiceStateTracker method.
d6c2f8b7891ee6c5a91c02180e6d7987ecef149f 23-Jul-2015 Etan Cohen <etancohen@google.com> am b55a49e8: am e7cdf4c4: am 37e4f9db: Merge "Do not update RAF for invalid sub IDs." into mnc-dev

* commit 'b55a49e85a1cc98299ac407fe5a96c68cefed0c5':
Do not update RAF for invalid sub IDs.
7f9c6433b66dbb5216bb06db590d9184cb3773cd 23-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> am 2f365232: am 1966812e: am 51f4bf7f: Log any Orphaned NetworkRequests.

* commit '2f3652329bb32ac3560d1245e23afdaee5a9ad4d':
Log any Orphaned NetworkRequests.
dcd076fab22ea9e9c96af5da03e04aaba7c57ee2 23-Jul-2015 Nathan Harold <nharold@google.com> am 13f146ab: Merge "Improve logging in ImsPhoneCallTracker.onFeatureCapabilityChanged()" into mnc-dev

* commit '13f146ab20a69f90cf9e7a58ae38767f5b875577':
Improve logging in ImsPhoneCallTracker.onFeatureCapabilityChanged()
269f1a018354024aad34362924f4aa4a3dc34b15 23-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> am e2060c20: Merge "Add logs to PhoneFactory" into mnc-dev

* commit 'e2060c201d9e6d2de468cdf5fc9cdd3fafba4ec5':
Add logs to PhoneFactory
74c8e1e7e9cf3f36959c29fd8c4cd9b55d944ff3 23-Jul-2015 Dianne Hackborn <hackbod@google.com> am 0772582c: Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev

* commit '0772582c7e539ba7c66f6fb424bda24f5043da30':
Fix issue #22612630: Ensure SMS/Call delivery during Doze
13f146ab20a69f90cf9e7a58ae38767f5b875577 23-Jul-2015 Nathan Harold <nharold@google.com> Merge "Improve logging in ImsPhoneCallTracker.onFeatureCapabilityChanged()" into mnc-dev
b2e01c4f08fcb86dd07fa2e236ea385ce1eff07e 23-Jul-2015 Vineeta Srivastava <vsrivastava@google.com> Merge "updateSpnDisplay: When PLMN values are same for before & after SIM loading in CDMA network It happened when called twice of updateSpnDisplay() in CdmaServiceStateTracker method." into mnc-dr-dev
915b8a421c34b0872c96199d4390a70d5a76ed98 21-Jul-2015 Nathan Harold <nharold@google.com> Improve logging in ImsPhoneCallTracker.onFeatureCapabilityChanged()

Change-Id: I839316f14bc53d2c4ec5a39112c6bed5263173c2
msphone/ImsPhoneCallTracker.java
e2060c201d9e6d2de468cdf5fc9cdd3fafba4ec5 23-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Add logs to PhoneFactory" into mnc-dev
265445ed9ade6b904a3b4bfaf03cf346230e86e3 22-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Add logs to PhoneFactory

Allow entities in the phone process to easily add logs
to TelephonyDebugService.

First user, VVM.

Bug: 22607570

Change-Id: I65cfaf723db647a3747f72f404b690a5ab110811
honeFactory.java
e7cdf4c426249d62a5f14a49041a14102b1b8dcd 22-Jul-2015 Etan Cohen <etancohen@google.com> am 37e4f9db: Merge "Do not update RAF for invalid sub IDs." into mnc-dev

* commit '37e4f9db29799f734ed4bb4e022d62699bc24397':
Do not update RAF for invalid sub IDs.
1966812e083c95dc59d1b1b64c7c45caaec96252 22-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> am 51f4bf7f: Log any Orphaned NetworkRequests.

* commit '51f4bf7f29ffeaa60a8e7d4d1da7b30f20e8a420':
Log any Orphaned NetworkRequests.
0772582c7e539ba7c66f6fb424bda24f5043da30 22-Jul-2015 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev
e85f0481135dd33c0e3392e16796add80de44eeb 22-Jul-2015 flower.choi <flower.choi@lge.com> updateSpnDisplay: When PLMN values are same for before & after SIM loading in
CDMA network
It happened when called twice of updateSpnDisplay() in CdmaServiceStateTracker
method.

Bug: 22439179
Change-Id: Ifc8ee7615288c224bc5b2d6881b794ae19b0076d
dma/CdmaServiceStateTracker.java
25ba0c3660ef78bbdaf2f4db7b3e7a833c377ccb 22-Jul-2015 Dianne Hackborn <hackbod@google.com> Fix issue #22612630: Ensure SMS/Call delivery during Doze

Place apps on whitelist when delivering SMS, like MMS.

Change-Id: Ied719152e84ba88cb2c224ed1669cb12c1412ee7
nboundSmsHandler.java
apPushOverSms.java
37e4f9db29799f734ed4bb4e022d62699bc24397 21-Jul-2015 Etan Cohen <etancohen@google.com> Merge "Do not update RAF for invalid sub IDs." into mnc-dev
51f4bf7f29ffeaa60a8e7d4d1da7b30f20e8a420 21-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Log any Orphaned NetworkRequests.

Try to figure out why the ApnContext isn't told the request is dead.

bug:22632129
Change-Id: I24a592e6a45c4476fabff50d8c640fb6ec6af6e1
ataconnection/ApnContext.java
08d40bc30eb992961fa4ec56a76a28c6e201d8c9 21-Jul-2015 Etan Cohen <etancohen@google.com> Do not update RAF for invalid sub IDs.

Bug: 22076899
Change-Id: I44c6744d6464d13a0803a6480ee72f07bda7c087
roxyController.java
ubscriptionController.java
38460cfac7a58ce6057f25b18889077f04cc4495 21-Jul-2015 Tyler Gunn <tgunn@google.com> am 9473626e: am d242431c: am ac464da4: Merge "Prevent preciseCallStateChanged from firing for media capabilities change." into mnc-dev

* commit '9473626e0a62f48ae849850884849766523146eb':
Prevent preciseCallStateChanged from firing for media capabilities change.
9402ca82c58070cc9216ffabd5f324beee7d56b1 21-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> am 97299351: am fb33ccc2: am 79be8acd: Merge "Support optional modem restart on certain errors." into mnc-dev

* commit '97299351137e497adcfe1f03d628207620415c38':
Support optional modem restart on certain errors.
d242431c27d4a7af9f2de3c16e570a3fc4a963bb 20-Jul-2015 Tyler Gunn <tgunn@google.com> am ac464da4: Merge "Prevent preciseCallStateChanged from firing for media capabilities change." into mnc-dev

* commit 'ac464da4b52c34dc989d7356cba983a82f6d300c':
Prevent preciseCallStateChanged from firing for media capabilities change.
ac464da4b52c34dc989d7356cba983a82f6d300c 20-Jul-2015 Tyler Gunn <tgunn@google.com> Merge "Prevent preciseCallStateChanged from firing for media capabilities change." into mnc-dev
fb33ccc2a2bf8f00125357f28b4308219e6bcc60 20-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> am 79be8acd: Merge "Support optional modem restart on certain errors." into mnc-dev

* commit '79be8acde2dff0022556a58abe85383d352aef26':
Support optional modem restart on certain errors.
79be8acde2dff0022556a58abe85383d352aef26 20-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Support optional modem restart on certain errors." into mnc-dev
d8413260e889d5b4db43e652304553ed29fa3e41 20-Jul-2015 Tyler Gunn <tgunn@google.com> Prevent preciseCallStateChanged from firing for media capabilities change.

In processCallStateChanged, there was the potential for
"notifyPreciseCallStateChanged()" to be called, even if ignoreState was
true. Moved the code for invoking the precise call state changed
callback into the "else" clause of the conditional.

Bug: 22564433
Change-Id: Ib2a05bd5f592005d57623812c6cd40c2bfcbf253
msphone/ImsPhoneCallTracker.java
941392e5d3b599e08291f20420d9cd65938f408b 17-Jul-2015 Junda Liu <junda@google.com> am 17f9a14a: am dcb4f5d7: am 79fc9641: Merge "Change max retry from 3 to 1." into mnc-dev

* commit '17f9a14a8fbff0b2db6debafe0d22e410f0752f9':
Change max retry from 3 to 1.
dcb4f5d783b5a8084c9cc576d954636cab3777de 17-Jul-2015 Junda Liu <junda@google.com> am 79fc9641: Merge "Change max retry from 3 to 1." into mnc-dev

* commit '79fc9641939795365822754c6ac934d3ae2919d7':
Change max retry from 3 to 1.
79fc9641939795365822754c6ac934d3ae2919d7 17-Jul-2015 Junda Liu <junda@google.com> Merge "Change max retry from 3 to 1." into mnc-dev
91e0d7fae8ab78b99ba25aa307ec1a558b5769fc 17-Jul-2015 Junda Liu <junda@google.com> Change max retry from 3 to 1.

Bug: b/22216437
Change-Id: Ib97d982fa918e79368ddd1d3b51a5427c10c7931
icc/UiccCarrierPrivilegeRules.java
27bc967ba840d2e2a8941d60aef89d0cb80b1626 17-Jul-2015 Tom Taylor <tomtaylor@google.com> am 193f193f: Externally-reported Moderate severity vulnerability in SMS: Apps can bypass the SMS short code notification prompt

* commit '193f193f79f06784fc1cb90328c4410c6b52820e':
Externally-reported Moderate severity vulnerability in SMS: Apps can bypass the SMS short code notification prompt
36b1a5253b309930bb8225c909182b44d064b38c 17-Jul-2015 Tom Taylor <tomtaylor@google.com> am 347352b5: am fb8ec484: Externally-reported Moderate severity vulnerability in SMS: Apps can bypass the SMS short code notification prompt

* commit '347352b548a1950b65e51bbba3ea616e52bd2eab':
Externally-reported Moderate severity vulnerability in SMS: Apps can bypass the SMS short code notification prompt
0d2abb5518d6a86619d2c2db04867c338b2092d4 17-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Support optional modem restart on certain errors.

Error counts are shared between all APNs, but fresh connect attempt
resets the counts.

bug:22455853
Change-Id: Id398a223d33d42f979b5cdc4a2bc263e92eb73cc
ataconnection/ApnContext.java
ataconnection/DataConnection.java
ataconnection/DcTracker.java
92837b8a9c44f6192ea4d613efa2cfe53156a9df 17-Jul-2015 Tom Taylor <tomtaylor@google.com> am 21ac5f11: Externally-reported Moderate severity vulnerability in SMS: Apps can bypass the SMS short code notification prompt

* commit '21ac5f1161b7554c564dd1213aef357fa4b4ca84':
Externally-reported Moderate severity vulnerability in SMS: Apps can bypass the SMS short code notification prompt
347352b548a1950b65e51bbba3ea616e52bd2eab 17-Jul-2015 Tom Taylor <tomtaylor@google.com> am fb8ec484: Externally-reported Moderate severity vulnerability in SMS: Apps can bypass the SMS short code notification prompt

* commit 'fb8ec484cfca6bd4f295fea70e75dad278781912':
Externally-reported Moderate severity vulnerability in SMS: Apps can bypass the SMS short code notification prompt
5241506e78b12a8e81d1567d16a6ca0a3a2938b7 16-Jul-2015 Sanket Padawe <sanketpadawe@google.com> am 2e0a7957: am 9fbed84b: am 73159fe8: Merge "Add new API for acessing DB associated with Subscription." into mnc-dev

* commit '2e0a7957e1783c94713f9295d30f441086ee045a':
Add new API for acessing DB associated with Subscription.
9fbed84be0ae74b6822ae1676d8ce05045aee9b7 16-Jul-2015 Sanket Padawe <sanketpadawe@google.com> am 73159fe8: Merge "Add new API for acessing DB associated with Subscription." into mnc-dev

* commit '73159fe819030161412702eec8ad4ada29667c7d':
Add new API for acessing DB associated with Subscription.
73159fe819030161412702eec8ad4ada29667c7d 16-Jul-2015 Sanket Padawe <sanketpadawe@google.com> Merge "Add new API for acessing DB associated with Subscription." into mnc-dev
00ceb7ef9583fe713e152c42676f08ad0e6e1b7c 16-Jul-2015 Tyler Gunn <tgunn@google.com> am fd0d34a4: am 593f6da2: am 5299d996: Merge "Enhance ImsPhoneCall/Tracker logging and fix swap on bad state change" into mnc-dev

* commit 'fd0d34a438f95f15e061ead509ffbe4047c8d5e6':
Enhance ImsPhoneCall/Tracker logging and fix swap on bad state change
593f6da2f72898a723f4423f174e83ceca691f03 16-Jul-2015 Tyler Gunn <tgunn@google.com> am 5299d996: Merge "Enhance ImsPhoneCall/Tracker logging and fix swap on bad state change" into mnc-dev

* commit '5299d9964976098ad5192474d485dbd02db9a0d4':
Enhance ImsPhoneCall/Tracker logging and fix swap on bad state change
5299d9964976098ad5192474d485dbd02db9a0d4 16-Jul-2015 Tyler Gunn <tgunn@google.com> Merge "Enhance ImsPhoneCall/Tracker logging and fix swap on bad state change" into mnc-dev
656614bc1f19ce1b2c3de01194668575438aa126 15-Jul-2015 Dianne Hackborn <hackbod@google.com> am 67dd4b2c: am 139bd216: am 932f590a: Fix issue #21626564: MMS should be receivied while Dozing

* commit '67dd4b2c607abd84807f4fd9992be39c03d1d183':
Fix issue #21626564: MMS should be receivied while Dozing
139bd21678fdf527232c751519a9cc5982a2293d 15-Jul-2015 Dianne Hackborn <hackbod@google.com> am 932f590a: Fix issue #21626564: MMS should be receivied while Dozing

* commit '932f590aadc3cfac86cc3972db5eb7013f94780d':
Fix issue #21626564: MMS should be receivied while Dozing
932f590aadc3cfac86cc3972db5eb7013f94780d 14-Jul-2015 Dianne Hackborn <hackbod@google.com> Fix issue #21626564: MMS should be receivied while Dozing

Uses new APIs to put apps on the whitelist as needed.

Change-Id: I24bf0c00f2a7dca64590e7fc0dd6ec036e9bd2bf
nboundSmsHandler.java
apPushOverSms.java
da85ad6d47a9a6f2dee0c801a2d8024d54385c46 15-Jul-2015 Santos Cordon <santoscordon@google.com> am 2d7d4f66: am 1269ff2f: am 3b748493: Merge "Add unregistration method for post-dial listeners." into mnc-dev

* commit '2d7d4f662985566ef910f5a26077edfe9abd0ce0':
Add unregistration method for post-dial listeners.
1269ff2f27e553fb85f522e2557a5fbeb61de303 15-Jul-2015 Santos Cordon <santoscordon@google.com> am 3b748493: Merge "Add unregistration method for post-dial listeners." into mnc-dev

* commit '3b748493f7dff23074aa5725f3619c63826375dd':
Add unregistration method for post-dial listeners.
62b375acf870f58b09137876367b1f3cd6073dbc 15-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> am fbb36258: am e228d03d: am f15fec95: Merge "Add logging for telephony network requests." into mnc-dev

* commit 'fbb362589f0bf6ae9bfdf020c493c94c87571c7f':
Add logging for telephony network requests.
fa4d32d8b8ca50b027b8ec8b5602a5fddd84bbee 15-Jul-2015 Anthony Lee <anthonylee@google.com> am 01e25971: am 53ed80f4: resolved conflicts for merge of d9c3a08d to mnc-dr-dev

* commit '01e25971045633b52fa26b6f9100704f56109039':
IMS: Do not update connection state for onCallUpdated callback.
3b748493f7dff23074aa5725f3619c63826375dd 15-Jul-2015 Santos Cordon <santoscordon@google.com> Merge "Add unregistration method for post-dial listeners." into mnc-dev
e228d03df8eac098f68f869d79dda1e3cf618155 14-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> am f15fec95: Merge "Add logging for telephony network requests." into mnc-dev

* commit 'f15fec95574304db6a7f434fb606276f4b614e85':
Add logging for telephony network requests.
f15fec95574304db6a7f434fb606276f4b614e85 14-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Add logging for telephony network requests." into mnc-dev
2dde8b1659b1eb231e667bc19307ef294b627beb 09-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Add logging for telephony network requests.

Try to track and retain what happens to requests to get to the bottom of
20731384.

bug:20731384
bug:21641873
Change-Id: Iabb01b3866c6748323a967e26c008246b29bdb17
ataconnection/ApnContext.java
ataconnection/DataConnection.java
ataconnection/DcSwitchAsyncChannel.java
ataconnection/DcSwitchStateMachine.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
ataconnection/DctController.java
53ed80f4bd5b15ca9494a376f05c84f0ac79462f 14-Jul-2015 Anthony Lee <anthonylee@google.com> resolved conflicts for merge of d9c3a08d to mnc-dr-dev

Change-Id: I0df7348fbbca184c5da80a28f24e0751be036f16
3129f2d5f339f8f10f1eeb5f3e92e32e58b191ec 14-Jul-2015 Nathan Harold <nharold@google.com> am 8c240df7: am 69142e7c: am c8582255: Merge "Fix NPE in Ril when RIL_REQUEST_SIM_AUTHENTICATION returns NULL" into mnc-dev

* commit '8c240df7217ea68b866bfb3146da343bf63a9831':
Fix NPE in Ril when RIL_REQUEST_SIM_AUTHENTICATION returns NULL
7dd2feb8968ffc1105b31293fb493aaadf65aaec 14-Jul-2015 Amit Mahajan <amitmahajan@google.com> am 9fd83d91: am f7f98b03: am 6b9b134f: Merge "Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm." into mnc-dev

* commit '9fd83d91da4c49c662283c392ef6474813d185c2':
Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm.
0c6f873ec06ca4b66bb8cd3f892a953a5f11f950 14-Jul-2015 Junda Liu <junda@google.com> am 858a47d4: am ce344de2: am 6266fc0e: Merge "Add localLog to UiccCard to record logical channel open/close." into mnc-dev

* commit '858a47d462b036a2f811cc03711b604d28ba1eac':
Add localLog to UiccCard to record logical channel open/close.
707644d8250cc5c3c2287068a9df210d7eb3e863 14-Jul-2015 Tyler Gunn <tgunn@google.com> Enhance ImsPhoneCall/Tracker logging and fix swap on bad state change

ImsPhoneConnection:
- Added check in update() to ensure we skip the update if we are putting
the call into an ACTIVE state, but there is a pending request to
hold the ImsCall. This is really a bug in the RIL; we are NOT getting
the callSessionHeld callback when putting a recently formed conference
call into the background. Without this check, we end up detaching the
ImsPhoneConnection from the "background" ImsPhoneCall and attaching it
to the "foreground" ImsPhoneConnection, which causes a scenario where there
are multiple active calls at the same time. I will file a bug against
the RIL to fix this missing state reporting.

ImsPhoneCallTracker:
- in switchWaitingOrHoldingAndActive check for the case where we are
holding a foreground call and reset the flag indicating we're expecting
to see a resume. This wasn't causing the bug I was working on but I
can see how it might have undesirable effects.
- added some extra debug logging to help track down hold/resumes
- fixed some BAD logic in onCallMerged added in change ID
I94abbae37eb6773f1824c0e5c3a267d345610ada. This code was swapping the
ImsPhoneCall references for foreground and background directly in order
to ensure that the right calls were passed in to ImsPhoneCall#merge.
The ImsPhoneCallTracker assumes the ImsPhoneCalls mForegroundCall and
mBackgroundCall will always stay the same; ImsPhoneConnections are attached
and detached from these ImsPhoneCalls, but the original references must
stay the same. Fixed up that code to ensure it does what its supposed to
without messing up the original references.
- Added logState method which can be turned on via debug flag to periodically
dump verbose state of the calls tracked my ImsPhoneCallTracker. I had
a hard time figuring out what was going on and this helped a lot.

ImsPhoneCall:
- Added enhanced logging when ImsPhoneConnections are moved between the
foreground, background, etc calls. Also added knowledge of whether an
ImsPhoneCall is a foreground or background call so that logging can be made
more clear.

- After operations which change which calls are FG or BG, calling
ImsPhoneCallTracker.logState() which will log the full ImsPhoneCallTracker
state for even easier debugging (but only if the stop-ship flag is on).

Bug: 22173672
Change-Id: I704af9522a81ee036f290c7c723de4c3602229fd
msphone/ImsPhoneCall.java
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
cfa612cdd84e44eb59ece6460d9db63ac72bee92 14-Jul-2015 Sanket Padawe <sanketpadawe@google.com> Add new API for acessing DB associated with Subscription.

Bug: 22360525
Change-Id: Ia51f38bab5327f77de4997cb4695959a5573048f
ubscriptionController.java
21e41094df746dc2fab0a4226581332da050468f 11-Jul-2015 Santos Cordon <santoscordon@google.com> Add unregistration method for post-dial listeners.

Bug: 22410282
Change-Id: I6e24c83108f635542e81f05e53a4dd5a51b69141
onnection.java
d9c3a08d5958e5ced0c0c9f7aabf376a5fe59bb2 08-Dec-2014 Anju Mathapati <anjucm@codeaurora.org> IMS: Do not update connection state for onCallUpdated callback.

onCallUpdated callback is to inform updates on parameters of ImsCall
other than the call state. Updating the call state during onCallUpdated
is sometimes corrupting the connection state, especially during
hold/resume operation. Hence refactored code to not update state
of connection for call updated callback.

Change-Id: I55ed948fe3b5b03f8836b84d7952a39f97cd2a8a
Bug: 22170586
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
69142e7c6848cccfc95be5a10a4b6f67a64c8144 14-Jul-2015 Nathan Harold <nharold@google.com> am c8582255: Merge "Fix NPE in Ril when RIL_REQUEST_SIM_AUTHENTICATION returns NULL" into mnc-dev

* commit 'c85822555356b80965161e26dcc85840f2337463':
Fix NPE in Ril when RIL_REQUEST_SIM_AUTHENTICATION returns NULL
c85822555356b80965161e26dcc85840f2337463 14-Jul-2015 Nathan Harold <nharold@google.com> Merge "Fix NPE in Ril when RIL_REQUEST_SIM_AUTHENTICATION returns NULL" into mnc-dev
10ac1062bbbab073205855fef38f6a1afb241002 13-Jul-2015 Nathan Harold <nharold@google.com> Fix NPE in Ril when RIL_REQUEST_SIM_AUTHENTICATION returns NULL

bug: 22457261
Change-Id: I5aad5ffd41527652c560e934eb0e154f0e0bfdca
IL.java
f7f98b03dcb016c982f707bcc189ba81ffd5cc08 14-Jul-2015 Amit Mahajan <amitmahajan@google.com> am 6b9b134f: Merge "Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm." into mnc-dev

* commit '6b9b134f14277408a3791f4a924805d6cac2774f':
Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm.
ce344de205135796c4fcd46f51a123073d2c3c51 14-Jul-2015 Junda Liu <junda@google.com> am 6266fc0e: Merge "Add localLog to UiccCard to record logical channel open/close." into mnc-dev

* commit '6266fc0e9e926dd09e93ac734c407871a271a923':
Add localLog to UiccCard to record logical channel open/close.
6b9b134f14277408a3791f4a924805d6cac2774f 14-Jul-2015 Amit Mahajan <amitmahajan@google.com> Merge "Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm." into mnc-dev
6266fc0e9e926dd09e93ac734c407871a271a923 13-Jul-2015 Junda Liu <junda@google.com> Merge "Add localLog to UiccCard to record logical channel open/close." into mnc-dev
b872941b01c651df631b4b4700f3493b2f517f7b 11-Jul-2015 Amit Mahajan <amitmahajan@google.com> Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm.

Self check is done as part of READ_PHONE_STATE and AppOps checks.

Bug: 22376654
Change-Id: I437f9bf324950cb70bae5be76699824da5897a6f
honeSubInfo.java
ubscriptionController.java
17ffd7b525d05ffdb3b620e5b23be94298d39937 11-Jul-2015 Jack Yu <jackyu@google.com> am 6fe81c8f: am df28ce6a: am 44383185: Merge "Fixed that phone service crashed during boot up issue." into mnc-dev

* commit '6fe81c8f671a598b6292f223273d00579cba9e23':
Fixed that phone service crashed during boot up issue.
df28ce6a4f6ba5627d47ad49eb39f3c388facbde 10-Jul-2015 Jack Yu <jackyu@google.com> am 44383185: Merge "Fixed that phone service crashed during boot up issue." into mnc-dev

* commit '44383185a911396c3f216a195b005c98dc5e9df1':
Fixed that phone service crashed during boot up issue.
44383185a911396c3f216a195b005c98dc5e9df1 10-Jul-2015 Jack Yu <jackyu@google.com> Merge "Fixed that phone service crashed during boot up issue." into mnc-dev
21ac5f1161b7554c564dd1213aef357fa4b4ca84 10-Jul-2015 Tom Taylor <tomtaylor@google.com> Externally-reported Moderate severity vulnerability in SMS: Apps can bypass the SMS short code notification prompt

Bug 22314646

When android.permission.SEND_SMS_NO_CONFIRMATION was renamed to
android.permission.SEND_RESPOND_VIA_MESSAGE in JB-MR2, the necessary change
in SmsDispatcher was accidentally overlooked.

Change-Id: Ie2e3c5e365af3f6e0810e3792c9ae9c4aca0bcf7
MSDispatcher.java
65cabf48ed0a4a03e08e31f6fece788331f14fba 10-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> am 12861d97: am 8bdb6997: am fac2b931: Merge "Enable EMERGENCY mobile connections." into mnc-dev

* commit '12861d97337493206461e959f0c733dba6d5e03f':
Enable EMERGENCY mobile connections.
8bdb6997ae4ebc5475b47f2b57ca5b0fac02236c 10-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> am fac2b931: Merge "Enable EMERGENCY mobile connections." into mnc-dev

* commit 'fac2b931e9e51b8bf1a8b00975b62e9b2e9f3ccd':
Enable EMERGENCY mobile connections.
fac2b931e9e51b8bf1a8b00975b62e9b2e9f3ccd 10-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Enable EMERGENCY mobile connections." into mnc-dev
fb8ec484cfca6bd4f295fea70e75dad278781912 10-Jul-2015 Tom Taylor <tomtaylor@google.com> Externally-reported Moderate severity vulnerability in SMS: Apps can bypass the SMS short code notification prompt

Bug 22314646

DO NOT MERGE

When android.permission.SEND_SMS_NO_CONFIRMATION was renamed to
android.permission.SEND_RESPOND_VIA_MESSAGE in JB-MR2, the necessary change
in SmsDispatcher was accidentally overlooked.

Change-Id: I2c3aa79da8064e55cec5a786696de519c2bf0b07
MSDispatcher.java
4bd0ae43eb0cb9969dee4f30cddc18a71da68190 10-Jul-2015 Jack Yu <jackyu@google.com> Fixed that phone service crashed during boot up issue.

bug: 22357173
Change-Id: I3b76a74c698e22c887b3482a3bdcbc34982ec658
ataconnection/DcTracker.java
193f193f79f06784fc1cb90328c4410c6b52820e 10-Jul-2015 Tom Taylor <tomtaylor@google.com> Externally-reported Moderate severity vulnerability in SMS: Apps can bypass the SMS short code notification prompt

Bug 22314646

When android.permission.SEND_SMS_NO_CONFIRMATION was renamed to
android.permission.SEND_RESPOND_VIA_MESSAGE in JB-MR2, the necessary change
in SmsDispatcher was accidentally overlooked.

Change-Id: I58aef2d044b8a48b1b42311a471cb112e3a258e4
MSDispatcher.java
3a7add3f99916af5c449d91e138755ec361ceeea 10-Jul-2015 Tom Taylor <tomtaylor@google.com> am ee137363: am da2f871e: am 4b633a38: Merge "Externally-reported Moderate severity vulnerability in SMS: Apps can bypass the SMS short code notification prompt" into mnc-dev

* commit 'ee13736308d20155f32b00eb9eb2849b11236b9d':
Externally-reported Moderate severity vulnerability in SMS: Apps can bypass the SMS short code notification prompt
da2f871e5955e2d0f4e0a94c0edb4e280989df23 10-Jul-2015 Tom Taylor <tomtaylor@google.com> am 4b633a38: Merge "Externally-reported Moderate severity vulnerability in SMS: Apps can bypass the SMS short code notification prompt" into mnc-dev

* commit '4b633a380d27047eecfee88c0923a03e7a24ed4c':
Externally-reported Moderate severity vulnerability in SMS: Apps can bypass the SMS short code notification prompt
4b633a380d27047eecfee88c0923a03e7a24ed4c 10-Jul-2015 Tom Taylor <tomtaylor@google.com> Merge "Externally-reported Moderate severity vulnerability in SMS: Apps can bypass the SMS short code notification prompt" into mnc-dev
6842c121aae5e1b79d70b64f1117d385f63c38d6 10-Jul-2015 Nicholas Sauer <nicksauer@google.com> am 400e211b: am 8cd146a5: am f4059ccd: Merge "Revert "Dont fail if modem ids are empty."" into mnc-dev

* commit '400e211b13a1b3d7be2a4304e8a50b9a84a1bde1':
Revert "Dont fail if modem ids are empty."
8cd146a5b0e4a0eaf7f8c4133110ed47562f0adb 10-Jul-2015 Nicholas Sauer <nicksauer@google.com> am f4059ccd: Merge "Revert "Dont fail if modem ids are empty."" into mnc-dev

* commit 'f4059ccdd6080e3600db8d99de55aea1ccbb6654':
Revert "Dont fail if modem ids are empty."
f4059ccdd6080e3600db8d99de55aea1ccbb6654 10-Jul-2015 Nicholas Sauer <nicksauer@google.com> Merge "Revert "Dont fail if modem ids are empty."" into mnc-dev
c95b11c750524f5b561d65b47b4aa456dcab5559 10-Jul-2015 Etan Cohen <etancohen@google.com> am 43c62182: am 943417fd: am b1103de1: Merge "Fix data call issue for null APN" into mnc-dev

* commit '43c62182371546527daad6ae3433b2195538fd60':
Fix data call issue for null APN
943417fd5a6f53ea3eab2371205757c3461b8b64 09-Jul-2015 Etan Cohen <etancohen@google.com> am b1103de1: Merge "Fix data call issue for null APN" into mnc-dev

* commit 'b1103de1da3c63bbae37296eb080f0cf64e32bfa':
Fix data call issue for null APN
19736f6fbee4d3079dc2debf9fb6a54bf7686161 09-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Enable EMERGENCY mobile connections.

Hooks the ConnectivityManager.TYPE_MOBILE_EMERGENCY,
PhoneConstants.APN_TYPE_EMERGENCY, and NetworkCapabilities.NET_CAPABILITY_EIMS
together so carrier apps can request connections to this APN.

bug:21785357
Change-Id: Iafd477dbc7bda89de888a124602b21efbbaa6712
ataconnection/DctController.java
b1103de1da3c63bbae37296eb080f0cf64e32bfa 09-Jul-2015 Etan Cohen <etancohen@google.com> Merge "Fix data call issue for null APN" into mnc-dev
801a47b6bd24dec45fa0cd554bcf301478e93f47 17-Oct-2014 Sukanya Rajkhowa <srajkh@codeaurora.org> Fix data call issue for null APN

When data call is setup on null apn, data call is deactivated
immediately after being set up as Telephony is treating null APN
as provisioning APN. This is because the xml entry for
provisioning APN is empty which is matching empty APN name.

Add isEmpty check for provisioning APN xml entry.

Bug: 22305124
Change-Id: Ifbb3aaaf18926b9209aa05f8346da839178dc803
ataconnection/ApnContext.java
ce058be9f5bcfdaa531f1b480ca5ed051b84e72e 09-Jul-2015 Tom Taylor <tomtaylor@google.com> Externally-reported Moderate severity vulnerability in SMS: Apps can bypass the SMS short code notification prompt

Bug 22314646

When android.permission.SEND_SMS_NO_CONFIRMATION was renamed to
android.permission.SEND_RESPOND_VIA_MESSAGE in JB-MR2, the necessary change
in SmsDispatcher was accidentally overlooked.

Change-Id: I84cbcaa0b7e199df04f11245d06b7fc7f02db7a0
MSDispatcher.java
c65bffb2e427380f28174040a706df441993ce28 09-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> am 50dc257e: am 2a0805b3: am 6356f18e: Revive NetworkInfo\'s SUSPENDED state.

* commit '50dc257e5f75b67801bbf9ccffd8fef36ba59dc1':
Revive NetworkInfo's SUSPENDED state.
2a0805b3c6e977c6a63e0f6e0ff6c343a282a0cc 09-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> am 6356f18e: Revive NetworkInfo\'s SUSPENDED state.

* commit '6356f18e1120be1b90f18dcd647054a751c52a36':
Revive NetworkInfo's SUSPENDED state.
6356f18e1120be1b90f18dcd647054a751c52a36 24-Jun-2015 Robert Greenwalt <rgreenwalt@google.com> Revive NetworkInfo's SUSPENDED state.

This got lost in the multinetwork work for L. It means
that if telephony stops having the ability to pass packets for a while
the rest of the platform doesn't know.

Telephony enters the suspended state if it enters a telephony call
while using certain radio access technologies, or if it switches to
one of those RATs while in a call. It also can enter this state if
it temporarily loses contact with the network - the modem will
not report the loss of the data call for an indeterminant time in
the hope that regaining the network will restore the connection
without harm to any ongoing ip layer interactions. For example
passing through a tunnel or taking an elevator trip may use this
mechanism.

bug: 19637156
Change-Id: I71d64d02088771df5d057eac8e8eba3785357e02
ataconnection/DataConnection.java
502d02140ecdc98d664775a4f4b33958dcc2e6f3 09-Jul-2015 Jeff Davidson <jpd@google.com> am 70a14de6: am 1dad8c80: am 21c6a490: Merge "Don\'t toggle app state for updated system apps." into mnc-dev

* commit '70a14de610af85c321be494a19a6770adabf66ed':
Don't toggle app state for updated system apps.
1dad8c802aef11cbd8b8afa86a32b3470d0fc2eb 09-Jul-2015 Jeff Davidson <jpd@google.com> am 21c6a490: Merge "Don\'t toggle app state for updated system apps." into mnc-dev

* commit '21c6a4902e2dc2342ae4df099fc01fd0b2c81422':
Don't toggle app state for updated system apps.
b6011638d49a47d841930456f3352c12be3a4b6d 09-Jul-2015 Etan Cohen <etancohen@google.com> am 27da8ed1: am 3f39a2e8: resolved conflicts for merge of df922b8a to mnc-dr-dev

* commit '27da8ed1014c8b3cfa9f7e3984fa1ffbb938f7f5':
IMS: Update data rat in IMS phone service state.
21c6a4902e2dc2342ae4df099fc01fd0b2c81422 09-Jul-2015 Jeff Davidson <jpd@google.com> Merge "Don't toggle app state for updated system apps." into mnc-dev
3f39a2e8779de4a459493484aed229ce53b0da1c 09-Jul-2015 Etan Cohen <etancohen@google.com> resolved conflicts for merge of df922b8a to mnc-dr-dev

Change-Id: I05b8c007c891b2c5d476ec1e58e5f26a09910f12
df922b8a15ab9c96803ede0ab8eae312a84ecda0 09-Jul-2015 Etan Cohen <etancohen@google.com> Merge "IMS: Update data rat in IMS phone service state." into mnc-dev
57d1d4f217bfe4b9b18709ed75b9c065b8b59917 09-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> am 0f927088: am 4af18fca: am fa7ca259: Merge "Add/Fix Permission check on SubscriptionManager." into mnc-dev

* commit '0f927088d07d194f81b171256c098640b611f555':
Add/Fix Permission check on SubscriptionManager.
4af18fca580fc0a5ea47d0dc46e00315e48326a2 08-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> am fa7ca259: Merge "Add/Fix Permission check on SubscriptionManager." into mnc-dev

* commit 'fa7ca2596309966d85db1294545592a6763a294a':
Add/Fix Permission check on SubscriptionManager.
fa7ca2596309966d85db1294545592a6763a294a 08-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Add/Fix Permission check on SubscriptionManager." into mnc-dev
59d7c92cdd71cdc7cbaf460a77243cea3da6bbf4 09-Mar-2015 Shriram Ganesh <sganesh@codeaurora.org> IMS: Update data rat in IMS phone service state.

Keep the data rat information in Ims phone servicestate updated
with that from default phone.
This makes sure applications can query correct data RAT when
default phone is not registered to voice and ims is in service.

Bug: 22123213
Change-Id: I8161a43efe9408572d41d7a0a320972873a7e60c
msphone/ImsPhone.java
14de7067e512abcfe1fa36dce343b5660a644298 08-Jul-2015 Anthony Lee <anthonylee@google.com> am fc3161e8: am 13fdc46c: am e589ac93: Merge "Change conference connect time to ignore undefined connect times." into mnc-dev

* commit 'fc3161e8291e60e41bd2357015eed321f26ee9f1':
Change conference connect time to ignore undefined connect times.
286fc2211b36fb3b7766f2a8e090b356427c2bc1 07-Jul-2015 Jeff Davidson <jpd@google.com> Don't toggle app state for updated system apps.

The default carrier app logic to disable/enable apps depending on the
SIM state should only apply to the copy of the app on /system. Once
the app has been updated via /data, we should leave the enabled
setting as the default (though we should still grant carrier
privileges as needed in this case).

Otherwise we may unexpectedly disable a previously enabled app if it
is updated and then the SIM state changes or device reboots at a time
when the SIM isn't loaded.

Bug: 22321187
Change-Id: Ia7281c5a174bd32fc4d63375603ace0b29794894
arrierAppUtils.java
787894d7a314ccd915d094bbc3f47fe7052efd62 01-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Add/Fix Permission check on SubscriptionManager.

Things that are modifying should check the modify permission.

bug: 19259681
Change-Id: I93968bccedc673171ddf0d27ffe664a698b8fcb4
ubscriptionController.java
13fdc46cce53cd571fe19c69d944a5d597db9c55 07-Jul-2015 Anthony Lee <anthonylee@google.com> am e589ac93: Merge "Change conference connect time to ignore undefined connect times." into mnc-dev

* commit 'e589ac9330e28d0e7fb76fed963c8c846fff047b':
Change conference connect time to ignore undefined connect times.
29a0711a7488ddc5bb6a96fdbd1ed2de417b8476 07-Jul-2015 Jeff Davidson <jpd@google.com> am f3ddc633: am 7e6ac93f: am 1d744e15: Don\'t kill carrier app when enabling it.

* commit 'f3ddc633038aa6e55ac57869063235b3e8eecbc2':
Don't kill carrier app when enabling it.
2e6781f1068032a1a092ec9b0f3ac55b18117b59 07-Jul-2015 Sungmin Choi <sungmin.choi@lge.com> am a6d8803f: am dfe98669: am 60bc4898: Add sort parameter to query apns

* commit 'a6d8803f66caa80854e15404f7f7c35e8ff2f1ad':
Add sort parameter to query apns
f0682d80fc9120503f21b152bbba6e7342b57bb3 07-Jul-2015 Sungmin Choi <sungmin.choi@lge.com> am b4370689: am a2fbe04a: am bf660a46: Add getPreferredApn() in buildWaitingApns()

* commit 'b43706894cf4809d4f4ecf88b8f27c3f18f54c00':
Add getPreferredApn() in buildWaitingApns()
e589ac9330e28d0e7fb76fed963c8c846fff047b 07-Jul-2015 Anthony Lee <anthonylee@google.com> Merge "Change conference connect time to ignore undefined connect times." into mnc-dev
7e6ac93fca725ceed86fbb3dda93a19d71101f60 07-Jul-2015 Jeff Davidson <jpd@google.com> am 1d744e15: Don\'t kill carrier app when enabling it.

* commit '1d744e15a15081c74b96513ed1cc95a1739087bb':
Don't kill carrier app when enabling it.
1d744e15a15081c74b96513ed1cc95a1739087bb 07-Jul-2015 Jeff Davidson <jpd@google.com> Don't kill carrier app when enabling it.

There's no reason to do this, and if the app is running it will cause
it to suddenly close despite already being enabled.

Bug: 22306627
Change-Id: Ic37ad74f92d50d49b329b8fb70ea171ff447091b
arrierAppUtils.java
d3b707d66dd2d31b2cd97f22702ea063e6e5dd9d 07-Jul-2015 Tyler Gunn <tgunn@google.com> am f1b39425: am 8762e33b: IMS: Supplementary services

* commit 'f1b39425adb5ca493e5b7a71b5387659fa468ad1':
IMS: Supplementary services
1adbcd489fd7bff2d0833d3078117e33b3370310 07-Jul-2015 Omkar Kolangade <omkark@codeaurora.org> am 061d6c44: am 03545e6c: IMS MWI Feature

* commit '061d6c44dea00a90e8d0d7e7125cb62a4ec6c020':
IMS MWI Feature
81d44150cf10693e626603395286629a12ee4f58 07-Jul-2015 Shriram Ganesh <sganesh@codeaurora.org> am 76459164: am ab759cc9: SRVCC Conference with Mid Call Enabled

* commit '76459164ebec01ade3099c93cfbc90b81e0c65e7':
SRVCC Conference with Mid Call Enabled
2521698d26fdfd614dd8471b25be01ac7774cb2c 07-Jul-2015 Shriram Ganesh <sganesh@codeaurora.org> am df04dd34: am 08e9c4b4: MWI,phantom call,Suppl services

* commit 'df04dd34976eff138e96bc7155f8ab07f6576dd6':
MWI,phantom call,Suppl services
730dfd09e812b47cdf8de7244995b003c0342269 07-Jul-2015 Etan Cohen <etancohen@google.com> am 1175bb82: am ecf99da5: Fix incorrect reference - isVideoEnabled would have always returned false.

* commit '1175bb828ef86066902b184c57459605d8e2da5e':
Fix incorrect reference - isVideoEnabled would have always returned false.
dfe98669cefdd98f2e7a558eea014508c7de3117 07-Jul-2015 Sungmin Choi <sungmin.choi@lge.com> am 60bc4898: Add sort parameter to query apns

* commit '60bc489803a3557526e1f95e34c237e70f28bc50':
Add sort parameter to query apns
a2fbe04ace721cd0b06e5776c1346a23539912f3 07-Jul-2015 Sungmin Choi <sungmin.choi@lge.com> am bf660a46: Add getPreferredApn() in buildWaitingApns()

* commit 'bf660a4647db8151609cdfa0ecc4c96e1518947f':
Add getPreferredApn() in buildWaitingApns()
60bc489803a3557526e1f95e34c237e70f28bc50 28-Jun-2015 Sungmin Choi <sungmin.choi@lge.com> Add sort parameter to query apns

Sometimes, result of query apns is not sorted by _id.
As a result, device tries to conntect data using unwilled apn.
For example, when user inserts 45005 SIM, create all apnlist as the followings:
1) L version
_id name
2516 SKT LTE INTERNET
2517 SKT 3G INTERNET
2518 SKT LTE Roaming
2519 SKT 3G Roaming
2) M version
_id name
2518 SKT LTE Roaming
2516 SKT LTE INTERNET
2519 SKT 3G Roaming
2517 SKT 3G INTERNET

Device tries to connect data using "Roaming apn", so user can't use data.
To fix it, add sort parameter to query apans.

Related-Bug: 22159434
Change-Id: I5743813236c8143fb83800b9ed0b2a98b33d6a51
ataconnection/DcTracker.java
bf660a4647db8151609cdfa0ecc4c96e1518947f 30-Jun-2015 Sungmin Choi <sungmin.choi@lge.com> Add getPreferredApn() in buildWaitingApns()

Now, only createAllApnList() calls getPreferredApn().
Unfortunately, in this time, getSubId() may not be proper value.
So getPreferredApn() could not get value which we want/set as preferred apn.
As a result, preferred apn is null and wrong apn info can be sent to modem
and be used by SETUP_DATA_CALL procedure.
To resolve this, just add getPreferredApn() in buildWaitingApns().

Bug: 22159434
Change-Id: Iee92325aa91c5c470328055746c321065a9829d4
ataconnection/DcTracker.java
8762e33ba987774e43aa9f4e216ebdb084d3a03e 24-Jun-2015 Tyler Gunn <tgunn@google.com> IMS: Supplementary services

- Propagate IMS supplementary services to telephony framework
- Introduce call forwarding history info.

Bug: 21725750
Change-Id: I43b281fe194e4a096dd057bb365cbf097d7be85a
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
03545e6c17da992dc0087fcd0db1262277e8da37 29-Sep-2014 Omkar Kolangade <omkark@codeaurora.org> IMS MWI Feature

Adding logic to propagate waiting
voice message count to UI.

Change-Id: I922d8ff3138aefdbf284b5ec9f84afcedaff59a1
msphone/ImsPhoneCallTracker.java
ab759cc92562162ceeb3d1a5b7592b704185433d 31-Dec-2014 Shriram Ganesh <sganesh@codeaurora.org> SRVCC Conference with Mid Call Enabled

1. Add support for SRVCC with more than 3 participants.

There is a max limit of 7 connections in GsmCallTracker. If RIL
reports call id greater than 7, it will be ignored while polling in
call tracker. Because of this, in case of SRVCC with more than 3
participants, call ids greater than 7 are getting dropped from UI.
Fix this by increasing the max connections limit to accomodate call
ids after SRVCC.

2. Add support for SRVCC Conference with greater than 3 participants

The phantom call mechanism that is used to notify the participants
of conference call during SRVCC, notifies only the last unknown
connection. During SRVCC conference call, all the participants
after the first are using the phantom call mechanism and hence
each unknown connection resulting should have a seperate notify
from frameworks.

3. Add support for using the CS connection address during SRVCC

Updated the values that are migrated from handover connection.
Some fields which have an updated value from the driver call list
are used directly instead of migrating their values from handover
Ims Connection.

4. IMS: Fix for duplicate registrants during SRVCC.

Currently CallManager registers for different phone states
with Gsm and Ims phone. But while handling the UNSOL SRVCC state
change the migrate function in PhoneBase, does no check for the
duplicate registrants and copies all the ImsPhone registrants to
GsmPhone.

Fix: Dont migrate the registrants from ImsPhone to GsmPhone if
CallManager has already registered with default phone for these
registrants.

Change-Id: I67ac7d7156e4d0dec8c66059263f0e29a6337c66
allManager.java
onnection.java
honeBase.java
dma/CdmaCallTracker.java
sm/GsmCallTracker.java
08e9c4b483dac2cbf1b7fe4cbad22f003ff92bcb 31-May-2015 Shriram Ganesh <sganesh@codeaurora.org> MWI,phantom call,Suppl services

1. IMS MWI Feature
- Add new API to update waiting
voice message count, for UI
propagation based on RFC 3842

2. phantom call support

Supplementary services

4.Unsol supplementary service notification
- send unsol supplementary notification to UI
- add call history info

5. Add Error message in commandexception

6. Add getExtras method

Miscellaneous:

7. IMS: Update Connect time for dialing/incoming SRVCC calls

Connect time (mConnectTimeReal) will be updated only for ACTIVE calls
and it's not updated for calls which are transferred from DIALING/ALERTING/
INCOMING/WAITING to ACTIVE as part of SRVCC. Due to this once call is
ended call duration will not be updated properly in connection.

Update Connect time properly for DIALING/ALERTING/INCOMING/WAITING to
ACTIVE SRVCC calls.

Change-Id: I551e63840b6a63e0cbd97919d4b03d2a68334dbd
ommandException.java
onnection.java
honeBase.java
dma/CDMAPhone.java
dma/CdmaCallTracker.java
sm/GSMPhone.java
sm/GsmCallTracker.java
sm/SuppServiceNotification.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
msphone/ImsPhoneMmiCode.java
ecf99da5806db453a7fc7517c4ed99322fba7d4a 29-May-2015 Etan Cohen <etancohen@google.com> Fix incorrect reference - isVideoEnabled would have always returned false.

Original call to itself - which for IMS Phone results in false.

Change-Id: I4e3f04e62c91c2a8857b2f72debbdd63d4123cf2
honeBase.java
6fc954232b3403f4de372a029660263a937a9ad3 03-Jul-2015 Makoto Onuki <omakoto@google.com> am 89136ced: am 406c3db3: Merge "Allow default SMS app to get self phone number" into mnc-dev

* commit '89136ceded228075421926958075160617e4e10d':
Allow default SMS app to get self phone number
c5042b2f709b1a787e999864fa6850a099c05c95 03-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> am f105b7b0: am 44b45f6f: Merge "Log reduction" into mnc-dev

* commit 'f105b7b06f7f29eb6be62556d2d317e0b1a1cb5d':
Log reduction
7129f582e0945c06ab94b40c2baa773bbe6afbbf 01-Jul-2015 Junda Liu <junda@google.com> Add localLog to UiccCard to record logical channel open/close.

Bug: b/22199321
Change-Id: I7eb2d0c112713ab1946c1be4d230f8b6895807ac
icc/UiccCard.java
406c3db35ab99b6ed23ccc79d2e41e95525978fd 01-Jul-2015 Makoto Onuki <omakoto@google.com> Merge "Allow default SMS app to get self phone number" into mnc-dev
44b45f6f2a9f3ccd60056ef5c9b2a88d8b4c7cc1 01-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Log reduction" into mnc-dev
9232dafa7ea833fc0b3a6024d6c7e23fc8e961ea 01-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Log reduction

Found all this while checking out 21957591. My work there was
a bust, but don't want to lose this logging cleanup.

bug: 22225815
Change-Id: I7a3e932e06d035066d4adbc10c99ecf2a20be5fd
honeFactory.java
ataconnection/ApnContext.java
ataconnection/DcTracker.java
3da7b3c392b175c87e9d084cf8df4c32f2e8971d 30-Jun-2015 Tyler Gunn <tgunn@google.com> am d01474e0: am 525d87a3: Merge "IMS: Update name, number and presentation values from ImsCall." into mnc-dev

* commit 'd01474e02994c6488dc408f0109d38d55902da99':
IMS: Update name, number and presentation values from ImsCall.
525d87a31ce730136c220f39e6eb9f9da4784dce 30-Jun-2015 Tyler Gunn <tgunn@google.com> Merge "IMS: Update name, number and presentation values from ImsCall." into mnc-dev
eeeb1cb65e41778fa78abcaba93a9e4ebe351ec6 27-Jun-2015 Shriram Ganesh <sganesh@codeaurora.org> IMS: Update name, number and presentation values from ImsCall.

Update the name, number and presentation fields of ImsPhoneConnection
on every ImsCall update.

Bug: 22123241
Change-Id: I2cab669f7fe41f1bce355672622ac03259ff3f16
msphone/ImsPhoneConnection.java
a3810313d7d65208a35ba626ae62642ecca61e58 30-Jun-2015 Svet Ganov <svetoslavganov@google.com> am 52ed6ea6: am 744621f9: Merge "Grant default permissons to the default SMS, Phone, Browser app." into mnc-dev

* commit '52ed6ea613a953a459937fa95e763f65c3b4783c':
Grant default permissons to the default SMS, Phone, Browser app.
744621f986d8c08648079537accba79d6a892d07 30-Jun-2015 Svet Ganov <svetoslavganov@google.com> Merge "Grant default permissons to the default SMS, Phone, Browser app." into mnc-dev
3c76dc89272d7b515d8afda1e7e9f7f362ef3caa 29-Jun-2015 Svet Ganov <svetoslavganov@google.com> Grant default permissons to the default SMS, Phone, Browser app.

bug:22104986

Change-Id: Idcbe85c43f995bdf37e7291c9384eb181560872d
arrierAppUtils.java
ubscriptionInfoUpdater.java
fff1fff32a5b43d01f74bcec6b6159d8c3ee0e4d 30-Jun-2015 Tyler Gunn <tgunn@google.com> am 6bbafa3b: am 07361401: Merge "IMS: Don\'t create IMS phone when switch to SIP Phone" into mnc-dev

* commit '6bbafa3b42136080468c416d5bd67c90a612b9b4':
IMS: Don't create IMS phone when switch to SIP Phone
07361401e703dc4e9bf1a238fd7e854e0c950097 30-Jun-2015 Tyler Gunn <tgunn@google.com> Merge "IMS: Don't create IMS phone when switch to SIP Phone" into mnc-dev
fa02ee3526403acad7533d50d69c3849a5c2de72 07-May-2015 Shriram Ganesh <sganesh@codeaurora.org> IMS: Don't create IMS phone when switch to SIP Phone

SIP Phone creates IMS phone while phone switch to SIP
phone when dial an SIP call.
Don't register receiver for Ims service state change
and SRVCC state change in case of SIP phone.
This way creatation of duplicate IMS phone will be
prevented when switch to SIP phone.

Bug: 22126128
Change-Id: I1206aaab703fec70107554352c2728e7dd42578e
honeBase.java
7ee3f31d9670662a3d4a652860396340b386c29e 30-Jun-2015 Tyler Gunn <tgunn@google.com> Change conference connect time to ignore undefined connect times.

- The existing code to get the earliest connect time for a conference
could potentially return 0 (i.e. undefined). Although I've not run into
this in my own testing, it is theoretically possible.
I suspect the reason that the connect time was being reset when starting
a conference is that one of the ImsCalls must be returning a connect time
of zero, which in Telecom is treated as "unspecified" (in other words,
no connect time specified, so use now).

Bug: 22089306
Change-Id: I79be11b67767650455600befbecf841ff8b87c09
msphone/ImsPhoneCall.java
msphone/ImsPhoneCallTracker.java
87a1adddb933d039a5ef2c0d5973c0f4513f8f9c 30-Jun-2015 Jack Yu <jackyu@google.com> Merge "Added FDN handling in AdnRecordLoader class." into mnc-dev
e4c2f93c6188b52574ad34a7d62e15f9daf625a5 29-Jun-2015 Makoto Onuki <omakoto@google.com> Allow default SMS app to get self phone number

Apps with WRITE_SMS app op can now call TelephonyManager.getLine1Number().
(Note we no longer have the WRITE_SMS permission.)

Bug 22031904

Change-Id: Iee616fa54e4c28e1bf6b17dbec01db2e1fe34a7e
honeSubInfo.java
7c1debea31b77032057ad3382b064f94f4a3402c 29-Jun-2015 Jack Yu <jackyu@google.com> Added FDN handling in AdnRecordLoader class.

bug: 21851547
Change-Id: Ibfc12a872a7643013ff207641f2254af3d24b3cd
icc/IccFileHandler.java
fa36990abc8b9c68d75e4b71fbea026b810c89e5 29-Jun-2015 Amit Mahajan <amitmahajan@google.com> am b5b719ab: am d2137887: Merge "Change the order of permission checks for READ_PHONE_STATE." into mnc-dev

* commit 'b5b719abfc7dde6603185cf0c83d2f47a0267cd4':
Change the order of permission checks for READ_PHONE_STATE.
4e286c0da881ea725221aa6d5d4feec891e338f0 29-Jun-2015 Amit Mahajan <amitmahajan@google.com> Change the order of permission checks for READ_PHONE_STATE.

This is needed for 2 reasons:
1. If called as self, OP_READ_PHONE_STATE check should not be done.
2. If caller does not have permission, exception should be thrown
for READ_PHONE_STATE.

Bug: 22128902
Change-Id: Ibd4de0c5ba314700b6b3d7a59f502d2a21b7d86f
honeSubInfo.java
ubscriptionController.java
7e412ba0e29942f7843e05208c5c86161f649631 27-Jun-2015 Amit Mahajan <amitmahajan@google.com> am ddd73ee6: am 27e8390d: am 796b9a92: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.

* commit 'ddd73ee628e5e898a5257b3768f5f17bea8d196e':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
b10c73b18ecc62ea17c56559260f674add348154 27-Jun-2015 Amit Mahajan <amitmahajan@google.com> am afb60bbc: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.

* commit 'afb60bbc52f725b9e0d95664d706995e2c75bd43':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
59982e0d3aae9c628dccda14250536db4f81998f 27-Jun-2015 Amit Mahajan <amitmahajan@google.com> am 535355c9: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.

* commit '535355c94efadb73fe7620adbdecd54927bb1399':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
27e8390dc902099e975e16dc66190c122a50d88f 27-Jun-2015 Amit Mahajan <amitmahajan@google.com> am 796b9a92: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.

* commit '796b9a929ec2a92614b3ebb5a7ad715d5c5eb1cc':
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
b202674bac298137167037adb0d588d14f146dc7 26-Jun-2015 Amit Mahajan <amitmahajan@google.com> am eb63eab0: am 7a4b136c: Merge "Change to set pref network type on APM off if SIM is already loaded." into mnc-dev

* commit 'eb63eab08d5d86dee10bf3be9614ca335c7ae279':
Change to set pref network type on APM off if SIM is already loaded.
6c79d70e860a7b936a6c7b087a5ee930f85a52ff 26-Jun-2015 Etan Cohen <etancohen@google.com> am 6b1c00d8: am d976d93f: Merge "Modify telephony permissions to use either READ_PHONE_STATE or READ_PRIVILEDGED_PHONE_STATE" into mnc-dev

* commit '6b1c00d823436fd9f09692f1757f7e511732a12c':
Modify telephony permissions to use either READ_PHONE_STATE or READ_PRIVILEDGED_PHONE_STATE
7a4b136c4febb729c334708f6c2678966f73e1fc 26-Jun-2015 Amit Mahajan <amitmahajan@google.com> Merge "Change to set pref network type on APM off if SIM is already loaded." into mnc-dev
d976d93fee98cb7d02b5071bca207623a6e6e7eb 26-Jun-2015 Etan Cohen <etancohen@google.com> Merge "Modify telephony permissions to use either READ_PHONE_STATE or READ_PRIVILEDGED_PHONE_STATE" into mnc-dev
afb60bbc52f725b9e0d95664d706995e2c75bd43 11-Jun-2015 Amit Mahajan <amitmahajan@google.com> DO NOT MERGE Change to add STK_PERMISSION for stk related commands.

And make stk commands protected.

Bug: 21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
at/AppInterface.java
at/CatService.java
535355c94efadb73fe7620adbdecd54927bb1399 11-Jun-2015 Amit Mahajan <amitmahajan@google.com> DO NOT MERGE Change to add STK_PERMISSION for stk related commands.

And make stk commands protected.

Bug: 21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
at/AppInterface.java
at/CatService.java
796b9a929ec2a92614b3ebb5a7ad715d5c5eb1cc 11-Jun-2015 Amit Mahajan <amitmahajan@google.com> DO NOT MERGE Change to add STK_PERMISSION for stk related commands.

And make stk commands protected.

Bug: 21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
at/AppInterface.java
at/CatService.java
825e25d7fa0cf93ce2ee2a307697af912a112dd5 26-Jun-2015 Chris Manton <cmanton@google.com> am 7be43c6f: am 8908e2ca: Merge "Add override check for home network carrier service API" into mnc-dev

* commit '7be43c6fa92ea26eee4be2e239fcc5b9364764cc':
Add override check for home network carrier service API
8908e2ca4ee99400c9656cde59b5aac656d49257 26-Jun-2015 Chris Manton <cmanton@google.com> Merge "Add override check for home network carrier service API" into mnc-dev
cdd0ef910a79d75d60222d97c5f33aa154876bfb 25-Jun-2015 Chris Manton <cmanton@google.com> Add override check for home network carrier service API

Bug: 20828356
Change-Id: I620d513445de65fee47016a6b8791f7e0d502b94
erviceStateTracker.java
dma/CdmaServiceStateTracker.java
sm/GsmServiceStateTracker.java
381bf2cb2cfefadb75b1c22092c62e9de71243cd 25-Jun-2015 Jeff Davidson <jpd@google.com> am 3c5ce481: am c5ce7ea3: Merge "Always regrant default permissions even if app is enabled." into mnc-dev

* commit '3c5ce48150ef86a34c9cf95f48d9bcb3ffc63877':
Always regrant default permissions even if app is enabled.
c5ce7ea349f4d4ffc5bc1a07f95acc0ed68003f2 25-Jun-2015 Jeff Davidson <jpd@google.com> Merge "Always regrant default permissions even if app is enabled." into mnc-dev
314fa4be00cb94d2617554351e13eafa0380b411 25-Jun-2015 Jeff Davidson <jpd@google.com> Always regrant default permissions even if app is enabled.

We can safely skip the call to setApplicationEnabledSetting in this
case, but we should still call grantDefaultPermissions to ensure that
we re-evaluate defaults when the carrier privilege rules has changed.

This fixes userdebug OTAs where the permissions are cleared, as we
were not re-granting them after the SIM was inserted, but it is safer
in general.

Bug: 22088420
Change-Id: Ied518653790e1fbf026cd3f0ec4de22e3b21f0ba
arrierAppUtils.java
d8e5b7f21331ab0903758bf25fbe15f009eb538d 25-Jun-2015 Amit Mahajan <amitmahajan@google.com> Change to set pref network type on APM off if SIM is already loaded.

This is to make sure user setting is preserved across APM toggling.

Bug: 21880742
Change-Id: I8ab780440023db339be99c06c239a3c0f3039cea
honeBase.java
dma/CDMAPhone.java
sm/GSMPhone.java
505e101bf4452237808e2398c9b660d711ca81aa 24-Jun-2015 Etan Cohen <etancohen@google.com> Modify telephony permissions to use either READ_PHONE_STATE or READ_PRIVILEDGED_PHONE_STATE

Bug: 22001264
Change-Id: Ieb06e5cbcc366c25c174ec18281e55c1d73f2d80
honeSubInfo.java
ubscriptionController.java
057a3dfbc3c46138d2251d592cda55581a38c0d7 24-Jun-2015 Nicholas Sauer <nicksauer@google.com> Revert "Dont fail if modem ids are empty."

This workaround is no longer needed as the root cause of the issue is now fixed in the vendor RILD

bug: 20617219

This reverts commit 07c51b1ad11ac669c1f65b5c424d5cc9fa633950.

Change-Id: I3add8c0c994f691289b7eecf676c0f80f99fd1da
roxyController.java
16e576815e07cbcc2a14798fae5fd845ab40a701 24-Jun-2015 Jonathan Basseri <misterikkit@google.com> am 5fd7ec4e: am 1d7647ae: Merge "Read VOLTE replacement RAT from carrier config." into mnc-dev

* commit '5fd7ec4edf779d0af46e1e9056dc42953ac06355':
Read VOLTE replacement RAT from carrier config.
1d7647aef3d5d7c4d9303ad058d6e361afbf48e8 24-Jun-2015 Jonathan Basseri <misterikkit@google.com> Merge "Read VOLTE replacement RAT from carrier config." into mnc-dev
700641332bd8745de28ca71a77162ad06273a490 24-Jun-2015 Jonathan Basseri <misterikkit@google.com> Read VOLTE replacement RAT from carrier config.

This config was migrated to CarrierConfigManager, so PhoneProxy needs
to read from there.

Bug: 21878236
Change-Id: Id574600e524c5709c38f6a7768b5623b92e0f633
honeProxy.java
5f0a1774419f49002a67afd02cdea8d85f5bc07e 24-Jun-2015 Zach Johnson <zachoverflow@google.com> am 63282eb4: am 2dc7607b: Update long lived bindings on package update

* commit '63282eb484fbd0b60d4a28cf7f8ec5bfb95f5052':
Update long lived bindings on package update
e3f0b7f1345713137ee4aa71a349ef85a369b519 24-Jun-2015 Zach Johnson <zachoverflow@google.com> am 0bee4456: am 4a3d736d: Bind to carrier apps that request it

* commit '0bee445687193cc0e1221ec8ff41bed5702ddb60':
Bind to carrier apps that request it
009dd8b509d46916e1338f608482b5d34391cfb2 24-Jun-2015 Jeff Davidson <jpd@google.com> am a24c25ab: am ebe753c8: Merge "Default permissions for carrier apps." into mnc-dev

* commit 'a24c25ab3652ebb0f3aab4518c54d805d582989e':
Default permissions for carrier apps.
2e65683f42627fc9c765232be4af4c1769e4152d 24-Jun-2015 Robert Greenwalt <rgreenwalt@google.com> am 0f7ccf46: am 112b61c0: Merge "Say a phone is disconnected if we can\'t find it." into mnc-dev

* commit '0f7ccf4669d6dad75e9ef18de233830a40188526':
Say a phone is disconnected if we can't find it.
2dc7607bae115d015083afad7dec3a3beee7c4c3 22-Jun-2015 Zach Johnson <zachoverflow@google.com> Update long lived bindings on package update

b/21080696

Change-Id: I48e313a09f403e1d2f083ddab23e6e59d1e83655
arrierServiceBindHelper.java
4a3d736dbf0b8262290d3720085779538ceaad72 15-May-2015 Zach Johnson <zachoverflow@google.com> Bind to carrier apps that request it

Also plumb through dumpsys output for
carrier app bindings.

b/21080696

Change-Id: I82e3f119e4f08f040da0f1071fe1dd15077b2797
arrierServiceBindHelper.java
honeFactory.java
ubscriptionInfoUpdater.java
eaabf26170dea40b0a8f4250e6fe69d2f891c670 23-Jun-2015 Robert Greenwalt <rgreenwalt@google.com> am 51f41859: am be2a6a25: More logging at dumpsys time.

* commit '51f41859876042c5585c80b5d9368427f079d271':
More logging at dumpsys time.
ebe753c8c4e103157b156922760a6e89f4d7a7ab 23-Jun-2015 Jeff Davidson <jpd@google.com> Merge "Default permissions for carrier apps." into mnc-dev
03540ca93e3e59fd3cb826bb71716e54cb9dd095 23-Jun-2015 Jeff Davidson <jpd@google.com> Default permissions for carrier apps.

Provide the current list of carrier apps to PackageManager when we are
queried for them as part of granting default permissions. Trigger an
evaluation of default permissions whenever we are enabling a new
carrier app due to a change in SIM state (e.g. new carrier privilege
rules).

Bug: 21696731
Change-Id: I3d6d61712acb554878edeb5ee172887da16ef851
arrierAppUtils.java
ubscriptionInfoUpdater.java
112b61c07802110cc02e4348f479eb61e05ad92e 23-Jun-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Say a phone is disconnected if we can't find it." into mnc-dev
5e135330856f187b160cc0c235afc1aafdba2099 23-Jun-2015 Etan Cohen <etancohen@google.com> Merge changes from topic 'mwd-merge-062315' into mnc-vt-dev

* changes:
Fix build due to merge of pag/217347 - "Auto-downgrade emergency vt ..."
Merge commit '43ee71f' into merge
Merge commit '8560465' into merge
Merge commit '2b3d690' into merge
025c01920e4cf357594379ef35fe89c715e3507e 23-Jun-2015 Etan Cohen <etancohen@google.com> Fix build due to merge of pag/217347 - "Auto-downgrade emergency vt ..."

Original CL:
Auto-downgrade emergency vt calls to audio when no carrier support

Change-Id: I21b486890b212a9733e8d40dab87575f66204f30
msphone/ImsPhoneCallTracker.java
feb939eb46ace6d4f59576ad4ccfec53f181d5b9 23-Jun-2015 Etan Cohen <etancohen@google.com> Merge commit '8560465' into merge
9c31457a5c018bf99b64fcada689c7cfe60d9c71 23-Jun-2015 Robert Greenwalt <rgreenwalt@google.com> am be2a6a25: More logging at dumpsys time.

* commit 'be2a6a25317c857290e486c0d9903c6cb658f9b5':
More logging at dumpsys time.
8e1bb23a1bfeb3d37ef1254baea6be09b7e04009 23-Jun-2015 Jeff Davidson <jpd@google.com> am b1dd1d90: am 0cdc53a0: Disable carrier apps until needed per the SIM.

* commit 'b1dd1d90bc8bcf8bbb25243c12660e9c2697365f':
Disable carrier apps until needed per the SIM.
4255481b2c36b884cfc97e44ce4479f312610136 23-Jun-2015 Robert Greenwalt <rgreenwalt@google.com> Say a phone is disconnected if we can't find it.

isDataDisconnected(subId) was returning false if it couldn't
find a phone servicing the given subscription. That seems
wrong and led to ServiceStateTracker thinking it was connected
if there was no SIM inserted. That in turn led to very slow
AirplaneMode engagement.

bug: 21427496
Change-Id: I762e5dae6bc4263e846245ddd49097e8bc204e12
roxyController.java
ubscriptionController.java
be2a6a25317c857290e486c0d9903c6cb658f9b5 23-Jun-2015 Robert Greenwalt <rgreenwalt@google.com> More logging at dumpsys time.

Trying to understand what's happening in this issue.

bug: 20731384
Change-Id: I01d3516adb8f443ce3b616be5b296a00771f302a
ataconnection/DctController.java
1ab83bd2fce383b0f107b07bfb22b27d0ab53504 23-Jun-2015 Jeff Davidson <jpd@google.com> am 0cdc53a0: Disable carrier apps until needed per the SIM.

* commit '0cdc53a095b5e715b9730f78dbd80d160fdd665f':
Disable carrier apps until needed per the SIM.
0cdc53a095b5e715b9730f78dbd80d160fdd665f 19-Jun-2015 Jeff Davidson <jpd@google.com> Disable carrier apps until needed per the SIM.

Similar to how InputMethodManagerService marks IME apps as
DISABLED_UNTIL_USED except for apps being used as IMEs, we mark
carrier apps bundled with the system as DISABLED_UNTIL_USED until a
SIM that marks those apps as privileged is inserted.

Bug: 21814643
Change-Id: I24006039c18f2b0ad01019d3bb27c1344f97d53c
arrierAppUtils.java
ubscriptionInfoUpdater.java
004e1d7c03b611ef8eb4e67a35735c226b820136 22-Jun-2015 Vineeta Srivastava <vsrivastava@google.com> am 0326e6d3: am 75b2c358: Merge "UICC: send Locked intent after ICCID loaded" into mnc-dev

* commit '0326e6d300011cb6fa0682543a358df3fa2a6e78':
UICC: send Locked intent after ICCID loaded
dbcbcd36b1b827dae98f05f10b881d704eb8ef84 22-Jun-2015 Vineeta Srivastava <vsrivastava@google.com> am 75b2c358: Merge "UICC: send Locked intent after ICCID loaded" into mnc-dev

* commit '75b2c35814c2471505391e79633a36947ec7ff82':
UICC: send Locked intent after ICCID loaded
75b2c35814c2471505391e79633a36947ec7ff82 22-Jun-2015 Vineeta Srivastava <vsrivastava@google.com> Merge "UICC: send Locked intent after ICCID loaded" into mnc-dev
2c9f19e8bbbbd196825c1e739b91f102124e4187 22-Jun-2015 Shishir Agrawal <shishir@google.com> am a1009eda: am 1974586c: Merge "Move OperatorInfo.java to frameworks/base." into mnc-dev

* commit 'a1009edac97c60314225985b7e60342052e249b3':
Move OperatorInfo.java to frameworks/base.
042b640f2268375b6821a88198ff60b970f3918a 22-Jun-2015 Shishir Agrawal <shishir@google.com> am 1974586c: Merge "Move OperatorInfo.java to frameworks/base." into mnc-dev

* commit '1974586c969a8d8274ac40895ee19a1f74f66fc4':
Move OperatorInfo.java to frameworks/base.
bada592ba581460d2cf5a0ae12a0f73bc471a0d6 11-Mar-2015 duho.ro <duho.ro@lge.com> UICC: send Locked intent after ICCID loaded

Keyguard can get the ICC Locked intent before ICCID loading on
SubscriptionInfoUpdater. But, the intent is not broadcasted after ICCID
loaded. So, Keyguard can not get the intent and can not change the PUK view
after user input 3 times wrong PIN code.
- add broadcastSimStateChanged() when ICCID already loaded.

Bug: 19611797
Bug: 21928887

Change-Id: I2a4d44e78a07bf7636d97b5fa7eb16cc8ab767a0
ubscriptionInfoUpdater.java
1974586c969a8d8274ac40895ee19a1f74f66fc4 22-Jun-2015 Shishir Agrawal <shishir@google.com> Merge "Move OperatorInfo.java to frameworks/base." into mnc-dev
6224ccf7f568abf1b5a00e4327000194155e3196 22-Jun-2015 Jack Yu <jackyu@google.com> am 7a2e8683: am c2c3bde6: Merge "Removed SMS header from CDMA binary SMS." into mnc-dev

* commit '7a2e8683b97c36bfd7eb3c2ee82179b627582dc1':
Removed SMS header from CDMA binary SMS.
559c49795cb7ac5ef915cce65caa7d139543d170 22-Jun-2015 Tyler Gunn <tgunn@google.com> Merge "IMS MWI Feature" into mnc-vt-dev
f38f5932049a1afae94c1b12111310f0eb476436 29-Sep-2014 Omkar Kolangade <omkark@codeaurora.org> IMS MWI Feature

Adding logic to propagate waiting
voice message count to UI.

Change-Id: I922d8ff3138aefdbf284b5ec9f84afcedaff59a1
msphone/ImsPhoneCallTracker.java
0f024402226aeb29d40a6115df7270866da0d0d5 22-Jun-2015 Jack Yu <jackyu@google.com> am c2c3bde6: Merge "Removed SMS header from CDMA binary SMS." into mnc-dev

* commit 'c2c3bde6e52fc75cce215cdc42321d590753701a':
Removed SMS header from CDMA binary SMS.
c2c3bde6e52fc75cce215cdc42321d590753701a 22-Jun-2015 Jack Yu <jackyu@google.com> Merge "Removed SMS header from CDMA binary SMS." into mnc-dev
ce5ba69ec673892bf42b7908c183a2e777998934 20-Jun-2015 Santos Cordon <santoscordon@google.com> am 1f623986: am 03eab6e2: Merge "Plumb intent extras through to IMS Phone." into mnc-dev

* commit '1f6239868750564c8960951198443252762b2ea6':
Plumb intent extras through to IMS Phone.
2fc53b569ee13bfc31f8c855e209048530cd21b6 20-Jun-2015 Pavel Zhamaitsiak <pavelz@google.com> am 9dab72f6: am 1b9d05de: Disable debug logging in DcTrackerBase

* commit '9dab72f6d610683982e4fc7efa8e418fc0ee65ab':
Disable debug logging in DcTrackerBase
a39be34a8f36e16361ae9b920e02ca1237aea071 20-Jun-2015 Santos Cordon <santoscordon@google.com> am 03eab6e2: Merge "Plumb intent extras through to IMS Phone." into mnc-dev

* commit '03eab6e2e46c4efd1e9251b60013f6a4fb1b5e6b':
Plumb intent extras through to IMS Phone.
efecbc338ce7821044b6e0251472aa89e743cf5f 18-Jun-2015 Jack Yu <jackyu@google.com> Removed SMS header from CDMA binary SMS.

bug: 21656132
Change-Id: I23a93ada079db891c0264f15bdc1b1ab9ff745c0
msNumberUtils.java
dma/CdmaSMSDispatcher.java
03eab6e2e46c4efd1e9251b60013f6a4fb1b5e6b 20-Jun-2015 Santos Cordon <santoscordon@google.com> Merge "Plumb intent extras through to IMS Phone." into mnc-dev
df0280231c51a24a0b66c24034827d7f73d6e1ac 13-Jun-2015 Santos Cordon <santoscordon@google.com> Plumb intent extras through to IMS Phone.

Bug: 21735451
Change-Id: I7c44a658b2585d272375c573bb31974109540bb4
allManager.java
hone.java
honeBase.java
honeProxy.java
dma/CDMAPhone.java
sm/GSMPhone.java
sm/GsmCallTracker.java
msphone/ImsPhone.java
msphone/ImsPhoneBase.java
msphone/ImsPhoneCallTracker.java
ip/SipPhone.java
ip/SipPhoneBase.java
a53b7a41d559b29ff04dcf037371b85c6e3b78ce 20-Jun-2015 Pavel Zhamaitsiak <pavelz@google.com> am 1b9d05de: Disable debug logging in DcTrackerBase

* commit '1b9d05de882a8cb1eef3be92a904267e43ae04bc':
Disable debug logging in DcTrackerBase
1b9d05de882a8cb1eef3be92a904267e43ae04bc 20-Jun-2015 Pavel Zhamaitsiak <pavelz@google.com> Disable debug logging in DcTrackerBase

Bug: 19689655
Change-Id: Ic3e525bde869addd4f85acdeee785d4d857538ad
ataconnection/DcTrackerBase.java
b1dce2fc8df5898d550f081aca56230ce1e0b0a2 19-Jun-2015 Shishir Agrawal <shishir@google.com> Move OperatorInfo.java to frameworks/base.

Bug: 21563489
Change-Id: Ia625842edb02636ac7a23570b84408bf58663083
peratorInfo.java
af4cb3b2dc14ffd989a17f346e6401d4edd011af 19-Jun-2015 Chao Liu <yjl@google.com> am c2eee5d9: am 6e6dff5d: Merge "Store the optional vendor cause string returned by RIL in telephony Connection object. We\'ll pass it to Telecom, which could be used by clients." into mnc-dev

* commit 'c2eee5d9dcf74a339204523084cbc197c025ae73':
Store the optional vendor cause string returned by RIL in telephony Connection object. We'll pass it to Telecom, which could be used by clients.
0ef4c5723cc1b08b62bd34ff9dc28b7b355158c5 19-Jun-2015 Tyler Gunn <tgunn@google.com> Merge "SRVCC Conference with Mid Call Enabled" into mnc-vt-dev
99a44d34280788ecfd455cf74615a14bde0f337f 31-Dec-2014 Shriram Ganesh <sganesh@codeaurora.org> SRVCC Conference with Mid Call Enabled

1. Add support for SRVCC with more than 3 participants.

There is a max limit of 7 connections in GsmCallTracker. If RIL
reports call id greater than 7, it will be ignored while polling in
call tracker. Because of this, in case of SRVCC with more than 3
participants, call ids greater than 7 are getting dropped from UI.
Fix this by increasing the max connections limit to accomodate call
ids after SRVCC.

2. Add support for SRVCC Conference with greater than 3 participants

The phantom call mechanism that is used to notify the participants
of conference call during SRVCC, notifies only the last unknown
connection. During SRVCC conference call, all the participants
after the first are using the phantom call mechanism and hence
each unknown connection resulting should have a seperate notify
from frameworks.

3. Add support for using the CS connection address during SRVCC

Updated the values that are migrated from handover connection.
Some fields which have an updated value from the driver call list
are used directly instead of migrating their values from handover
Ims Connection.

4. IMS: Fix for duplicate registrants during SRVCC.

Currently CallManager registers for different phone states
with Gsm and Ims phone. But while handling the UNSOL SRVCC state
change the migrate function in PhoneBase, does no check for the
duplicate registrants and copies all the ImsPhone registrants to
GsmPhone.

Fix: Dont migrate the registrants from ImsPhone to GsmPhone if
CallManager has already registered with default phone for these
registrants.

Change-Id: I67ac7d7156e4d0dec8c66059263f0e29a6337c66
allManager.java
onnection.java
honeBase.java
dma/CdmaCallTracker.java
sm/GsmCallTracker.java
0dc400084c21aef77ddd4cae1f45488a07e7a269 19-Jun-2015 Chao Liu <yjl@google.com> am 6e6dff5d: Merge "Store the optional vendor cause string returned by RIL in telephony Connection object. We\'ll pass it to Telecom, which could be used by clients." into mnc-dev

* commit '6e6dff5d2d81b8dc49cd4d0d6b824c07be73e606':
Store the optional vendor cause string returned by RIL in telephony Connection object. We'll pass it to Telecom, which could be used by clients.
6e6dff5d2d81b8dc49cd4d0d6b824c07be73e606 19-Jun-2015 Chao Liu <yjl@google.com> Merge "Store the optional vendor cause string returned by RIL in telephony Connection object. We'll pass it to Telecom, which could be used by clients." into mnc-dev
1bf7548d3f61ef8e4073024fef06d93a88ee46c9 19-Jun-2015 Fyodor Kupolov <fkupolov@google.com> am 270b567b: am 5eef9d48: Merge "Restore OP_READ_PHONE_STATE check" into mnc-dev

* commit '270b567be43166c28d3d22dffc04d142391c9b00':
Restore OP_READ_PHONE_STATE check
2d39ca796a11347b36f513a644aabb2684ce7128 19-Jun-2015 Chris Manton <cmanton@google.com> am 6b0ce16e: am 870008cb: Merge "Remove deprecated remote override checks" into mnc-dev

* commit '6b0ce16e7b454b7ab1dcfac8b084c7f9c736f430':
Remove deprecated remote override checks
91daece818094d038ac9356f8e2487967143d61c 19-Jun-2015 Chris Manton <cmanton@google.com> am 79f70740: am ed68b140: Merge "Check carrier config loader for roaming overrides" into mnc-dev

* commit '79f70740944796c7190eb69579a269d6bf688edf':
Check carrier config loader for roaming overrides
aa8befee0f1996aaf6b5e62c4b8be51122a45f9f 19-Jun-2015 Stuart Scott <stuartscott@google.com> am d5829f8c: am 9837423e: Merge "Ensure correct mapping when sim cards are ready." into mnc-dev

* commit 'd5829f8cfaf45fb8a8df31edb0233d2c8012fa81':
Ensure correct mapping when sim cards are ready.
fa2bd6e5936a2a9fd3a41f27d8fd9cf1711cd3f2 19-Jun-2015 Fyodor Kupolov <fkupolov@google.com> am 5eef9d48: Merge "Restore OP_READ_PHONE_STATE check" into mnc-dev

* commit '5eef9d48a0eba48043f33efbb27ee2397bf07e01':
Restore OP_READ_PHONE_STATE check
5eef9d48a0eba48043f33efbb27ee2397bf07e01 19-Jun-2015 Fyodor Kupolov <fkupolov@google.com> Merge "Restore OP_READ_PHONE_STATE check" into mnc-dev
33cfb500a7cf192adfc5ca06792fe3847073b6c1 15-May-2015 Chao Liu <yjl@google.com> Store the optional vendor cause string returned by RIL in telephony
Connection object. We'll pass it to Telecom, which could be used by
clients.

Original partner change:
https://partner-android-review.googlesource.com/#/c/215709/

Change-Id: Icc2efeb35fbbaa59c4ecec5c97e776fe7e414fd3
onnection.java
astCallFailCause.java
IL.java
dma/CdmaCallTracker.java
dma/CdmaConnection.java
sm/GsmCallTracker.java
sm/GsmConnection.java
msphone/ImsPhoneConnection.java
ip/SipConnectionBase.java
9056b2a88993f2e87fa69b4eced300a936ec2d8e 19-Jun-2015 Chris Manton <cmanton@google.com> am 870008cb: Merge "Remove deprecated remote override checks" into mnc-dev

* commit '870008cb048a2672f1a3b6af75662b67dfdaadda':
Remove deprecated remote override checks
1b2592215a4890670b9f1dca81e51092be4b6711 19-Jun-2015 Chris Manton <cmanton@google.com> am ed68b140: Merge "Check carrier config loader for roaming overrides" into mnc-dev

* commit 'ed68b140029a196d65a11e511a941543ff7dda34':
Check carrier config loader for roaming overrides
21035637f1e5240a1b9071cd862124ce88a699fd 19-Jun-2015 Stuart Scott <stuartscott@google.com> am 9837423e: Merge "Ensure correct mapping when sim cards are ready." into mnc-dev

* commit '9837423e7fe023609645d8666652c84792f6a37c':
Ensure correct mapping when sim cards are ready.
870008cb048a2672f1a3b6af75662b67dfdaadda 19-Jun-2015 Chris Manton <cmanton@google.com> Merge "Remove deprecated remote override checks" into mnc-dev
ed68b140029a196d65a11e511a941543ff7dda34 18-Jun-2015 Chris Manton <cmanton@google.com> Merge "Check carrier config loader for roaming overrides" into mnc-dev
9837423e7fe023609645d8666652c84792f6a37c 18-Jun-2015 Stuart Scott <stuartscott@google.com> Merge "Ensure correct mapping when sim cards are ready." into mnc-dev
66c85e8180f60ef0a9006745d6e9dc61f56ac604 18-Jun-2015 Feixiong Zhang <feixiong@google.com> am b10945be: am 6698f84f: Merge "add PhoneStateListener in DcController which fires at carrierNetworkChange event." into mnc-dev

* commit 'b10945bedeceecc216728335181236109ac900a0':
add PhoneStateListener in DcController which fires at carrierNetworkChange event.
19278e130b1552554fc77cd6a5db4b789a387c16 18-Jun-2015 Feixiong Zhang <feixiong@google.com> am 6698f84f: Merge "add PhoneStateListener in DcController which fires at carrierNetworkChange event." into mnc-dev

* commit '6698f84f6eca6ea6ce44751b4dc4b044cbd49bcd':
add PhoneStateListener in DcController which fires at carrierNetworkChange event.
6698f84f6eca6ea6ce44751b4dc4b044cbd49bcd 18-Jun-2015 Feixiong Zhang <feixiong@google.com> Merge "add PhoneStateListener in DcController which fires at carrierNetworkChange event." into mnc-dev
a9a4a8eb8ce421c0ca4fc3ebb0d58c17e652fd35 18-Jun-2015 Chris Manton <cmanton@google.com> Remove deprecated remote override checks

bug: 20828356
Change-Id: I595d6b310316270928ec651c242a2a0e2745773c
dma/CdmaServiceStateTracker.java
sm/GsmServiceStateTracker.java
de2d2034a7df068f3e929ff1d623a80c847b6335 16-Jun-2015 Chris Manton <cmanton@google.com> Check carrier config loader for roaming overrides

Carrier config loader may have roaming and non-roaming
overrides for both GSM and CDMA technologies. Provide
access to get this information and act accordingly.

bug: 20828356

Change-Id: I1baea4bc9d11fdff153a4fc3ca5450e3f7897b86
erviceStateTracker.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
sm/GsmServiceStateTracker.java
6b51863ae0a4a5b69807703bbfc7fe96a8ca9e58 17-Jun-2015 Fyodor Kupolov <fkupolov@google.com> Restore OP_READ_PHONE_STATE check

Now that PhoneInterfaceManager clears calling identity before calling
TelephonyManager, the app opp check can be restored.

Bug: 21726452
Bug: 21878243
Change-Id: Id4108b54fafafc64bb0f0204c486dd0f76591b94
honeSubInfo.java
72e4bdc60317acb6eeca672fcb115e32663da60c 17-Jun-2015 Fyodor Kupolov <fkupolov@google.com> am 3af3f401: am b507a182: Temporarily remove app ops check OP_READ_PHONE_STATE

* commit '3af3f4013cc12b0c0311fae997ebe6cc66a3134c':
Temporarily remove app ops check OP_READ_PHONE_STATE
d16cdb9d474a9ee747adff09eb132d84ef2b3937 17-Jun-2015 Fyodor Kupolov <fkupolov@google.com> am b507a182: Temporarily remove app ops check OP_READ_PHONE_STATE

* commit 'b507a182a281afc5d8c4d2f94a854a0333999fc6':
Temporarily remove app ops check OP_READ_PHONE_STATE
b507a182a281afc5d8c4d2f94a854a0333999fc6 17-Jun-2015 Fyodor Kupolov <fkupolov@google.com> Temporarily remove app ops check OP_READ_PHONE_STATE

It causes runtime crashes on certain devices.
PhoneInterfaceManager.getMergedSubscriberIds should clearCallingIdentity
before calling TelephonyManager.

Bug: 21726452
Bug: 21878243
Change-Id: I92a9dbe1c9f64bf67a3c872e7f1ba15a41c36a1e
honeSubInfo.java
d783ac30a202ad54fd52be67102522a85e342360 16-Jun-2015 Fyodor Kupolov <fkupolov@google.com> am 9031a515: am e8bec333: Merge "Additional OP_READ_PHONE_STATE AppOps checks for telephony" into mnc-dev

* commit '9031a515e5c6966e1006d9420197ac6ca8fc412f':
Additional OP_READ_PHONE_STATE AppOps checks for telephony
1fd4a7774f6f2fe49aaa97fd6f06bfb13faa5417 16-Jun-2015 Chris Wren <cwren@android.com> am 6931177b: am 370a1e54: Merge "remove setLatestEventInfo from telephony" into mnc-dev

* commit '6931177b65ff0d031063b1ab8d9f4d93aa625505':
remove setLatestEventInfo from telephony
a636b71405706b2d3904f3a272332521622188c0 16-Jun-2015 Fyodor Kupolov <fkupolov@google.com> am e8bec333: Merge "Additional OP_READ_PHONE_STATE AppOps checks for telephony" into mnc-dev

* commit 'e8bec3331560bc6a936d403ad0680b6835d18798':
Additional OP_READ_PHONE_STATE AppOps checks for telephony
e8bec3331560bc6a936d403ad0680b6835d18798 16-Jun-2015 Fyodor Kupolov <fkupolov@google.com> Merge "Additional OP_READ_PHONE_STATE AppOps checks for telephony" into mnc-dev
30f255e9096a95dcc8bdf0be52fee02990710bb7 16-Jun-2015 Chris Wren <cwren@android.com> am 370a1e54: Merge "remove setLatestEventInfo from telephony" into mnc-dev

* commit '370a1e54673209e393909edc57c6e9ba3ca72238':
remove setLatestEventInfo from telephony
370a1e54673209e393909edc57c6e9ba3ca72238 16-Jun-2015 Chris Wren <cwren@android.com> Merge "remove setLatestEventInfo from telephony" into mnc-dev
e46ca900e24db43157cd7c886bf8a95453f9230e 12-Jun-2015 Junda Liu <junda@google.com> am bb896b41: am 5eb92018: Merge "Reduce logging for uicc carrier privilege component." into mnc-dev

* commit 'bb896b4133e61512d85ce54a7173d8de1948e666':
Reduce logging for uicc carrier privilege component.
43742623a0401df580e4eebd02149dba517b96e9 12-Jun-2015 Junda Liu <junda@google.com> am 5eb92018: Merge "Reduce logging for uicc carrier privilege component." into mnc-dev

* commit '5eb9201854b41d890128b0ec51a1b882c8021690':
Reduce logging for uicc carrier privilege component.
5eb9201854b41d890128b0ec51a1b882c8021690 12-Jun-2015 Junda Liu <junda@google.com> Merge "Reduce logging for uicc carrier privilege component." into mnc-dev
22ae2cc396de6231f06fbde617d79723092f17a5 04-Jun-2015 Feixiong Zhang <feixiong@google.com> add PhoneStateListener in DcController which fires at carrierNetworkChange event.

when DataConnection exits, it checks the mExecutingCarrierChange variable in
DcController. if it's under ExecutingCarrierChange, it updates the
reason field of networkInfo as carrierChange.

Bug: b/21706784
Change-Id: Ic9e7daf3bbc48db3cbe7be5ce1e2606f759d5edf
hone.java
ataconnection/DataConnection.java
ataconnection/DcController.java
c3ac6ac3d62e0e1637ff8fddf945953dca60eeba 12-Jun-2015 Junda Liu <junda@google.com> Reduce logging for uicc carrier privilege component.

Bug: b/21556527
Change-Id: I39090a6279b9baa99d9e471f43861f92429842f9
icc/UiccCarrierPrivilegeRules.java
189f3fd233ca1291f924a26c8db7c6008d2fa9fa 11-Jun-2015 Amit Mahajan <amitmahajan@google.com> am 6fbb3d24: am 0ca6b607: Merge "Change to add STK_PERMISSION for stk related commands." into mnc-dev

* commit '6fbb3d241103717b7d07cf6bcb219169541d7497':
Change to add STK_PERMISSION for stk related commands.
23856b2bab3f73d992dfcd02de60bd51ecba63dc 11-Jun-2015 Amit Mahajan <amitmahajan@google.com> am 0ca6b607: Merge "Change to add STK_PERMISSION for stk related commands." into mnc-dev

* commit '0ca6b60721a3dd07f3e80da8ee0d7f08323700ab':
Change to add STK_PERMISSION for stk related commands.
e67b41667980ad07d41b9977c8a80b52a985971f 11-Jun-2015 Chris Wren <cwren@android.com> remove setLatestEventInfo from telephony

Bug: 18510449
Change-Id: Ie2f953285adf21e3a066ddae8d08f6bef36426bd
sm/GsmServiceStateTracker.java
0ca6b60721a3dd07f3e80da8ee0d7f08323700ab 11-Jun-2015 Amit Mahajan <amitmahajan@google.com> Merge "Change to add STK_PERMISSION for stk related commands." into mnc-dev
060d33dc3af35728e7c6ba2e524727526bb2f1d1 11-Jun-2015 Robert Greenwalt <rgreenwalt@google.com> am 38bc3ea5: am 6add4575: Merge "Add dumpsys Logging." into mnc-dev

* commit '38bc3ea523b949306a5f828cecb29774fabf4e04':
Add dumpsys Logging.
3dbf4c06b04cbb47c09887efb442d5249a60ce06 11-Jun-2015 Uma Maheswari Ramalingam <umam@codeaurora.org> am 0036f22d: am 007b8ea2: IMS Conference changes

* commit '0036f22d5c4e75c2c7798affcbbc613e13ba04d5':
IMS Conference changes
880425273bd32ccf1de54ea417838b5e9c2109b2 11-Jun-2015 Robert Greenwalt <rgreenwalt@google.com> am 6add4575: Merge "Add dumpsys Logging." into mnc-dev

* commit '6add4575d8949162c6ee8bc0fbd5d9bb43659688':
Add dumpsys Logging.
81a37ae5a6809f3977102df29e4dfd8427572d73 11-Jun-2015 Uma Maheswari Ramalingam <umam@codeaurora.org> am 007b8ea2: IMS Conference changes

* commit '007b8ea24251ebb713780be787c069cedb3a4c6a':
IMS Conference changes
7fc6429b66e677c294e142adf843a8dfedce0ff6 11-Jun-2015 Robert Greenwalt <rgreenwalt@google.com> am 361b276c: Merge "Specify path when reading contacts from EF_ADN - DO NOT MERGE" into mnc-dev

* commit '361b276cc320b476915bbac9e5487b1befa8d1a8':
Specify path when reading contacts from EF_ADN - DO NOT MERGE
c00307d9a019dda93a34f8bb805a9ba59f33358a 11-Jun-2015 Jeff Davidson <jpd@google.com> am 8dc41c42: Merge "Include DISABLED_UNTIL_USED components in carrier privilege check." into mnc-dev

* commit '8dc41c421f6c305faf53b6468414f7bfa32d6230':
Include DISABLED_UNTIL_USED components in carrier privilege check.
8a78fcf3146fa0ba7b6f4e1dea102aba450abe98 11-Jun-2015 Junda Liu <junda@google.com> am 7352beef: Merge "Avoid logging phone number and add comment." into mnc-dev

* commit '7352beefac94ed2908ed5925fc27d86d1c06fa8f':
Avoid logging phone number and add comment.
6add4575d8949162c6ee8bc0fbd5d9bb43659688 11-Jun-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Add dumpsys Logging." into mnc-dev
dabb160754d8266ed97d819ba30d95b0d3dd6bb8 11-Jun-2015 Robert Greenwalt <rgreenwalt@google.com> Add dumpsys Logging.

This bug is hard to repro and understand. Add some clues.

bug:20731384
Change-Id: I7b0c65f07b4940f508826fc09bd9f51c0987e0a8
ataconnection/DctController.java
007b8ea24251ebb713780be787c069cedb3a4c6a 19-May-2015 Uma Maheswari Ramalingam <umam@codeaurora.org> IMS Conference changes

CL handles -
- refer failure for held call
- 4 way conference merge

Bug: 20224516, 20232100
Change-Id: I94abbae37eb6773f1824c0e5c3a267d345610ada
msphone/ImsPhoneCall.java
msphone/ImsPhoneCallTracker.java
361b276cc320b476915bbac9e5487b1befa8d1a8 11-Jun-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Specify path when reading contacts from EF_ADN - DO NOT MERGE" into mnc-dev
9eafe27e7974e38a45ba387c03332653c1ecf7dd 11-Jun-2015 Fyodor Kupolov <fkupolov@google.com> Additional OP_READ_PHONE_STATE AppOps checks for telephony

Bug: 21726452
Change-Id: Idb4b70b5222934c19f7ccdf17deeaab475ab7faa
honeSubInfo.java
honeSubInfoController.java
honeSubInfoProxy.java
cfa6dbeaf46193dae1be6779783f6ec2dc09b7ab 09-Jan-2013 Preeti Ahuja <preetia@codeaurora.org> Specify path when reading contacts from EF_ADN - DO NOT MERGE

Some cards, like RUIM and UICC with CSIM, have the same file ID for
multiple EFs. e.g. EF_ADN and EF_CSIM_LI. When trying to retrieve
the EF_ADN from such a card, the path gets mapped to that of
EF_CSIM_LI resulting in incorrect behavior.

To avoid this, specify the EF Id and the path to uniquely identify
EF_ADN, when reading contacts.

Bug: 21268058
Change-Id: If7052e640810e89ec3ff13169c6166b500b0ed46
icc/AdnRecordLoader.java
icc/IccFileHandler.java
d607cf3bc9ac43900dd4c87b86b2dbe5fabc3249 11-Jun-2015 Amit Mahajan <amitmahajan@google.com> Change to add STK_PERMISSION for stk related commands.

And make stk commands protected.

Bug: 21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
at/AppInterface.java
at/CatService.java
8dc41c421f6c305faf53b6468414f7bfa32d6230 11-Jun-2015 Jeff Davidson <jpd@google.com> Merge "Include DISABLED_UNTIL_USED components in carrier privilege check." into mnc-dev
7352beefac94ed2908ed5925fc27d86d1c06fa8f 11-Jun-2015 Junda Liu <junda@google.com> Merge "Avoid logging phone number and add comment." into mnc-dev
d42ff1487ed5c85ce6633e3e91164f25f9381e0b 09-Jun-2015 Etan Cohen <etancohen@google.com> am f9f73e5f: Hide CSIM IMSI information (mask by VDBG)

* commit 'f9f73e5f5125df262b8c2bec21de5600dc4d1801':
Hide CSIM IMSI information (mask by VDBG)
f9f73e5f5125df262b8c2bec21de5600dc4d1801 09-Jun-2015 Etan Cohen <etancohen@google.com> Hide CSIM IMSI information (mask by VDBG)

Bug: 21518434
Change-Id: Icfc26ad0f5540afb55272ffc66bdaad38ae1b092
icc/RuimRecords.java
c67db11f3c5dfaed45769169ba507cab007d4403 31-May-2015 Shriram Ganesh <sganesh@codeaurora.org> MWI,phantom call,Suppl services

1. IMS MWI Feature
- Add new API to update waiting
voice message count, for UI
propagation based on RFC 3842

2. phantom call support

Supplementary services

4.Unsol supplementary service notification
- send unsol supplementary notification to UI
- add call history info

5. Add Error message in commandexception

6. Add getExtras method

Miscellaneous:

7. IMS: Update Connect time for dialing/incoming SRVCC calls

Connect time (mConnectTimeReal) will be updated only for ACTIVE calls
and it's not updated for calls which are transferred from DIALING/ALERTING/
INCOMING/WAITING to ACTIVE as part of SRVCC. Due to this once call is
ended call duration will not be updated properly in connection.

Update Connect time properly for DIALING/ALERTING/INCOMING/WAITING to
ACTIVE SRVCC calls.

Change-Id: I551e63840b6a63e0cbd97919d4b03d2a68334dbd
ommandException.java
onnection.java
honeBase.java
dma/CDMAPhone.java
dma/CdmaCallTracker.java
sm/GSMPhone.java
sm/GsmCallTracker.java
sm/SuppServiceNotification.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
msphone/ImsPhoneMmiCode.java
cd30338d719dcd77db99766bf21438e494564174 09-Jun-2015 Jeff Davidson <jpd@google.com> Include DISABLED_UNTIL_USED components in carrier privilege check.

In order to support situations where a single device SKU (build) will
work with multiple carrier apps bundled in the system image, we may
want to mark carrier apps as DISABLED_UNTIL_USED, which means they are
effectively disabled until the user explicitly takes action indicating
that they want to use the app (e.g. by inserting a matching SIM card).

This facilitates this behavior by having carrier privilege checks work
on apps in this state without having the app be fully disabled.

This is similar to how IMEs and device policy both work.

Bug: 21613234
Change-Id: Ibe8266214c6dbd6743b4386483a61f377d3cc691
icc/UiccCarrierPrivilegeRules.java
29fede43db2cf9b4207281ce946542f74134934b 09-Jun-2015 Prerepa Viswanadham <dham@google.com> am 61155b8b: Merge "Activity info and stats from modem" into mnc-dev

* commit '61155b8bb537300f796cf7c433fde7beda63f1df':
Activity info and stats from modem
61155b8bb537300f796cf7c433fde7beda63f1df 09-Jun-2015 Prerepa Viswanadham <dham@google.com> Merge "Activity info and stats from modem" into mnc-dev
b8a1662bc51a75f662b12b25363aabed528c54c9 09-Jun-2015 Junda Liu <junda@google.com> Avoid logging phone number and add comment.

Bug: b/21706074
Change-Id: I92aa149296a6df7e4e1d5f8f12b0617227c8489c
ubscriptionController.java
27eef341b171f925ef43dd088cc559280fd7d2b9 28-May-2015 Prerepa Viswanadham <dham@google.com> Activity info and stats from modem

Change-Id: Ib00c317d8571a318491e91d79ba42577af5485a4
ommandsInterface.java
hone.java
honeBase.java
honeProxy.java
IL.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
1a5a8a98de03d154a7bf9fdb5e8ef0fd7452ed02 08-Jun-2015 Ye Wen <ywen@google.com> am f4eaa59c: Check special system apps\' signatures when setting up default SMS app

* commit 'f4eaa59cc0a6d9b35ae92e52dd1390d60b9e877a':
Check special system apps' signatures when setting up default SMS app
f4eaa59cc0a6d9b35ae92e52dd1390d60b9e877a 08-Jun-2015 Ye Wen <ywen@google.com> Check special system apps' signatures when setting up default SMS app

b/21699325

Change-Id: Id24bef961756ac85ad0ccd1728ec311a11996f5b
msApplication.java
e1450a3553556537d81064b42da8d68230258c8f 08-Jun-2015 Amit Mahajan <amitmahajan@google.com> am 45540cd5: Changing getSimState to use slot idx instead of sub id.

* commit '45540cd5c71494df8421c7602b27082c98cc8cb7':
Changing getSimState to use slot idx instead of sub id.
45540cd5c71494df8421c7602b27082c98cc8cb7 02-Jun-2015 Amit Mahajan <amitmahajan@google.com> Changing getSimState to use slot idx instead of sub id.

Bug: 20736251
Change-Id: I43ec6450358f833f878ed4eee993ea79d5220c65
ubscriptionController.java
9f4fbe2fbce9f1f43a57bf3a25a3cf92e5d0c00c 05-Jun-2015 Narayan Kamath <narayan@google.com> am a1fd99a6: GsmMmiRecords: Fix bogus null check.

* commit 'a1fd99a6910a97470cab01fbc28bfea82e832dab':
GsmMmiRecords: Fix bogus null check.
a1fd99a6910a97470cab01fbc28bfea82e832dab 28-May-2015 Narayan Kamath <narayan@google.com> GsmMmiRecords: Fix bogus null check.

The intent clearly is to check this.mIccRecords, and not
mPhone.mIccRecords. Moreover, the latter is never null because it's
a public final AtomicReference<?>.

Change-Id: I8f42368198e19656bd676f83a70dc3aa04e7a102
sm/GsmMmiCode.java
56ffa2cd8d6d034bdd22f12893c2d1d1217b01ed 04-Jun-2015 Etan Cohen <etancohen@google.com> Merge "Fix incorrect reference - isVideoEnabled would have always returned false." into mnc-vt-dev
56d0643322560eb2603571b0689766c62c5add04 03-Jun-2015 Chris Manton <cmanton@google.com> am b95320cd: Merge "Reload Apn settings upon technology change" into mnc-dev

* commit 'b95320cdb931c39fc5d4be49aecba35e449de9f3':
Reload Apn settings upon technology change
b95320cdb931c39fc5d4be49aecba35e449de9f3 03-Jun-2015 Chris Manton <cmanton@google.com> Merge "Reload Apn settings upon technology change" into mnc-dev
7144204e518d2033568e94d8c15336b062e4f550 03-Jun-2015 Tyler Gunn <tgunn@google.com> am 975d9e58: Merge "API Cleanup: Remove references to VideoState class." into mnc-dev

* commit '975d9e58e456a4285a7060add47b0c27be4a6e4c':
API Cleanup: Remove references to VideoState class.
631ce4b47921fef7e38bb9736899e9ecf0ee0403 03-Jun-2015 Tyler Gunn <tgunn@google.com> API Cleanup: Remove references to VideoState class.

- Replace constants with VideoProfile equivalents.
- Call static methods in VideoProfile instead.

Bug: 21573551
Change-Id: Ic2561bffcee16e477b3c6c79f8adb034b4067f62
allManager.java
honeBase.java
sm/GSMPhone.java
964101acf9a23c9047ddd827b48825d773c3686e 02-Jun-2015 Amit Mahajan <amitmahajan@google.com> am 5a68da34: Merge "Change to not log IMSI." into mnc-dev

* commit '5a68da341137763920f682b8d239c9229b934a05':
Change to not log IMSI.
5a68da341137763920f682b8d239c9229b934a05 02-Jun-2015 Amit Mahajan <amitmahajan@google.com> Merge "Change to not log IMSI." into mnc-dev
dd211525e86e632a438811aa76ccdd7ef13248fc 02-Jun-2015 Uma Maheswari Ramalingam <umam@codeaurora.org> am 61952e69: IMS: Conference fixes

* commit '61952e69d543ddc7bffdefb89cb512e22b00bf49':
IMS: Conference fixes
61952e69d543ddc7bffdefb89cb512e22b00bf49 20-May-2015 Uma Maheswari Ramalingam <umam@codeaurora.org> IMS: Conference fixes

- Add IMS Conference Participant API

Change-Id: I5f9829926beeb468cd4979db55a07e1cd3dd1c30
Bug: 21376607
all.java
onnection.java
msphone/ImsPhoneCall.java
e50e6c1d03701f579fb558324425bc3d6f64c4ea 01-Jun-2015 Stuart Scott <stuartscott@google.com> Ensure correct mapping when sim cards are ready.

Also only switch modems if the requested config is different from the
current configuration.

bug: 20821126
Change-Id: I56135b693a27561440a075dc36fa409f0d6eda0e
roxyController.java
ubscriptionInfoUpdater.java
a1421a82e8d4f711ba13a86d40889868ead492d4 30-May-2015 Amit Mahajan <amitmahajan@google.com> Change to not log IMSI.

Bug: 21518434
Change-Id: Ief0ed018106aaa9783acd1da1e5c4533ed2a6718
honeBase.java
icc/IccRecords.java
icc/IsimUiccRecords.java
icc/RuimRecords.java
icc/SIMRecords.java
e5a57dca4d8cf4be71417f4d752b48237c0ba1ed 29-May-2015 Etan Cohen <etancohen@google.com> Fix incorrect reference - isVideoEnabled would have always returned false.

Original call to itself - which for IMS Phone results in false.

Change-Id: I4e3f04e62c91c2a8857b2f72debbdd63d4123cf2
honeBase.java
8560465c584604ff51ceb4492bb7daca023e7d52 28-May-2015 Tyler Gunn <tgunn@google.com> Auto-downgrade emergency vt calls to audio when no carrier support.

Where the carrier config indicates that video emergency calls is not
supported, auto-downgrade to audio-only on dial.

Note: This functionality is moved from telecom.

Bug: 20089489
Change-Id: Ib72f37fa036178c5b6bc315c23533d451f605eb9
msphone/ImsPhoneCallTracker.java
54e7d59a8733845a8d2049f2e7154ee032fdf688 28-May-2015 Narayan Kamath <narayan@google.com> am a727251a: Don\'t update Configuration#locale on MCC/carrier changes.

* commit 'a727251af66b94f38e269321bb153ca98d21c944':
Don't update Configuration#locale on MCC/carrier changes.
a727251af66b94f38e269321bb153ca98d21c944 16-Apr-2015 Narayan Kamath <narayan@google.com> Don't update Configuration#locale on MCC/carrier changes.

Also, handle the sim language indicator (EF LI) and the sim
preferred language (EF PL). We keep track of these values in
the IccRecords object and make the information available via
the associated "Phone" object.

This means language updates are always consistent, the last
SIM to load records doesn't always "win".

bug: 19818550

Change-Id: I719eb75cbf48f54167b596c677f883a2ffb99ff7
ccTable.java
hone.java
honeBase.java
honeProxy.java
icc/IccRecords.java
icc/RuimRecords.java
icc/SIMRecords.java
e7c64afd4d4fbac8847a3758e896e0c017ccd144 26-May-2015 Etan Cohen <etancohen@google.com> Merge commit '6aa3318' into merge
b757d07125d8294062586b5258e4e79d0b8417a3 20-May-2015 Junda Liu <junda@google.com> Retry if open logical channel failed due to missing_resource, also add exception message to error state log.

Bug: b/20822441
Change-Id: Ia3af16fcda9b260ad746bd956a79a93209383543
icc/UiccCarrierPrivilegeRules.java
2b3d690d0eac06017c6ec9c65725dd0e8ddc9946 21-May-2015 Amit Mahajan <amitmahajan@google.com> Merge "Delay DIAL cmd to RIL after sending SWITCH_WAITING_OR_HOLDING_AND_ACTIVE." into m-wireless-dev
2af87145a8b1aac18099a2118e1280277c272f5b 21-May-2015 Amit Mahajan <amitmahajan@google.com> Merge "Delay DIAL cmd to RIL after sending SWITCH_WAITING_OR_HOLDING_AND_ACTIVE." into mnc-dev
e26c2bdbd23b1079615edd24fba334f6d541ef36 20-May-2015 Amit Mahajan <amitmahajan@google.com> Delay DIAL cmd to RIL after sending SWITCH_WAITING_OR_HOLDING_AND_ACTIVE.

This is a hack (adding sleep between the 2 commands). The actual fix is
expected to be more invasive and will touch stable code so avoiding that.
This code may be refactored in N so making minimal change for now.

Bug: 10680506
Change-Id: I0b106e082d357e1f464413d96e7cddd56dc53cc7
sm/GsmCallTracker.java
bcaae9e047356a9b69e766e3981e008d0283057a 20-May-2015 Amit Mahajan <amitmahajan@google.com> Merge "Remove pending intent from restricted cs/ps notification." into m-wireless-dev
8f596c81db7fae17f1cf3e3b9f793ab9570b1d13 20-May-2015 Amit Mahajan <amitmahajan@google.com> Merge "Remove pending intent from restricted cs/ps notification." into mnc-dev
df7736df7447c3692b0ee487ef61e73f1c2d11d4 20-May-2015 Amit Mahajan <amitmahajan@google.com> Remove pending intent from restricted cs/ps notification.

There is no action associated with the notification so there's no need
for the intent. It is not clear why the intent was added to the code in
the first place; it has been there since before frameworks/opt/telephony
was created.

Bug: 18700448
Change-Id: I21e2020101a6d1c18264495488357be57f5740cc
sm/GsmServiceStateTracker.java
6ac69dd1cc1d73fff1db84baac19101f51a76699 02-May-2015 fenglu <fenglu@google.com> LCE feature enhancement

start LCE service when radio state changes from unavailable to available.
capacityDownBps --> capacityDownKbps name nit fix
sync mwd with mnc-dev

Bug: 21307951
Change-Id: I583c0204f9a9651a315607f9a31deadf672e8883
IL.java
55444f7005d30d09a9c0fa05b25ac96e40ebea13 20-May-2015 Amit Mahajan <amitmahajan@google.com> Remove pending intent from restricted cs/ps notification.

There is no action associated with the notification so there's no need
for the intent. It is not clear why the intent was added to the code in
the first place; it has been there since before frameworks/opt/telephony
was created.

Bug: 18700448
Change-Id: I21e2020101a6d1c18264495488357be57f5740cc
sm/GsmServiceStateTracker.java
186c297bf39700f4e6b9781a8cbdbe6b23db3768 02-May-2015 fenglu <fenglu@google.com> LCE feature enhancement

start LCE service when radio state changes from unavailable to available.
cherry pick from mwd to mnc-dev
capacityDownBps --> capacityDownKbps name nit fix

Bug: 21307951
Change-Id: I0a966440bbddff87417cbea12f46583657e0b1e7
hone.java
honeBase.java
honeProxy.java
IL.java
dma/CDMAPhone.java
sm/GSMPhone.java
9a22a86e86f3986fdc242b924a01b5ffd3e78d73 20-May-2015 Amit Mahajan <amitmahajan@google.com> Delay DIAL cmd to RIL after sending SWITCH_WAITING_OR_HOLDING_AND_ACTIVE.

This is a hack (adding sleep between the 2 commands). The actual fix is
expected to be more invasive and will touch stable code so avoiding that.
This code may be refactored in N so making minimal change for now.

Bug: 10680506
Change-Id: I0b106e082d357e1f464413d96e7cddd56dc53cc7
sm/GsmCallTracker.java
96f1e8d7d44795814d725815cb3a0a7e457c5870 19-May-2015 fenglu <fenglu@google.com> Merge "LCE feature enhancement" into m-wireless-dev
8b2f761de79814ccb79a90ee9a4640ce93098739 02-May-2015 fenglu <fenglu@google.com> LCE feature enhancement

start LCE service when radio state changes from unavailable to available.

Change-Id: I0a966440bbddff87417cbea12f46583657e0b1e7
hone.java
honeBase.java
honeProxy.java
dma/CDMAPhone.java
sm/GSMPhone.java
f36c0f3c73227dddd69b956d6704c85e82c506e5 13-May-2015 Vipin Sapra <vipin.sapra@gmail.com> Set reason code when disconnecting

Possible fix for https://code.google.com/p/android/issues/detail?id=152085

There is a bug identified in Android NetworkInfo API
(http://developer.android.com/reference/android/net/NetworkInfo.html)
since Android Lollipop 5.0.0 release. On Android 4.4 and prior, the
NetworkInfo API was correctly reporting disconnection reason. In
Android 5.0+, this NetworkInfo API does not correctly report the
reason of disconnection.

The submitted framework modification appears to fix this issue
and report the reason.

Change-Id: I5c37f17f7cd3df687863259409567fb95e794d0b
ataconnection/DataConnection.java
27b15ba477b11994dc61f8b96c666e4f8302a09d 13-May-2015 Vipin Sapra <vipin.sapra@gmail.com> Set reason code when disconnecting

Possible fix for https://code.google.com/p/android/issues/detail?id=152085

There is a bug identified in Android NetworkInfo API
(http://developer.android.com/reference/android/net/NetworkInfo.html)
since Android Lollipop 5.0.0 release. On Android 4.4 and prior, the
NetworkInfo API was correctly reporting disconnection reason. In
Android 5.0+, this NetworkInfo API does not correctly report the
reason of disconnection.

The submitted framework modification appears to fix this issue
and report the reason.

Change-Id: I4b43cf99983b2b369503c9484302972e3d0b2330
ataconnection/DataConnection.java
448a71b64b772e7b354b9b4008509c01a5bac3ac 14-May-2015 Junda Liu <junda@google.com> Merge "Add EF_GID2 support to uicc and phone." into mnc-dev
3ad0c75dac907e8490b78d6fd8c0278d28b96f84 08-May-2015 Robert Greenwalt <rgreenwalt@google.com> Add support for static RadioCapabilities.

Some RILs don't support RIL_REQUEST_GET_RADIO_CAPABILITY. Add
code to RIL.java to notice a REQUEST_NOT_SUPPORTED response and
check config.xml (config_radio_access_family) for a static answer.

Also catching GENERIC_FAILURE responses because Hammerhead modem
returns that. B 21079604 created for this.

If neither Modem nor config.xml provide data, uses RAF_UNKNOWN
so we don't lie about capabilities and also so we fail fast
(setPreferredNetwork won't work).

bug:20561357
Change-Id: I2ded369af9b38420b9f91d63a542ae08eb925d6d
IL.java
7234bd8664dbec97858f3f635eaa01c77d2f2881 14-May-2015 Junda Liu <junda@google.com> Add EF_GID2 support to uicc and phone.

Bug: b/21078450
Change-Id: I6beaa969a95c1ad7f77868a8c56a287474da7af5
hone.java
honeProxy.java
dma/CDMALTEPhone.java
dma/CDMAPhone.java
sm/GSMPhone.java
msphone/ImsPhoneBase.java
ip/SipPhoneBase.java
icc/IccConstants.java
icc/IccRecords.java
icc/SIMFileHandler.java
icc/SIMRecords.java
icc/UsimFileHandler.java
735bc2f4524d68155765351912ffae11306c3bd5 13-May-2015 Chris Manton <cmanton@google.com> Reload Apn settings upon technology change

Service providers may require different APNs for
different radio access technologies (RATs).
If a RAT changes during a retry data connection
the device may repeatedly try to re-use invalid
APNs for the given technology.

This change adds a check for connection retry in
addition to failure to reload Apn settings.

bug: b/20098693
Change-Id: I5208699b06807e73bcb17413fa803c397249fbd7
ataconnection/DcTracker.java
1b37218006bd7817179481f782e287159f501e27 13-May-2015 Wojciech Staszkiewicz <staszkiewicz@google.com> Merge "Pass charset to XmlPullParser.setInput instead of null" into mnc-dev
b064f1e03dcafcf36169c8881188874d19873b8f 13-May-2015 Amit Mahajan <amitmahajan@google.com> Merge "Move apn related helper functions from DcTracker to ApnSetting." into m-wireless-dev
3664f0da6ed9db59b6615335b0c3da23b7068e21 13-May-2015 Amit Mahajan <amitmahajan@google.com> Move apn related helper functions from DcTracker to ApnSetting.

Bug: 10719093
Change-Id: I942ce59995afffd395f7d73e4fd70674db0f643f
ataconnection/ApnSetting.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
63913dc903872c45bab7d2483d633d845dd9c5d6 13-May-2015 Amit Mahajan <amitmahajan@google.com> Move apn related helper functions from DcTracker to ApnSetting.

Bug: 10719093
Change-Id: I942ce59995afffd395f7d73e4fd70674db0f643f
ataconnection/ApnSetting.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
8d9ea2a1e2b4f1118329d030ccfb43c4fbb79a80 08-May-2015 Robert Greenwalt <rgreenwalt@google.com> Add support for static RadioCapabilities.

Some RILs don't support RIL_REQUEST_GET_RADIO_CAPABILITY. Add
code to RIL.java to notice a REQUEST_NOT_SUPPORTED response and
check config.xml (config_radio_access_family) for a static answer.

Also catching GENERIC_FAILURE responses because Hammerhead modem
returns that. B 21079604 created for this.

If neither Modem nor config.xml provide data, uses RAF_UNKNOWN
so we don't lie about capabilities and also so we fail fast
(setPreferredNetwork won't work).

bug:20561357
Change-Id: I50d6e5f8f6f046a9d7f2e521641b4e0ad3dc2592
IL.java
bfda9080cab9a819fc48bdb97ef70911016a0f21 08-May-2015 Wojciech Staszkiewicz <staszkiewicz@google.com> Pass charset to XmlPullParser.setInput instead of null

Passing null to XmlPullParser.setInput forces it to do additional
work, which can be easily avoided if we know the charset beforehand.

bug: b/20849543

Change-Id: I4f8833aa1583e6e5b0b1c698dedcb5474d3b95d2
msUsageMonitor.java
538fc24b127cc546d85af564192b5e6b40a96f10 07-May-2015 Yao Chen <yaochen@google.com> Merge "Let RIL not tell baseband that screen is OFF if the device is plugged." into mnc-dev
e694c1d4e5fd58c5ee2eebcc057bd0586022bcd7 04-May-2015 Yao Chen <yaochen@google.com> Let RIL not tell baseband that screen is OFF if the device is plugged.

We want to keep radio signal updates on when the default display is OFF
but the device is plugged. This change allows Android Auto to continue
receiving radio updates and show true signal states on its
virtual display.

Change-Id: Ibacd4692a9913836b7e82c424f7b57b34f807a64
IL.java
fa0cc99e942ce9fb5ec45013c51e140be0d4039d 07-May-2015 Sanket Padawe <sanketpadawe@google.com> Fix displayName value for subInfoRecord.

Bug: 20542760
Change-Id: I3abe3184cc327676ef25ed45c3959342fbcb0207
ubscriptionController.java
3aebefa5d06fce81044aebd70d650641a8f30673 05-May-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "Revert "Fix build"" into mnc-dev
b4571e2622a18f0eefaba167fe26624baab9b55e 05-May-2015 Pavel Zhamaitsiak <pavelz@google.com> Revert "Fix build"

This reverts commit 85e2c971f5eac03c1a95f9ef8329c20a9a603855.

Change-Id: I4f8427a27c23ab944df22a7a381af21662a68b86
sm/GsmServiceStateTracker.java
6aa33188a3e6329d51551a4100fe37d430ab713c 05-May-2015 Etan Cohen <etancohen@google.com> More complete (including VoLTE/VT) debug information for IMS feature changes.

Change-Id: I0f053a9512d0df4ba113bf08eb64353d68fe9f30
msphone/ImsPhoneCallTracker.java
1bb5ae036984e729ef9053058e00b0f8dd5e8e9c 05-May-2015 Prerepa Viswanadham <dham@google.com> Merge changes from topic 'mwd-merge-050415' into mnc-dev

* changes:
Fix build
Merge commit '72a3740' into alee_merge
Merge commit 'ec1be30' into alee_merge
Merge commit '52c1beb' into alee_merge
Merge commit '94de93e' into alee_merge
Merge commit '8c162d4' into alee_merge
319d801550166fc7a9bdbb501a8a226d321b926e 04-May-2015 Prerepa Viswanadham <dham@google.com> Fix build

Change-Id: I94b54466ef75d6562a69e440aa611ef576ab61e8
ubscriptionController.java
9c6fc6d57f76593efa64da13962ec23adfae9c7b 04-May-2015 Prerepa Viswanadham <dham@google.com> Merge commit '72a3740' into alee_merge
a55882e08163283ff3fe0763df9ffa97b4b69f01 04-May-2015 Prerepa Viswanadham <dham@google.com> Merge commit '52c1beb' into alee_merge
2595c2ace7feb7f91b80df445bbedda809a5435d 04-May-2015 Prerepa Viswanadham <dham@google.com> Merge commit '94de93e' into alee_merge

Change-Id: I2ee46f8e5f806963fe642c0bbeec0f3c12970d08
58ad34367efdf5e8c19874a1d7848fa383403c38 04-May-2015 Prerepa Viswanadham <dham@google.com> Merge commit '8c162d4' into alee_merge

Change-Id: Ib8b923319368c74eb6c23ef3c34a7f6770da4c89
aaf0e8d623b1e94004557573aef9235177ca19e3 16-Apr-2015 Amit Mahajan <amitmahajan@google.com> Adding bearer_bitmask support.

Change-Id: I4da0bdd6de16963a60218789154da17f40fec8cd
ataconnection/ApnSetting.java
ataconnection/DataProfile.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
1a831941af11826079bb5e93432e1d49b8b0456d 16-Apr-2015 Amit Mahajan <amitmahajan@google.com> Adding bearer_bitmask support.

Change-Id: I4da0bdd6de16963a60218789154da17f40fec8cd
ataconnection/ApnSetting.java
ataconnection/DataProfile.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
72a3740dc2fe5e51fc8940f11baab7c820353ffc 29-Apr-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Broadcast icc card state as NOT_READY if card is not initialized" into m-wireless-dev
8625a5c81b4870dd5d60006ad96866f3783ce019 28-Apr-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Stk: Handle LAUNCH_BROWSER_ERROR Response" into m-wireless-dev
fb80b64cb2252ef058ae127363cefb7b6698b294 28-Apr-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Stk: Ensure that APDU input length does NOT exceed 255 Bytes." into m-wireless-dev
61ff68828eafb0c3c421881eccfc9e8f84f80737 28-Apr-2015 Cheuksan Wang <edwang@google.com> Merge "split long messages with 4-byte unicode characters correctly" into m-wireless-dev
e472090bda6d8c16975807e37b52e6bb558426bf 08-Apr-2015 Cheuksan Wang <edwang@google.com> split long messages with 4-byte unicode characters correctly

also fix SmsMessage.calculateLength() for the same case
refactor to remove some duplicated code

BUG: 19535708
Change-Id: Ie2b46d54fdf09b5979e34d6aa1f7e1cb6dff56f8
msMessageBase.java
dma/sms/BearerData.java
sm/SmsMessage.java
ec1be30862e89618072557eece0aa65ef12e31c1 24-Apr-2015 Robert Greenwalt <rgreenwalt@google.com> DO NOT MERGE - Abort ProxyController if we get an error on start.

Single SIM radio gives error on start and this leads to problems. Small change
to short circuit and release wakelock.

bug:20559020
Change-Id: Ia113915f3be81ebd2b9635c5759fd3d33dec4270
roxyController.java
9be8281627be591812c59c112eab2b191aca91d8 24-Apr-2015 Robert Greenwalt <rgreenwalt@google.com> DO NOT MERGE - Handle RIL failures of DATA_ALLOWED.

Some of our radios don't handle the command so we need to watch
for errors and move to appropriate states. This fixes a race
between SIM notifications and ServiceState where often on
VZW we'd end up thinking we were detached (and never setting
up data calls) when we actually were still attached.

bug:20537726
Change-Id: I993af016216dfbb2b7d6f4e28f22fbede8367f08
ataconnection/DcSwitchStateMachine.java
2e7e0925a1d82cbf88f9933ffc5e65671413f9b5 28-Apr-2015 Stuart Scott <stuartscott@google.com> DO NOT MERGE - Dont fail if modem ids are empty.

bug: 20617219
Change-Id: Ic78e6f6bd6d1f6bce420a35a85b12fd5ef99ab77
roxyController.java
651c37741104a24a598dc3d1eead8b339cf98cc3 16-Apr-2015 Stuart Scott <stuartscott@google.com> DO NOT MERGE - Only reassign modems if the default data subscription is valid.

bug:20255880
Change-Id: I7dcff9b896cc8a67543a3a0f92998e020c3b39c0
ubscriptionController.java
71873c36ccdc38af01a74072e78bd67fbf616d37 07-Apr-2015 Robert Greenwalt <rgreenwalt@google.com> DO NOT MERGE - Clean up the switch state machine.

Handle inputs while in any state. This is made much easier by removing
the synchronous calls - any time you find a synchronous call into a state
machine you're doing something wrong.

Also rework the timeout system - it was bad in that it injected the
new session id whenever you start an new session so old timers were
always acted upon.

Also should eliminate/reduce the duplicate ALLOW_DATA RIL calls.

bug:20076867
Change-Id: I175f267238bc4c7afa82ef27fe3d79a0d5e2eeb1
roxyController.java
IL.java
ataconnection/DcSwitchAsyncChannel.java
ataconnection/DcSwitchStateMachine.java
ataconnection/DctController.java
1b8d2e0d55a54906779ecebe4856a5252f381bd1 08-Apr-2015 Stuart Scott <stuartscott@google.com> DO NOT MERGE - Ensure subscriptions aren't bound to the same modem.

bug:19996651
Change-Id: I58ac8ba36bb3f0cc065de7f28a56697c355d1f47
roxyController.java
13f898997bdf23d780e91e5d0198884afe60ea75 08-Apr-2015 Abhishek Adappa <aadappa@codeaurora.org> DO NOT MERGE - Fix no data call on SIM2 on multisim

For release network request, request info is removed first
and then processed. Due to this, phone id cannot be retrieved
as there is no request info present, and default phone id of
sub1 is used. This is leading to issues in data call restore
to sub 2 after wifi is disabled.
Fix is to use the default data phone id instead of default phone id.

bug:20002067
Change-Id: If7ef960281a2050c60bae06173b744d68dea2ca9
ataconnection/DctController.java
cf7f5302eab7fd3359caa582c5798e02fa39fece 08-Apr-2015 Sooraj Sasindran <ssasin@codeaurora.org> DO NOT MERGE - Issue Finish command even if a transaction failed

Was only sending FINISH to modems that hadn't errored.

bug: 19996651
Change-Id: I958524f0905644eb56b64d217f61ea4f671b2158
roxyController.java
b571fda6f6ac625562337b8c6a4db9c7f084d344 03-Apr-2015 Abhishek Adappa <aadappa@codeaurora.org> DO NOT MERGE - Fix filtering logic for setting the network type

Convert the network type to radio access family (RAF) before filtering it.
Convert the filtered RAF to network type before sending it to the
modem.

Change-Id: I4a208bca4cc221d7bd98d6b902343a4bcdaf5f80
honeBase.java
f9e34b7b8193065be654e171963eb6efc2bd941d 03-Apr-2015 Robert Greenwalt <rgreenwalt@google.com> DO NOT MERGE - Don't set preferred network when RAF is unknown.

bug:20046639
Change-Id: I097ab8f60e04cb0d605925e3d9f1bd42e02d456e
honeBase.java
733eab1e21c785dcbf2a1349e80fc22e7d290520 03-Apr-2015 Robert Greenwalt <rgreenwalt@google.com> DO NOT MERGE - Add OperatorInfo constructor for unknown state.

We were passing "" for the state if we didn't know but that causes
Exceptions.

bug:20058021
Change-Id: Ie7a73038c2fa920eb55cd60eef8007be6cda990c
peratorInfo.java
honeBase.java
7a919a90b14fd71ba4fe3eeaff53d2976650ee3b 02-Apr-2015 Robert Greenwalt <rgreenwalt@google.com> DO NOT MERGE - Fix NPE.

Check if we have radio capabilties yet before trying to access them.

bug:20046639
Change-Id: I36a0acf97115e2b0f8ed65c14720b41ad5c121c6
honeBase.java
510faba5993face88b4fe30bb505894b37809f94 01-Apr-2015 Sanket Padawe <sanketpadawe@google.com> DO NOT MERGE - Fix carrier text

Set only plmn to carrierText if both plmn & spn are same in setPlmnSpn

Bug: 19710990
Change-Id: I205eda54f2bb26027a24e764296cc9341c7542ba
ubscriptionController.java
60e33681594aa657244aa590483e9dd338e4f8a1 20-Feb-2015 Stuart Scott <stuartscott@google.com> DO NOT MERGE - Set subscription info to modem after capability switch.

bug:19301751
Change-Id: I80654d55eace5d8d033d3551a934fcf5e76d23d9
aseCommands.java
ommandsInterface.java
hone.java
honeBase.java
honeProxy.java
roxyController.java
IL.java
erviceStateTracker.java
sm/GsmServiceStateTracker.java
25da9074b269046d0278116e2fca5c6b769c9c90 04-Mar-2015 Robert Greenwalt <rgreenwalt@google.com> DO NOT MERGE - Change how we revert data modem allocation.

The old code did a START, APPLY, FINISH sequence,
taking each modem to each step before taking any further.
When it had an error (generally at the APPLY step) it
simply used FINISH with the old configuration to indicate
the rollback. However the 3 stages mean stuff.. generally
the START is an indication to release resources, APPLY
means to grab the new resources and FINISH means others have
grabbed their resources successfully. The reason for the
careful staging is because one modem can't grab a resource
until it has been released by the other modem that had it
grabbed so we have to release all first.

With this in mind, the abort should look like START,
APPLY(err), START, APPLY(old-config), FINISH. This causes
anybody who'd successfully passed the first APPLY to release
their resources again so the rollback could happen in the
second APPLY.

Unfortunately we've already shipped with the existing
semantics. A compromise is START, APPLY (err), FINISH
(old-config, just like the current rollback works), START,
APPLY (old-config), FINISH (old-config). This should
work on existing devices and devices needing the release.

bug:19430895
Change-Id: I6959c51923a6843fe1c6f47c2d987de5ccc121cf
roxyController.java
4052888939ac1e3efc59890ea75291bb51c18f2d 09-Feb-2015 Sandeep Gutta <sangutta@codeaurora.org> DO NOT MERGE - Send correct modemId/RAF during SET request

- During SET_RADIO_CAP_REQUEST request, send appropriate modemId
which received as part of GET_RADIO_CAP request
- Update the phone RAF/ModemId local cache when UNSOL_RADIO_CAP
success event received, this is to make sure the local cache
is in sync with the current config @ modem layer.
- During SET_RADIO_CAP_REQUEST request, send the exact RAF value
as is which received as part of GET_RADIO_CAP request.

bug:19296282
Change-Id: I7183f84bc1b2bad2a6bfc231bb25b5a5fd21e608
hone.java
honeBase.java
honeProxy.java
roxyController.java
ubscriptionController.java
52c1bebcaf545d679923ffbac870eb581faf2b13 25-Apr-2015 Anthony Lee <anthonylee@google.com> Add plumbing for merge failures and renable button. (4/4)

The merge failure is not plumbed up through any layer that
can trap the callback and act on it. The first part of this
fix is to create that plumbing. Then we need to reenable the
merge button. At this point in time, we leverage the fact
that forcing the call to reassess its capabilities will poke
the InCallUI to reenable the merge button. In the future, we
should plumb the merge failure all the way to InCallUI and
not only handle the button but display UI to the user. The UI
is currently being displayed by CallNotifier which is the wrong
place. See b/20530631 for more details.

Bug: 20229905
Change-Id: I9a49b25b7ed08061db804e8afd01a0a34be7370c
onnection.java
msphone/ImsPhoneCallTracker.java
07c51b1ad11ac669c1f65b5c424d5cc9fa633950 28-Apr-2015 Stuart Scott <stuartscott@google.com> Dont fail if modem ids are empty.

bug: 20617219
Change-Id: Ic9079de64de2629093aaa1ea55417a7b790549e6
roxyController.java
93350616e5e18e0f7627507e5c639331e13f2cb1 27-Apr-2015 Cheuksan Wang <edwang@google.com> Merge "remove permission check from isActiveSubId()" into m-wireless-dev
2462a6d1434f52f31ec407cd40d1917f020c6d1d 27-Apr-2015 Cheuksan Wang <edwang@google.com> remove permission check from isActiveSubId()

This check added READ_PHONE_STATE permission to calls that didn't
require it before.

Bug: 20629608
Change-Id: Ie506b99ee4e0b36b42f930928cebcf9c0289e150
ubscriptionController.java
efb61cfcef43945024b6ca21214ea10289b523db 25-Apr-2015 Etan Cohen <etancohen@google.com> Merge changes from topic 'mwd-merge-042415'

* changes:
Merge commit 'eb37460' into merge2
Merge commit '833231d' into merge2
94de93efcd4d4b879c14c443f7dfaabb5a9ce4a9 03-Apr-2015 Cheuksan Wang <edwang@google.com> add injectSmsPdu with subId to ISms.aidl

also clean up unused methods from ISms.aidl and UiccSmsController.java

BUG: 20015121
Change-Id: Ibd746ded4ac50c004cc7e5e2f629f53e919dfe2d
iccSmsController.java
665fffc939d17d629cd7e45f74870a2912dc8616 24-Apr-2015 Cheuksan Wang <edwang@google.com> Merge "add a parameter to carrier messaging calls to request delivery status" into m-wireless-dev
5563fb430555fd68ca671aeff34dd33ce651795d 24-Apr-2015 Cheuksan Wang <edwang@google.com> Merge "Fail SmsManager requests if SubId is not active." into m-wireless-dev
9414f24cd6c870f131d90d609243fc21cb91f3fa 24-Apr-2015 Robert Greenwalt <rgreenwalt@google.com> Abort ProxyController if we get an error on start.

Single SIM radio gives error on start and this leads to problems. Small change
to short circuit and release wakelock.

bug:20559020
Change-Id: I6569257d66e7e2e37f80f3c6b9a2ece23d5f4b8f
roxyController.java
d305a7216e7a85c4528654ef6552483f70852a47 24-Apr-2015 Etan Cohen <etancohen@google.com> Merge commit '833231d' into merge2
689e05fa14800639cf3d7997fc855bb158656efd 24-Apr-2015 Robert Greenwalt <rgreenwalt@google.com> Handle RIL failures of DATA_ALLOWED.

Some of our radios don't handle the command so we need to watch
for errors and move to appropriate states. This fixes a race
between SIM notifications and ServiceState where often on
VZW we'd end up thinking we were detached (and never setting
up data calls) when we actually were still attached.

bug:20537726
Change-Id: Ieb32e613c16a79e8c18d65d1cce84d093d51a4b0
ataconnection/DcSwitchStateMachine.java
325ae99b500488dd22f08bff67007151ad233b18 16-Apr-2015 Stuart Scott <stuartscott@google.com> Only reassign modems if default data sub is valid.

bug:20255880
Change-Id: I20912d5203613fddd9d7c28708d97f8d10ee8abd
ubscriptionController.java
a5ea9112a448ee8a51df1a2317457ae560a191f2 07-Apr-2015 Robert Greenwalt <rgreenwalt@google.com> Clean up the switch state machine.

Handle inputs while in any state. This is made much easier by removing
the synchronous calls - any time you find a synchronous call into a state
machine you're doing something wrong.

Also rework the timeout system - it was bad in that it injected the
new session id whenever you start an new session so old timers were
always acted upon.

Also should eliminate/reduce the duplicate ALLOW_DATA RIL calls.

bug:20076867
Change-Id: Ibabd76fad0759dd9c403ac8ee017958e38df56a5
roxyController.java
IL.java
ataconnection/DcSwitchAsyncChannel.java
ataconnection/DcSwitchStateMachine.java
ataconnection/DctController.java
4c4b8afa802e537bafd691704193f4b3812de738 08-Apr-2015 Stuart Scott <stuartscott@google.com> Ensure subs aren't bound to the same modem.

bug:19996651
Change-Id: Id49504f6c4d0909caf530eb38b86fa588d761c7e
roxyController.java
ceec26c0578b5eadeb15776b33a35010390040bb 08-Apr-2015 Abhishek Adappa <aadappa@codeaurora.org> Fix no data call on SIM2 on multisim

For release network request, request info is removed first
and then processed. Due to this, phone id cannot be retrieved
as there is no request info present, and default phone id of
sub1 is used. This is leading to issues in data call restore
to sub 2 after wifi is disabled.
Fix is to use the default data phone id instead of default phone id.

bug:20002067
Change-Id: I2a1aee22fb472ed591dfad8c8f829a3161606541
ataconnection/DctController.java
fd7db44af3dcbba5f6da372d0b30dff07baba97b 08-Apr-2015 Sooraj Sasindran <ssasin@codeaurora.org> Issue Finish command even if a transaction failed

Was only sending FINISH to modems that hadn't errored.

bug: 19996651
Change-Id: Ib646be5c0807c0cf9f824e71bead2e192c550c6d
roxyController.java
3af34e156c880c4c5b1a329421af9703717fc978 03-Apr-2015 Abhishek Adappa <aadappa@codeaurora.org> Fix filtering logic for setting the network type

Convert the network type to radio access family (RAF) before filtering it.
Convert the filtered RAF to network type before sending it to the
modem.

Change-Id: I3c044572d65e61b12143228309b931dfd1032fec
honeBase.java
05fcb2eae9dff8357767695fa6b3af4f2855a8a7 03-Apr-2015 Robert Greenwalt <rgreenwalt@google.com> Don't set preferred network when RAF is unknown.

bug:20046639
Change-Id: I76195239a4436edde72cc934e83ecc6978246571
honeBase.java
13a760aff2ce18b3e7b3d68c1524fbf5e6a33b56 03-Apr-2015 Robert Greenwalt <rgreenwalt@google.com> Add OperatorInfo constructor for unknown state.

We were passing "" for the state if we didn't know but that causes
Exceptions.

bug:20058021
Change-Id: I04c28dfdc46eb76bf47b962b1a741b4d7e43bdef
peratorInfo.java
honeBase.java
511a5bed2583a3b93884cd91b0e654607828bc40 02-Apr-2015 Robert Greenwalt <rgreenwalt@google.com> Fix NPE.

Check if we have radio capabilties yet before trying to access them.

bug:20046639
bug:20514935
Change-Id: I9e71e9fcb24475f3f0fb3983ea7b65ac419d9a97
honeBase.java
639eb9aaa82f38bd30ee78a752f3c54cf9a13c49 01-Apr-2015 Sanket Padawe <sanketpadawe@google.com> Set only plmn to carrierText if both plmn & spn are same in setPlmnSpn

Bug: 19710990
Change-Id: I308fa7b29c71f10644942fd0f147d19cba8fa2e1
ubscriptionController.java
0349fc63faa1e63848cba7718c5002d53e6b0451 20-Feb-2015 Stuart Scott <stuartscott@google.com> Set sub info to modem after capability switch.

bug:19301751
Change-Id: I9a99a36c02144c181aaa1e55798e10b53aab213a
aseCommands.java
ommandsInterface.java
hone.java
honeBase.java
honeProxy.java
roxyController.java
IL.java
erviceStateTracker.java
sm/GsmServiceStateTracker.java
11c94f3da98661b53ebbc81872b39b20cbe76223 04-Mar-2015 Robert Greenwalt <rgreenwalt@google.com> Change how we revert data modem allocation.

The old code did a START, APPLY, FINISH sequence,
taking each modem to each step before taking any further.
When it had an error (generally at the APPLY step) it
simply used FINISH with the old configuration to indicate
the rollback. However the 3 stages mean stuff.. generally
the START is an indication to release resources, APPLY
means to grab the new resources and FINISH means others have
grabbed their resources successfully. The reason for the
careful staging is because one modem can't grab a resource
until it has been released by the other modem that had it
grabbed so we have to release all first.

With this in mind, the abort should look like START,
APPLY(err), START, APPLY(old-config), FINISH. This causes
anybody who'd successfully passed the first APPLY to release
their resources again so the rollback could happen in the
second APPLY.

Unfortunately we've already shipped with the existing
semantics. A compromise is START, APPLY (err), FINISH
(old-config, just like the current rollback works), START,
APPLY (old-config), FINISH (old-config). This should
work on existing devices and devices needing the release.

bug:19430895
Change-Id: Ie395e5ee74ed67e4ffbba4c1ed35670e0ce30167
roxyController.java
32dfb14dd5469ea4e65c08a9e3be4ff97a136c6b 09-Feb-2015 Sandeep Gutta <sangutta@codeaurora.org> MSIM: Send correct modemId/RAF during SET request

- During SET_RADIO_CAP_REQUEST request, send appropriate modemId
which received as part of GET_RADIO_CAP request
- Update the phone RAF/ModemId local cache when UNSOL_RADIO_CAP
success event received, this is to make sure the local cache
is in sync with the current config @ modem layer.
- During SET_RADIO_CAP_REQUEST request, send the exact RAF value
as is which received as part of GET_RADIO_CAP request.

bug:19296282
Change-Id: I86f3983eb86032352b84902ad7eef752f3ecfe0a
hone.java
honeBase.java
honeProxy.java
roxyController.java
ubscriptionController.java
c22e8507402956a747469208bd1aa43dbd683e21 22-Apr-2015 Svet Ganov <svetoslavganov@google.com> Clear caller indetitiy and use controller op package after security checks.

The SubscriptionController is calling into local managers from its
context. Hence, we have to clear the IPC binder identity and then
use the app ops package name for the controller when calling into
other APIs. This avoid two situations: first, the subscription
controller calls into other APIs with the caller identity but the
controller op package name; second, the controller calls into
other APIs with its own identity but the ap op package of the
caller. This avoid crashes when we have nested APIs each of which
performs its own app op checks. Fun.

Change-Id: I0bd02d9ab1bea4de6bd96584a514cdc6406193af
ubscriptionController.java
eb974b05e0ceae8d08b31ad9118872dd456694fe 22-Apr-2015 Robert Greenwalt <rgreenwalt@google.com> am fa308224: am a2f372ce: am e9b0fcbc: Merge "Telephony: Fix call forward info logging."

* commit 'fa3082245e856e65422980acba878df0aa12fc6e':
Telephony: Fix call forward info logging.
a2f372cecfd08d931a163e0558367ad39e0583d1 22-Apr-2015 Robert Greenwalt <rgreenwalt@google.com> am e9b0fcbc: Merge "Telephony: Fix call forward info logging."

* commit 'e9b0fcbc79c39445c0a270dd9dbd08146d05c404':
Telephony: Fix call forward info logging.
e20154713e46216e5033af2339490321dc9ca1bf 19-Jun-2013 Gao Rong <gaorong.dawn@gmail.com> Telephony: Fix call forward info logging.

Currently, QUERY_CALL_FORWARD_STATUS would use array to store call info
response, from BP side. So RILJ would just show the array hash code
instead of each field in the array, it would like this:
< QUERY_CALL_FORWARD_STATUS [Lcom.android.internal.telephony.CallForwardInfo;@41573f30]

This code change would parse the array field one-by-one, and show
each field in RILJ, like this:
< QUERY_CALL_FORWARD_STATUS { [not active reason:0 serviceClass:255 'null' 0seconds] }

This is very helpful for developer tracking call forward related issues.

Change-Id: I5485578c70f5344c75294d56583896a2d87d5d29
IL.java
ade6a7a40779f907ba34142ad2286d532fcdebff 16-Apr-2015 Cheuksan Wang <edwang@google.com> add a parameter to carrier messaging calls to request delivery status

In the carrier messaging API, I forgot to add the parameter to request
delivery status. We need to add one more parameter (to indicate
requesting delivery status) to these calls:

onSendMultipartTextSms
onSendTextSms
onSendDataSms

BUG: 20224743
Change-Id: I8ad1b19cd0c703f9082178733ec59808103be805
MSDispatcher.java
b8eadaa4e0496f89667e4357ca714033dac1f2a6 19-Apr-2015 Svet Ganov <svetoslavganov@google.com> Add OP_READ_PHONE_STATE app op continued - telephony

Change-Id: Iee4064b12bff5e2e3fbfd807bc8bc5601a40424c
ubscriptionController.java
ubscriptionInfoUpdater.java
e0e635f49707265e50e559face05332d835d2c06 19-Apr-2015 Svet Ganov <svetoslavganov@google.com> Fix crash due to recent app op changes

Change-Id: Ied887fe9dd7287f14a4a6eeee8ebeecbc7aff38f
ubscriptionController.java
dce46028ac2aca743ecd4dd2cf62da70cbb07d3d 17-Apr-2015 Jay Shrauner <shrauner@google.com> Merge "Remove connection substate"
eb3746024a73447904242c9599d61dc9de5b9a1e 16-Apr-2015 Jay Shrauner <shrauner@google.com> DO NOT MERGE Remove connection substate

Bug:20300433
Change-Id: Ic7f097cf371204f8ec4271cea735be9fbed14a7d
msphone/ImsPhoneConnection.java
1c94eb7b0d47bac7e0237da969fbafc4984a663c 16-Apr-2015 Jay Shrauner <shrauner@google.com> Remove connection substate

Bug:20300433
Change-Id: Ic7f097cf371204f8ec4271cea735be9fbed14a7d
msphone/ImsPhoneConnection.java
a1c457765342cee69203188b32419c395f54829c 14-Apr-2015 Junda Liu <junda@google.com> update carrier configs on uicc events.

Bug: b/19483786
Change-Id: I4e3c4b51a22facc823eaaee95dda75fb763df4c2
ubscriptionInfoUpdater.java
6cd5ae363cc32559c682c6bc3daafdfa68311c07 26-Mar-2015 Cheuksan Wang <edwang@google.com> Fail SmsManager requests if SubId is not active.

If subId is not active, expected subIds can be assigned to the messages being
processed due to SmsManager calls. The change will fail any SmsManager calls
if SubId is not active.

Bug: 18629526
Change-Id: I8da1b1e2c477f32dcbaff417fc4e14ba2a225414
ubscriptionController.java
iccSmsController.java
65bee39d7e417fb898c3948696d5d8a38046c449 20-Mar-2015 fenglu <fenglu@google.com> LCE service implementation - tele service side

-redesigned based on ConnectivityService/NetworkCapabilities

Change-Id: I54074234e1117b41eb6ff761ead9241928585fc6
aseCommands.java
ommandsInterface.java
honeBase.java
IL.java
erviceStateTracker.java
ataconnection/DataConnection.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
1da840a4695f16d243567c197a2cb247900c5936 13-Apr-2015 Prerepa Viswanadham <dham@google.com> Merge "Fix build"

Change-Id: I3799abad62664943bdd3783f36f5bd12335da014
0944ca6b13083c9caea56ec04f4bba953c0ce61b 20-Mar-2015 fenglu <fenglu@google.com> LCE service implementation - tele service side

-redesigned based on ConnectivityService/NetworkCapabilities

Change-Id: I54074234e1117b41eb6ff761ead9241928585fc6
aseCommands.java
ommandsInterface.java
honeBase.java
IL.java
erviceStateTracker.java
ataconnection/DataConnection.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
833231d404bb3bf0ec739ed900befa843a051467 16-Apr-2015 Jonathan Basseri <misterikkit@google.com> Merge "update carrier configs on uicc events." into m-wireless-dev
4ec77aae8534173b7395278565c323d92fcbf05c 15-Apr-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "Propagate CODE_UT_SERVICE_UNAVAILABLE from IMS stack." into lmp-mr1-wfc-dev
automerge: 5aef6ac

* commit '5aef6acce26a299f717194952dcb2f5af5c9e1ff':
Propagate CODE_UT_SERVICE_UNAVAILABLE from IMS stack.
3da6563183231657793efa775e0413c8c41eebdc 15-Apr-2015 Omkar Kolangade <omkark@codeaurora.org> IMS: Always initiate emergency call on IMS
automerge: 12262a1

* commit '12262a150c9e4e48457068d85923e2048c54f6ad':
IMS: Always initiate emergency call on IMS
28f0b85be9cddf2c3c9ef268e3bf2781747a66f2 15-Apr-2015 Tyler Gunn <tgunn@google.com> resolve merge conflicts of 5b326ce to m-wireless-dev.

Change-Id: I6327e47b036f9c0ad968e465b4b3f4d74038edd1
f92ed0aa269844ffa8b9fab37b6e4a80631f7617 14-Apr-2015 Junda Liu <junda@google.com> update carrier configs on uicc events.

Bug: b/19483786
Change-Id: I4e3c4b51a22facc823eaaee95dda75fb763df4c2
ubscriptionInfoUpdater.java
5aef6acce26a299f717194952dcb2f5af5c9e1ff 13-Apr-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "Propagate CODE_UT_SERVICE_UNAVAILABLE from IMS stack." into lmp-mr1-wfc-dev
041983bd3d4a5a830f3fecdd76080be21d8bdc00 12-Apr-2015 Prerepa Viswanadham <dham@google.com> Merge "Merge commit '781905d987989ae608151ba7677257649c19cb01' into merge_work"
85e2c971f5eac03c1a95f9ef8329c20a9a603855 11-Apr-2015 Prerepa Viswanadham <dham@google.com> Fix build

Change-Id: I4f8427a27c23ab944df22a7a381af21662a68b86
sm/GsmServiceStateTracker.java
f7724ddcb3e08f996b4878c9238fc7707edcab3e 10-Apr-2015 Prerepa Viswanadham <dham@google.com> Merge commit '781905d987989ae608151ba7677257649c19cb01' into merge_work
12262a150c9e4e48457068d85923e2048c54f6ad 10-Apr-2015 Omkar Kolangade <omkark@codeaurora.org> IMS: Always initiate emergency call on IMS

Irrespective of registration state emergency calls
should go over IMS

Bug: 20142455
Change-Id: Icae07f5031e6d5da8a93812a223c816e9b3a1933
dma/CDMAPhone.java
sm/GSMPhone.java
c55f67e3fa488c5f8aa90fda1ae43ef9d32cef52 10-Apr-2015 Nancy Chen <nancychen@google.com> Allow less stringent sms permissions for a few Telephony apps.

Create a hidden method to send sms messages within a process. The
current sms message methods only allow for permissions cross processes.
This is used in the OMTP visual voicemail implementation.

Bug: 19236241
Change-Id: I25e74aea395434c7ced76cd34e46254f41abf3d5
ccSmsInterfaceManager.java
iccSmsController.java
7ada7424c83980c3d6ea2aeb46ab9641f592448d 09-Apr-2015 Pavel Zhamaitsiak <pavelz@google.com> Propagate CODE_UT_SERVICE_UNAVAILABLE from IMS stack.

Bug: 19573535
Change-Id: Ice13e35331e44f23e500e96021c04a54b6e0ebbb
msphone/ImsPhone.java
5b326ce011fe6c42098ca2967d5664fcce48a889 08-Apr-2015 Tyler Gunn <tgunn@google.com> Merge "Prevent merging conference calls hosted on peer device." into lmp-mr1-wfc-dev
781905d987989ae608151ba7677257649c19cb01 07-Apr-2015 Pavel Zhamaitsiak <pavelz@google.com> Fix race condition which caused extra ImsPhone object to be created.
automerge: 6cc5ac4

* commit '6cc5ac4992e4a46162bc022669830fe039046e34':
Fix race condition which caused extra ImsPhone object to be created.
9e33205706cd6eb065a2ee4dffca09d0a58e0fee 06-Apr-2015 Pavel Zhamaitsiak <pavelz@google.com> Make mImsPhone static. DO NOT MERGE ANYWHERE

This change is fixing cases when unnecessary ImsPhone object
was created causing missing updates from IMS stack.

Bug: 20077297
Change-Id: I58d0166767998c16c71fd86bf2b08a90bf80f8ce
allManager.java
honeBase.java
msphone/ImsPhone.java
6cc5ac4992e4a46162bc022669830fe039046e34 02-Apr-2015 Pavel Zhamaitsiak <pavelz@google.com> Fix race condition which caused extra ImsPhone object to be created.

Extra ImsPhone object was created if IMS service was available when
voice RAT was changing. Later this object was replaced inside GSM or
CDMA phone object, but it proceed receiving updates from IMS service.

Bug: 19986577
Change-Id: I2907569fc0270e58a37725d530da0a60ead4215e
hone.java
honeBase.java
honeFactory.java
honeProxy.java
ce67e30bf7a91a3ff63f86020c2d91c248c3a71b 01-Apr-2015 Tyler Gunn <tgunn@google.com> Prevent merging conference calls hosted on peer device.

With IMS, the "multiparty" bit on an ImsCall is set to "true" when a call
is merged into a conference. This not only occurs on the device hosting
the conference call, but also on the devices of the callers merged into
the conference.

This CL adds code to propagate changes in the multiparty state of a call
from the ImsCall up to the ImsPhoneConnection.

Bug: 19478784
Change-Id: I51b84731dbc77a235d2602db751af016e6c397ea
onnection.java
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
288268d5528e0df03f348e303954813cb188c55b 24-Mar-2015 Rekha Kumar <rekhak@codeaurora.org> IMS-VT: Propagate video capability of phone to telecomm.
To dynamcally enable/disable Make Video Call button in dialer,
the phone capabilities need to be propagate to TelecommMgr.
Propagate video capability of phone to telecomm layer.

IMS-VT: Notify call updates
-When call type is updated from VoLTE to VT, this notification
does not reach UI. Fix this

Fix the issue - Unable to add second VT call when first call is active
- Cache the video state of the new pending call when the foreground
call is HOLDING.
- Use the cached video state when dialing the pending MO call or
accepting the pending MT call after the first call is put on HOLD.

Ims: Add support for WIFI network mode notifications
Added support for enabling and disabling features for Voice and
Video when network mode is WIFI or IWLAN

IMS-VT: Peer capabilities
-Add support for peer capabilities
Change-Id: I44177dd6804b69a7b790021502eda0eb3bea3cab

IMS-VT: Do not allow changing the TTY mode during a Video call
When the device is already in a video call, the user SHOULD NOT
be allowed to change the TTY mode. If the user tries to change,
then an UI alert message will be displayed explaining it cannot
be changed during video calls.

Propagate the call substate changed message to the UI

Notify video capability to listeners in certain new scenarios
- In certain cases, we have seen that when the phone
object is deleted/re-created, we fail to notify the
video capability to the listeners.
- There also seemed to be a race condition when the
time a listener registers is not in sync with
the time we are notified of the video capability.
- In order to fix the above two issues, we notify
registrants when a new phone is created and
updateParentPhone is called. Also, when a new
registrant registers with us for video capability
changed, we immediately notify them of our cached
capability.

Change-Id: Ic6002c2518104c20b5de10d1081af4559f506ace

IMS-VT: Enable Video conferencing.
Enable Video conferencing.

Change-Id: Ia1155960492165cff7f4993a4bf98ecc920ebf41
onnection.java
hone.java
honeBase.java
honeProxy.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
957caf97d9ea11ad18b025c5bcba0ac4f70b487a 31-Mar-2015 Etan Cohen <etancohen@google.com> Merge commit '6f651e30841ff5b7576904fd45e908a6009cb7dc' into merge
2cf0110362801d2826d054424d5cc05008ef6535 30-Mar-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "Add optional error codes to CallStateException" into lmp-mr1-wfc-dev
automerge: 2ae7c58

* commit '2ae7c587b4afbf78226d8ae1701979b9d717726f':
Add optional error codes to CallStateException
f622ee51ff2e9427d544214be4a43416d1128348 30-Mar-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "Use different carrier name string for data connection in WiFi Calling mode." into lmp-mr1-wfc-dev
automerge: ce550fe

* commit 'ce550fea75b7f5e6e6a4137a48a80c1c9f94b9e4':
Use different carrier name string for data connection in WiFi Calling mode.
2ae7c587b4afbf78226d8ae1701979b9d717726f 30-Mar-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "Add optional error codes to CallStateException" into lmp-mr1-wfc-dev
d20c102c3efad73ff1e560236b4396c0a244a8da 25-Mar-2015 Pavel Zhamaitsiak <pavelz@google.com> Add optional error codes to CallStateException

Bug: 19583351
Change-Id: I5d8b1ccb4ffc68fad6171e443468775760e83fec
allStateException.java
dma/CDMAPhone.java
sm/GSMPhone.java
msphone/ImsPhone.java
519ffa0fab25898c909ed96c10f64b2c23910f88 27-Mar-2015 Pavel Zhamaitsiak <pavelz@google.com> Use different carrier name string for data connection in WiFi Calling mode.

Bug: 19950657
Change-Id: I41cfc78ad559138f9d458ec6eec6e958d363b6ac
erviceStateTracker.java
sm/GsmServiceStateTracker.java
6f651e30841ff5b7576904fd45e908a6009cb7dc 26-Mar-2015 Omkar Kolangade <omkark@codeaurora.org> IMS: UT serviceClass
automerge: 1d60bf2

* commit '1d60bf2949d68b587886411543752a7922529804':
IMS: UT serviceClass
1d60bf2949d68b587886411543752a7922529804 05-Feb-2015 Omkar Kolangade <omkark@codeaurora.org> IMS: UT serviceClass

When CF and CW MMI request will be triggered,
user preferred serviceclass will be sent to
the lower layers.

Change-Id: I3e35e7b5d028dc2aa140a243f55c2c99a6747263
msphone/ImsPhone.java
msphone/ImsPhoneMmiCode.java
3dead61aeb5434eccd7a419f7d00bcbb6213aed4 25-Mar-2015 Prerepa Viswanadham <dham@google.com> Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge2
0bb8799f15d25a577bc271cb6e89ba5e43c4a672 02-Oct-2013 Preeti Ahuja <preetia@codeaurora.org> Stk: Handle LAUNCH_BROWSER_ERROR Response

- ensure that we process a LAUNCH_BROWSER_ERROR response in
handleCmdResponse()

Change-Id: I7dd10a3d170fc711625615c65f73527bf1440911
at/CatService.java
33a48fcaa7ae76a2bf85c5de80a5df2a2d4818c4 07-Jun-2013 Preeti Ahuja <preetia@codeaurora.org> Stk: Ensure that APDU input length does NOT exceed 255 Bytes.

- Depending on the encoding , the number of characters that
can be stored in 255 bytes varies. See details below.
- detect the current encoding used and enforce max length

Details:
As per TS 102.223 Annex C, Structure of CAT communications,
the APDU length can be max 255 bytes. This leaves only 239 bytes for
user input string. CMD details TLV + Device IDs TLV + Result TLV + Other
details of TextString TLV not including user input take 16 bytes.

If UCS2 encoding is used, maximum 118 UCS2 chars can be encoded in 238
bytes.Each UCS2 char takes 2 bytes. Byte Order Mask(BOM), 0xFEFF takes
2 bytes.

If GSM 7 bit default(use 8 bits to represent a 7 bit char) format is
used,maximum 239 chars can be encoded in 239 bytes since each char takes
1 byte.

No issues for GSM 7 bit packed format encoding.

Change-Id: If5ead7ffa742d67718986b9bce1db05f615c1db4
at/CommandParamsFactory.java
a021838fbd2f82a43852f58f055d448361ba2f14 23-Mar-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "Wi-Fi Calling: Update strings" into lmp-mr1-wfc-dev
automerge: 2eaab50

* commit '2eaab509f4f9ca2dfd3eb929a86c2f4ebadc8c0f':
Wi-Fi Calling: Update strings
2eaab509f4f9ca2dfd3eb929a86c2f4ebadc8c0f 23-Mar-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "Wi-Fi Calling: Update strings" into lmp-mr1-wfc-dev
32e813e3e202d17b02f25e6fce0d4e88b8eb20fa 18-Dec-2014 Preeti Ahuja <preetia@codeaurora.org> Broadcast icc card state as NOT_READY if card is not initialized

When radio turns on, card state (external state ) is updated.
At this point, if the UiccCard instance is null (UiccCard instance could
be null at bootup, before we have received a vaild card state from
UiccController), icc state as ABSENT is broadcasted.

When the card state is being updated, if the UiccCard instance
is null, broadcast the state as NOT_READY instead of ABSENT.

Change-Id: I18ced764a43f77b2df01a09891ef6356d7ac7ed2
icc/IccCardProxy.java
029d855056bb03191cd747da84172f9881903e6f 23-Mar-2015 Pavel Zhamaitsiak <pavelz@google.com> Wi-Fi Calling: Update strings

Latest UX requirement is to have different text for Alert and Notification

Change-Id: I4cdc8aea634808cfa9f43ab4bfd4eb38bc449002
msphone/ImsPhone.java
b7fb33171bfd5e1073f35d147f0997bb63bd52a5 23-Mar-2015 Etan Cohen <etancohen@google.com> Merge "Do not output user information (phone number)" into lmp-mr1-wfc-dev
automerge: 89e3aba

* commit '89e3abaf3cc69ffe24c4a8ff1e2c7afb6f81b523':
Do not output user information (phone number)
89e3abaf3cc69ffe24c4a8ff1e2c7afb6f81b523 23-Mar-2015 Etan Cohen <etancohen@google.com> Merge "Do not output user information (phone number)" into lmp-mr1-wfc-dev
dea7f56082f075fa8ce25a471cbbece7b88657f1 20-Mar-2015 Pavel Zhamaitsiak <pavelz@google.com> Remove extra space in SPN
automerge: 7d100e1

* commit '7d100e1efc1671edca8026660f012ab457f941d4':
Remove extra space in SPN
7d100e1efc1671edca8026660f012ab457f941d4 20-Mar-2015 Pavel Zhamaitsiak <pavelz@google.com> Remove extra space in SPN

For some SIM cards, SPN is returned with trailing spaces.
This causes extra spaces in SPN string when "Wi-Fi Calling" suffix is applied.

Change-Id: I4722441ab54dbf2106c2d3ecdf29ed1ce1253867
sm/GsmServiceStateTracker.java
44ddf672bb0c896569b53bfce6bbbc9e7fbe7b6c 20-Mar-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Handle SIM Refresh for MSISDN, CFIS, CFF_CPHS" into m-wireless-dev
c04a910bd5e93b9e5b48a14cfbf37f86d8c67549 20-Mar-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Use EF_EXT5 as extension for EF_MSISDN on USIM" into m-wireless-dev
936cf96aeb696feeec28638c08acbb53d5cb725b 16-Mar-2015 Etan Cohen <etancohen@google.com> Do not output user information (phone number)

Elmiinate leakage of user information - phone number. Restrict to cases where
VDBG is enabled - flagged by STOPSHIP.

Bug: 19602904
Change-Id: I3e5b1f9ed8e825010f4711923dc673f25e2f7724
dma/CdmaConnection.java
dma/CdmaInformationRecords.java
164ca5a38bbbf2bc1e13c34bd9a94c33b4ce840a 19-Mar-2015 Paul Jensen <pauljensen@google.com> Merge "Remove dead code, mostly DataStateTracker." into m-wireless-dev
00647e7f55b1e2283a89b2888dbe2e6ad34cce01 10-Mar-2015 Ye Wen <ywen@google.com> Restricted view of SMS/MMS providers (1/2)

Added new SmsApplication method to check if a package is default SMS app

b/19348537

Change-Id: I2e2139430744b8d90495b86097e6fdbbe7be6c73
msApplication.java
5bc9df4808de831031da436df0497669e8ec42e0 18-Mar-2015 Nathan Harold <nharold@google.com> Merge changes I76b4f0e3,I8a33ea78 into m-wireless-dev

* changes:
Adding hidden isVolteEnabled and isWifiCallingEnabled APIs for TelephonyManager
Revert "resolve merge conflicts of c1e2c65 to m-wireless-dev."
dee62e5560fd5ad925dd1ded51d1a95d74351e0d 12-Mar-2015 Nathan Harold <nharold@google.com> Adding hidden isVolteEnabled and isWifiCallingEnabled APIs
for TelephonyManager

Change-Id: I76b4f0e34af1b1e739a803738723300b6acdae72
hone.java
honeBase.java
honeProxy.java
f07531254a09e3afca4653d54df772f4de899899 18-Mar-2015 Pavel Zhamaitsiak <pavelz@google.com> When Wi-Fi calling is available display SPN as SPN+" Wi-Fi"
automerge: e51d918

* commit 'e51d918511afab905399d9fda7f51442f15bd8a7':
When Wi-Fi calling is available display SPN as SPN+" Wi-Fi"
b1897e099d2d7ecb88cf7f202a59216c64994dbd 18-Mar-2015 Nathan Harold <nharold@google.com> Revert "resolve merge conflicts of c1e2c65 to m-wireless-dev."

This reverts commit 83c0318772f81606e6799186d391a12c2743460e.

Change-Id: I8a33ea78e3fce2dc1dddd91bc64f36c938ed9b26
hone.java
honeBase.java
honeProxy.java
a7d2628569dfa8d9ec8bc2c87205eab9fd7c9d58 18-Mar-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "Disable WFC in case of "permanent" registration failures." into lmp-mr1-wfc-dev
automerge: 90dc547

* commit '90dc5475d81e0c9899e2bbf46852a5a23bca0a1e':
Disable WFC in case of "permanent" registration failures.
83c0318772f81606e6799186d391a12c2743460e 18-Mar-2015 Nathan Harold <nharold@google.com> resolve merge conflicts of c1e2c65 to m-wireless-dev.

Change-Id: Id98213e022786470de7cdc581394f8f51e4254fc
7fdbc541a9d311de8709220e3c23efdfb815fd29 18-Mar-2015 Paul Jensen <pauljensen@google.com> Remove dead code, mostly DataStateTracker.

(cherry picked from AOSP commit efab986836683a6f8bb32ec92ff9da702b8fca15)

Change-Id: I18c44cd08dfb51e02a96d0b726e9af1db21e3058
ataconnection/DcTracker.java
fcc95e67fce873f3f303cc2dee284ce437295783 27-Sep-2013 Preeti Ahuja <preetia@codeaurora.org> Handle SIM Refresh for MSISDN, CFIS, CFF_CPHS

When we receive a Sim Refresh of type file update
add support for re-loading the following EFs:
MSISDN, CFIS, CFF_CPHS

Change-Id: Idd9e2f4dd40541c25de0c45408168381eb0fdb52
icc/SIMRecords.java
b66ae5f6334393d39becc860840ab42a90c9a926 11-Jan-2013 Preeti Ahuja <preetia@codeaurora.org> Use EF_EXT5 as extension for EF_MSISDN on USIM

For USIM applications, use EF_EXT5 as the extension for EF_MSISDN
as per TS 31.102 Section 4.2.37

Change-Id: I8d339eb0accaf16dc61311f973326083018aac61
icc/IccConstants.java
icc/SIMRecords.java
icc/UsimFileHandler.java
82396ea74e33c5a4a146162fd1b5f1490094e408 04-Mar-2015 Neil Fuller <nfuller@google.com> 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
Bug: 19786631

(cherry picked from commit af857af442d52ffdfeaff1d6d13473d00272a231)

Change-Id: Ib9aca0ad280b6d6774c9cc2ad32c78003f019e3a
ccTable.java
e51d918511afab905399d9fda7f51442f15bd8a7 12-Mar-2015 Pavel Zhamaitsiak <pavelz@google.com> When Wi-Fi calling is available display SPN as SPN+" Wi-Fi"

Bug:19681794
Change-Id: I2859d4d26c3103d9900befc6f5fe4aa50c6eadb7
erviceStateTracker.java
sm/GsmServiceStateTracker.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
90dc5475d81e0c9899e2bbf46852a5a23bca0a1e 17-Mar-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "Disable WFC in case of "permanent" registration failures." into lmp-mr1-wfc-dev
e05e489c16abe0311a783f089904f9f71fb7c399 16-Mar-2015 Vinit Deshpande <vinitd@google.com> Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'

Change-Id: I80c47b7384f104d5a3680cc34e9cbb11145ee4a0
6e501e7dd96ad52ce80479ed1f85dfd71e8d060b 12-Mar-2015 Pavel Zhamaitsiak <pavelz@google.com> Disable WFC in case of "permanent" registration failures.

Bug: 19698057
Change-Id: I6f46f89a2d993ed6dad8e15814a024ae8ef75fb2
msphone/ImsPhone.java
c1e2c65191513555b6ecfb4830d57f83d375c13e 12-Mar-2015 Nathan Harold <nharold@google.com> Adding hidden isVolteEnabled and isWifiCallingEnabled APIs
for TelephonyManager

Change-Id: I76b4f0e34af1b1e739a803738723300b6acdae72
hone.java
honeBase.java
honeProxy.java
dff6ace44c689a6a56264dfbf3e64cee910370fa 26-Feb-2015 Tyler Gunn <tgunn@google.com> Fix emergency callback number not shown for incoming calls.

- Adding isInEcm() to Phone interface and PhoneProxy; this is already
present in PhoneBase.
- Required so that TelephonyConnections can query ECM state of the phone.

Bug: 18689292
Change-Id: Ibdf7b42d7cd95c96c11ff11840d5883ff587f5b0
hone.java
honeBase.java
honeProxy.java
c5ebc2100d4cd77c2bce7785180f3d7d735d48fc 11-Mar-2015 Lorenzo Colitti <lorenzo@google.com> am 68897126: Merge "Remove dead code, mostly DataStateTracker."

* commit '688971268675affdfe0bfe856f4100e0031fbf4c':
Remove dead code, mostly DataStateTracker.
efab986836683a6f8bb32ec92ff9da702b8fca15 21-Nov-2014 Paul Jensen <pauljensen@google.com> Remove dead code, mostly DataStateTracker.

Change-Id: I1433937bffdb29bd42fb1adbfcf0a50ceffac7dd
ataconnection/DcTracker.java
d20afc9b2035d89ea636d9e1b155c2def43fc573 10-Mar-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "Show notifications in case of some IMS Registration errors" into lmp-mr1-wfc-dev
automerge: c6ce3e5

* commit 'c6ce3e54e454dd1ff28594398a4ace4db4ff53d0':
Show notifications in case of some IMS Registration errors
c6ce3e54e454dd1ff28594398a4ace4db4ff53d0 10-Mar-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "Show notifications in case of some IMS Registration errors" into lmp-mr1-wfc-dev
580f4e1521cce4e36bf9c1d483a0b9a9af662999 10-Mar-2015 Shishir Agrawal <shishir@google.com> am 7dc7f596: am 4cdf0a45: Log last 20 CAT proactive commands.

* commit '7dc7f596d6ab276a8cc9e47f8bb553dbbabdaee9':
Log last 20 CAT proactive commands.
42987e887b135bbaa44ff087e004c4fd0df515b0 10-Mar-2015 Shishir Agrawal <shishir@google.com> am 4cdf0a45: Log last 20 CAT proactive commands.
automerge: cd2425f

* commit 'cd2425ff47ffb6029a2bc6d6183ff242dd020a1b':
Log last 20 CAT proactive commands.
cd2425ff47ffb6029a2bc6d6183ff242dd020a1b 10-Mar-2015 Shishir Agrawal <shishir@google.com> am 4cdf0a45: Log last 20 CAT proactive commands.

* commit '4cdf0a453fa3df6015032ec5cbb8d3253b6f81da':
Log last 20 CAT proactive commands.
4cdf0a453fa3df6015032ec5cbb8d3253b6f81da 09-Mar-2015 Shishir Agrawal <shishir@google.com> Log last 20 CAT proactive commands.

These commands are useful for debugging issues where SIMs lock, since most
would invoke some kind of display message before locing the SIM.

Bug: 19440660
Change-Id: I5d24818e4122c875b630aead5bcc6f1f252bdd1f
at/CatService.java
at/CommandParams.java
at/TextMessage.java
icc/UiccController.java
53f2bb9ba3118ff4c22e20ab3ad46ec97a72ac24 06-Mar-2015 Pavel Zhamaitsiak <pavelz@google.com> Show notifications in case of some IMS Registration errors

Change-Id: I3aded2ee422f070f19399bd3f6f56bf4f6f7272c
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
eac3fc4a8d31dee6d6c8913a90ace549e6a66874 07-Mar-2015 Rekha Kumar <rekhak@codeaurora.org> IMS: Ims Registration and Handover error codes support
automerge: 0ba5c4a

* commit '0ba5c4a978fba0c15c8539c790a3ae1793bd99e3':
IMS: Ims Registration and Handover error codes support
0ba5c4a978fba0c15c8539c790a3ae1793bd99e3 04-Feb-2015 Rekha Kumar <rekhak@codeaurora.org> IMS: Ims Registration and Handover error codes support

- Support for IMS registration error code and error message to be
passed to UI.
- Propagate the call session handover info to the UI
- Show the error message as a Toast on the UI
Change-Id: I8b53d14c8f151e19496608504918cd79150a35e2
msphone/ImsPhoneCallTracker.java
0d093e653129230e20590758a586a3468e3dac04 04-Mar-2015 Bart Sears <bsears@google.com> resolved conflicts for merge of 0d0f2577 to lmp-mr1-dev-plus-aosp

Change-Id: Ibf441059ff30faeb104a036f348a58eb17c8fbce
b2c02637c8ab6fa1ee296aa90c3fa18bcd2aa6b0 04-Mar-2015 Bart Sears <bsears@google.com> Merge "Lightweight fix for incorrect locale changes - DO NOT MERGE" into lmp-mr1-dev
af857af442d52ffdfeaff1d6d13473d00272a231 04-Mar-2015 Neil Fuller <nfuller@google.com> 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
ccTable.java
453e7057bd059c09c709f051f793c44751f74c2e 03-Mar-2015 Etan Cohen <etancohen@google.com> am 73876a17: IMS phone instantiation: add polling on base phone creation
automerge: bf22188

* commit 'bf221885fcd29a076d63780e5744549fff6ebdf2':
IMS phone instantiation: add polling on base phone creation
bf221885fcd29a076d63780e5744549fff6ebdf2 03-Mar-2015 Etan Cohen <etancohen@google.com> am 73876a17: IMS phone instantiation: add polling on base phone creation

* commit '73876a17e45f57e36013eeffc1cac61e6cb12482':
IMS phone instantiation: add polling on base phone creation
e7620f73a41bdbc6a6cfe3b89848f411ccf6eae4 03-Mar-2015 Etan Cohen <etancohen@google.com> am 1212e103: am 73876a17: IMS phone instantiation: add polling on base phone creation

* commit '1212e103c257346e06c417f2ec435e68e340d4d6':
IMS phone instantiation: add polling on base phone creation
5fcf15d7561dd93909c166fe327f7c0c16f716d1 03-Mar-2015 Shishir Agrawal <shishir@google.com> resolved conflicts for merge of 1d92343e to lmp-mr1-wfc-dev
automerge: 90c8cf7

* commit '90c8cf76cc35ff4b510ec62c0f1a6ef22a0c4dc2':
DcTracker: Cleanup connections when IccRecords is destroyed.
90c8cf76cc35ff4b510ec62c0f1a6ef22a0c4dc2 03-Mar-2015 Shishir Agrawal <shishir@google.com> resolved conflicts for merge of 1d92343e to lmp-mr1-wfc-dev

Change-Id: Ib0a8bc425ab43be4938d431d9aeaa236b76b0517
6fc38dd579c4505645bd76dd79eb2450a63c8f2e 03-Mar-2015 Shishir Agrawal <shishir@google.com> am 626e1203: UICC: Handle card level REFRESH RESET events.
automerge: b096d24

* commit 'b096d24a8fb44a5d369a15115b92d84173547dbf':
UICC: Handle card level REFRESH RESET events.
73876a17e45f57e36013eeffc1cac61e6cb12482 27-Feb-2015 Etan Cohen <etancohen@google.com> IMS phone instantiation: add polling on base phone creation

Phone registers for notification of IMS service up and down. However,
there may be a race condition which causes the phone to be created after
the intents are alrady sent. Add polling in addition to listening to
broadcast intent.

Bug: 19447972
Change-Id: I0e12118bb11a22161cf2f389b9ca6f39442202e1
honeBase.java
7bea5a6c42e85ed98e894915f1d392bed701a47f 02-Mar-2015 Shishir Agrawal <shishir@google.com> am 953d04d3: am 1d92343e: Merge "DcTracker: Cleanup connections when IccRecords is destroyed." into lmp-mr1-dev

* commit '953d04d39a6ae1e4818be473abde04136b3c0ef9':
DcTracker: Cleanup connections when IccRecords is destroyed.
16ef9b3ae88d7dc0f680b45726e56bee59045652 02-Mar-2015 Shishir Agrawal <shishir@google.com> am 455a15e7: am 626e1203: UICC: Handle card level REFRESH RESET events.

* commit '455a15e7e561d99a27fc404efcf3a69a94ff0380':
UICC: Handle card level REFRESH RESET events.
b096d24a8fb44a5d369a15115b92d84173547dbf 02-Mar-2015 Shishir Agrawal <shishir@google.com> am 626e1203: UICC: Handle card level REFRESH RESET events.

* commit '626e120359bef26ef72c710c0d2d1c7b7d76722b':
UICC: Handle card level REFRESH RESET events.
1d92343e63ca13bcc215d93377afe341f84a280e 02-Mar-2015 Shishir Agrawal <shishir@google.com> Merge "DcTracker: Cleanup connections when IccRecords is destroyed." into lmp-mr1-dev
f95afafa466a8e1ad22ffc23f89886ed776fdbcc 20-Jan-2015 Tyler Gunn <tgunn@google.com> Enable video telephony support. (1/4)

- Add "isVideoEnabled" method to phone classes to pass up the
"isVideoEnabled" attribute from the ImsPhone.
- Sip phones do not support video.

Bug: 19062133
Change-Id: I9c2616b75319cba3d31df110f556db7399509057
hone.java
honeBase.java
honeProxy.java
ip/SipPhoneBase.java
626e120359bef26ef72c710c0d2d1c7b7d76722b 23-Feb-2015 Shishir Agrawal <shishir@google.com> UICC: Handle card level REFRESH RESET events.

Currently the platform assumes that on a UICC REFRESH RESET, the radio will
send out individual RESETs for each of the applets. In the case of N6 that
does not seem to be the case, where only a card level RESET is indicated to
Android.

The change will dispose the applet caches on both card level resets as well as
applet level resets.

Bug: 19379406
Change-Id: Ie9081fc6867a89c566229c305e10bca4162c0178
icc/UiccCard.java
icc/UiccController.java
0469925aace7a2254e0cef90bd7398fbd72622fa 24-Feb-2015 Shishir Agrawal <shishir@google.com> DcTracker: Cleanup connections when IccRecords is destroyed.

The IccRecords are destroyed when the SIM goes through a state change like a
refresh reset. Attempting to setup data connections when in this case can lead
to incorrect APNs being passed to the radio.

The change will cleanup all data connections when IccRecords are disposed off.
New data connections will not be setup because SIM ready checks are done
before setting them up.

Bug: 19379406
Change-Id: Ide24ec3ab08bd8e76d4a98a47b4f0509987c11eb
hone.java
ataconnection/DcTracker.java
5405d4aa4961454f285bb8406567b5b704cc5d14 28-Feb-2015 Sanket Padawe <sanketpadawe@google.com> am dcd47586: am 656905ee: Notify subscriptionInfoChanged in setPlmnSpn even without sim.

* commit 'dcd47586072dc5b5a99722f0c3ab648b4f7a26a5':
Notify subscriptionInfoChanged in setPlmnSpn even without sim.
1e79fea3aa77e3d47b39d3c76b789627b0bb966d 28-Feb-2015 Sanket Padawe <sanketpadawe@google.com> am 656905ee: Notify subscriptionInfoChanged in setPlmnSpn even without sim.

* commit '656905eedf13bbeaa7748c85970d814871c0eb35':
Notify subscriptionInfoChanged in setPlmnSpn even without sim.
656905eedf13bbeaa7748c85970d814871c0eb35 27-Feb-2015 Sanket Padawe <sanketpadawe@google.com> Notify subscriptionInfoChanged in setPlmnSpn even without sim.

Bug: 19476978
Change-Id: I3f87c60f3de2f9e317061466d6c57bca0efc821d
ubscriptionController.java
6273c0720c1e8a747ec2d39132f5e39ac0c332a9 27-Feb-2015 Sanket Padawe <sanketpadawe@google.com> am 4c3af49b: am e9876ff4: Set carrierName of subInfo to null while creating/updating subInfo.

* commit '4c3af49bc4de897cf2bc0f02196a58edb6e73fda':
Set carrierName of subInfo to null while creating/updating subInfo.
ba095af14ff390c79c821acfb5d2ea94e54e0a0e 26-Feb-2015 Sanket Padawe <sanketpadawe@google.com> am e9876ff4: Set carrierName of subInfo to null while creating/updating subInfo.

* commit 'e9876ff49bded7a139ee80471408f9fa965c0e89':
Set carrierName of subInfo to null while creating/updating subInfo.
0e42864afb21261d6bd2e9b4aa97f6d01d039a25 23-Feb-2015 Yashdev Singh <yashdevs@codeaurora.org> Telephony: Implementation of IWLAN

- Allow registration polling in radio off state.
- Disable default APN if current RAT is IWLAN.
- Allow non-default PDP activation in radio off state provided
current RAT is IWLAN.

Set data registration state in APM for IWLAN RAT
- APM causes data registration state to be POWER_OFF. Set it
to IN_SERVICE for iwlan case
- In APM, UNSOL_VOICE_NETWORK_STATE_CHANGED resets data RAT and
registration state to POWER_OFF. Ensure that this is done only
when current RAT is not IWLAN or when iwlan feature is not
available.

Change-Id: I419f3df987ef90bb5f31b0e381257a81dcc57c3b
aseCommands.java
hone.java
IL.java
erviceStateTracker.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
ataconnection/DataConnection.java
ataconnection/DcTracker.java
sm/GsmServiceStateTracker.java
04b0216a5f64b70ec4b06f129946fff4ef359878 23-Feb-2015 Andrew Lee <anwlee@google.com> Update internal telephony connection's wifi state.

When the ImsPhoneConnection is updated, pass the state of whether it
is using Wifi to the Telecom Connection. This is done by checking
changes to a Connection's feature capabilities to see if
isVowifiEnabled.

This is a temporary measure. In the long run, this information will
be passed up on the ImsCallSession, and we will need to listen to
WFC handover events.

Bug: 19151548
Change-Id: I53c84cb0169abd72c35407ca3e77952bac30d656
onnection.java
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
e9876ff49bded7a139ee80471408f9fa965c0e89 24-Feb-2015 Sanket Padawe <sanketpadawe@google.com> Set carrierName of subInfo to null while creating/updating subInfo.

Bug: 19476304
Change-Id: Ia16465584cf31858bbf1ae36cfdbf21184de10d7
ubscriptionController.java
ubscriptionInfoUpdater.java
6b0df560da444fe69815f3a938837fd141a29d8e 19-Feb-2015 Amit Mahajan <amitmahajan@google.com> am c2e91ac4: am 3ce96a06: Adding a new param to calculateLength for SMS to indicate if called for a segment of multipart msg.

* commit 'c2e91ac46fab719433013f7d217bacdb7ef5926c':
Adding a new param to calculateLength for SMS to indicate if called for a segment of multipart msg.
9c74fcddcbf1546bd09f359b730d11f235e1a2b1 19-Feb-2015 Amit Mahajan <amitmahajan@google.com> am 3ce96a06: Adding a new param to calculateLength for SMS to indicate if called for a segment of multipart msg.

* commit '3ce96a061c2c6e24f4ff3bd237e18c29fc0c0108':
Adding a new param to calculateLength for SMS to indicate if called for a segment of multipart msg.
3ce96a061c2c6e24f4ff3bd237e18c29fc0c0108 19-Feb-2015 Amit Mahajan <amitmahajan@google.com> 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
MSDispatcher.java
dma/CdmaSMSDispatcher.java
dma/SmsMessage.java
dma/sms/BearerData.java
65124c822e9cb8c462ae22a7c9479feb8e52d5f5 18-Feb-2015 Pavel Zhamaitsiak <pavelz@google.com> Add Phone.isRadioOn() function

Change-Id: If5a4d7ab768e9f2a6a03b22e52f39301326f19b7
hone.java
honeBase.java
honeProxy.java
62a2b2f341be6130e4022b487648ff2fee06db8c 14-Jan-2015 Libin.Tang@motorola.com <w16529@motorola.com> IMS: add api to indicate the current availability of IMS call on IWLAN.

Also add the WIFI only handle.

Change-Id: Ia96d8a3a6e3146603b76760cec02593bf5f1e3b6
honeBase.java
dma/CDMAPhone.java
sm/GSMPhone.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
773bde04522097f9d29610f9602adfc2abe902a9 18-Feb-2015 Ian Pedowitz <ijpedowitz@google.com> am 0cd59368: am 64e02b05: Revert "Revert "Remove special handling for length field.""

* commit '0cd59368a1996858c53591ce363c5d325b7f8efb':
Revert "Revert "Remove special handling for length field.""
4b7aa3d3e7df82ff42e7accab5d861616ce7981d 18-Feb-2015 Ian Pedowitz <ijpedowitz@google.com> am 08dad0f9: am dddce02e: Revert "Remove special handling for length field."

* commit '08dad0f9804d3e5089217c207ca4a264e7ba249d':
Revert "Remove special handling for length field."
64e02b05d7334a9d5704ee2b9f4710a310d9937e 18-Feb-2015 Ian Pedowitz <ijpedowitz@google.com> Revert "Revert "Remove special handling for length field.""

This reverts commit dddce02ea69219173eedd8d624654fd40f016a36.
icc/UiccCarrierPrivilegeRules.java
dddce02ea69219173eedd8d624654fd40f016a36 18-Feb-2015 Ian Pedowitz <ijpedowitz@google.com> Revert "Remove special handling for length field."

This reverts commit cda4eded9861bea93e2467bdd65fc7ba8b41dfc9.

This will be reverted after submission

Bug: 18012893
icc/UiccCarrierPrivilegeRules.java
f85c798ad28c65bc3466c452682762d240f8645a 17-Feb-2015 Sanket Padawe <sanketpadawe@google.com> am db81ecd2: am 4084e108: Reverting change which uses spnoverride to set ONS.

* commit 'db81ecd28f9004713caea1eb2b1c6b58802b4d1a':
Reverting change which uses spnoverride to set ONS.
4084e10843c7e643c13773b36be85fe59ea49992 16-Feb-2015 Sanket Padawe <sanketpadawe@google.com> Reverting change which uses spnoverride to set ONS.

Bug: 19386079
Change-Id: I1417d55415be88a90c350fbe2533889630117503
IL.java
sm/GsmServiceStateTracker.java
icc/SpnOverride.java
49b014bb6d4d6ed44ee773342244650605811294 14-Feb-2015 Sanket Padawe <sanketpadawe@google.com> am a24ffa51: am d75e1725: Pass new connection object to telecomm layer after a phone switch.

* commit 'a24ffa51855412825a7b761d83f102b9c7c98c53':
Pass new connection object to telecomm layer after a phone switch.
d75e17258586c090493385f18c5be895a2fc8783 13-Feb-2015 Sanket Padawe <sanketpadawe@google.com> 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
dma/CdmaCallTracker.java
3ebb983f3754b5fcef444afae0219baa93a84771 12-Feb-2015 Robert Greenwalt <rgreenwalt@google.com> am e5c8dd51: am 40dc7774: Treat a SIM power cycle as first boot.

* commit 'e5c8dd516e5c6830ac0459f5403e239d7e1b4d0d':
Treat a SIM power cycle as first boot.
40dc777432250ec592696c7e1f395d582edb3b5f 12-Feb-2015 Robert Greenwalt <rgreenwalt@google.com> 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
erviceStateTracker.java
sm/GsmServiceStateTracker.java
3ac3e618c407eb050c46088db03fade3068780ac 10-Feb-2015 Shishir Agrawal <shishir@google.com> am 00d4324d: SmsSenderCallback: Run the callback with the phone UID. automerge: f323afd

* commit '00d4324d6a3f0172271f5acef0e516854747ddbd':
SmsSenderCallback: Run the callback with the phone UID.
f323afdb70b83e0c851ced2af7594b20412542c3 10-Feb-2015 Shishir Agrawal <shishir@google.com> 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
MSDispatcher.java
msUsageMonitor.java
66e1e7324f9ffdc7324da2e10b5b361269887b9b 06-Feb-2015 Amit Mahajan <amitmahajan@google.com> am 14458de5: Merge "Reduce binder call when determing whether or not to use CDMA format for MO SMS" into lmp-mr1-dev
automerge: 6683f0f

* commit '6683f0f020cae8b646af3255d7745a2d66e431f9':
Reduce binder call when determing whether or not to use CDMA format for MO SMS
14458de5764c64fbc9fa75a5d0bd64a0c6953a08 06-Feb-2015 Amit Mahajan <amitmahajan@google.com> Merge "Reduce binder call when determing whether or not to use CDMA format for MO SMS" into lmp-mr1-dev
47f25ad7781ed322c1f1fed6ea563aeaee4a378f 05-Feb-2015 Xia Ying <yingxia@motorola.com> 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
ms7BitEncodingTranslator.java
400d01874a3c75e50595cd7623c5dfb2def3bcca 06-Feb-2015 Sanket Padawe <sanketpadawe@google.com> am 5e500806: Merge "Supress phone number from logcat." into lmp-mr1-dev
automerge: cebdc07

* commit 'cebdc071bb3bd109c4b223927fca7ecaaae8b25e':
Supress phone number from logcat.
5e5008068b0cbab3f51b26f659330eb9b8e9d3cc 05-Feb-2015 Sanket Padawe <sanketpadawe@google.com> Merge "Supress phone number from logcat." into lmp-mr1-dev
c3765347c476488ce8bd81204813dfb199cfd359 05-Feb-2015 Sanket Padawe <sanketpadawe@google.com> Supress phone number from logcat.

Bug: 19251204
Change-Id: Iba489fdd84cc2085cf23290e162d3b561e458214
ubscriptionController.java
icc/RuimRecords.java
e79ea90dfe2b8f08564718307a31aeb3963601ad 05-Feb-2015 Ye Wen <ywen@google.com> Fix mistake of calling wrong method to return sim country iso automerge: c029b57
automerge: c95dc0c

* commit 'c95dc0c880c3d6f206166369c25047168b606fee':
Fix mistake of calling wrong method to return sim country iso
c029b573426b57995925fc7701969ad371899f0b 05-Feb-2015 Ye Wen <ywen@google.com> Fix mistake of calling wrong method to return sim country iso

b/19240047

Change-Id: If155f682ec06e377b4c5e6b05494631112812146
ubscriptionController.java
17d81dad9f611b01cddcb6191478637ccb08f6f7 04-Feb-2015 Robert Greenwalt <rgreenwalt@google.com> am 672d815d: am de6a6c5d: Merge "Add comments to explain what we\'re currently doing" into lmp-mr1-dev

* commit '672d815d56fd0fcbfc58a8b2db77f62dec09a205':
Add comments to explain what we're currently doing
de6a6c5d76c54f41bd8d3f5945c2eb9eaf4d8d5d 04-Feb-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Add comments to explain what we're currently doing" into lmp-mr1-dev
0710ff7ae80f217782f08528c5406f6d26a29f75 04-Feb-2015 Robert Greenwalt <rgreenwalt@google.com> 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
ataconnection/DcTracker.java
179cd02f659cb171fe954e89a8cafc508e8feffc 03-Feb-2015 Sanket Padawe <sanketpadawe@google.com> Remove phone number being displayed from logs automerge: 29b4388
automerge: bc9de73

* commit 'bc9de73d0c0e6f6108c26d8c6038c4807a13ba3d':
Remove phone number being displayed from logs
29b438847b8cd2ea874c505d878dcadcba632522 03-Feb-2015 Sanket Padawe <sanketpadawe@google.com> Remove phone number being displayed from logs

Bug: 19251204
Change-Id: I5391fa2033ddb8cb41e11cb23aa16485369cd13e
icc/IccRecords.java
a06b266f98d6daeb65714f1df1e04cc58e246d9d 02-Feb-2015 Tyler Gunn <tgunn@google.com> am ba82fe49: am 1601772b: Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev

* commit 'ba82fe492b72bd6520a32232f71fba3a7615b19c':
Fixing conference merge where only one party is added to conference.
1601772b42456692efd9ce79d1ef7fefcc2ecf6f 02-Feb-2015 Tyler Gunn <tgunn@google.com> Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev
22c8960322d11514c3d8d71ec66e293db6726ded 30-Jan-2015 Legler Wu <legler.wu@mediatek.com> am f118a6ec: am e70617d8: [DS] Correct the access method for telephony system property

* commit 'f118a6ec331f76c440eab16b7fe5e2990a7dd6d2':
[DS] Correct the access method for telephony system property
e70617d81dcd42350a737b11c25532e1d43df4ff 22-Jan-2015 Legler Wu <legler.wu@mediatek.com> [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
ccProvider.java
nboundSmsHandler.java
ccTable.java
honeFactory.java
IL.java
MSDispatcher.java
erviceStateTracker.java
msNumberUtils.java
ubscriptionController.java
ubscriptionInfoUpdater.java
dma/CDMALTEPhone.java
dma/CDMAPhone.java
dma/CdmaCallTracker.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
dma/SmsMessage.java
sm/GSMPhone.java
sm/GsmCellBroadcastHandler.java
sm/GsmServiceStateTracker.java
icc/IccCardProxy.java
icc/IccRecords.java
icc/RuimRecords.java
icc/SIMRecords.java
dc7343e93fadc8f33e9ab1ad2589477824bbf226 30-Jan-2015 Amit Mahajan <amitmahajan@google.com> am 583f21f5: Merge "Changes to make sure READ_PHONE_STATE permission is not needed to send SMS." into lmp-mr1-dev
automerge: 8409032

* commit '8409032e561690dfe94c3ec40d25796c3fbaa3c2':
Changes to make sure READ_PHONE_STATE permission is not needed to send SMS.
583f21f57ece05ad8980197f120a142c1ae3178f 30-Jan-2015 Amit Mahajan <amitmahajan@google.com> Merge "Changes to make sure READ_PHONE_STATE permission is not needed to send SMS." into lmp-mr1-dev
9652ea3e06de5d35b1c3314db6414edbe2a3889a 29-Jan-2015 Sanket Padawe <sanketpadawe@google.com> am 252d10a8: am dfe72816: Merge "Suppress logging to avoid showing phone number." into lmp-mr1-dev

* commit '252d10a8bc2996e0980367858b476a068e3a5b67':
Suppress logging to avoid showing phone number.
dfe728162d1ecd9f6c76989fba58e05ca943fbe8 29-Jan-2015 Sanket Padawe <sanketpadawe@google.com> Merge "Suppress logging to avoid showing phone number." into lmp-mr1-dev
fd2305639e3761c2bf3213463c4f17cc8310f4d0 29-Jan-2015 Tyler Gunn <tgunn@google.com> 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
msphone/ImsPhoneCall.java
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
65f78dfd8122c8f76d685abb9968bc3f973e5725 29-Jan-2015 Sanket Padawe <sanketpadawe@google.com> Suppress logging to avoid showing phone number.

Bug: 19193581
Change-Id: If8e35b6c8386a0e92cd1e89172b6dd1f0c220bc1
ubscriptionController.java
f6c0e3489a9365a4851bf3ed19dab18773ecbf65 29-Jan-2015 Amit Mahajan <amitmahajan@google.com> Changes to make sure READ_PHONE_STATE permission is not needed to send SMS.

Bug: 19112332
Change-Id: I7da30ebcebaf57f713acc6938626930dbc51d1f2
iccSmsController.java
2916a2fda6c72fcbb525d1482bffeb1cfe7412b4 29-Jan-2015 Junda Liu <junda@google.com> am 42f33a05: am 20baf033: Merge "Check line1number override and use it instead for subscription." into lmp-mr1-dev

* commit '42f33a0558a71f1010ab01cae6ed6be1158cce5d':
Check line1number override and use it instead for subscription.
20baf0330a05f7507cce251e9c16cb0c47542d0f 29-Jan-2015 Junda Liu <junda@google.com> Merge "Check line1number override and use it instead for subscription." into lmp-mr1-dev
ac45e0c666ce85c70fefe5c6416764be23ad13f1 29-Jan-2015 Stuart Scott <stuartscott@google.com> am 1e2ca359: Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev automerge: cdec256

* commit '1e2ca35931205b6ebe295659e35d2b1cfa1f4030':
Change getDeviceId to take phoneId.
cdec2562d8c41b7f503b79fde55f1a45057981c6 29-Jan-2015 Stuart Scott <stuartscott@google.com> Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev
ab2b99691917b654a2afcdb26b932315c480d6f8 29-Jan-2015 Sanket Padawe <sanketpadawe@google.com> am 5de8cb01: am 409cde85: Merge "Handle network change messages when phone tries to switch to GSM from CDMA." into lmp-mr1-dev

* commit '5de8cb01bb9360af09cd8fa75d8ad681d4071964':
Handle network change messages when phone tries to switch to GSM from CDMA.
409cde85e5cda5cbef3399ce78fa494a0d8bf2ef 29-Jan-2015 Sanket Padawe <sanketpadawe@google.com> Merge "Handle network change messages when phone tries to switch to GSM from CDMA." into lmp-mr1-dev
197f509eb95e275863e3ca36ef1fb53df63345f5 29-Jan-2015 Sanket Padawe <sanketpadawe@google.com> Handle network change messages when phone tries to switch to GSM from CDMA.

Bug: 19165700
Change-Id: I995308853b04db29e76e87303beec02ff32f231e
dma/CDMALTEPhone.java
6c5f02407589589bb792a0a5744cd3dbcd6a7d3b 29-Jan-2015 Robert Greenwalt <rgreenwalt@google.com> am 1e53b596: Merge "Fix dump to not require extra permissions." into lmp-mr1-dev automerge: bccbea8

* commit '1e53b59664b63c461cf1cc222125b88a92dd6e09':
Fix dump to not require extra permissions.
bccbea8d77fdca0b7dc19826f2b1a8d55daaa970 29-Jan-2015 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix dump to not require extra permissions." into lmp-mr1-dev
11bf4f45a64ce8bebd8edca04a8a401e2a40ae61 29-Jan-2015 Robert Greenwalt <rgreenwalt@google.com> 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
ubscriptionController.java
516a9df88657fcf1edd1588b26e00e963fe9ce51 28-Jan-2015 Junda Liu <junda@google.com> Check line1number override and use it instead for subscription.

Bug: b/19143556
Change-Id: I7bceea2ed39a075e66db2a5487296d4d33e2a941
ubscriptionController.java
9edd04fa340c3f7dbbd272329f5630670e8b97f9 28-Jan-2015 xinhe <xinhe@google.com> am 012da70f: Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev automerge: 59c6f03

* commit '012da70f101ebce4636313baed7059d579991e7f':
Sprint: MMS cannot be sent in the UK
59c6f03ac8d3c059808f785e292843c593e86f99 28-Jan-2015 xinhe <xinhe@google.com> Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev
5f8c9d88fe53b4b5fa9497a90302280e1b45ac3f 28-Jan-2015 Stuart Scott <stuartscott@google.com> Change getDeviceId to take phoneId.

bug:18827144
Change-Id: I0aec0d95c372c9bf65939310f0c85baaf526b0d6
honeSubInfoController.java
honeSubInfoProxy.java
e9fdc85df2111a0a0d7d240bbc11ed5b14b01376 28-Jan-2015 xinhe <xinhe@google.com> 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
dma/CDMAPhone.java
sm/GSMPhone.java
icc/RuimRecords.java
fa4b7a38175451675f58629f4abbc9e60714804b 27-Jan-2015 Ye Wen <ywen@google.com> am 676b53fd: am 52a98d0a: Fix regression that stores data SMS automatically

* commit '676b53fd4eed281d10c8bd238073b8013c0b1b73':
Fix regression that stores data SMS automatically
52a98d0a37731f48a316bc79fbc2c5a0f00a5e58 27-Jan-2015 Ye Wen <ywen@google.com> 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
MSDispatcher.java
dma/CdmaSMSDispatcher.java
sm/GsmSMSDispatcher.java
8a4b35f1fbef575d42c582f0cfb7b720f910785c 26-Jan-2015 Tyler Gunn <tgunn@google.com> am 090e8bd2: am e70972cf: Correcting issue where video call icon shows for all calls.

* commit '090e8bd2ec34a4951d04505a65ff4b9a60f616ce':
Correcting issue where video call icon shows for all calls.
e70972cf6a3b48df1f7d036877eb28529e606ca9 26-Jan-2015 Tyler Gunn <tgunn@google.com> 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)
msphone/ImsPhoneConnection.java
2ca7aba13efe47bf48cd6dbd892b199b3fdeb5c3 23-Jan-2015 Amit Mahajan <amitmahajan@google.com> Merge "Change to append subId to network selection related sharedPreferences." into lmp-mr1-dev automerge: 17faeca
automerge: 5b79ef6

* commit '5b79ef62dda56bdf17eb1bd9e7333cdfc9ac1e0c':
Change to append subId to network selection related sharedPreferences.
17faeca71d4d214a01fad1dea407eacbc05a499b 23-Jan-2015 Amit Mahajan <amitmahajan@google.com> Merge "Change to append subId to network selection related sharedPreferences." into lmp-mr1-dev
01dc60929b7306024abd66cdd41f0652b1d43890 23-Jan-2015 Pavel Zhamaitsiak <pavelz@google.com> am 3588d6dd: Merge "IMS:silent redial/srvcc call cleanup." into lmp-mr1-dev
automerge: 671d05f

* commit '671d05f2eb61e19c82be3a6b060910bd3832b85a':
IMS:silent redial/srvcc call cleanup.
3588d6ddff39416a909260e284ba2c0cbfdf4fe3 23-Jan-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "IMS:silent redial/srvcc call cleanup." into lmp-mr1-dev
72b8fbfe8f8b8bc9abdf503b5f9f43a2926d957b 23-Jan-2015 Libin.Tang@motorola.com <w16529@motorola.com> Fix the issue that Volte call is not cleaned up properly from telephony framework when call failure is notified through dial command response. automerge: 990c42d
automerge: 147e989

* commit '147e989751c6dde9d95b2fac90fbf229880760ed':
Fix the issue that Volte call is not cleaned up properly from telephony framework when call failure is notified through dial command response.
69e989aceb5660b39932049daad2299f75f07201 20-Jan-2015 Libin.Tang@motorola.com <w16529@motorola.com> 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
dma/CdmaCallTracker.java
sm/GsmCallTracker.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
990c42d788cb2f39cd7a6ddd97e5ebdefb298f75 21-Jan-2015 Libin.Tang@motorola.com <w16529@motorola.com> 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
msphone/ImsPhoneCallTracker.java
c2552f74f07fa0ce9d3132dd9f3796a22ba4e0d1 23-Jan-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "Add an API to access the CDMAPhone/GSMPhone call tracker state for DCTracker to check" into lmp-mr1-dev automerge: 90d3640
automerge: a2164fb

* commit 'a2164fbe1500f072c878fb117af41657c88c43d6':
Add an API to access the CDMAPhone/GSMPhone call tracker state for DCTracker to check
90d3640600ab3b80bd7a6f878e24bb764f0b08a1 23-Jan-2015 Pavel Zhamaitsiak <pavelz@google.com> Merge "Add an API to access the CDMAPhone/GSMPhone call tracker state for DCTracker to check" into lmp-mr1-dev
9956b691a9f89933ce062376d3688fb60aab2f77 23-Jan-2015 Robert Greenwalt <rgreenwalt@google.com> Remove _REPLACE_PENDING flag from SIM_CHANGED. automerge: 875357f
automerge: 232a756

* commit '232a756e7268936ca14292191d6b7285e91bd3e7':
Remove _REPLACE_PENDING flag from SIM_CHANGED.
501a084583a20e5e436a3c8b4e2b5e9538ddc050 22-Jan-2015 Narayan Kamath <narayan@google.com> resolved conflicts for merge of 7e0352da to lmp-mr1-dev-plus-aosp

Change-Id: I2e490d2f3aef8b7f42ea86105c0df98f6f9f9267
595c172c6fec75d287716ad404622db8ddb554dd 16-Jan-2015 Narayan Kamath <narayan@google.com> Track changes to locale management.

For MccTable : use persist.sys.locale to detect whether the user
has set a locale instead of persist.sys.locale.language / region.

For CatService : use Locale.getDefault, which will always return
the current locale. There's no need to rely on a system property.

bug: 17691569
Change-Id: Ic0f39067a04e4cb762848a6bd81a6ee97a392126
ccTable.java
at/CatService.java
875357f84bde43d1b774123579a16afe689b4182 22-Jan-2015 Robert Greenwalt <rgreenwalt@google.com> 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
ubscriptionInfoUpdater.java
icc/IccCardProxy.java
1bb79c7fb3f306c113234359390a75b625703b34 22-Jan-2015 Tyler Gunn <tgunn@google.com> Merge "Fixing resume of FG call after failure to merge IMS calls." into lmp-mr1-dev
d756a6bcf4fe09b561481eb6ed5368bd7b21ca76 16-Jan-2015 Amit Mahajan <amitmahajan@google.com> Change to append subId to network selection related sharedPreferences.

Bug: 19023266
Change-Id: Ia7b2ac5b37d5abb1231288caf923336bf0bec9e1
honeBase.java
erviceStateTracker.java
sm/GsmServiceStateTracker.java
b79f845a0451895b0f0b8a926a8571511d476ce8 20-Jan-2015 Libin.Tang@motorola.com <w16529@motorola.com> 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
allTracker.java
dma/CdmaCallTracker.java
ataconnection/DcTracker.java
sm/GsmCallTracker.java
msphone/ImsPhoneCallTracker.java
64eb927121bcd48570a5a7086b15d75ac1e5350d 21-Jan-2015 Shishir Agrawal <shishir@google.com> Don't send SIM_STATE_CHANGED before boot.

Missed call point in ag/607433.

Bug: 18802536
Change-Id: I42ffc2d16944096573a4a45dba0b6607e8829e05
ubscriptionInfoUpdater.java
45736edd9628b9c58068b8c85d54e19834415a8c 20-Jan-2015 Christopher Tate <ctate@google.com> Merge "Don't launch broadcast receiver processes during boot" into lmp-mr1-dev
262aceca11c9cfeb910bc95765a17a801134d102 20-Jan-2015 Christopher Tate <ctate@google.com> 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
icc/IccCardProxy.java
05eb62a0ccc74ecfbc8d61d334f247ff6996dc78 20-Jan-2015 Stuart Scott <stuartscott@google.com> Revert "Make SubscriptionController thread safe and some cleanup."

This reverts commit f34c3ae44f20f7454cda82628e8d23bff3198130.

bug:19029410
Change-Id: Iff8e99429565f8b43d4cbf5c8457e25691ba626c
ubscriptionController.java
062a2a3838c8d8adf16f4d9fbde8d52450da0336 13-Jan-2015 Shishir Agrawal <shishir@google.com> 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
ccSmsInterfaceManager.java
nboundSmsHandler.java
MSDispatcher.java
erviceStateTracker.java
ubscriptionInfoUpdater.java
dma/CDMAPhone.java
dma/CdmaConnection.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
sm/GSMPhone.java
sm/GsmServiceStateTracker.java
icc/IccCardProxy.java
icc/RuimRecords.java
icc/UiccCard.java
icc/UiccCardApplication.java
icc/UiccController.java
1783ee4505c9ab5ac88b826e93e8459259994b86 16-Jan-2015 Amit Mahajan <amitmahajan@google.com> Merge "Change to update carrier text after subId is updated." into lmp-mr1-dev
c7c2aff39afb425b34ea6cc17d172cc28f5ab4f0 15-Jan-2015 Tyler Gunn <tgunn@google.com> 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
msphone/ImsPhoneCallTracker.java
43677a14279bf3820e0372ff4422ab0c1f8dbb2b 15-Jan-2015 Amit Mahajan <amitmahajan@google.com> Change to reset network settings on SIM change instead of IMSI change.

Bug: 19012822
Change-Id: I22403636d36282c6d9a7c7063640051c93afea5b
ubscriptionInfoUpdater.java
19517065ec69bafc5cfc91c8386a7583441ecf6d 15-Jan-2015 Amit Mahajan <amitmahajan@google.com> Change to update carrier text after subId is updated.

Bug: 18752574
Change-Id: I9cb8b7d26fca1654bd2323bd5555a1cfc4e9877d
erviceStateTracker.java
ubscriptionController.java
dma/CdmaServiceStateTracker.java
sm/GsmServiceStateTracker.java
03b39148bb0dde533187c4835166c9bf2238522a 14-Jan-2015 Wink Saville <wink@google.com> Merge "Make SubscriptionController thread safe and some cleanup." into lmp-mr1-dev
6a970a5050f36793eb51b236c24ab4d9918806cd 14-Jan-2015 Stuart Scott <stuartscott@google.com> Merge "[DS] Load SPN from System or Oem image" into lmp-mr1-dev
f34c3ae44f20f7454cda82628e8d23bff3198130 13-Jan-2015 Wink Saville <wink@google.com> 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
ubscriptionController.java
c2a3cd0bb99f1db4ebea7d1e2d4fb1f9ae1ff2d6 14-Jan-2015 Wink Saville <wink@google.com> Merge "Add additional debug logging." into lmp-mr1-dev
15470bf53747992f54edb2ae61055f042db1ab18 13-Jan-2015 Tyler Gunn <tgunn@google.com> Merge "Fix for call timer resetting when starting IMS conference call. 2/4" into lmp-mr1-dev
1aabb5ca0a162ab510ed0dfcf4c51b4bde7e1b3c 29-Dec-2014 Legler Wu <legler.wu@mediatek.com> [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
icc/SpnOverride.java
33d14d71f4b43d82d6c1b87d1d30cd86d13c5372 13-Jan-2015 Wink Saville <wink@google.com> Rename reg/unreg OnSubscriptionsChangedListener.

To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.

Bug: 18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
erviceStateTracker.java
ataconnection/DcTrackerBase.java
ataconnection/DctController.java
45eaa2335e64a8ff1ad8d5e8224c580ef996f370 12-Jan-2015 Wink Saville <wink@google.com> Add additional debug logging.

Bug: 18950975
Change-Id: I2d826dc4c355d7b940fee90f1bdff946128166e6
ataconnection/DataConnection.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
52c193f0c615a9153a702ea2597217202613e413 10-Jan-2015 Libin.Tang@motorola.com <w16529@motorola.com> IMS: fix ImsPhoneConnection wakelock stuck
Bug: 18965642

Change-Id: If708a0cde665fd9225138bf07db7d27e2cd36709
msphone/ImsPhoneCallTracker.java
e1ca3096b04579edacf3fe467766e82d69490acc 12-Jan-2015 Amit Mahajan <amitmahajan@google.com> Merge "Assisted dialing support of Multi-part SMS" into lmp-mr1-dev
bd681a048599441c659f3d3a8300e47599783d54 09-Jan-2015 Xia Ying <yingxia@motorola.com> Assisted dialing support of Multi-part SMS

Bug: 18951323
Change-Id: I55eff2d5c7b8447acf0d2fc067ea443c34febc49
ccSmsInterfaceManager.java
31b502cb274be3c20b993d51192b56f0e7a9ae09 10-Jan-2015 Tyler Gunn <tgunn@google.com> 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
onnection.java
msphone/ImsPhoneCall.java
84b5d1652f6791d859d880bd73ada8ad698cae8e 09-Jan-2015 Amit Mahajan <amitmahajan@google.com> Change to not call setLine1Number() when display number is updated in
SubscriptionController.

Bug: 18957504
Change-Id: I83637b377d4a3af9eae1aee454da19be8a00496d
ubscriptionController.java
04ddc0ecf259380a777ebcc086047e9eccfb9f56 09-Jan-2015 Wink Saville <wink@google.com> Merge "Make getDefaultSubId smarter and handle data only devices." into lmp-mr1-dev
330ca5606ebfb11a03967487d86bd8be8d9d2744 09-Jan-2015 Amit Mahajan <amitmahajan@google.com> Merge "“Pending” SMS is not sent automatically after airplane mode is turned off with VZW sim card" into lmp-mr1-dev
9cd10f29b23f1df574a1ef13379908ddfc933d5e 08-Jan-2015 Wink Saville <wink@google.com> Make getDefaultSubId smarter and handle data only devices.

Bug: 18919382
Change-Id: I9409d550cd4c3ef7bba64ca69ae0205ec3be3fec
ubscriptionController.java
3972955a3b3730c4e1632949dcaecc6fcc0c0567 08-Jan-2015 Jason Monk <jmonk@google.com> Merge "Have ServiceStateTrackers update Plmn/Spn directly" into lmp-mr1-dev
0192d7f3f201bce2b513749982577c8ddebe3ea2 10-Dec-2014 Jason Monk <jmonk@google.com> Have ServiceStateTrackers update Plmn/Spn directly

It seems that somehow the info from the ServiceState trackers is
getting out of sync with the Subscription database. To avoid this
update the info directly rather than going through a sticky broadcast.

Bug: 18752574
Change-Id: I66a3cb30df6478b7313230252ff2560946297d47
erviceStateTracker.java
ubscriptionController.java
dma/CdmaServiceStateTracker.java
sm/GsmServiceStateTracker.java
c73beb1d1a145141691d6c980e62649d0d6a1ba3 07-Jan-2015 Amit Mahajan <amitmahajan@google.com> Merge "Change to update CFI after subId has been updated." into lmp-mr1-dev
ad8eab8645079b88aeba3c7dc77ce885114a0efc 07-Jan-2015 Amit Mahajan <amitmahajan@google.com> Change to update CFI after subId has been updated.

Bug: 18784534
Change-Id: Ib2fc4af2bc036129ac1b8ac0fa6c018c479e3927
erviceStateTracker.java
ad553291b5c8d19cd8342b0b12fadc2f668843d3 07-Jan-2015 Amit Mahajan <amitmahajan@google.com> Merge "Change to update phone # in subInfo when RuimRecords have been read." into lmp-mr1-dev
5866914ae9798adebcb84cd710bca660b797bff0 06-Jan-2015 Amit Mahajan <amitmahajan@google.com> Change to update phone # in subInfo when RuimRecords have been read.

Issue was seen because both SIMRecords and RuimRecords are read for CDMA
but subInfo is updated when SIMRecords are read. Phone # is updated
based on RuimRecords but subInfo is not updated then. Change is to call
an API to update # in subInfo after RuimRecords are read.

Bug: 18789473
Change-Id: I70f521e73dda6b2849e0c477cc8de639d4281b84
hone.java
honeProxy.java
ubscriptionController.java
dma/CDMAPhone.java
sm/GSMPhone.java
msphone/ImsPhoneBase.java
ip/SipPhoneBase.java
icc/RuimRecords.java
9a90f1dde8fa4bd7b1606742909c2f2f28a28a2f 06-Jan-2015 Hui Wang <huiwang@motorola.com> On apn change, only clean up those data connection using the updated
apn setting

Bug: 18923165
Change-Id: I89a5772deb97437032edf642fdaa104eb4ed558e
ataconnection/DcTracker.java
2bb2331aa5c5285f70a7404d61ee71ede4831056 06-Jan-2015 Shishir Agrawal <shishir@google.com> Data roaming/enable settings should be per phone on a single SIM device.

On a multi-sim device it is dependent on the subId. But for a single SIM
device it should be a property of the device.

Bug: 18814559
Change-Id: I53ae2604db856914453aa4861e12b051700d187c
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
d0d53c0abda36e56e883f3db76330cca03d2fcf1 22-Dec-2014 Xia Ying <yingxia@motorola.com> “Pending” SMS is not sent automatically after airplane mode is turned off with VZW sim card

Rootcause: When airplane mode is on, the network operator is set to empty.
If VZW's assisted dailing for sms feature is enabled, there would be
StringIndexOutOfBoundsException if there is not empty check for network operator.

Bug:18828906
Change-Id: I72b1525a927097d1c70a2d56b0e624508cce73d1
msNumberUtils.java
cf53a4abdf13d04542be44e181d8a7f2983aeb7b 17-Dec-2014 Shishir Agrawal <shishir@google.com> Delay certain SIM_STATE_CHANGE broadcasts.

Delay "loaded" and "locked" broadcasts till until the SubInfo system is ready.

Bug: 18156403
Change-Id: I43aa71354fc2551d0692751935abcbd13f6bd7fc
ubscriptionInfoUpdater.java
icc/IccCardProxy.java
6095eb5ae2968051ee4b513372e4dc0aeb028a17 16-Dec-2014 Shishir Agrawal <shishir@google.com> SubscriptionInfoUpdater: Do not do work in the BroadcastReciever.

Currently a lot of work is done in the BR, which is bad design, possibly
problematic. Also removes the EVENT_OFFSET encoding what was not required.

Bug: 18156403
Change-Id: I6400eb27a77858efdbdd69289602fb2b5d7aaf83
ubscriptionInfoUpdater.java
f60ab49ba2975886b4ad52095c355a455ab745c4 23-Dec-2014 Etan Cohen <etancohen@google.com> Merge "Update GSM/CDMA getState API to consider state of the IMS phone as well." into lmp-mr1-dev
af622caecc38ae80d7d5d3128c3896068d78baf3 23-Dec-2014 Pavel Zhamaitsiak <pavelz@google.com> Merge "Uses TTY mode and VoLTE over TTY support to determine call type: IMS or CS." into lmp-mr1-dev
bd4bb4f2250463ba59dc98be649f6aa4df9fb682 18-Dec-2014 Libin.Tang@motorola.com <w16529@motorola.com> IMS: add the api to get IMS registration information.

Bug: 18668325
Change-Id: Id5b0ed420990bde44b3525c7ec22eb37827d649c
hone.java
honeBase.java
honeProxy.java
erviceStateTracker.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
f1099a9dfe0250a6b343de0646413db4034381de 15-Dec-2014 Etan Cohen <etancohen@google.com> Uses TTY mode and VoLTE over TTY support to determine call type: IMS or CS.

Bug: 18593974
Change-Id: I5a993688ade0269bcf3ca61c69cf9c274e694a13
dma/CDMAPhone.java
sm/GSMPhone.java
msphone/ImsPhoneCallTracker.java
4f5f5e2aab6a42cdb9493bddcb3c3d9530bc778f 18-Dec-2014 Etan Cohen <etancohen@google.com> Update GSM/CDMA getState API to consider state of the IMS phone as well.

Provides a true indication if the combined phone is IDLE or not.

Fix the one location where this combined information may cause issues: the
decision whether can send SMS over IMS or not.

Bug: 18774469
Change-Id: Iddb91798ae7278addbbf013d3880e126a7a29fdb
dma/CDMAPhone.java
dma/CdmaSMSDispatcher.java
sm/GSMPhone.java
39fb52b112c96f3867cbcfcf7cca435b5c0d69e9 19-Dec-2014 Amit Mahajan <amitmahajan@google.com> Merge "Change to make sure that code triggered by onSubscriptionsChanged() is executed on popping out and putting same SIM back in." into lmp-mr1-dev
69dc731fa6ea6ccb219e8172a6f2c6b24f032be7 19-Dec-2014 Wink Saville <wink@google.com> Merge "Have SubscriptionInfo.getDataRoaming return proper value." into lmp-mr1-dev
85d3bea1d42631917c36eb8b7174dc117b25a234 18-Dec-2014 Andrew Lee <anwlee@google.com> Merge "In SipPhoneBase, do not notify call state changes." into lmp-mr1-dev
e672c658aedf907fb2afab18b9b51dc69839e240 18-Dec-2014 Andrew Lee <anwlee@google.com> In SipPhoneBase, do not notify call state changes.

For Telephony phones, we'd like to notify call state changes in this
scenario, but for SIP calls we aren't concerned with this.

Tested: Added a custom listener to confirm that onCallStateChanged
previously was triggered on PhoneStateListener for specific subIds
and SIP calls. After this change, the callback is no longer invoked
for SIP calls, but still is for specific subIds.

Bug: 17612140
Change-Id: I9e4c6282fd53135580203c0b222782c23add5c42
ip/SipPhoneBase.java
b8ec2c1d94a76180871a58e14da06e1f0267e503 18-Dec-2014 Amit Mahajan <amitmahajan@google.com> Change to make sure that code triggered by onSubscriptionsChanged() is
executed on popping out and putting same SIM back in.

Basically to handle the scenario where subId goes from X->invalid->X.
This is on top of ag/604848

Bug: 18718732
Change-Id: I42bd7906715e4a9702439c1498a17a3add4c25a6
erviceStateTracker.java
25e3f0d82828ddefcd1d58570b96c699b5017375 18-Dec-2014 Wink Saville <wink@google.com> Have SubscriptionInfo.getDataRoaming return proper value.

In DcTrackerBase.setDataOnRoamingEnabled
call mSubscriptionManager.setDataRoaming so SubscriptionInfo.getDataRoaming
returns valid information.

Bug: 18784668
Change-Id: Ibeef8049cfa2673fd6044ed726b0750383c8a355
ataconnection/DcTrackerBase.java
e0592ed35429b99716988a2ed4c78b3111a9a286 17-Dec-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Don't rety permanent failures on every RAT change" into lmp-mr1-dev
a097459c324a2350f7b814184b8a011b6af6489e 17-Dec-2014 Stuart Scott <stuartscott@google.com> Merge "Return the data network type for the given sub id." into lmp-mr1-dev
e748b0a00e41489d34b3fc901bf687ec319e56ba 17-Dec-2014 Amit Mahajan <amitmahajan@google.com> Merge "Change to register content observer for data_roaming only after subId is updated." into lmp-mr1-dev
4325c5648e156c226c96396372496ef570fb60a8 17-Dec-2014 Amit Mahajan <amitmahajan@google.com> Merge "Change to ignore onSubscriptionsChanged() in SST if active subId does not change." into lmp-mr1-dev
c2d1d6b2725b4611360d2725624a0d8905d75694 16-Dec-2014 Robert Greenwalt <rgreenwalt@google.com> Don't rety permanent failures on every RAT change

The code to retry on RAT change was added to catch cases where
we had disconnected because of the RAT (specifically the
RAT disallowed simultaneous voice and data). Made our
RAT-change handler more focused so it now will
retry failed networks if the new RAT causes a change
in voice concurrency or APN list.

bug:17944570
Change-Id: I3d46328f45584fdf9cf927b176104ff2c8233304
ataconnection/ApnContext.java
ataconnection/DcTracker.java
b41cbe42c6e7c07c039eac2a871b6a772329d8db 17-Dec-2014 Amit Mahajan <amitmahajan@google.com> Change to ignore onSubscriptionsChanged() in SST if active subId does not
change.

Bug: 18718732
Change-Id: Ib08b62e860d0b6286272836e649cd2c171adc37e
erviceStateTracker.java
de2242679c927ed9c46fa42f40162b113e337112 10-Dec-2014 Omkar Kolangade <omkark@codeaurora.org> IMS: Detach disconnected connections from its parent

Detach disconnected connections from its parent once
the call is ended

----------------------------------------------------

IMS: After SRVCC handover, disconnect the dropped IMS calls

After a successful SRVCC handover, disconnect the handover pending
or dropped IMS calls, if any

Bug: 18777284
Change-Id: If4899c70c587c70b8202559b3fe0027ecd166f21
dma/CdmaCallTracker.java
sm/GsmCallTracker.java
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
efb8df7d67223933570849b0eb3917f3730f31a5 17-Dec-2014 Nancy Chen <nancychen@google.com> Merge "Notify listeners of a Connection if a DTMF character has been processed." into lmp-mr1-dev
c03103f7525d900f509283db959c2f8ae82b3fec 16-Dec-2014 Amit Mahajan <amitmahajan@google.com> Change to register content observer for data_roaming only after subId is
updated.

Bug: 18468163
Change-Id: Ie5358fb05c84939fe85eec262e3d07029732f712
ataconnection/DcTrackerBase.java
4567a0789e9966929c71af9a2c3866582c85c9e0 16-Dec-2014 Nancy Chen <nancychen@google.com> Notify listeners of a Connection if a DTMF character has been processed.

In order to make DTMF digits in the post dial wait state audible to the
caller, the Connection must alert its PostDialListeners when it has
processed each character.

Bug: 18644688
Change-Id: Ic4078c2fb2cf9bfc0e6791dc76cb27ce7ab7077c
onnection.java
dma/CdmaConnection.java
sm/GsmConnection.java
msphone/ImsPhoneConnection.java
c6cbdea1423262784e0a155f93be75f3f72e242c 15-Dec-2014 xinhe <xinhe@google.com> Sim Card full and can't delete messages in 5.0

change permission check

Bug:18458183
Change-Id: Ic7255659432e438fb5dd6b6e51201dc2d9bbbb86
ccSmsInterfaceManager.java
11d4ab2de742c1570567a1d9e2ab8ca3aa9dd78e 15-Dec-2014 Amit Mahajan <amitmahajan@google.com> Merge "Change to register for SIM_STATE or RADIO_STATE updates only if device is decrypted." into lmp-mr1-dev
0470315f0ad74e6bf756824cf1cdf62f85feaeab 15-Dec-2014 Stuart Scott <stuartscott@google.com> Return the data network type for the given sub id.

bug: 18634918
Change-Id: Ie6cf11a387bb8fe17f9354d6f712aae378f7f584
efaultPhoneNotifier.java
5ea2f81065ee1e440ca28bf5b4024c71b509726a 12-Dec-2014 Wink Saville <wink@google.com> Merge "Fix NPE in SubscriptionController if getActiveSubscriptionInfoList is empty." into lmp-mr1-dev
434fa420329b093f68d83862a637c7ded93a4daf 12-Dec-2014 Craig Lafayette <craiglafa@google.com> Fix build. Use isValidSubscriptionId in DcTracker.

Change-Id: I1cd2250a78daaac896070fbff58ad2c1a75c3b7f
ataconnection/DcTracker.java
fecec7d7a925364ee265068f35e399e03faeee8e 11-Dec-2014 Wink Saville <wink@google.com> Fix NPE in SubscriptionController if getActiveSubscriptionInfoList is empty.

Bug: 18683935
Change-Id: I34a185a1585449bf8c7e9fe56672f2578753cc4d
ubscriptionController.java
7a71b5bd8d1472266c18f41ad81f9ed8a3c3a70d 12-Dec-2014 Wink Saville <wink@google.com> Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev
d2b2de164b155cce847737360663dd516c51dc7d 12-Dec-2014 Stuart Scott <stuartscott@google.com> Merge "Do not allow data if defaults are not selected." into lmp-mr1-dev
6d91e295add44a5b7e611cb51401a20b3caa6571 11-Dec-2014 Pavel Zhamaitsiak <pavelz@google.com> IMS: Notify about change of TTY mode of other call participants

Pass notification to Phone app

Bug: 18247323
Change-Id: I975a93909dc02cc211e956667f5efb2ca3f330bb
allManager.java
hone.java
honeBase.java
honeProxy.java
msphone/ImsPhoneBase.java
msphone/ImsPhoneCallTracker.java
8002387711e57456dbb4353eb894714592f303fb 11-Dec-2014 Wink Saville <wink@google.com> Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.

Rename isValidSubId to isValidSubscriptionId.

Bug: 18668873
Change-Id: Ie937d20b1bc6d3d63b658abe48e0aa65d830181f
erviceStateTracker.java
ubscriptionController.java
ubscriptionInfoUpdater.java
ataconnection/DcTrackerBase.java
d4865a0d910a03458730aa428fd008dc163ceab4 11-Dec-2014 Wink Saville <wink@google.com> Merge "[DS] Data registration fails" into lmp-mr1-dev
ae3fcd6998674761c8bc629fe2758d2fa2831ee5 11-Dec-2014 Stuart Scott <stuartscott@google.com> Merge "Comment out masking of supported RAFs" into lmp-mr1-dev
972efd34f867b7803688c3f831106f59244a11f0 09-Dec-2014 Stuart Scott <stuartscott@google.com> Comment out masking of supported RAFs

bug:18343231

Change-Id: I05064fb2bfcf0fce2a8e68172f98a3b7da77a683
roxyController.java
e6992ac801b9d293b4f4309df60193422cd32da1 05-Dec-2014 Amit Mahajan <amitmahajan@google.com> Change to display correct network name on locked/quick settings screen.

Bug: 18161228
Change-Id: Ic5ab163ba238958ac74a4651425c9d2041e6e251
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
d21febaffa28f41e8cce37f88f4ceea5e7e2a398 11-Dec-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Add logging of TelephonyNetworkFactory" into lmp-mr1-dev
ff290f05fb8f7c6d98dc5646880dbbd28d97a261 11-Dec-2014 Wink Saville <wink@google.com> Merge "ProxyController.setRadioCability - do not throw exception on simultaneous requests." into lmp-mr1-dev
f5960ecb0bc8c6ab1add3755182f941ac709e173 11-Dec-2014 Pavel Zhamaitsiak <pavelz@google.com> Merge "Make sure to always call update profile (remove short-circuit bug)." into lmp-mr1-dev
c3c49a26ee58ef58d0b98f3ce3402fbb0d0555bb 11-Dec-2014 Sanket Padawe <sanketpadawe@google.com> Merge "Fixed phone crash due to missing NP check." into lmp-mr1-dev
390c357ab9e1300f03d7477bf9d86bf67a3c8413 11-Dec-2014 Amit Mahajan <amitmahajan@google.com> Change to register for SIM_STATE or RADIO_STATE updates only if device is decrypted.

Bug: 18656027
Change-Id: Ibaeb720955f6abc421b84d3cb32eb812b6c55a34
icc/UiccController.java
5d1d2d7c9f7a3b0d09269b2a6fe8a76d4cdd0f4b 11-Dec-2014 Pavel Zhamaitsiak <pavelz@google.com> Merge "IMS: SRVCC related changes." into lmp-mr1-dev
f61ebb3de5029839dd99ef973f79290f3245deda 11-Dec-2014 xinhe <xinhe@google.com> Merge "Unable to send MMS from Bugle accordian release apk" into lmp-mr1-dev
12fe7c9dce4807d482bf1bcb8472dacae9aa34fd 11-Dec-2014 Shishir Agrawal <shishir@google.com> ProxyController.setRadioCability - do not throw exception on simultaneous requests.

Simultaneous requests are a possibility becuase multiple SIM_STATE_CHANGED can
fire with READY or LOADED status.

Bug: 18703118
Change-Id: Ifcbc27626feb5f5bc28f74811cbdc0c91ab3f281
roxyController.java
cd95be49c217ecdfd97d1a43f745731a5aede1fb 11-Dec-2014 Andrew Lee <anwlee@google.com> Merge "Pass Message to sendDtmf, notify postNotify." into lmp-mr1-dev
4be56374921b52d54b80889540d982f39d26e3ab 09-Dec-2014 Uma Maheswari Ramalingam <umam@codeaurora.org> IMS: SRVCC related changes.

1. Telephony: Multiparty srvcc

Change-Id: Ie689f31d7970ecf3a5008cf1dad450045d0b34db

2. SRVCC: Add support for incoming call SRVCC

Transfer connections from ringing call to handover call on getting
Handover Complete notification. This allows for accept to be done
on the default phone instead of IMS phone after SRVCC. Set the
state of ImsPhoneCall object to Idle after the transfer.

Change-Id: I09cfcc9fc99b3ea4b3a4bd332af546bcfae4b679

3. Add support for SRVCC conference call

Add support for updating the parent of handover connections to
point to handover call.
Update status of the handover call object based on the status of
foreground, background or ringing call.

Change-Id: Iacd7daa929d0da9a0e020491669165aa42bed144

4. Add support for SRVCC connection clean up in Ims Service

Added support for SRVCC connections to be cleaned up in the IMS
Service by calling close opertion on the call session and
subsequently removing the call session from list of tracked call
sessions

Change-Id: I850ab111c884bbe7698810b15d0e9c8bdb10e8c9

5. add null check when add all srvcConnection

add null check when add all srvcConnection

Change-Id: I3bc93a301584e7fc16ef5aabf474bd1577402d22

6. IMS/911: Do not clear handover connections on SRVCC COMPLETE

Even though SRVCC or silent redial is successful, the handover connection
objects are cleared before migrated to CS domain. Proper checks are added
NOT to clear the handover connection objects as they are removed as and
when a new driver call via CS pipe is received and processed.

Change-Id: I061fa81e651b4c6b6bdea1f1cf0b09dde39fdb4a

7. Add fix for picking correct Handover connection

A single handover call cannot track both the foreground and
background call state after handover.

Added support to go through all the handover connections and
pick the first match based on the number and if there is no
match check the state.

Added support for tracking the state of call associated with
the connection before handover. This is used to retrieve the
correct connection based on state.

Change-Id: Iec87c09523d459998d0880252a71f98eb8e296a2

Bug: 18559588
Change-Id: I0c428b33e09684fc7f33f0abd7f9c0471961ad1f
all.java
allTracker.java
onnection.java
honeBase.java
dma/CdmaCall.java
dma/CdmaCallTracker.java
sm/GsmCall.java
sm/GsmCallTracker.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
56dbbcf63e9991ee83945fd10661190d917f700a 09-Dec-2014 xinhe <xinhe@google.com> Unable to send MMS from Bugle accordian release apk

The root cause is the race condition.SubId is not valid
when OperatorNumeric is tried to be stored.

Bug:18582651
Change-Id: I3a6f91b04fcaf7752b039c9a8ebf696c25de3722
honeProxy.java
erviceStateTracker.java
icc/IccCardProxy.java
851cbcf8a3b9ce9ae383494b0e267b157d9e8802 11-Dec-2014 Shishir Agrawal <shishir@google.com> Merge "Adding new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming." into lmp-mr1-dev
8bb75423745b09a92688919f5b32d49695a61abb 10-Dec-2014 Robert Greenwalt <rgreenwalt@google.com> Add logging of TelephonyNetworkFactory

It seems sometimes we don't react to a request properly. I suspect the
NetworkCapabilities are misconfigured for this Sub.

bug:18569575
Change-Id: I1a4605a4d9b02804f4d6a9b959e9f300008164a7
honeFactory.java
ataconnection/DctController.java
2b0f0da4f9fe8449c578632b491e2f158c201bd5 10-Dec-2014 Stuart Scott <stuartscott@google.com> Do not allow data if defaults are not selected.

bug:15925985
bug:18269924
Change-Id: I2eca123a358eeadf9d22cfe6cc55627a9387546a
ataconnection/DcTracker.java
549148fb25d8b38c2bd1207c1a21027c6621932b 10-Dec-2014 Etan Cohen <etancohen@google.com> Make sure to always call update profile (remove short-circuit bug).

Guarantees that HD icon information is updated on any call session updates.

Bug: 18457066
Change-Id: I6c07f75aa355942b00eb270b25a15c9f113a34d2
msphone/ImsPhoneConnection.java
77d90293fb7dff1d71f6673e74192f8d265638b4 10-Dec-2014 Sanket Padawe <sanketpadawe@google.com> Fixed phone crash due to missing NP check.

Bug: 18291406
Change-Id: Iefc9b3834f7b138d8ebff917cfd4e9f57dbb472c
ataconnection/DctController.java
34057c56c8cb3e3c011a70b2c799c73f15bd4522 01-Dec-2014 Shishir Agrawal <shishir@google.com> Adding new hidden carrier API to mark GSM/CDMA networks as roaming/non-roaming.

The calls allow us to specify MCC/MNCs (for GSM) and SIDs for CDMA that should
not be considered as roaming for the current ICCID.

Bug: 13288143
Change-Id: I6c0de2ff85478eb4fae9505141027c8c07684082
hone.java
honeBase.java
honeProxy.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
sm/GsmServiceStateTracker.java
d9aa1a75304b1c04c352198b9269f40a2a059f74 09-Dec-2014 Andrew Lee <anwlee@google.com> Pass Message to sendDtmf, notify postNotify.

+ Use ImsPhoneCallTracker's sendDtmf method instead of the commands
interface.
+ Echo GsmConnection/CdmaConnection in notifying post dial listeners
after the post dial state is updated. Otherwise, the post dial dialog
is not shown.

Bug: 18643493
Change-Id: I9db13a673bd022bf3949a268f5f54f2c8f2511fc
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
8b25624ba664619f1935e5ddb401556cf4c3d5d1 09-Dec-2014 Etan Cohen <etancohen@google.com> Fix reference to incorrect extra name for SPN

Bug: 18223317
Change-Id: I7f8c11dede44861cc4386a11eaef039e0e429bbd
ubscriptionController.java
77b812e71c7d2e434a90a777cf2b608e9db3bc61 09-Dec-2014 Tyler Gunn <tgunn@google.com> Merge "Cannot swap active and background calls after failing to merge." into lmp-mr1-dev
68fa8654db03489be87687c7ad8d745ac24b4409 09-Dec-2014 Cheuksan Wang <edwang@google.com> Merge "Clear calling entity before deleting SMS from raw table. Deletion needs permissions of the phone process." into lmp-mr1-dev
473eaf181c0964e3b04bdd71307056c78d484abc 09-Dec-2014 Cheuksan Wang <edwang@google.com> Clear calling entity before deleting SMS from raw table.
Deletion needs permissions of the phone process.

BUG: 18672706
Change-Id: If70b69745f5b09c644720ba019b409a82efb8033
nboundSmsHandler.java
1392c6c61aaff0f52f8d21423956aef6fa80f46b 08-Dec-2014 Legler Wu <legler.wu@mediatek.com> [DS] Data registration fails

Try to process all request after sub ready. When encountering abnormal
situation and causes subscription manager unready, data frameworks needs
to process requests after subscription manager is ready again

Bug: 18542143
Change-Id: Idebacb242fb08ac6b9ed307572499a19753eba97
ataconnection/DcSwitchStateMachine.java
ataconnection/DctController.java
c109ae65829a77d555ffb94ac3df2b6d481d3017 09-Dec-2014 Wink Saville <wink@google.com> Merge "Add debug dataEnable." into lmp-mr1-dev
c204cc0f515864b36187d60f6ab79af28885d36e 06-Dec-2014 Uma Maheswari Ramalingam <umam@codeaurora.org> IMS: start and stop dtmf tones.

Support of start and stop dtmf tones in Imsphone

Bug: 18371919
Change-Id: I9dec982035e8fdffcd198685caecceffb7e9f406
CRs-Fixed: 751797
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
276bc50374a46461b334fef28fdf07b536d96c71 08-Dec-2014 Tyler Gunn <tgunn@google.com> Cannot swap active and background calls after failing to merge.

When a conference call merge fails, an attempt to swap between the active
and held calls will fail; resuming the bg call fails. The problem is
switchWaitingOrHoldingAndActive swaps the FG/BG ImsCall references before
getting positive confirmation that they suceeded.

1. When initiating a call swap, keep track of the call we expect to
resume. In the resume success method, check if we resume a call other than
the one we expect to. In the resume fail method, check if we failed to
resume the call we expected to. In both cases, switch the FG/BG call
references back to ensure that state signaling is handled properly.
2. Trigger a notifySuppServiceFailed on the phone to report that the
resume failed; this is used by Telephony to display a failure message.

Bug: 18656014
Change-Id: I8e67389601861a933c648ca876d4e8a12ef54fee
hone.java
msphone/ImsPhoneCallTracker.java
957b01a07bfc7ffa29745b39970d930daf40f406 03-Dec-2014 Jeff Sharkey <jsharkey@android.com> Splice subscriber identity into NetworkMisc.

This gives us a path that strongly ties a network to the underlying
subscriber identity, which is needed for multi-SIM support.

Bug: 18012787
Change-Id: Ie8ddd2bd280af82fa1414c42c9ae4538557ca8a0
ataconnection/DataConnection.java
13f5f13dd6e33d3fee77cd5d05df998ef4e01c26 06-Dec-2014 Amit Mahajan <amitmahajan@google.com> Merge "Use operator name from CSIM record only when voiceRegState is IN_SERVICE." into lmp-mr1-dev
652c1add01ea5f0c93aa60c262863147d3aeefc2 06-Dec-2014 Wink Saville <wink@google.com> Add debug dataEnable.

Change-Id: I4c2c49d9283652429affc190abacf7775ef3fe43
honeFactory.java
ataconnection/DcTrackerBase.java
9dd8bcd98376fc644d372f96ad93dc6dadd73058 05-Dec-2014 Stuart Scott <stuartscott@google.com> Merge "Default data should connect on user's preferred network type" into lmp-mr1-dev
074c58307cc9eae7f4b3614ef6d956ab06e06253 02-Dec-2014 Amit Mahajan <amitmahajan@google.com> Use operator name from CSIM record only when voiceRegState is IN_SERVICE.

Bug: 18479861
Change-Id: I8bb446573829f06c530389d195825dc0fe116da5
dma/CdmaLteServiceStateTracker.java
4e0060436bb5e76beb399eb9525ebc0841a61ab3 05-Dec-2014 Cheuksan Wang <edwang@google.com> Merge "Add checking to find AppDirectedSmsProxy for App Directed SMS feature" into lmp-mr1-dev
7e7d2b34010bf24a70bbf40303c7a4606c438ada 04-Dec-2014 Stuart Scott <stuartscott@google.com> Default data should connect on user's preferred network type

bug:18416275
bug:18415493

Change-Id: I14bce5520af67f038f43920a4454275c5a7e8a9f
aseCommands.java
ommandsInterface.java
hone.java
honeBase.java
honeProxy.java
roxyController.java
IL.java
ubscriptionController.java
de060226160826546f0f78e3b437998ad194ed6d 05-Dec-2014 Jason Monk <jmonk@google.com> Only register SPN receiver when we need to

Avoid crashing fugu by not registering this receiver when the uri
where we would store the data is not valid.

Bug: 18634568
Change-Id: I882eaa0dc6a312b4df7d5e39056ab5f8df844162
ubscriptionController.java
cf924dde47f17d85359d947ad8752f6000a97a59 05-Dec-2014 Jing Zhao <zhaojing@motorola.com> Add checking to find AppDirectedSmsProxy for App Directed SMS feature

To integration with AppDirectedSmsProxy,
which proxy extends CarrierMessagingService for App Directed SMS feature.
InboundSmsHandler needs to add a checking to look for system service with intent entry
'CarrierMessagingService.SERVICE_INTERFACE',
so that could find AppDirectedSmsProxy and bind such service.

Bug: 18609762
Change-Id: I80a133653101cd4ec1793e726faf3601e2970224
nboundSmsHandler.java
3ec379cf2c240fe7f7cc36e2fe7502f769f309a0 05-Dec-2014 Wink Saville <wink@google.com> Merge "getActiveSubscriptionInfoList used wrong slection operator." into lmp-mr1-dev
7860f2c34240b2486546ddfc90dff20e41400faa 05-Dec-2014 Amit Mahajan <amitmahajan@google.com> Merge "Change to query ICC file handler directly from IccCard instead of from Phone obj." into lmp-mr1-dev
2236bf11125220d9b396a607bcd1bba45c1fe2c3 04-Dec-2014 Wink Saville <wink@google.com> getActiveSubscriptionInfoList used wrong slection operator.

The call to getSubInfo should use ">=0" to find "active" subscriptions.
Previously INVALID_SIM_SLOT_INDEX was -1000 and now its -1 so the
"!=" would return older inactive subscriptons (i.e. -1000 for
SIM_SLOT_INDEX) as well as the truly active subscriptions.

Bug: 18599334
Change-Id: Ied1af25773df34725508a2ab1a5954e6a3ffb20a
ubscriptionController.java
916a4a24ae001831f15bafad1d5105f049f22031 04-Dec-2014 Jason Monk <jmonk@google.com> Merge "SubscriptionController store SPN brdcst in carrier" into lmp-mr1-dev
cd9e0d22c9a50903efc9965beb7e022f727ce63a 04-Dec-2014 Jason Monk <jmonk@google.com> SubscriptionController store SPN brdcst in carrier

Save the current PLMN/SPN in the carrier name of the SubscriptionInfo.

Bug: 18223317
Change-Id: I75ceba8ca8e1d9eb356292296b84a9cdac2e54e2
ubscriptionController.java
4a69b13af6bdb87251c513d78f8e134572cb2044 04-Dec-2014 Sanket Padawe <sanketpadawe@google.com> Merge "Fixed IMEI crash in HH without SIM" into lmp-mr1-dev
4608e158b3907fb980cac72d20909919a8031f96 04-Dec-2014 Sanket Padawe <sanketpadawe@google.com> Fixed IMEI crash in HH without SIM

Added null pointer check in SubscriptionController

Bug: 18292087
Change-Id: I1289143388466b66a74de5070bcecc17d22fd799
ubscriptionController.java
b7fa93b50e3381d8685c3e1956c41106d431f6ce 04-Dec-2014 Amit Mahajan <amitmahajan@google.com> Merge "UICC : discard language setting of SIM" into lmp-mr1-dev
2d2fa9e5ab6edd541b72fb372edc4a08e392dbd0 04-Dec-2014 Amit Mahajan <amitmahajan@google.com> Change to query ICC file handler directly from IccCard instead of from Phone obj.

Bug: 18115115
Change-Id: I34f6bb449d76aa5bc60fff8c0e070a0631e9d316
ubscriptionInfoUpdater.java
66f0814614bc2d1df51bb3b3ee9b3d020c19a21a 04-Dec-2014 Cheuksan Wang <edwang@google.com> Merge "Use the AIDL based API to communicate with the carrier app." into lmp-mr1-dev
d23426638791fe055e5ca3f270918f22bac3883e 04-Dec-2014 xinhe <xinhe@google.com> Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev
bf96bc5d20e42a1c011413c3b1dee8ef5b524b43 04-Dec-2014 Wink Saville <wink@google.com> Merge "Add debug and check validity of mCardIndex." into lmp-mr1-dev
4fae501dc021c215c1f291a244466610bc3f7120 04-Dec-2014 Wink Saville <wink@google.com> Add debug and check validity of mCardIndex.

Change-Id: Ic5a2baaacaf1810416b898dcb6171ef15e422f7f
ubscriptionController.java
icc/IccCardProxy.java
058304574f5acd8b66e2e943e7da9824323a2050 03-Dec-2014 xinhe <xinhe@google.com> Unable to unlock SIM with a PIN/PUK

call TelephonyManager.getSimState instead of accessing systemProperty
Bug:18489776
Bug:18259307

Change-Id: Ie95befc6e4aa8cfc26947a1cb2bf54b296dcb443
ubscriptionInfoUpdater.java
b42ae7c2b523a294799ecf5fc98126c1afe878bf 03-Dec-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Separate voice and data roaming state & roaming type." into lmp-mr1-dev
e409b02a691d5bb0515aab41cfa597c725eb9174 12-Nov-2014 duho.ro <duho.ro@lge.com> UICC : discard language setting of SIM

Some carrier card has incorrect language file.
This is to disable loading language setting from SIM card.

Bug: 18095177
Bug: 18108786
Change-Id: I40881fc64fea52480c968a18440740af9c8cff57
icc/RuimRecords.java
icc/SIMRecords.java
8215559cd1141ac90c478fd3df75e43c9d755c6c 01-Nov-2014 Cheuksan Wang <edwang@google.com> Use the AIDL based API to communicate with the carrier app.

Implements SMS sending.

BUG: 18005911

Change-Id: I467036b59b51905532e7ce1591dcb2e2856ef2d3
ccSmsInterfaceManager.java
msSMSDispatcher.java
nboundSmsHandler.java
MSDispatcher.java
iccSmsController.java
dma/CdmaSMSDispatcher.java
sm/GsmSMSDispatcher.java
c8398905516a393527f9beb4b7f51d72ed933c88 03-Dec-2014 Stuart Scott <stuartscott@google.com> Merge "SubscriptionController uses RAT families to control default data" into lmp-mr1-dev
417798bec2263fb7d39a5dc81ec086a49030e7a2 03-Dec-2014 Sanket Padawe <sanketpadawe@google.com> Merge "Settings now shows the proper carrier name." into lmp-mr1-dev
bc28f0884cc08e06afdb34a9068faa4334323338 02-Dec-2014 Tyler Gunn <tgunn@google.com> Merge "Cleanup to remove misused CallGroup concept." into lmp-mr1-dev
ffdf8ce51e37e5e45791c9ea11604aa00dffc88e 15-Jul-2014 Jing Zhao <zhaojing@motorola.com> Separate voice and data roaming state & roaming type.

It is possible for voice and data registered on different network,
so the roaming state could be different.

Set voice and data roaming status and roaming type separately.

Bug: 17318123
Change-Id: Iede9132cbf94bc9971702bd9232374585edd5cd0
efaultPhoneNotifier.java
erviceStateTracker.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
ataconnection/DataConnection.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
sm/GsmServiceStateTracker.java
0db65ec818e58fb5b83a492e082db4536f3b83e0 01-Dec-2014 Tyler Gunn <tgunn@google.com> Cleanup to remove misused CallGroup concept.

- Removed call group references in ImsPhoneCallTracker.

Bug: 18588383

Change-Id: I2128a978299dd7030c98c01f3e4c27ad15fbfa14
msphone/ImsPhoneCallTracker.java
f3f5ba2fb558379172195b2106feefbaa4c80133 02-Dec-2014 Junda Liu <junda@google.com> Merge "Add hasMatchedTetherApnSetting support." into lmp-mr1-dev
ed588e46368d6ab91c128bcacb0a343fc65c71c2 02-Dec-2014 Andrew Lee <anwlee@google.com> Merge "Indicate high quality audio." into lmp-mr1-dev
8185c727302954f6708c274ea21edac35cedae20 02-Dec-2014 Pavel Zhamaitsiak <pavelz@google.com> Merge "MSIM IMS: convert to phone ID based selection." into lmp-mr1-dev
4e7f34de0e226703fadd1f30f9976bb426c5166b 11-Nov-2014 Stuart Scott <stuartscott@google.com> SubscriptionController uses RAT families to control default data

bug: 18417009

Change-Id: I0c016db0c5adce6e28fc3ffb713d4a4c4d270b51
honeFactory.java
roxyController.java
IL.java
ubscriptionController.java
53dde7e076954c250e55d156cc1df1202c3a8a9e 27-Sep-2014 Etan Cohen <etancohen@google.com> MSIM IMS: convert to phone ID based selection.

Bug: 18576822
Change-Id: I2dea8ef3cb897fc2f8b7798937319df06b33701c
honeBase.java
msphone/ImsPhoneCallTracker.java
3ffd9ad50690a7bdfb3c7df56fce27fb11bf7d7f 26-Nov-2014 Preeti Ahuja <preetia@codeaurora.org> STK: Add support for idle screen notification

1. Add support for Idle Screen Available set up
event list and event download.
2. For Display Text, when screen is busy the set the
correct additional information in terminal response.

Bug: 18274506
Change-Id: I35ec31cbf3b11fc55cbc1cc2d4b6a32a099e5b5f
at/CatService.java
6a0fa4105fa8104a09b33a3403df5ae2711e0083 20-Nov-2014 Andrew Lee <anwlee@google.com> Indicate high quality audio.

Check remote profile to take into account whether we consider the
session to be using high-quality audio.

Merge two separate blocks to update media capabilities into one
helper method, and simplified code. This helper is
boolean updateMediaCapabilities(ImsCall imsCall).

Bug: 18103173
Change-Id: Iec082dda6ec80bba2ce386f8ee7398f191152a3e
msphone/ImsPhoneConnection.java
0f067e2fa879ecfb7a9e4b28f361a9a622630261 01-Dec-2014 Junda Liu <junda@google.com> Merge "Remove special handling for length field." into lmp-mr1-dev
cb44e007bab05e1faa4dec2f8772dd515c3e281e 26-Nov-2014 Sanket Padawe <sanketpadawe@google.com> Settings now shows the proper carrier name.

In settings UI, stale values of carrier name are shown up and requires
device wiping for fixing it. This fix handles the case.

Bug: 18538581
Change-Id: I0c981d20124fae6cec544dd40a8f5349b11ab7be
ubscriptionInfoUpdater.java
191fcbb559771da0f1339e1b90064cb444963811 26-Nov-2014 Amit Mahajan <amitmahajan@google.com> Change to use DATA_ROAMING setting correctly with subId.

Bug: 18466745
Change-Id: Ib2d7979d164ca3cf32c6619340fae1dc578ca686
honeFactory.java
ataconnection/DcTrackerBase.java
80f67ef9e1603c8140a30d69c753e8d1813dc254 25-Nov-2014 Amit Mahajan <amitmahajan@google.com> Merge "Using default setting if setting+subid is not found." into lmp-mr1-dev
cda4eded9861bea93e2467bdd65fc7ba8b41dfc9 25-Nov-2014 Junda Liu <junda@google.com> Remove special handling for length field.

Bug: b/18012893
Change-Id: I99a678c2ffce1bf31c79b1fdb2dc846193b972b3
icc/UiccCarrierPrivilegeRules.java
79f9daf3ef1c254439ed0e9a640df214c5f8196d 08-Nov-2014 Junda Liu <junda@google.com> Add hasMatchedTetherApnSetting support.

Code will check TETHER_DUN_APN setting and config_tether_apndata for APN that
matches current operator.

Bug: b/18158411
Change-Id: I0780bce96cfce8752e9bb0c10b9d156ef5a54f06
hone.java
honeBase.java
honeProxy.java
ataconnection/DcTrackerBase.java
373f9fa99e95e7a05772337c437a8616a71dd0cd 24-Nov-2014 Cheuksan Wang <edwang@google.com> Merge "Implements platform changes to use the AIDL based API to communicate with the carrier app for SMS filtering." into lmp-mr1-dev
5d1afa5e52d1c5acc28af11dd5891a848a561a7e 24-Nov-2014 Amit Mahajan <amitmahajan@google.com> Merge "Set network selection to automatic when in Global mode" into lmp-mr1-dev
c9e4b3e8c1be7626ddbb81d49457e529a4e33847 19-Nov-2014 Amit Mahajan <amitmahajan@google.com> Using default setting if setting+subid is not found.

We should do this for other settings as well; fixing just this for now
to fix HFA bug.

Bug: 18392680
Change-Id: I360bc19c4501020afd9dfa1cfb7e66ce2fad9536
honeFactory.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
fcfebf4b77005d8936f487684e34d2b028407f14 12-Nov-2014 a20023 <a20023@motorola.com> Set network selection to automatic when in Global mode

Verzion request network selection should set to automatic when network mode
is global mode.

Bug: 18372726
Change-Id: I6ea2a230f3a2c43d16112d9f3faa00000d05aa26
sm/GSMPhone.java
sm/GsmServiceStateTracker.java
4b09dff383ae7dfca595aeeea886a594a1947340 22-Nov-2014 Wink Saville <wink@google.com> Additional changes to SubscriptionManager API as per API council.

bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
ccProvider.java
honeBase.java
honeFactory.java
MSDispatcher.java
erviceStateTracker.java
ubscriptionController.java
ubscriptionInfoUpdater.java
iccSmsController.java
at/RilMessageDecoder.java
ataconnection/DcTrackerBase.java
ataconnection/DctController.java
icc/IccCardProxy.java
cc0146c9f6800f82d0fbf2931775a8a1fd83681b 20-Nov-2014 Preeti Ahuja <preetia@codeaurora.org> STK: Remove dependency on idle screen notification

1. Remove support for Idle Screen available set up
event list and event download.
2. Remove dependency of Set Up Idle Mode Text from
idle screen notification.
3. Remove dependency of Display Text command from
idle screen notification.

Bug: 17553408
Change-Id: I9d15ae89cb0412032355a813f6c47b0e394504d3
at/AppInterface.java
at/CatService.java
ff62e12cd5a0f0feaaf965044be9231bf7aa82d9 22-Nov-2014 Amit Mahajan <amitmahajan@google.com> Merge "Change to use subId with PREFERRED_NETWORK_MODE in all places." into lmp-mr1-dev
0b8f331026738eeb8f5673c6bc78da32bd3d139a 22-Nov-2014 Sanket Padawe <sanketpadawe@google.com> Merge "Changing API to handle storing of carrier names in multi-sim" into lmp-mr1-dev
3bc32aa4a3f533421f82a6d7991bb1971bf78191 18-Nov-2014 Amit Mahajan <amitmahajan@google.com> Change to use subId with PREFERRED_NETWORK_MODE in all places.

MobileNetworkSettings already does that; it was the mismatch that was
causing the issue.

Bug: 18424733
Change-Id: Ib1c6d55c5bf2cff8986c740e96881f34e536b43f
honeFactory.java
erviceStateTracker.java
ubscriptionInfoUpdater.java
dma/CdmaServiceStateTracker.java
sm/GsmServiceStateTracker.java
d3b1fc2d1f7de07a947c7bcaad1c44b5021ceac9 20-Nov-2014 Andrew Lee <anwlee@google.com> Merge "Return MERGED_SUCCESSFULLY as a disconnect cause." into lmp-mr1-dev
c631eda0f7e8cd9e23b80e3a0bccdbef11d5e720 20-Nov-2014 Pavel Zhamaitsiak <pavelz@google.com> Merge "VoLTE over CDMA phone: when FG call terminated by remote do NOT unhold BG call" into lmp-mr1-dev
0623a6e25643407f30fd52d724ae112a10184cac 20-Nov-2014 Shishir Agrawal <shishir@google.com> Merge "On IMSI change and CDMA mode, set automatic network selection if it is manual." into lmp-mr1-dev
4307afa09d2898348551df8d9db79cd2704aa64e 20-Nov-2014 Shishir Agrawal <shishir@google.com> Merge "Delete UiccCardApplication on recieving REFRESH_RESET for them." into lmp-mr1-dev
8f37dc99700424c41ec46960f33852f2a89683db 18-Nov-2014 Etan Cohen <etancohen@google.com> VoLTE over CDMA phone: when FG call terminated by remote do NOT unhold BG call

Matches GSM and VoLTE over GSM. The BG call is restored but stays on hold.

Bug: 18375108
Change-Id: I8ac65a9b0070b98235ccc53f9de366a84a8f07da
msphone/ImsPhoneCallTracker.java
449769f65ca82d162ca17d0475dcb5e8b7fa401a 19-Nov-2014 Xia Ying <yingxia@motorola.com> Add configuration to control converting sms destination number
automerge: 2020578

* commit '20205781da619031c5c59b15e2e39b2ad298375f':
Add configuration to control converting sms destination number
feb6c37a994c607a3cbab865779b3da900759c3c 19-Nov-2014 Amit Mahajan <amitmahajan@google.com> Adding new LTE nodes to RadioConfigCommands and RadioNVItems.

Bug: 18278720
Change-Id: Ib6fd5d37fd3de7af43ad2cf4e9d9b5d94ad523ec
adioNVItems.java
f885059bcd0c294e9830bfe5aeb16974c0717fa3 13-Nov-2014 Andrew Lee <anwlee@google.com> Return MERGED_SUCCESSFULLY as a disconnect cause.

If a call was merged, change the disconnect cause to
IMS_MERGED_SUCCESSFULLY instead of NORMAL (because it was not
actually terminated as the result of a remote disconnect).

Bug: 18291234
Change-Id: I4cff83ace2aaa6062f4e182e9ac0f441bf77a23a
msphone/ImsPhoneCallTracker.java
f73cd58ce49157ebca38a687507cc1e2659c0eda 18-Nov-2014 Sanket Padawe <sanketpadawe@google.com> Changing API to handle storing of carrier names in multi-sim

Changing the api call to save system properties so that they handle case of
multi-sim when storing carrier name.

Bug: 18390441
Change-Id: Ib1575dd0f46535d9d4ad0106c4dcd59f6d928147
icc/SIMRecords.java
2c08b740c7217b0ac3f66d558cf1379142883a16 19-Nov-2014 Amit Mahajan <amitmahajan@google.com> Removing unnecessary SystemProperty lookup.

Bug: 18328639
Change-Id: Icbf9d7987d27af34cbe4ee1b4e9df19e139c2fc7
ubscriptionInfoUpdater.java
20205781da619031c5c59b15e2e39b2ad298375f 08-Oct-2014 Xia Ying <yingxia@motorola.com> Add configuration to control converting sms destination number

Romove hard codes about the SimcardOperatorList and NetworkOperatorList.

Bug: 18081228
Change-Id: I230816b247491977256a83e0de07e56e0a158221
ccSmsInterfaceManager.java
msNumberUtils.java
1d52db3bff8b4af5ebee9993443f3ce17d1312c1 19-Nov-2014 Ye Wen <ywen@google.com> Merge "PduParser MSIM support (2/4)" into lmp-mr1-dev
62648296ee1514d871d7d779d6f33da5e55babca 04-Nov-2014 Shishir Agrawal <shishir@google.com> Delete UiccCardApplication on recieving REFRESH_RESET for them.

After a REFRESH_RESET, the applications are not valid any more.

Bug: 17655366
Change-Id: Id3c9fab6fd863cd0c44c45f4bc27d780009668d8
icc/IccRecords.java
icc/IsimUiccRecords.java
icc/RuimRecords.java
icc/SIMRecords.java
icc/UiccCard.java
icc/UiccController.java
47f7fc631633c4c92e084cfc6587456f4f8cd727 04-Feb-2014 Preeti Ahuja <preetia@codeaurora.org> Cat: Do not send TR immediately for Display_Text

Currently for DISPLAY_TEXT proactive command, if the application
response is not required, CatService sends a terminal response to
card immediately and then sends the proactive command to StkApp.
On receiving the TR, the card responds with a Session_End. If the
Session_End is sent to StkApp before it finishes processing the
Display_Text command, a nullPointerException is seen in StkApp

Do not send Display_Text TR to card immediately. Send the TR after
the Display_Text command response has been received from StkApp.

Bug: 17553408
Change-Id: I23f25a9128e8545098610bec620429948233405e
at/CatService.java
734900afa3a8e35d3a75786dc59f91b6f3136157 14-Jun-2013 Preeti Ahuja <preetia@codeaurora.org> Usat Phase 2 feature and Screen status

This change combines below 3 fixes.
1) Usat Phase 2 fixes
Added changes to support Idle screen, Language Selection.

This also includes change to support Idle screen status information.

Fix to address alpha display for proactive commands

2) Telephony: Correct terminal response sent for Idle mode text cmd

When a proactive command : SET_UP_IDLE_MODE_TEXT arrives with
empty text and non-self explanatory icon, terminal response
:CMD_DATA_NOT_UNDERSTOOD should be sent back to the UICC as
per the SAT spec

3) The GCF Testcase GCF-PTCRB SAT/USAT 27.22.4.1.1seq1.2 expects a
screen busy response if the ME is not in idle screen and if the
display text message is a low priority message. Hence sending screen busy
response instead of RESPONSE_TIMEOUT. In present implementation a
USER_RESPONSE_TIMEOUT response is sent for all timeout cases.

Bug: 17553408
Change-Id: If7fb74a451d53a4475475ac570fa8ae9d1a08a3b
at/AppInterface.java
at/CatCmdMessage.java
at/CatLog.java
at/CatResponseMessage.java
at/CatService.java
at/CommandParams.java
at/CommandParamsFactory.java
b0bbf54087d1f02471e96bb6ac24cf406f9d1d75 18-Nov-2014 Amit Mahajan <amitmahajan@google.com> Merge "STK CC feature implementation" into lmp-mr1-dev
032e0398ba2770edd52c543482afbae6f92ff29b 17-Nov-2014 Ye Wen <ywen@google.com> PduParser MSIM support (2/4)

PduParser needs to know if Content-Disposition part header is supported
for a specific carrier. Originally this is loaded directly from system
resource in PduParser. This won't work for multi-SIM, which requires
getting that config based on carrier. This change adds parameter to
indicate if this header is supported and requires caller to provider the
config.

b/18371228

Change-Id: I2394dbb9551280037ad52e6983e35fa1f26d86ca
apPushOverSms.java
09b65da3b46e18c8acc146d722047ba2fb161bfe 19-Oct-2012 Preeti Ahuja <preetia@codeaurora.org> STK CC feature implementation

Support to display the current request is changed by STKCC.
Support to display alpha messgae from STKCC.
Support to display informatiom from new SS message.
Add FLAG_RECEIVER_FOREGROUND to alpha broadcast intent.

Bug: 17646476
Change-Id: I89671830eeef62a48e3133a2e3afbdeb096ecf3c
aseCommands.java
ommandException.java
ommandsInterface.java
honeBase.java
IL.java
at/AppInterface.java
at/CatService.java
dma/CallFailCause.java
dma/CdmaConnection.java
sm/CallFailCause.java
sm/GSMPhone.java
sm/GsmConnection.java
sm/GsmMmiCode.java
sm/SsData.java
est/SimulatedCommands.java
5bb4fbef46c97363460de2f4b6687c29c83f3afb 18-Nov-2014 Ye Wen <ywen@google.com> Merge "Addressing API review issues for SmsManager (1/3)" into lmp-mr1-dev
069450526bd54806b9d580a7788586e877aa48cb 18-Nov-2014 Tyler Gunn <tgunn@google.com> Merge "Add null-check to isMultiparty method, additional debug strings." into lmp-mr1-dev
5316753793bfa48f10b34ab585ff4e7e78c6473f 18-Nov-2014 Anthony Lee <anthonylee@google.com> Merge "Register for supplemental service failures in CallManager." into lmp-mr1-dev
e9455c226b06808ed41606d93adc2d617be9cdf0 18-Nov-2014 Junda Liu <junda@google.com> Merge "Handle long UICC rules correctly." into lmp-mr1-dev
3b9b9d704121b1c7a9cd98626d7ca87d9cff5437 17-Nov-2014 Shishir Agrawal <shishir@google.com> On IMSI change and CDMA mode, set automatic network selection if it is manual.

Currently the mode is set to automiatic without checking the actual mode. This
causes the radio to not respond till it attaches to a network (as per the
definition in RIL).

Bug: 18233109
Change-Id: I543743298f888300af77d2d81f887bb61002524f
hone.java
honeBase.java
honeProxy.java
ubscriptionInfoUpdater.java
dma/CdmaServiceStateTracker.java
b502a189332bb98b3b8e631181ca6ce5b7ee6ef9 17-Nov-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "telephony: Support mvno tethering apn through config_tether_apndata" into lmp-mr1-dev
541accbd8e08fac77faa1c60d14533b1a5a36347 17-Nov-2014 Tyler Gunn <tgunn@google.com> Add null-check to isMultiparty method, additional debug strings.

Bug: 18200934
Change-Id: I4b146046dc0d9f5ebb7c37151d95d81629a3dd25
msphone/ImsPhoneConnection.java
4e47e27d1d2cbd8e533cdd2081c5bc8e51b79ad9 16-Nov-2014 Anthony Lee <anthonylee@google.com> Register for supplemental service failures in CallManager.

This is to enabled the plumbing for us to show the user an error
message when conference calls fail to merge.

Bug: 18080792
Change-Id: Ie301eac647967cbd38e66c7cdd1cb333b99adb45
allManager.java
msphone/ImsPhoneCallTracker.java
9dbb6ad72f064bde732111fe40ded4543b34295e 12-Nov-2014 Ye Wen <ywen@google.com> Addressing API review issues for SmsManager (1/3)

b/18356155

Change-Id: I6202861943fe578a1edadf65de60df5bd77dae51
apPushOverSms.java
5db65ca06c4caeb2dfd2d7e206c73369f0212765 17-Nov-2014 Stuart Scott <stuartscott@google.com> Merge "Updating Subscription Info Icon" into lmp-mr1-dev
dc56885dfe571f949a5bf2161ecc6b839a8b373e 17-Nov-2014 Amit Mahajan <amitmahajan@google.com> Merge "Maintain NITZ info in RILJ so that it can be used even after phone type is switched." into lmp-mr1-dev
947781d8871fdd94e0eb44f9d7afee0881388d5d 11-Nov-2014 Stuart Scott <stuartscott@google.com> Updating Subscription Info Icon

bug: 18356155

Change-Id: If78d47c68864ff83b879a17d28fa81cab5d2e652
ubscriptionController.java
952f6df569fd0dffdb0600c20ff383a02e64a038 13-Nov-2014 Amit Mahajan <amitmahajan@google.com> Maintain NITZ info in RILJ so that it can be used even after phone type is switched.

Bug: 18071327
Change-Id: Ib1aa4ab375219dc37e51e5cbe430de5cec5eadce
IL.java
dc0a540399226a3b98140bb9e43640bcb0cc3b5d 17-Nov-2014 xinhe <xinhe@google.com> Merge "CMAS opt-out setting does not work when switching from Secondary user to Device owner" into lmp-mr1-dev
5a9c232c861968974321545cbc429ecee3bf6b1b 15-Nov-2014 Shishir Agrawal <shishir@google.com> Merge "Query voice radio tech when the SIMRecords finish loading." into lmp-mr1-dev
ab55881316cc64a537485a14c3103a74d1fd8ac7 11-Nov-2014 Shishir Agrawal <shishir@google.com> CdmaLteServiceStateTracker: Do not override the volte override.

Doing this could lead to the device being stuck in CDMAPhone incorrectly.

Bug: 18193790
Change-Id: I9e7fe60f19ae1a624b0cbaf3b881e75f4b6ea47a
dma/CdmaLteServiceStateTracker.java
5c182fdff2e24858dc9bfdb4e0fbb59c1bafeb20 15-Nov-2014 Shishir Agrawal <shishir@google.com> Merge "ServiceStateTracker: Only call updatePhoneObject when the phone is registered." into lmp-mr1-dev
feca8c8380d1109bac5101cb85e66e1789352d2b 14-Nov-2014 xinhe <xinhe@google.com> CMAS opt-out setting does not work when switching from Secondary user to
Device owner

Fix includes:
(1) Only device owner is alloed to set/change preference
(2) CBS intents are sent to all users
(3) Cell broadcast alter is only displayed on the active user
(4) Cell broadcast messages are saved in all users' mail box
(5) Cell broadcast test app send intents to all users
(6) Remove airplane mode trigger cellbroadcast MID configure. This should
be taken care of by ServiceStateChange

Bug:18223949
Change-Id: Icefbf1592bb83c9df9ba0c53a15aee4e913473ee
ellBroadcastHandler.java
ed0cfa93b9e42486bfc7caeca83ceae1a2f7328e 25-Oct-2014 Abhijith Shastry <ashastry@google.com> Implements platform changes to use the AIDL based API to communicate with the carrier app for SMS filtering.

BUG: 18005911

Change-Id: Ibc52fe4d4e5b73dc82ab3569a9818730d4acd5a3
nboundSmsHandler.java
icc/UiccCarrierPrivilegeRules.java
8698a61c207a4d74dfdb87b0a9021874d2dea7bd 14-Nov-2014 Ye Wen <ywen@google.com> Merge "Stop persisting SMS into OUTBOX before sending" into lmp-mr1-dev
7541d468b7d9464008d6186bc7c1bcef1c925782 20-Sep-2014 Junda Liu <junda@google.com> Handle long UICC rules correctly.

Repeatedly read from UICC until all data has been read and parse the length field correctly.

Bug: b/17572167
Change-Id: I7c9c0d36911fef246e0d73a3bfd5eebf3bc9cf73
icc/UiccCarrierPrivilegeRules.java
54fa5c2393b8f9c75a946a05dc0dfe650574b7d8 13-Nov-2014 xinhe <xinhe@google.com> Merge "Update enabe/disableCellBroadcast with RAN argument" into lmp-mr1-dev
a8064ed9c00ab7bdd584e722efebce429bcaa51b 08-Nov-2014 xinhe <xinhe@google.com> Update enabe/disableCellBroadcast with RAN argument

Allow them to take an explicit argument indicating GSM or CDMA range and
fix the extreme alert disable error.

Bug: 18202935
Change-Id: I1747e5d522bfe5da7d980aef00cabbb0045bda46
ccSmsInterfaceManager.java
iccSmsController.java
4bd1dec4138ac11a91a8ec606a27fc4c5c63f14b 12-Nov-2014 Ye Wen <ywen@google.com> Stop persisting SMS into OUTBOX before sending

Persisting SMS into OUTBOX before sending proved to cause
problems with Messaging app (and potentially other apps) that could try
sending messages in OUTBOX without being asked as manifested in bug
b/18155366. This CL only presists SMS after it is being sent.

b/18202414

Change-Id: Ie0d0e088549bf0853b364e4d33eed2a5d79a7758
msSMSDispatcher.java
MSDispatcher.java
dma/CdmaSMSDispatcher.java
sm/GsmSMSDispatcher.java
3b225692047485dfb4db5eb1b5a3e871be1e50aa 12-Nov-2014 PauloftheWest <paulofthewest@google.com> Merge "Frameworks update to support Multi-SIM data roaming and networks." into lmp-mr1-dev
299dad50409e907993fa96c7401d4f10c58018b1 11-Nov-2014 Wink Saville <wink@google.com> Update SubscriptionManager API as per API council.

bug: 17575308
Change-Id: Ib39a60e4f75981a466e9d606ec627756efad018d
ccProvider.java
honeFactory.java
ubInfoRecordUpdater.java
ubscriptionController.java
ubscriptionInfoUpdater.java
iccSmsController.java
apPushOverSms.java
dma/CDMALTEPhone.java
dma/CDMAPhone.java
ataconnection/DctController.java
sm/GSMPhone.java
80915ad5159e7a4e72fa436787044b0c075ff6cf 03-Nov-2014 Shishir Agrawal <shishir@google.com> Query voice radio tech when the SIMRecords finish loading.

This is required since the overlays may change once the SIMRecords have
finished loading and the overlays help determine the volte radio tech
replacement.

Bug: 18108765
Change-Id: Iebc17fda48cae28abb2e9658c4bb3b7d2ed18e60
honeProxy.java
dma/CDMALTEPhone.java
dma/CdmaLteServiceStateTracker.java
0d70691725c8258ee49b59461ab80457480f8af7 11-Nov-2014 Shishir Agrawal <shishir@google.com> Merge "NPE: DcTracker.isApnSupported should return false on null input." into lmp-mr1-dev
f1d59f07cc3375134b448e849d33507af0662a1b 01-Sep-2014 Sungmin Choi <sungmin.choi@lge.com> telephony: Support mvno tethering apn through config_tether_apndata

The GSMDCT already has classfication of mvno operator in createApnList().
But, fetchDunApn() funtion has no consideration about mvno operator.
So it needs to be implemented for mvno operator.
As qualifier could not be classified by mvno parameter, the resource
should be changed to support multiple apns by one mcc/mnc.

The modified fetchDunApn() returns matched mvno apn or normal(not mvno) apn.

Bug: 10096119
Change-Id: I551236040c810b9603fb84542af9765184ce0c29
ataconnection/DcTrackerBase.java
be70fe67be210ecfa4b51967f17b65bff983318c 10-Nov-2014 Andrew Lee <anwlee@google.com> Merge "Clear disconnected connections when detaching." into lmp-mr1-dev
14ad8ce79de28b7e4a1d25bacb4e51ca027159b4 07-Nov-2014 Shishir Agrawal <shishir@google.com> ServiceStateTracker: Only call updatePhoneObject when the phone is registered.

This is to avoid situations where we switch phone types unnecessarily.

Bug: 18193790

Change-Id: Ic0fa608122a43077ca599d1b1ac5b41365466237
erviceStateTracker.java
dma/CdmaLteServiceStateTracker.java
91bce2abae052df918cb546b9c5d205706ede026 08-Nov-2014 Shishir Agrawal <shishir@google.com> NPE: DcTracker.isApnSupported should return false on null input.

Bug: 18238326
Change-Id: I4ceb4855c7c2e1dbfde123512690cd845e8c74a3
ataconnection/DcTracker.java
db3aec65b5c02e3f5b28d32e4c742ba72a4b3867 08-Nov-2014 Andrew Lee <anwlee@google.com> Clear disconnected connections when detaching.

This bug was happening because there was a disconnected connection
lingering on the background call after it is resumed. Because of
this lingering connection, its state remained on HOLD and did not
return to IDLE.

This caused the phone to get in a bad state, such that when trying
to unhold the conference later on, there foreground call is ACTIVE
and the background call is HOLD, which precludes unhold from working
properly.

This fix for the bug would clear disconnected connections from the
ImsPhoneCall after detaching a connection.

Note: clearDisconnected also updates the state to IDLE, which is why
I deleted that code.

Bug: 18291230
Change-Id: I09b5e274408235a9b6630d40bf3a3161676ffc79
msphone/ImsPhoneCall.java
367855488aacde260410dad0eddc18b183cf852f 07-Nov-2014 Etan Cohen <etancohen@google.com> Added debug messages for dialing - more VoLTE information.

Bug: 18242297
Change-Id: I70891341fd581c1b2bce8bb7c8b55081d44638ad
dma/CDMAPhone.java
sm/GSMPhone.java
0aa03d22e29d57d1064c292bcdb4e762e9abca01 21-Oct-2014 Anju Mathapati <anjucm@quicinc.com> ussd: Suppress error dialog when ussd release received

Remove the prompt sent when network releases USSD session

Bug: 17782840
Change-Id: I4ca1d6db3be89ce2f28986cbc96824276edc6c7f
ommandsInterface.java
sm/GSMPhone.java
sm/GsmMmiCode.java
657d4db8bc4c9c892c5d31fee5e2b5084b86fbee 28-Oct-2014 Stuart Scott <stuartscott@google.com> SubscriptionController gives SubInfoRecord the blank bitmap icon.

bug: 17575308
Change-Id: I5cf2f8e59091f752b2258ccf560db8b03108fcff
ubscriptionController.java
24b9b00e7058ef1f1b3f1d996b7e46b605c53770 07-Nov-2014 PauloftheWest <paulofthewest@google.com> Frameworks update to support Multi-SIM data roaming and networks.

Bug: 18293168
Change-Id: I727e79d2e5127214a1851d4228d3383dc58f8210
honeFactory.java
ataconnection/DcTrackerBase.java
fe1472a29a0545f44d7c1793cb9a5532c161e0c0 07-Nov-2014 Tyler Gunn <tgunn@google.com> Merge "Conference event package performance improvement." into lmp-mr1-dev
d517ae2516691a5d39d812f1669348abb2ab0f3d 07-Nov-2014 Amit Mahajan <amitmahajan@google.com> Merge "Change to reset preferred network type and network selection mode on IMSI change." into lmp-mr1-dev
7369b07d30e7d8b3b6f6965c8fd8fc45eb32a1d1 07-Nov-2014 Sanket Padawe <sanketpadawe@google.com> Merge "Set default sim name and carrier name for subInfoRecord." into lmp-mr1-dev
24e3fd66bf996b3b2c63088aa2b0c201871dd4a5 07-Nov-2014 Sanket Padawe <sanketpadawe@google.com> Set default sim name and carrier name for subInfoRecord.

Changes for setting display name and carrier name inside subinforecord
object when its created and updated.

Bug: 17732079
Bug: 18247211
Change-Id: I5db976d5ed540ce46d4dd236195a7e60d96ae381
ubInfoRecordUpdater.java
ubscriptionController.java
d578d868402f67bac20f441aa89cd1edbf574173 07-Nov-2014 Junda Liu <junda@google.com> Merge "Support SHA256 and avoid unnecessary signature parsing." into lmp-mr1-dev
504d01e264b1f058f1829436ca860d8d41bb02f2 07-Nov-2014 Amit Mahajan <amitmahajan@google.com> Merge "Add configuration to control converting sms destination number" into lmp-mr1-dev
a77b7504cf2c437548b89e73bdc0898feaa30be0 06-Nov-2014 Amit Mahajan <amitmahajan@google.com> Change to reset preferred network type and network selection mode on IMSI change.

Bug: 17406959
Change-Id: Ica94bed24a658247ac8670c0c9e1987a3b96a680
ubInfoRecordUpdater.java
b1f3304f97988bbd5784c06752f1e4393afca2f8 06-Nov-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Add our subId to telephonys NetworkCapabilities." into lmp-mr1-dev
f62c0dfc57e6a04edc134f03383b457cdc90680b 05-Nov-2014 Sanket Padawe <sanketpadawe@google.com> Merge "Changes related to setting default color for sim in multisim." into lmp-mr1-dev
3c36d8029ea2c92e0339cd0cbe26511e5478da09 08-Oct-2014 Xia Ying <yingxia@motorola.com> Add configuration to control converting sms destination number

Romove hard codes about the SimcardOperatorList and NetworkOperatorList.

Bug: 18081228
Change-Id: I230816b247491977256a83e0de07e56e0a158221
ccSmsInterfaceManager.java
msNumberUtils.java
f53559f13dc272115f27f3b23955933da45ce127 04-Nov-2014 Tyler Gunn <tgunn@google.com> Conference event package performance improvement.

- Instead of sending each participant to the telephony conference
controller, all participants are sent at once. This way the conference
only needs to be recalculated once.

Bug: 18057361
Change-Id: I2e81a14ac6ad2858cf70d98ba0b7e14f0bd55cb5
onnection.java
msphone/ImsPhoneCallTracker.java
ad0554e7602bb8a117f9bca33318dd166942d33e 05-Nov-2014 Tyler Gunn <tgunn@google.com> Merge "Support disconnecting conference participants from conference." into lmp-mr1-dev
24d498b7139781fc88cfbe4c6ad1500c8b3212b5 05-Nov-2014 Sanket Padawe <sanketpadawe@google.com> Changes related to setting default color for sim in multisim.

Changes for setting default sim color when the subinforecord
is added into the database.

Change-Id: I5717da94bfb6bb260864a46c3898d347be96d6af
ubscriptionController.java
2132a7b87244251e6742d6a058abd1e61aada3e4 05-Nov-2014 Shishir Agrawal <shishir@google.com> Merge "Temporarily disable setting of automatic network selection mode in CdmaServiceStateTracker." into lmp-mr1-dev
d7f4ed8ac190763dce7e57b737caa44654b4592a 04-Nov-2014 Tyler Gunn <tgunn@google.com> Support disconnecting conference participants from conference.

- Added implementation for onDisconnectConferenceParticipant method in
ImsPhoneConnction. Calls the "removeParticipants" method provided by the
ImsCall to inform the conference server that a conference participant
should be disconnected.

Bug: 18176606
Change-Id: Icab779a49382765c198494c18d8adc276189e9c3
onnection.java
msphone/ImsPhoneConnection.java
0be2d4bc2b1a55a0e7356bb447a8a0fd4f264fba 04-Nov-2014 Shishir Agrawal <shishir@google.com> Temporarily disable setting of automatic network selection mode in CdmaServiceStateTracker.

The above calls causes a deadlock in the radio when the Sprint profile is
coming up. This should be removed when the radiob bug is fixed.

Bug: 18233109
Change-Id: Ib4db046d65707f34c2e79358ed35d523ca75badd
dma/CdmaServiceStateTracker.java
5f208fd8c2c2ef5036dabffafc72b73b9eb3fc16 30-Oct-2014 Stuart Scott <stuartscott@google.com> Clean up public API of SubInfoRecord.

bug: 17575308

Change-Id: Id69135474a7b90d6731d27f191e95c3fa61e0d0f
ccProvider.java
ubInfoRecordUpdater.java
ubscriptionController.java
2ba7bb72c1706e265f7e572fcf2fa1887430dade 31-Oct-2014 xinhe <xinhe@google.com> Bad merge in DcTracker (lmp-sprout-dev): mAutoAttachOnCreationConfig
always set to true

Bug: 17684566
Change-Id: I904e0de44ce16c080f9f3fab83f064d76eb56e3c
ataconnection/DcTracker.java
b52ad26bd96320f47a3157ba13d080ab71522a15 31-Oct-2014 Anthony Lee <anthonylee@google.com> Merge "Changed the prototype for onCallMerged." into lmp-mr1-dev
9511319220e2596c02b65d2cab0ca34cbec30b99 29-Oct-2014 Libin.Tang@motorola.com <w16529@motorola.com> IMS: fix auto-resume behavior for remote hangup on Volte call made on
carriers that also supports CDMA.

Bug: 18120718
Change-Id: Ib39c9e04247886786950acf84b84fe4517cb176f
msphone/ImsPhoneCallTracker.java
edb419cf73826d033065919f63e4ffdd7d76db81 25-Oct-2014 Robert Greenwalt <rgreenwalt@google.com> Add our subId to telephonys NetworkCapabilities.

Else it won't match people asking for this particular subId.

bug:18031008
Change-Id: If107042828c152ede51a2497a3859bc1a6c83694
ataconnection/DataConnection.java
c05061bdcff84d8211d51a5080c57f442e4edf74 30-Oct-2014 Junda Liu <junda@google.com> Support SHA256 and avoid unnecessary signature parsing.

Bug: b/17372964
Change-Id: I6567db63288986d100614e73c5e9af6ab9d5c756
icc/UiccCarrierPrivilegeRules.java
e0edd708029cd6154101437051e3068a75675ee0 30-Oct-2014 Anthony Lee <anthonylee@google.com> Changed the prototype for onCallMerged.

The removed parameter is never used and it actually doesn't make
much sense as the layer that calls this callback doesn't have
any sensible second call to return to the handlers.

Bug: 18056632
Change-Id: I4abe92c020f64692370d9ab309e0d12877bdbb06
msphone/ImsPhoneCallTracker.java
ab884d1f7359f504f5d3eaa60988b080453fc624 30-Oct-2014 xinhe <xinhe@google.com> Merge "add Cell broadcast Message debug log" into lmp-mr1-dev
8af0cd7e6086d3c71199f557000f493f4f796276 30-Oct-2014 Shishir Agrawal <shishir@google.com> Merge "Adding Dumpsys to UiccCarrierPrivilegeRules." into lmp-mr1-dev
22f63e1953ccb581cb89585e4ab77eda185c1897 30-Oct-2014 xinhe <xinhe@google.com> add Cell broadcast Message debug log

Bug:18176874
Change-Id: Ibe17b2c7af89b2695a95d786bfcdde634b90f048
ellBroadcastHandler.java
IL.java
8712fac82ffb468decf38f778830e38e0e36eb2e 29-Oct-2014 Amit Mahajan <amitmahajan@google.com> Merge "Fix *86 converting issue." into lmp-mr1-dev
cd8f9413fb2647309a729e40d5ae4d8d90a60895 29-Oct-2014 Amit Mahajan <amitmahajan@google.com> Merge "Update saved network operator on manual network selection req instead of resp." into lmp-mr1-dev
5f9b2cea085f58dde3cea4e3051600f1ff11887a 29-Oct-2014 Tyler Gunn <tgunn@google.com> Merge "Communicating participant changes to conference controller." into lmp-mr1-dev
38aa6d75f4edfe03a20826952e41572127bcd6c9 29-Oct-2014 Shishir Agrawal <shishir@google.com> Adding Dumpsys to UiccCarrierPrivilegeRules.

* Call UiccCard.dump during dumpsys.
* Remove obsolete code from UiccController.

Bug: 17596631
Change-Id: Ia64b08489cc4b1d926de46b4b31bc285f88e5d08
icc/UiccCard.java
icc/UiccCarrierPrivilegeRules.java
icc/UiccController.java
d401e14a4bae195234983d18209dbdcd3155cf56 03-Oct-2014 Xia Ying <yingxia@motorola.com> Fix *86 converting issue.

Our design is to convert *86 to +1MDN, using real MDN to replace string 'MDN'.
When phone roaming in GSM/UMTS network, MDN is grabbed from sim card's EF_MSISDN,
here the EF_MSISDN is +1XXXXX, so after converting, the number is changed to
+1+1XXXXX, and finally the second + and following part will be removed in
number format checking.

Bug: 17822591
Change-Id: Iafa0f36c4e58e80d3fd300a2a1430147332f4a1a
allTracker.java
6523e56f478a3afef01519e45f62814e15df53a9 29-Oct-2014 Shishir Agrawal <shishir@google.com> Merge "DctContoller should recreate TelephonyNetworkFactory on phone object update." into lmp-mr1-dev
8cef6eeaae1f80cf867875e8b3e0172216806509 29-Oct-2014 Amit Mahajan <amitmahajan@google.com> Update saved network operator on manual network selection req instead of resp.

Bug: 17989129
Change-Id: I207187a7cc5d1ac067ad0e45b8d5205aca13ac93
honeBase.java
af64bba0e977e7fa58b5034e6032a0438275f820 29-Oct-2014 Shishir Agrawal <shishir@google.com> Merge "Undo changes caused by bad merge of I94eb65c62231b5831570bb0cbbbd9c916bee0a37" into lmp-mr1-dev
7981b8525b5ca29dc699e395b7f3e395be23de07 28-Oct-2014 Sanket Padawe <sanketpadawe@google.com> Merge "Remove checks to support new sim color selection." into lmp-mr1-dev
26a0a93d610130e2a6f11a49f2f4b454617fcd55 28-Oct-2014 Shishir Agrawal <shishir@google.com> DctContoller should recreate TelephonyNetworkFactory on phone object update.

Not doing this means that a setup_data_call will not trigger when we change
phone (say from CDMA to GSM). Ideally it should be doing this on DcTracker
object getting created, but since DcTracker is tied to Phone, this approach
should work.

Bug: 18158402
Change-Id: I2ed04f1d7b48081e809925d9fda35062b40955ef
ataconnection/DctController.java
50297d8a0fbc6f7d799af3931fa378453476ea9f 28-Oct-2014 Sanket Padawe <sanketpadawe@google.com> Remove checks to support new sim color selection.

Remove checks to support new sim color selection in multi-sim settings UI.

Change-Id: I26da0a79f5b1edf829fc5d46af2c0c23962226b8
ubscriptionController.java
450e082ac29af48a86158416d3bfd237171bd135 27-Oct-2014 Shishir Agrawal <shishir@google.com> Undo changes caused by bad merge of I94eb65c62231b5831570bb0cbbbd9c916bee0a37

The change seems to have deleted some code that it should not have.

Bug: 18153840
Change-Id: Iaf338509f6bf88a8214b01d6bc4a220fe82b80d8
sm/GsmServiceStateTracker.java
fdca22cc56b0e1ef1504e36a5aacb2ebbc4d146c 28-Oct-2014 Tyler Gunn <tgunn@google.com> Communicating participant changes to conference controller.

- Add event handlers to pass participant info to conference controller.

Bug: 18057361
Change-Id: Ifdd2d871994fc6e347f54d1e69686f7c68a7d6b0
onnection.java
elephonyTester.java
msphone/ImsPhoneCallTracker.java
481a66b57a62b669a4ff3b173f3e96aabec65592 27-Oct-2014 Amit Mahajan <amitmahajan@google.com> Initialize voicemail count correctly.

This affects cases when neither of EF_MWIS and EF_MWIS_CPHS are present
on SIM.

Bug: 18126828
Change-Id: I860e39017829d939df07d5a8520d8980dbb82395
icc/SIMRecords.java
0b83b4f03096a3b7111d758407786538fdfd3dff 24-Oct-2014 Etan Cohen <etancohen@google.com> Separate VoLTE and VT configurations.

Change-Id: Id5c673c9329e01ec47a257252c70ecbe127df988
dma/CDMAPhone.java
sm/GSMPhone.java
3a80c025e1f78319feaf771e406d4906ab58be0b 27-Oct-2014 Wink Saville <wink@google.com> Merge "Change subId to int from long" into lmp-mr1-dev
5ff829bf9413cc438306a44b1b97583aa9502643 27-Oct-2014 Amit Mahajan <amitmahajan@google.com> Revert "Telephony: Voice mail notification related changes"

This reverts commit 2a9a655afb255aa5dc449180499e68a2bbfbb82d.

Bug: 18126828
Change-Id: I11b02c909253caa8ffa69a3dae8e11e36262c055
nboundSmsHandler.java
honeBase.java
elephonyCapabilities.java
dma/CDMAPhone.java
dma/CdmaInboundSmsHandler.java
sm/GSMPhone.java
sm/GsmInboundSmsHandler.java
icc/IccRecords.java
icc/IsimUiccRecords.java
icc/RuimRecords.java
icc/SIMRecords.java
0d4f1fe3137cc4a76fc2bb0dac80c68220e53550 27-Oct-2014 Tyler Gunn <tgunn@google.com> Implement test IMS conference event package harness.

Implement test conference event package intent receiver and parser which
allows the user to issue an intent to cause a test conference event
package file to be injected into the current ImsCall:

adb shell am broadcast
-a com.android.internal.telephony.TestConferenceEventPackage
-e filename test_filename.xml

Bug: 18119796
Change-Id: Ic51be9442ae5b991054ccfd7655c6efd76ffd8e0
elephonyTester.java
msphone/ImsPhoneCall.java
est/TestConferenceEventPackageParser.java
b237a11044ed842d2865ff8c8716befb06b6ca25 25-Oct-2014 Wink Saville <wink@google.com> Change subId to int from long

Change-Id: Idae6335e63e7b1e4e714bc17e71b1a4705e38474
allManager.java
efaultPhoneNotifier.java
IccPhoneBook.aidl
ccProvider.java
hone.java
honeBase.java
honeFactory.java
honeNotifier.java
honeProxy.java
honeSubInfo.java
honeSubInfoController.java
honeSubInfoProxy.java
roxyController.java
MSDispatcher.java
ubInfoRecordUpdater.java
ubscriptionController.java
iccPhoneBookController.java
iccSmsController.java
apPushOverSms.java
dma/CdmaLteServiceStateTracker.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
ataconnection/DctController.java
sm/GsmServiceStateTracker.java
msphone/ImsPhone.java
icc/IccCardProxy.java
icc/UiccCardApplication.java
6137cc7b1a52486465055445e24328487e19553f 24-Oct-2014 Sanket Padawe <sanketpadawe@google.com> Default sim name set to carrier name in sim settings

Default sim name in SIM settings UI should be carrier name untill user
specifies a name for SIM.

Bug: 17732079
Change-Id: I302ad00095fd06b393dbe358b135f031390a3678
ubInfoRecordUpdater.java
ubscriptionController.java
c947b1f5118a2ae463d73495c5a9527de8f6df13 24-Oct-2014 Amit Mahajan <amitmahajan@google.com> DO NOT MERGE. Fixed merge issue in GSMPhone.java

Change-Id: I2615c5567f8f0089c2a824d3d041ec4a36f1e293
sm/GSMPhone.java
8d4668a51a1ab0f7a240d76c1f59b1b7cb6e8c6b 24-Oct-2014 Amit Mahajan <amitmahajan@google.com> am d10a9057: am 796d3c22: Change to consider SIGNAL_LOST as permanenet failure only if not attached.

* commit 'd10a9057b2dd78ea698dd64c25f1a5eff0c07614':
Change to consider SIGNAL_LOST as permanenet failure only if not attached.
d10a9057b2dd78ea698dd64c25f1a5eff0c07614 24-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 796d3c22: Change to consider SIGNAL_LOST as permanenet failure only if not attached.

* commit '796d3c22f21041116110735c92d7e2c3a7c8f60d':
Change to consider SIGNAL_LOST as permanenet failure only if not attached.
c36fa2485015ed665398cc9389bd406c61d9ce4f 24-Oct-2014 Tyler Gunn <tgunn@google.com> Merge "Propagating isMultiParty indicator from RIL up into Telephony layer." into lmp-mr1-dev
796d3c22f21041116110735c92d7e2c3a7c8f60d 24-Oct-2014 Amit Mahajan <amitmahajan@google.com> Change to consider SIGNAL_LOST as permanenet failure only if not attached.

Bug: 18062475
Change-Id: I6c1b220fbb3cc9798419ec190e83d3eaea16ec69
ataconnection/DataConnection.java
ataconnection/DcController.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
9baab0cf7ec904aaf4a54bf8356b0db302dcf0c8 24-Oct-2014 xinhe <xinhe@google.com> Merge "turning off cellular data doesn't do anything when wifi is active and cellular is unvalidated" into lmp-mr1-dev
afc90048d97e1893e45c7a2212e02b28b07a5415 24-Oct-2014 Amit Mahajan <amitmahajan@google.com> Fixed merge issue in GSMPhone.java

Change-Id: I2615c5567f8f0089c2a824d3d041ec4a36f1e293
sm/GSMPhone.java
eb3b88635c60b0a4eb73ed11995ce2c968956eb4 24-Oct-2014 Amit Mahajan <amitmahajan@google.com> am c6194371: Merge "Telephony: Voice mail notification related changes" into lmp-dev automerge: 8daf2a4

* commit 'c61943711a3054a758fbca1193edac623e1235ef':
Telephony: Voice mail notification related changes
c61943711a3054a758fbca1193edac623e1235ef 24-Oct-2014 Amit Mahajan <amitmahajan@google.com> Merge "Telephony: Voice mail notification related changes" into lmp-dev
automerge: 8daf2a4

* commit '8daf2a45de154ac1f8dd54e43e45d147dc9d2a0f':
Telephony: Voice mail notification related changes
2c38178d30afd3f168c6506f0942f93c785d3d7e 24-Oct-2014 Tyler Gunn <tgunn@google.com> Propagating isMultiParty indicator from RIL up into Telephony layer.

- Changing ImsPhoneCall to return the multiparty bit from the ImsCall
instead of depending on the number of connections present.

Bug: 18058253
Change-Id: I0f81f16e38d3a907c8e81143b0f36d2d17e7f971
msphone/ImsPhoneCall.java
msphone/ImsPhoneConnection.java
014103f70a8d7dc5b0030f18641ca5d117197ce0 24-Oct-2014 xinhe <xinhe@google.com> turning off cellular data doesn't do anything when wifi is active and cellular is
unvalidated

The root cause of this bug is:
If you turn on wifi when mobile data is enabled, after WIFI network is ready:

(1) 10s later, ConnectivityService will decrease the APN ref counter and
deactivate APN mdataEnabled
(2) After 30s, ConnectivityService will finish linger and tear down all mobile
data connection

However, if you turn off the mobile data in that 30s race window, since APN is
mobile data deactivated already, the turn off mobile data will not tear down
connections anymore. And then if you trun on the wifi, ConnectivityService will
re-enable the mobile data network.

Our fix remove the check of existing data connection and force state change with
the manual UI setting since the enable/disable mobile data should behave like a
switch.

Bug:17282476
Change-Id: If4cc95985c9c7401ef179403274d7f598cbc4a40
ataconnection/DcTrackerBase.java
776e350a422070a0579900bfcc542766241c1414 23-Oct-2014 Sukanya Rajkhowa <srajkh@codeaurora.org> am 26a4150c: Telephony: Voice mail notification related changes

* commit '26a4150cfb8cd317eb64994b9d9fd6109bd87ba7':
Telephony: Voice mail notification related changes
26a4150cfb8cd317eb64994b9d9fd6109bd87ba7 03-Jan-2014 Sukanya Rajkhowa <srajkh@codeaurora.org> Telephony: Voice mail notification related changes

* Separate voice mail notify from SIM/RUIM card

* For GSM store voice mail count in phone memory
irrespective of SIM write result.

* Display voice mail count for GSM

Bug: 17299884

Change-Id: I368bfb98c8798ed1f43bcc330e6d97e8f95f0f54
nboundSmsHandler.java
honeBase.java
elephonyCapabilities.java
dma/CDMAPhone.java
dma/CdmaInboundSmsHandler.java
sm/GSMPhone.java
sm/GsmInboundSmsHandler.java
icc/IccRecords.java
icc/IsimUiccRecords.java
icc/RuimRecords.java
icc/SIMRecords.java
c9c58c08241c4b7ce96b92481a9156ca4772ce42 23-Oct-2014 Legler Wu <legler.wu@mediatek.com> am 1e7aeace: [DS] Change the copyright

* commit '1e7aeace971d8b6d5e5b8cf2038cfce820bb7772':
[DS] Change the copyright
1e7aeace971d8b6d5e5b8cf2038cfce820bb7772 23-Oct-2014 Legler Wu <legler.wu@mediatek.com> [DS] Change the copyright

Change the copyright as Android.

Review: https://partner-android-review.git.corp.google.com/#/c/185242

Change-Id: Iad9632917d14ddb429aeb08d7335aef3fe0663d8
ubInfoRecordUpdater.java
ubscriptionController.java
454a551540693edd4941bd51f6c077243b6bc84e 23-Oct-2014 xinhe <xinhe@google.com> am f37635cc: am d86df358: Device mobile data is not working though mobile data status indicator shows "H" with full signal

* commit 'f37635ccc9835c19c25be947c2a755bc353eb542':
Device mobile data is not working though mobile data status indicator shows "H" with full signal
f37635ccc9835c19c25be947c2a755bc353eb542 23-Oct-2014 xinhe <xinhe@google.com> am d86df358: Device mobile data is not working though mobile data status indicator shows "H" with full signal

* commit 'd86df358b8fe07160caa12147b6e4ad34d378ce6':
Device mobile data is not working though mobile data status indicator shows "H" with full signal
c0f3d31174bc41dfde2374a56f7f1461cee5594c 23-Oct-2014 Wink Saville <wink@google.com> Merge "Radio Capability Support." into lmp-mr1-dev
fc93067f7ab07b39b4eb1cb4fb3ea4e0f769f023 23-Oct-2014 Legler Wu <legler.wu@mediatek.com> Radio Capability Support.

Add missing code.

Change-Id: Id23e36d606e55a80be865c2e9c091af896c08b58
IL.java
8daf2a45de154ac1f8dd54e43e45d147dc9d2a0f 23-Oct-2014 Amit Mahajan <amitmahajan@google.com> Merge "Telephony: Voice mail notification related changes" into lmp-dev
2a9a655afb255aa5dc449180499e68a2bbfbb82d 03-Jan-2014 Sukanya Rajkhowa <srajkh@codeaurora.org> Telephony: Voice mail notification related changes

* Separate voice mail notify from SIM/RUIM card

* For GSM store voice mail count in phone memory
irrespective of SIM write result.

* Display voice mail count for GSM

Bug: 17299884

Change-Id: I368bfb98c8798ed1f43bcc330e6d97e8f95f0f54
nboundSmsHandler.java
honeBase.java
elephonyCapabilities.java
dma/CDMAPhone.java
dma/CdmaInboundSmsHandler.java
sm/GSMPhone.java
sm/GsmInboundSmsHandler.java
icc/IccRecords.java
icc/IsimUiccRecords.java
icc/RuimRecords.java
icc/SIMRecords.java
d86df358b8fe07160caa12147b6e4ad34d378ce6 23-Oct-2014 xinhe <xinhe@google.com> Device mobile data is not working though mobile data status indicator shows
"H" with full signal

Fix: Do not merge the APN configures which have the same type element. If there
are multiple type elements in the confgures, they should be merge only if
there is no common set between them.

Bug:18080519
Change-Id: Ic3bf5979abdf1623ae57d7a9fc659f6c3005b869
ataconnection/DcTracker.java
f598a35694a785e999d4c12f90af4ecbfa34b689 22-Oct-2014 Paul Jensen <pauljensen@google.com> am 7c580f7a: resolved conflicts for merge of 2b7b6016 to lmp-sprout-dev

* commit '7c580f7ad2dd8c631fc84a383a98f09990a78c13':
Show ProgressDialog when waiting for radio to turn on when provisioning.
7812b9c66f0feeecc4d178ab49859ddefb541f31 22-Oct-2014 Nick Kralevich <nnk@google.com> am 1a3c1bc6: am 9ecf9dc2: Merge "require DUMP permission on dump()" into lmp-dev

* commit '1a3c1bc62a605e868d0b722f4cab124b4bfb2a42':
require DUMP permission on dump()
42a8ffee27221c31b0c1b7da3b3cc9badfdd46ab 22-Oct-2014 Amit Mahajan <amitmahajan@google.com> am e5423c30: am f63f536e: Merge "Change apn comparison (apnsSimilar()) to make sure same APNs are merged." into lmp-dev

* commit 'e5423c3025ca036ff884012e7f2208ce45e4398e':
Change apn comparison (apnsSimilar()) to make sure same APNs are merged.
4932ebdafa908e740174f631dc6471c8d529ed8d 22-Oct-2014 Junda Liu <junda@google.com> Merge "Add logging to check cdma subscription source." into lmp-mr1-dev
7c580f7ad2dd8c631fc84a383a98f09990a78c13 22-Oct-2014 Paul Jensen <pauljensen@google.com> resolved conflicts for merge of 2b7b6016 to lmp-sprout-dev

Change-Id: Iaa354ddf634fa21a06eae961c7bdb5b1602e891e
7e3260e3a9469b8d5b90665a7f9ccb359f8e708a 22-Oct-2014 Junda Liu <junda@google.com> Add logging to check cdma subscription source.

Bug: b/17935642
Change-Id: I8e3d7d14288d01ead0cad92bf8269aae5f5de518
dma/CdmaServiceStateTracker.java
dma/CdmaSubscriptionSourceManager.java
2b7b6016c7a5f2c3ce9c7e623ea10a9fe9239dc2 15-Oct-2014 Paul Jensen <pauljensen@google.com> Show ProgressDialog when waiting for radio to turn on when provisioning.

Turning on the cellular radio when user selects the provisioning notification
can take 30-60s so a UI is needed to keep the user informed that the radio is
coming up. This is only for provisioning APN support (only AT&T tablets now).

bug:15990642
Change-Id: I1e77c3a1b1a24be7acc7cb3c925c002e5fa2d1a9
ataconnection/DcTracker.java
1a3c1bc62a605e868d0b722f4cab124b4bfb2a42 22-Oct-2014 Nick Kralevich <nnk@google.com> am 9ecf9dc2: Merge "require DUMP permission on dump()" into lmp-dev

* commit '9ecf9dc231ad2720cb11d4b9aeb4fee620cd6e78':
require DUMP permission on dump()
9ecf9dc231ad2720cb11d4b9aeb4fee620cd6e78 22-Oct-2014 Nick Kralevich <nnk@google.com> Merge "require DUMP permission on dump()" into lmp-dev
e5423c3025ca036ff884012e7f2208ce45e4398e 22-Oct-2014 Amit Mahajan <amitmahajan@google.com> am f63f536e: Merge "Change apn comparison (apnsSimilar()) to make sure same APNs are merged." into lmp-dev

* commit 'f63f536e81106549de980122f3efbef8fe86fab9':
Change apn comparison (apnsSimilar()) to make sure same APNs are merged.
f63f536e81106549de980122f3efbef8fe86fab9 22-Oct-2014 Amit Mahajan <amitmahajan@google.com> Merge "Change apn comparison (apnsSimilar()) to make sure same APNs are merged." into lmp-dev
d786f9a4184a8d6f116fc9aece46adf18e52a14d 21-Oct-2014 Nick Kralevich <nnk@google.com> require DUMP permission on dump()

Bug: 17983781
Change-Id: Ib8e9904da80d638abdcc74a5e183ce3d44e1e33b
ubscriptionController.java
61cdbcf2de392d043de0e4a533fbc615fc423000 21-Oct-2014 Amit Mahajan <amitmahajan@google.com> Change apn comparison (apnsSimilar()) to make sure same APNs are merged.

Bug: 18015631
Change-Id: I590bfb04600d6f6f6b0f552713b04616bc6a3330
ataconnection/DcTracker.java
f1227d71324a4d1916c3fd441ca688cc76129583 18-Oct-2014 Libin.Tang@motorola.com <w16529@motorola.com> IMS:Re-Initiate Conference Call from Leaf Node Causes Conference Call Crash.

During conference call, if there is an incoming call and user accepts it,
the ims FW triggers two accept commands since ims FW triggers the onCallHeld
multiple times for conference call.
The multiple accept commands causes the ims ril to respond failure. As the result,
the call drops and also crash occurs.
The fix is to block the multiple accepts in ims FW layer.

Bug: 17606426
Change-Id: I89904d4c64dad0d19398f74408ddc177f59c40ce
msphone/ImsPhoneCallTracker.java
3b2b1bd2293667d4de32920cdad2c19f77777e2f 18-Oct-2014 Libin.Tang@motorola.com <w16529@motorola.com> IMS: fix Missed call notification not shown.

Bug: 18012896
Change-Id: Ifff83c401171de7317ab93359174df357779c38a
msphone/ImsPhoneCallTracker.java
e3dbfb6b3a0147bd9138a775e619a780f8b22367 21-Oct-2014 Legler Wu <legler.wu@mediatek.com> am ae798a22: Stk FWK DSDS support

* commit 'ae798a22222a7e6ee5c47cd789838b3e915d1f13':
Stk FWK DSDS support
ae798a22222a7e6ee5c47cd789838b3e915d1f13 20-Oct-2014 Legler Wu <legler.wu@mediatek.com> Stk FWK DSDS support

CatService.java: extend sInstance to support dsds

Change-Id: I47823aab90b692a2a1e3c2f57c0b658e104c1b84
at/CatService.java
8d0025d614edb5075f72b2fc95b0cae069068283 20-Oct-2014 Wink Saville <wink@google.com> am 2b40e622: Radio Capability Support.

* commit '2b40e6226b4b71408964bca46f0a9f256cd4f523':
Radio Capability Support.
2b40e6226b4b71408964bca46f0a9f256cd4f523 18-Oct-2014 Wink Saville <wink@google.com> Radio Capability Support.

New design of capability switch for L.
Add new RIL requests:
RIL_REQUEST_GET_RADIO_CAPABILITY
RIL_REQUEST_SET_RADIO_CAPABILITY
RIL_UNSOL_RADIO_CAPABILITY

These commands allow the framework to communicate what the Radio
Capabilities for each logical modem has or should be using.

It can support 2/3/4G switch and has flexible architecture to support
future technology.

Change-Id: Iedf7f608d2ba3c06a883500f2d85abb98e69d9c1
aseCommands.java
ommandsInterface.java
hone.java
honeBase.java
honeProxy.java
roxyController.java
IL.java
adioCapability.java
dma/CDMAPhone.java
sm/GSMPhone.java
sm/GsmServiceStateTracker.java
msphone/ImsPhoneCommandInterface.java
0d60e906b66848239a02d6cd7ad0f3b73538a240 18-Oct-2014 Wink Saville <wink@google.com> am c4506d3d: Merge "Add a new Item constructor for use by DSDS Stk." into lmp-sprout-dev

* commit 'c4506d3dd27997da2a57b264c0e1b0d37769ea48':
Add a new Item constructor for use by DSDS Stk.
c4506d3dd27997da2a57b264c0e1b0d37769ea48 18-Oct-2014 Wink Saville <wink@google.com> Merge "Add a new Item constructor for use by DSDS Stk." into lmp-sprout-dev
0601551e110b0e4a2d6da455fed275d2e2afd40b 17-Oct-2014 Mohamad Ayyash <mkayyash@google.com> am 3122b0f0: am cbb9298b: Merge "ril: Fix update screen events." into lmp-dev

* commit '3122b0f0acdeb87a29907107efaa4ed7028269dd':
ril: Fix update screen events.
3122b0f0acdeb87a29907107efaa4ed7028269dd 17-Oct-2014 Mohamad Ayyash <mkayyash@google.com> am cbb9298b: Merge "ril: Fix update screen events." into lmp-dev

* commit 'cbb9298b084b89d794eca0aae4e6997076e68284':
ril: Fix update screen events.
5fbf6bed80437e092a93e6137de56e6b409910b1 17-Oct-2014 Etan Cohen <etancohen@google.com> Added log to clarify cause of incoming call termination: rejected or missed

Change-Id: Id59630b6fefb50bc4320622f79ca70a7459ba28b
msphone/ImsPhoneCallTracker.java
2865ee97881486cc533e0336b9865ca5a6ee0a2a 17-Oct-2014 Mohamad Ayyash <mkayyash@google.com> Merge "ril: Fix update screen events." into lmp-dev
automerge: cbb9298

* commit 'cbb9298b084b89d794eca0aae4e6997076e68284':
ril: Fix update screen events.
cbb9298b084b89d794eca0aae4e6997076e68284 17-Oct-2014 Mohamad Ayyash <mkayyash@google.com> Merge "ril: Fix update screen events." into lmp-dev
b9597d030e970e13e1c399301e671542b52db3b5 16-Oct-2014 Mohamad Ayyash <mkayyash@google.com> ril: Fix update screen events.

- Handle invalid states in updateScreenState.
- Call updateScreenState in onRadioAvailalbe instead.

BUG: 17991196
Change-Id: I567aa74b1dd6b4bbadb273c05296fe82be575f7f
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
IL.java
f92eac81f9b684a52a0959e5f703e79e6e179eb9 16-Oct-2014 Wink Saville <wink@google.com> Add a new Item constructor for use by DSDS Stk.

Change-Id: Ie7d4113629b6cea521465a4a4d5d147707956fff
at/Item.java
b5efe8fb65f28142ee3b568b91195693807c5d8d 16-Oct-2014 Wink Saville <wink@google.com> am 013a66ce: am f17dec63: Fix an NPE in SubscriptionController.dump

* commit '013a66ce082512dbe744a4a696304659578bd775':
Fix an NPE in SubscriptionController.dump
013a66ce082512dbe744a4a696304659578bd775 16-Oct-2014 Wink Saville <wink@google.com> am f17dec63: Fix an NPE in SubscriptionController.dump

* commit 'f17dec635141a16b68ab4980c118d49ec5ae11c0':
Fix an NPE in SubscriptionController.dump
e0e741bfdeaee35109a47b5ff0de14c5f50483b6 16-Oct-2014 Wink Saville <wink@google.com> am f17dec63: Fix an NPE in SubscriptionController.dump

* commit 'f17dec635141a16b68ab4980c118d49ec5ae11c0':
Fix an NPE in SubscriptionController.dump
f17dec635141a16b68ab4980c118d49ec5ae11c0 16-Oct-2014 Wink Saville <wink@google.com> Fix an NPE in SubscriptionController.dump

Bug: 17945275
Change-Id: I076112ede5fd224284c23078b321fd282d0dffe0
ubscriptionController.java
7332ab220b9d90701aa0645ded6887f5c49f4557 16-Oct-2014 xinhe <xinhe@google.com> Merge "Sprint: MMS proxy authorization does not include NAI" into lmp-mr1-dev
2351b17aba5350004fc76707f3b3d2859ce773c8 15-Oct-2014 xinhe <xinhe@google.com> Sprint: MMS proxy authorization does not include NAI

Read the NAI from CSIM and pass it to MMS module
Bug:17752727

Change-Id: I2f8bbe3cdf4a447f7ecf13e06733615a2e60ec53
hone.java
honeBase.java
honeProxy.java
honeSubInfo.java
honeSubInfoController.java
honeSubInfoProxy.java
dma/CDMAPhone.java
icc/CsimFileHandler.java
icc/IccConstants.java
icc/IccRecords.java
icc/RuimFileHandler.java
icc/RuimRecords.java
f8a5a95e21d2844193b9f9ce91fbee379df84504 13-Oct-2014 Libin.Tang@motorola.com <w16529@motorola.com> IMS:autoresume the holding call to simulate CDMA network behavior
when default phone is CDMAPhone during voltecall.

Change-Id: I8bc363c0f3e9385d14c4a067ae055069e41081c1
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
bc1e44907073900212fb87da372174483525f3ed 15-Oct-2014 Jay Shrauner <shrauner@google.com> Fix NPE when in initConnection()

Make sure mApnSetting is non-null.

Bug:18001406
Change-Id: Ieec252ae7252754c2967ef635085113e3f3ce36d
ataconnection/DataConnection.java
97dddb84e24762704c252291070fbe4a52695a00 15-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 2f5d7186: am 7b960c8a: Hide sensitive payload from logging.

* commit '2f5d7186151a4fbc39fa676e14366c73d023e02d':
Hide sensitive payload from logging.
8d79a62a9675544949d6c847bd581803245f5dfd 15-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 7b960c8a: Hide sensitive payload from logging.

* commit '7b960c8adc35113c6eb3fad6cdfe32c2169d380b':
Hide sensitive payload from logging.
2f5d7186151a4fbc39fa676e14366c73d023e02d 15-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 7b960c8a: Hide sensitive payload from logging.

* commit '7b960c8adc35113c6eb3fad6cdfe32c2169d380b':
Hide sensitive payload from logging.
7b960c8adc35113c6eb3fad6cdfe32c2169d380b 14-Oct-2014 Amit Mahajan <amitmahajan@google.com> Hide sensitive payload from logging.

For:
RIL_REQUEST_SIM_OPEN_CHANNEL
RIL_REQUEST_SIM_TRANSMIT_APDU_CHANNEL
UNSOL_STK_EVENT_NOTIFY
UNSOL_STK_PROACTIVE_COMMAND

Bug: 17984085
Change-Id: I8b83ae0d85792636bae0b7e0f57b0ea6e5cb33d9
IL.java
9787e809c4c4665d46970b7e82864027ed9894c9 11-Oct-2014 Robert Greenwalt <rgreenwalt@google.com> am 6b4d4c9a: am 8eb4b07b: Merge "Fix enabling of FailFast mechanism." into lmp-dev

* commit '6b4d4c9acc9a6a64a511cf1fbe403b2a6e24d25a':
Fix enabling of FailFast mechanism.
474410449d1c576e4731d7018c2579aec7a52e6a 11-Oct-2014 Yorke Lee <yorkelee@google.com> am 97d4c648: am 4a00d523: Pass in connection to CDMAPhone.notifyUnknownConnection

* commit '97d4c648a2f6563439e084c65bef538bb1176e99':
Pass in connection to CDMAPhone.notifyUnknownConnection
d50a625fe1da674d95c0032d9be845f09365a5d5 10-Oct-2014 Robert Greenwalt <rgreenwalt@google.com> am 8eb4b07b: Merge "Fix enabling of FailFast mechanism." into lmp-dev

* commit '8eb4b07b8535c04901cc46dc7860c87aa9e9fbfc':
Fix enabling of FailFast mechanism.
6b4d4c9acc9a6a64a511cf1fbe403b2a6e24d25a 10-Oct-2014 Robert Greenwalt <rgreenwalt@google.com> am 8eb4b07b: Merge "Fix enabling of FailFast mechanism." into lmp-dev

* commit '8eb4b07b8535c04901cc46dc7860c87aa9e9fbfc':
Fix enabling of FailFast mechanism.
8eb4b07b8535c04901cc46dc7860c87aa9e9fbfc 10-Oct-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix enabling of FailFast mechanism." into lmp-dev
8a2034b155e1623e47c99a2b903e836cc9d07c30 10-Oct-2014 Yorke Lee <yorkelee@google.com> am 4a00d523: Pass in connection to CDMAPhone.notifyUnknownConnection

* commit '4a00d523459470e604728784d36a3dd2a0f6c331':
Pass in connection to CDMAPhone.notifyUnknownConnection
97d4c648a2f6563439e084c65bef538bb1176e99 10-Oct-2014 Yorke Lee <yorkelee@google.com> am 4a00d523: Pass in connection to CDMAPhone.notifyUnknownConnection

* commit '4a00d523459470e604728784d36a3dd2a0f6c331':
Pass in connection to CDMAPhone.notifyUnknownConnection
6395443719ec3ee0257085945e753d02f603886b 10-Oct-2014 Robert Greenwalt <rgreenwalt@google.com> Fix enabling of FailFast mechanism.

If you use the wrong obtainMessage it's cast into an Integer
and stored in obj instead of arg1. This causes us to retry onto
the provisioning apn in 3 seconds instead of 20 and speeds up
the process.

bug:15990642
Change-Id: I3deb32d49c9fa77b16af9daf5c6ffb682363f6d1
ataconnection/DcTracker.java
4a00d523459470e604728784d36a3dd2a0f6c331 10-Oct-2014 Yorke Lee <yorkelee@google.com> Pass in connection to CDMAPhone.notifyUnknownConnection

An equivalent change has already been made in GSMPhone.

Bug: 17939852
Change-Id: I546618b3d56b2c855e33d8a5604478262f21514c
dma/CDMAPhone.java
dma/CdmaCallTracker.java
3f1fa0373259a7c65b9471c862a6b5402ea07fe0 26-Sep-2014 Omkar Kolangade <omkark@codeaurora.org> IMS UT Exception and Call Forwarding

Adding handling of ImsException in
ImsPhone, supporting propagation of
network error string to the UI.
Also adding logic to handle
'All' and 'All Conditional' call
forwarding condition types in
call forwarding supplementary
service operations.

Change-Id: Ia623818e6bcd60a832dc07afb53d0c19429e515f
msphone/ImsPhone.java
b7aff911e1106eb2eb16fd2bafae0ed8f4d4d4f7 14-Aug-2014 Shriram Ganesh <sganesh@codeaurora.org> Ims: Send user selected TTY mode to lower layers.

Irrespective of whether TTY device is connected or not
send TTY mode setting to modem whenever user changes it
from settings.

Change-Id: I6f6b82e3bb7fd326f71b0aabf4c1098a06c8941c
hone.java
honeBase.java
honeProxy.java
dma/CDMAPhone.java
sm/GSMPhone.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
378df2c548e0683e8c2c53f5adbccbd496fe2fee 09-Oct-2014 Etan Cohen <etancohen@google.com> Fix incorrect phone change on voice RAT change.

Did not switch phones if new phone type didn't match old phone type.

Change-Id: Iab1a438b860ea5db0669e4b97985cf48a59aac4f
honeProxy.java
78dd205434b26d4e64186b1ae4878dcd4fdd8b7e 09-Oct-2014 Wink Saville <wink@google.com> am 4cae974a: Merge commit \'c93ffd4a\' into fix-merge-conflict

* commit '4cae974a6e780e0b3fbc47f1aecfaa9f4e0b857f':
Add SubscriptionController dump.
4cae974a6e780e0b3fbc47f1aecfaa9f4e0b857f 09-Oct-2014 Wink Saville <wink@google.com> Merge commit 'c93ffd4a' into fix-merge-conflict

Conflicts:
src/java/com/android/internal/telephony/DebugService.java
src/java/com/android/internal/telephony/SubscriptionController.java

Change-Id: Ifa2fe56599d7f3459164def6d7291315a9afa546
5bf6757ac96865fc84e4a4326b76cf6d9b136800 26-Sep-2014 Libin.Tang@motorola.com <w16529@motorola.com> IMS:make volte call based on volte run time capability.

Bug: 17182366
Change-Id: I763d2061c8e7eee188dfd40a5582ecd3ab1dd967
dma/CDMAPhone.java
sm/GSMPhone.java
86e3a84441aa87e13ffab8b00bf0b2817174fe23 08-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 4886d62a: am 536cae75: Merge "Send SMS over 1x when on eHRPD/LTE and active voice call" into lmp-dev

* commit '4886d62afc316b302ef32fe9efcc1fefde9d5902':
Send SMS over 1x when on eHRPD/LTE and active voice call
fcd5374c05a4a504686b6803c9e9b6afafdfaef5 08-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 3e389976: am a88daac2: Merge "PLMN10 PWS test fails for Taiwan region certification" into lmp-dev

* commit '3e389976bb9c5937b6d5ee73d8059d280cbf445c':
PLMN10 PWS test fails for Taiwan region certification
4886d62afc316b302ef32fe9efcc1fefde9d5902 08-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 536cae75: Merge "Send SMS over 1x when on eHRPD/LTE and active voice call" into lmp-dev

* commit '536cae75031e11ee30da0a0b4d4a0752e5526e96':
Send SMS over 1x when on eHRPD/LTE and active voice call
3e389976bb9c5937b6d5ee73d8059d280cbf445c 08-Oct-2014 Amit Mahajan <amitmahajan@google.com> am a88daac2: Merge "PLMN10 PWS test fails for Taiwan region certification" into lmp-dev

* commit 'a88daac223c9644b9bf2eb17f37d053194c4da3e':
PLMN10 PWS test fails for Taiwan region certification
6bd6abbe485390844db82ab927108235d90d27f0 08-Oct-2014 Wink Saville <wink@google.com> am c93ffd4a: Merge "Add SubscriptionController dump." into lmp-dev

* commit 'c93ffd4aff9e9b90210c6f1c9ae2a650f16f9edb':
Add SubscriptionController dump.
c93ffd4aff9e9b90210c6f1c9ae2a650f16f9edb 08-Oct-2014 Wink Saville <wink@google.com> Merge "Add SubscriptionController dump." into lmp-dev
0c1c62029a6a2ae895e96d83b9c1929f1a5c7daf 08-Oct-2014 Jeff Brown <jeffbrown@google.com> am 2183de15: am 63848d36: Merge "Notify modem about screen on/off states more precisely." into lmp-dev

* commit '2183de15ae39469ae20c8a3af6eca2589cdbddf5':
Notify modem about screen on/off states more precisely.
2183de15ae39469ae20c8a3af6eca2589cdbddf5 08-Oct-2014 Jeff Brown <jeffbrown@google.com> am 63848d36: Merge "Notify modem about screen on/off states more precisely." into lmp-dev

* commit '63848d3691b01bb253989a5cacf4d2fa56883bb5':
Notify modem about screen on/off states more precisely.
7066ed79e177b5c139d0aa43ea3e355801b73c6d 08-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 536cae75: Merge "Send SMS over 1x when on eHRPD/LTE and active voice call" into lmp-dev

* commit '536cae75031e11ee30da0a0b4d4a0752e5526e96':
Send SMS over 1x when on eHRPD/LTE and active voice call
453fc7e8ef3f53196d32aa1d08363cb9298f5ffa 08-Oct-2014 Amit Mahajan <amitmahajan@google.com> am a88daac2: Merge "PLMN10 PWS test fails for Taiwan region certification" into lmp-dev

* commit 'a88daac223c9644b9bf2eb17f37d053194c4da3e':
PLMN10 PWS test fails for Taiwan region certification
536cae75031e11ee30da0a0b4d4a0752e5526e96 08-Oct-2014 Amit Mahajan <amitmahajan@google.com> Merge "Send SMS over 1x when on eHRPD/LTE and active voice call" into lmp-dev
a88daac223c9644b9bf2eb17f37d053194c4da3e 08-Oct-2014 Amit Mahajan <amitmahajan@google.com> Merge "PLMN10 PWS test fails for Taiwan region certification" into lmp-dev
fa06894356aabe0cebb8b83d9d4b170c3de673e7 12-Sep-2014 bansalv <bansalv@motorola.com> PLMN10 PWS test fails for Taiwan region certification

Solution: Need to add channel 4383 in SmsCbConstants.java and sam should be
handle in Cell Broadcast Application.

Bug: 17886894
sm/SmsCbConstants.java
4eb8e4c8dc684e2109276ea2ec4ce25d3b188568 26-Aug-2014 Xia Ying <yingxia@motorola.com> Send SMS over 1x when on eHRPD/LTE and active voice call

When UE is attached to eHRPD network LTE network which not
allow data and voice concurrent, and IMS is registered:
- If there is an active 1x RTT voice call, send SMS over 1x
- If there no active 1xRTT voice call, send SMS over IMS

Bug: 17331507

Change-Id: I2647c1ccdbf5286445aa34925be0027b21f84a03
dma/CdmaSMSDispatcher.java
14bbab2f43b1040e788fb8fbc8fd67dfaedcfee2 08-Oct-2014 Jeff Brown <jeffbrown@google.com> am 63848d36: Merge "Notify modem about screen on/off states more precisely." into lmp-dev

* commit '63848d3691b01bb253989a5cacf4d2fa56883bb5':
Notify modem about screen on/off states more precisely.
63848d3691b01bb253989a5cacf4d2fa56883bb5 08-Oct-2014 Jeff Brown <jeffbrown@google.com> Merge "Notify modem about screen on/off states more precisely." into lmp-dev
976586d02baafa601eb816467cd9321eaa3c66dc 08-Oct-2014 Wink Saville <wink@google.com> Add SubscriptionController dump.

Unable to reproduce 17678050 so add a dump method and
ScLocalLogs to hopefully capture what's happening.

Bug: 17678050
Change-Id: I91d99c98cff9b6fd484d4972b5461098bba23ba2
ebugService.java
ubscriptionController.java
a12de088fea645c0bc3b491f1b1747811819fefe 07-Oct-2014 Junda Liu <junda@google.com> am 07de07dc: Merge "dispose uicc card if modem is not available." into lmp-dev

* commit '07de07dcacc731b4955656e0be7428ed5427d122':
dispose uicc card if modem is not available.
f5f9fd54550745fa6552816f38db0090e4361fb2 07-Oct-2014 Junda Liu <junda@google.com> am 97b247de: am 07de07dc: Merge "dispose uicc card if modem is not available." into lmp-dev

* commit '97b247deb15a15e5db1442d37cc3674a3d6fdaed':
dispose uicc card if modem is not available.
91ef5eb79927c80103b8942c0c840586f7a9e821 07-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 76b0a0d9: am 7b54f44b: Merge "[ADR] TS51.010-1 34.2.9.1 failed to send concatenated segments SMS to short code" into lmp-dev

* commit '76b0a0d939f7d33ca085aabbe944da997c842fb2':
[ADR] TS51.010-1 34.2.9.1 failed to send concatenated segments SMS to short code
841263550d226c48fc031ac59a0944aa89f9c30c 07-Oct-2014 Amit Mahajan <amitmahajan@google.com> am bd75a8d1: am 8bac0d74: Merge "Sms7BitEncodingTranslator" into lmp-dev

* commit 'bd75a8d17beb989b40143d7cf26abd4dba4d0359':
Sms7BitEncodingTranslator
97b247deb15a15e5db1442d37cc3674a3d6fdaed 07-Oct-2014 Junda Liu <junda@google.com> am 07de07dc: Merge "dispose uicc card if modem is not available." into lmp-dev

* commit '07de07dcacc731b4955656e0be7428ed5427d122':
dispose uicc card if modem is not available.
76b0a0d939f7d33ca085aabbe944da997c842fb2 07-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 7b54f44b: Merge "[ADR] TS51.010-1 34.2.9.1 failed to send concatenated segments SMS to short code" into lmp-dev

* commit '7b54f44bafb4ef6e7d8f051970f2ab1ec5bb0d73':
[ADR] TS51.010-1 34.2.9.1 failed to send concatenated segments SMS to short code
bd75a8d17beb989b40143d7cf26abd4dba4d0359 07-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 8bac0d74: Merge "Sms7BitEncodingTranslator" into lmp-dev

* commit '8bac0d74998db86022d47c2f9848c10243a4bf0c':
Sms7BitEncodingTranslator
07de07dcacc731b4955656e0be7428ed5427d122 07-Oct-2014 Junda Liu <junda@google.com> Merge "dispose uicc card if modem is not available." into lmp-dev
5d8e4457b03d166aa249989916b66a85df898516 11-Sep-2014 Steven Liu <stevenliu@motorola.com> dispose uicc card if modem is not available.

Bug: 17786992
Change-Id: Idd36a2afe696789340e0b6cba1d30eeadc378036
icc/IccCardProxy.java
icc/UiccController.java
e5aa0a55f616e838faed13419df2b219b06c56c4 07-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 7b54f44b: Merge "[ADR] TS51.010-1 34.2.9.1 failed to send concatenated segments SMS to short code" into lmp-dev

* commit '7b54f44bafb4ef6e7d8f051970f2ab1ec5bb0d73':
[ADR] TS51.010-1 34.2.9.1 failed to send concatenated segments SMS to short code
05c853db53bfec9cea36c6a41c5c9557f2e7f210 07-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 8bac0d74: Merge "Sms7BitEncodingTranslator" into lmp-dev

* commit '8bac0d74998db86022d47c2f9848c10243a4bf0c':
Sms7BitEncodingTranslator
7b54f44bafb4ef6e7d8f051970f2ab1ec5bb0d73 07-Oct-2014 Amit Mahajan <amitmahajan@google.com> Merge "[ADR] TS51.010-1 34.2.9.1 failed to send concatenated segments SMS to short code" into lmp-dev
8bac0d74998db86022d47c2f9848c10243a4bf0c 07-Oct-2014 Amit Mahajan <amitmahajan@google.com> Merge "Sms7BitEncodingTranslator" into lmp-dev
f27ef3ef053915cfeedfd4ce8a5a8742efab18ba 07-Oct-2014 Yorke Lee <yorkelee@google.com> am d43785e8: am c2030a3b: Merge "Add ability to add sim-initiated MO call to UI (4/4)" into lmp-dev

* commit 'd43785e8e88e3a8f3d115a5893dc1eff08fc1f50':
Add ability to add sim-initiated MO call to UI (4/4)
8b53bb26569395511e3dbd5f94bda74ea6b9e37c 29-Jul-2014 Xia Ying <yingxia@motorola.com> Sms7BitEncodingTranslator

Bug: 16197894
Change-Id: I389248343c4ee621a1e8980481987742623bcbe7
ms7BitEncodingTranslator.java
dma/SmsMessage.java
sm/SmsMessage.java
d43785e8e88e3a8f3d115a5893dc1eff08fc1f50 07-Oct-2014 Yorke Lee <yorkelee@google.com> am c2030a3b: Merge "Add ability to add sim-initiated MO call to UI (4/4)" into lmp-dev

* commit 'c2030a3ba58b384b10d4a566a44e1761b9eaf1df':
Add ability to add sim-initiated MO call to UI (4/4)
a4966d898ed918aa371d1762699a92e5e569dc2d 07-Oct-2014 Yorke Lee <yorkelee@google.com> am c2030a3b: Merge "Add ability to add sim-initiated MO call to UI (4/4)" into lmp-dev

* commit 'c2030a3ba58b384b10d4a566a44e1761b9eaf1df':
Add ability to add sim-initiated MO call to UI (4/4)
c2030a3ba58b384b10d4a566a44e1761b9eaf1df 07-Oct-2014 Yorke Lee <yorkelee@google.com> Merge "Add ability to add sim-initiated MO call to UI (4/4)" into lmp-dev
7771a0a487bc9253872034025e9c91283af4425f 30-Sep-2014 Etan Cohen <etancohen@google.com> Make sure network set messages are routed even when phone is being switched

Phone will normally be switched as part of network set command process. This
may result in the network set command not being completed.

Bug: 17202095
Change-Id: Ida004effebb7f7e793899866aab649d043f90109
honeBase.java
honeProxy.java
dma/CDMAPhone.java
sm/GSMPhone.java
6c376fea69306e22a2f11894d05cd0abfdaefed3 04-Oct-2014 Xia Ying <yingxia@motorola.com> [ADR] TS51.010-1 34.2.9.1 failed to send concatenated segments SMS to short
code

On handling EVENT_SEND_CONFIRMED_SMS, we should updte mExpectMore
based on mPendingTrackerCount.

Bug: 17570854
Change-Id: I9071031e30c724e05e9738dad3b476289dc79afc
MSDispatcher.java
84f46e8b47047774d9b5ec87615a5fb0b47bdc6d 06-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 2b6939b1: am 9f638ce6: Merge "fix issues to set data profiles" into lmp-dev

* commit '2b6939b13ddf74a6bf6ad8467adea85c2c1b6c3d':
fix issues to set data profiles
4dece2a4fa359695a3dd2e457a537fdfef1cf997 06-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 9f638ce6: Merge "fix issues to set data profiles" into lmp-dev

* commit '9f638ce6ea260b3139fb627d7d232e720e771e03':
fix issues to set data profiles
2b6939b13ddf74a6bf6ad8467adea85c2c1b6c3d 06-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 9f638ce6: Merge "fix issues to set data profiles" into lmp-dev

* commit '9f638ce6ea260b3139fb627d7d232e720e771e03':
fix issues to set data profiles
9f638ce6ea260b3139fb627d7d232e720e771e03 06-Oct-2014 Amit Mahajan <amitmahajan@google.com> Merge "fix issues to set data profiles" into lmp-dev
fdcef0a7e14c15b05509e91edeb2db9bcf0a8aff 06-Oct-2014 Robert Greenwalt <rgreenwalt@google.com> am c0f0cb78: resolved conflicts for merge of d8e86a5e to lmp-sprout-dev

* commit 'c0f0cb783124b8be684cbd7a45f0f1cd3cc3b60a':
Merge similar APNs together when loading All Apns.
c0f0cb783124b8be684cbd7a45f0f1cd3cc3b60a 06-Oct-2014 Robert Greenwalt <rgreenwalt@google.com> resolved conflicts for merge of d8e86a5e to lmp-sprout-dev

Change-Id: I873ca35a7baf57e52a41918a7daade7467540c00
dd5db09966b6d24e2ba0f4d6f5d26985d3303540 01-Oct-2014 Hui Wang <huiwang@motorola.com> fix issues to set data profiles

Bug: 17781567
Change-Id: I62fbe1179c3d71f50b50c70f493e0f86c66c2991
ataconnection/DataProfile.java
ataconnection/DcTrackerBase.java
0dec178a402be98dd0e68bb063f1e4294cbd1d58 04-Oct-2014 Bing Gao <w20090@motorola.com> Fix overlay didn't take effect issue

Change-Id: Ic7102b03a80fecd213706a67223f746b177e42cb
ccTable.java
83a97603d6e38ca5600cc12780fbfbee0cfe483f 04-Oct-2014 Yorke Lee <yorkelee@google.com> Add ability to add sim-initiated MO call to UI (4/4)

Pass in connection when calling notifyUnknownConnection

Bug: 16852844
Change-Id: I52a0eb7ab8bc767db34ccee4d55a2c7b6bd363f5
sm/GSMPhone.java
sm/GsmCallTracker.java
727f33f07eb06abe3b72bc7973a15b68288077b2 06-Oct-2014 Robert Greenwalt <rgreenwalt@google.com> am d8e86a5e: Merge "Merge similar APNs together when loading All Apns." into lmp-dev

* commit 'd8e86a5eb1f8757244fad0f9b54d2ce8ceb3287b':
Merge similar APNs together when loading All Apns.
d8e86a5eb1f8757244fad0f9b54d2ce8ceb3287b 06-Oct-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Merge similar APNs together when loading All Apns." into lmp-dev
80795c239d6281db5fbf0f5a23494bfa3fb938f5 03-Oct-2014 Jeff Brown <jeffbrown@google.com> Notify modem about screen on/off states more precisely.

The SCREEN_ON / SCREEN_OFF broadcasts are no longer adequate for
monitoring the screen state since they are not sent in cases
where the screen is turned off transiently such as due to the
proximity sensor.

This change uses the DisplayManager to watch for screen state
changes to tell the RIL that it can stop sending signal strength
updates.

It's worth pointing out that the RIL should *not* be watching for
screen state changes in the first place! We should create a
new API to more precisely specify the behavior to be controlled
and the signals which govern that behavior. But this change
should be good enough to save a little more power today when the
screen is off due to the proximity sensor.

Bug: 17821361
Change-Id: Ide77e04c3b2cadefc44ef5e51bd958f25a4a3d62
IL.java
167e330592a72f495ddad5115d0fd966567af028 03-Oct-2014 Gordon Gao <njh348@motorola.com> am 8585c965: am d98d019d: Optimize CDMA RATs TCP buffer sizes

* commit '8585c9654cf61dc294656919a19cb71df955daed':
Optimize CDMA RATs TCP buffer sizes
cae168ea4b92a02c64efd377e4969b2d5c241ddc 03-Oct-2014 Gordon Gao <njh348@motorola.com> am d98d019d: Optimize CDMA RATs TCP buffer sizes

* commit 'd98d019d2a23bc7a8f96e8388021e5c87b71f158':
Optimize CDMA RATs TCP buffer sizes
8585c9654cf61dc294656919a19cb71df955daed 03-Oct-2014 Gordon Gao <njh348@motorola.com> am d98d019d: Optimize CDMA RATs TCP buffer sizes

* commit 'd98d019d2a23bc7a8f96e8388021e5c87b71f158':
Optimize CDMA RATs TCP buffer sizes
d98d019d2a23bc7a8f96e8388021e5c87b71f158 02-Oct-2014 Gordon Gao <njh348@motorola.com> Optimize CDMA RATs TCP buffer sizes

1. Add CDMA 1xRTT buffer sizes
2. Add CDMA eHPRD buffer sizes

Bug: 17786212
Change-Id: I31633829576ced088d2bcf563205bbe216c648dd
ataconnection/DataConnection.java
29c6659c8767212d23d417f2b7f032b6c0d82119 03-Oct-2014 Robert Greenwalt <rgreenwalt@google.com> Merge similar APNs together when loading All Apns.

They should have been merged together in the DB. Do it now
at this convenient point so that we don't end up
making duplicate requests for the same apn. That can lead
to duplicate calls with diff call IDs and then netd gets confuse
and things don't work.

bug:17634414
Change-Id: Ia77e43f53456f8ecadc9e94c20301fe8a52338d7
ataconnection/DcTracker.java
ecfff20e8a2257e6a5acd72496660e148eb141cc 03-Oct-2014 Elliott Hughes <enh@google.com> Merge "Better automated fallbacks in MccTable." into lmp-mr1-dev
ef43e2415dd9e668f05d692dc540d200063e9e6c 30-Sep-2014 Elliott Hughes <enh@google.com> Better automated fallbacks in MccTable.

Rather than keep a very incomplete list of the main language spoken in every
country, use CLDR data instead.

Also switch to the persist.sys.override_mcc system property for testing this
code.

Also bring the list of country codes up to date with the 2012 edition of the
ITU list.

Bug: 17664563
Change-Id: I609619e3ba6f1683afe0e1b755a72e7d93f39b3d
ccTable.java
984f6108cf4a10ae9a7fe7304cfc8ad1daf3eead 02-Oct-2014 Amit Mahajan <amitmahajan@google.com> am b98d8ea9: am de9bf648: Merge "Send SMS using RIL_REQUEST_SEND_SMS_EXPECT_MORE" into lmp-dev

* commit 'b98d8ea9fe653ab34824ed78498459bdfa6fc501':
Send SMS using RIL_REQUEST_SEND_SMS_EXPECT_MORE
b98d8ea9fe653ab34824ed78498459bdfa6fc501 02-Oct-2014 Amit Mahajan <amitmahajan@google.com> am de9bf648: Merge "Send SMS using RIL_REQUEST_SEND_SMS_EXPECT_MORE" into lmp-dev

* commit 'de9bf648fb2dfc768ec73d207ea49379814dfdda':
Send SMS using RIL_REQUEST_SEND_SMS_EXPECT_MORE
241b55a1887bc5cea510948245fa507d7ca9633f 02-Oct-2014 Amit Mahajan <amitmahajan@google.com> am de9bf648: Merge "Send SMS using RIL_REQUEST_SEND_SMS_EXPECT_MORE" into lmp-dev

* commit 'de9bf648fb2dfc768ec73d207ea49379814dfdda':
Send SMS using RIL_REQUEST_SEND_SMS_EXPECT_MORE
de9bf648fb2dfc768ec73d207ea49379814dfdda 02-Oct-2014 Amit Mahajan <amitmahajan@google.com> Merge "Send SMS using RIL_REQUEST_SEND_SMS_EXPECT_MORE" into lmp-dev
6ad88a8a2caf739e78c8d5f7f50fc7fa84a07ca7 24-Sep-2013 Chaitanya Saggurthi <csaggurt@codeaurora.org> Send SMS using RIL_REQUEST_SEND_SMS_EXPECT_MORE

1) New commandinterface API sendSMSExpectMore to send sms using
ril request RIL_REQUEST_SEND_SMS_EXPECT_MORE.
2) sendSMSExpectMore API to send multisegment sms pdu's except
last pdu in GSM. In case of retry use sendSms even for
multi segment message, because don't know how many
segments are failed to send

Bug: 17570854
Change-Id: Icfc200a9c9c5940f0e10668b4385d1633a6c943b
ommandsInterface.java
IL.java
MSDispatcher.java
dma/CdmaSMSDispatcher.java
sm/GsmSMSDispatcher.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
3c8c830140e49ad4e328a40dd4b43b85e67f9545 02-Oct-2014 xinhe <xinhe@google.com> am 38aacb31: Merge "Fix for CMAS is not turned on" into lmp-dev

* commit '38aacb31e230f7b8b6dbd3865cc1c84bbaf2ee65':
Fix for CMAS is not turned on
a6003c7f0f2315418d2032b4b1f66703f4c38428 02-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 5f0f5c18: Merge "Treat SIGNAL_LOST error in dataCallResponse as permanent failure." into lmp-dev

* commit '5f0f5c18a1ec4cc85ba737a9fce3dd489b46c54a':
Treat SIGNAL_LOST error in dataCallResponse as permanent failure.
a81f2c47e313a3fcec7adc483f2a60fa2c68f9e0 02-Oct-2014 xinhe <xinhe@google.com> am 86b36e54: am 38aacb31: Merge "Fix for CMAS is not turned on" into lmp-dev

* commit '86b36e54674a99a38d27e1150169daa8bba89d51':
Fix for CMAS is not turned on
16cb1ed27e26cc9258d4bd69f4196793adf0481c 02-Oct-2014 Amit Mahajan <amitmahajan@google.com> am aedac211: am 5f0f5c18: Merge "Treat SIGNAL_LOST error in dataCallResponse as permanent failure." into lmp-dev

* commit 'aedac211fb9aba62cd5db0ecd42f6083a46a516f':
Treat SIGNAL_LOST error in dataCallResponse as permanent failure.
86b36e54674a99a38d27e1150169daa8bba89d51 02-Oct-2014 xinhe <xinhe@google.com> am 38aacb31: Merge "Fix for CMAS is not turned on" into lmp-dev

* commit '38aacb31e230f7b8b6dbd3865cc1c84bbaf2ee65':
Fix for CMAS is not turned on
38aacb31e230f7b8b6dbd3865cc1c84bbaf2ee65 02-Oct-2014 xinhe <xinhe@google.com> Merge "Fix for CMAS is not turned on" into lmp-dev
aedac211fb9aba62cd5db0ecd42f6083a46a516f 01-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 5f0f5c18: Merge "Treat SIGNAL_LOST error in dataCallResponse as permanent failure." into lmp-dev

* commit '5f0f5c18a1ec4cc85ba737a9fce3dd489b46c54a':
Treat SIGNAL_LOST error in dataCallResponse as permanent failure.
5f0f5c18a1ec4cc85ba737a9fce3dd489b46c54a 01-Oct-2014 Amit Mahajan <amitmahajan@google.com> Merge "Treat SIGNAL_LOST error in dataCallResponse as permanent failure." into lmp-dev
b29d086776eef04852322f7d245ada4eb68f7d76 01-Oct-2014 Etan Cohen <etancohen@google.com> am 0e776303: Fixing build - missing import.

* commit '0e776303ca82b5bec5db19bb44e0f13b0c7c6400':
Fixing build - missing import.
0e776303ca82b5bec5db19bb44e0f13b0c7c6400 01-Oct-2014 Etan Cohen <etancohen@google.com> Fixing build - missing import.

Change-Id: I47dc727ede78c3d253702de175c9070b03f59c8b
ataconnection/DcTracker.java
b5f5ccd875f35e817450e5cc5eec6962214990b3 01-Oct-2014 Amit Mahajan <amitmahajan@google.com> am d2ee2822: am c187e073: Merge "Roaming blacklist" into lmp-dev

* commit 'd2ee28229337dc9ae4d627179abbcfba9c2e1431':
Roaming blacklist
a0fb70cee434951fa89b7951464745e8a454ef7a 01-Oct-2014 duho.ro <duho.ro@lge.com> am c0c5a58c: am 1f22d778: STK: fixing to send intent when card status changed

* commit 'c0c5a58cc8eb7b4087f2b891e84faafb28f3967b':
STK: fixing to send intent when card status changed
824facabdc5d608c9729ba5164606a5998c75f0d 01-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 53de4aea: am 5d8a08eb: Merge "Change to update SPN based on spn-conf.xml." into lmp-dev

* commit '53de4aea14394b86733d9d29644619ad187646a0':
Change to update SPN based on spn-conf.xml.
b82c53f767621d1535d920970fbb4253ac9a7b7a 01-Oct-2014 Robert Greenwalt <rgreenwalt@google.com> am 62022f7a: am 2b3d92bf: Merge "Support bearer-specific DUN APN on CDMA" into lmp-dev

* commit '62022f7a40cca775a4e9214c10ce14ac0a53a017':
Support bearer-specific DUN APN on CDMA
d2ee28229337dc9ae4d627179abbcfba9c2e1431 01-Oct-2014 Amit Mahajan <amitmahajan@google.com> am c187e073: Merge "Roaming blacklist" into lmp-dev

* commit 'c187e073823cc4d9c86b536617ea0d198d14755e':
Roaming blacklist
c0c5a58cc8eb7b4087f2b891e84faafb28f3967b 01-Oct-2014 duho.ro <duho.ro@lge.com> am 1f22d778: STK: fixing to send intent when card status changed

* commit '1f22d77839c35908113e4978a1431636be0786ac':
STK: fixing to send intent when card status changed
53de4aea14394b86733d9d29644619ad187646a0 01-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 5d8a08eb: Merge "Change to update SPN based on spn-conf.xml." into lmp-dev

* commit '5d8a08eb08034746ef0828bcf24c2f29acc21fdf':
Change to update SPN based on spn-conf.xml.
62022f7a40cca775a4e9214c10ce14ac0a53a017 01-Oct-2014 Robert Greenwalt <rgreenwalt@google.com> am 2b3d92bf: Merge "Support bearer-specific DUN APN on CDMA" into lmp-dev

* commit '2b3d92bf5b79eddc8299c1236a83b508b31f3432':
Support bearer-specific DUN APN on CDMA
8656e0b32c10fba3427c139ae00f0e1d54ec7a64 01-Oct-2014 Junda Liu <junda@google.com> am 0f8a6b53: am b30d3481: Merge "Fixes: SIM records loaded not firing on refresh reset." into lmp-dev

* commit '0f8a6b5340226c1c0d388928838ede25effd367a':
Fixes: SIM records loaded not firing on refresh reset.
49cb932aa52e629c7d3ceccefd2009fb90941ada 01-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 9ff91cb5: am 33b32317: Merge "Update mRecordsRequested on sending request instead of onLocked." into lmp-dev

* commit '9ff91cb57fb4ec7c0c8cfe7e72f771e8ce0b5d53':
Update mRecordsRequested on sending request instead of onLocked.
6ae4c063741ecb1b3eeba4f0602b2e8983d32aa9 01-Oct-2014 Anthony Lee <anthonylee@google.com> am 573ba864: resolved conflicts for merge of 8574e746 to lmp-sprout-dev

* commit '573ba864406ec81dd3ff878760fa3317daddaa07':
Create and track different Handler instances for each Phone.
ab61d24d9ebe2e01402fe0778d9e9aadae37d0cb 01-Oct-2014 Amit Mahajan <amitmahajan@google.com> am c187e073: Merge "Roaming blacklist" into lmp-dev

* commit 'c187e073823cc4d9c86b536617ea0d198d14755e':
Roaming blacklist
0f8a6b5340226c1c0d388928838ede25effd367a 01-Oct-2014 Junda Liu <junda@google.com> am b30d3481: Merge "Fixes: SIM records loaded not firing on refresh reset." into lmp-dev

* commit 'b30d3481987401d1f3ede9317b0d6f80ebbd0e57':
Fixes: SIM records loaded not firing on refresh reset.
9ff91cb57fb4ec7c0c8cfe7e72f771e8ce0b5d53 01-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 33b32317: Merge "Update mRecordsRequested on sending request instead of onLocked." into lmp-dev

* commit '33b32317a7ac74e331b1e66479ad9f9fa60b449b':
Update mRecordsRequested on sending request instead of onLocked.
c187e073823cc4d9c86b536617ea0d198d14755e 01-Oct-2014 Amit Mahajan <amitmahajan@google.com> Merge "Roaming blacklist" into lmp-dev
400d32b9f12f6b0eacd2aff01311aa2567e8a800 01-Oct-2014 duho.ro <duho.ro@lge.com> am 1f22d778: STK: fixing to send intent when card status changed

* commit '1f22d77839c35908113e4978a1431636be0786ac':
STK: fixing to send intent when card status changed
1f22d77839c35908113e4978a1431636be0786ac 19-Sep-2014 duho.ro <duho.ro@lge.com> STK: fixing to send intent when card status changed

The intent name is not match with STK app.
Also, it should get the reference of UiccCard with its own slot id.
It affects with install and uninstall STK app when card status changed.

Bug: 17463742
Bug: 16148051

Change-Id: I9a4bab72411fce39846d7d11e6a15519d58c1d7a
at/AppInterface.java
at/CatService.java
4a1dfae2a805d4cd7a3ae81f3cc00ea1e1cb2677 01-Oct-2014 xinhe <xinhe@google.com> Fix for CMAS is not turned on

CMAS is not turned on for several reasons:
(1) Exception happends when default SMS sub Id is not available.
(2) Cellbroadcast thread can die before the servicestate change triggered

Bug:17571958
Change-Id: I7b210226fa24f266896763ff80235c4ed4b936eb
iccSmsController.java
573ba864406ec81dd3ff878760fa3317daddaa07 01-Oct-2014 Anthony Lee <anthonylee@google.com> resolved conflicts for merge of 8574e746 to lmp-sprout-dev

Change-Id: I6dd854c05e62317242c0236ea461236b6fdf7b5c
8ff0cbdff7795752b85d1c6c35bcdf6d58c99dcc 01-Oct-2014 Amit Mahajan <amitmahajan@google.com> am 5d8a08eb: Merge "Change to update SPN based on spn-conf.xml." into lmp-dev

* commit '5d8a08eb08034746ef0828bcf24c2f29acc21fdf':
Change to update SPN based on spn-conf.xml.
acaf3d23ff95b7f820d4e56d09047f583ac313a0 01-Oct-2014 Robert Greenwalt <rgreenwalt@google.com> am 2b3d92bf: Merge "Support bearer-specific DUN APN on CDMA" into lmp-dev

* commit '2b3d92bf5b79eddc8299c1236a83b508b31f3432':
Support bearer-specific DUN APN on CDMA
5d8a08eb08034746ef0828bcf24c2f29acc21fdf 01-Oct-2014 Amit Mahajan <amitmahajan@google.com> Merge "Change to update SPN based on spn-conf.xml." into lmp-dev
8d298c8557bfa2413c7d90610d26fbe3f37ed1ca 01-Oct-2014 Amit Mahajan <amitmahajan@google.com> Change to update SPN based on spn-conf.xml.

If there is an SPN override for this carrier, we should update
gsm.sim.operator.alpha with this value.

Bug: 17701706
Change-Id: I12aa3950f3e3636d573d2d1ff1bc1bab6f3a6abd
icc/SIMRecords.java
2b3d92bf5b79eddc8299c1236a83b508b31f3432 01-Oct-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Support bearer-specific DUN APN on CDMA" into lmp-dev
123dde955d7fdb486f4e3e38d6e7eef3b247d0b2 01-Oct-2014 Etan Cohen <etancohen@google.com> am c13bf07d: Merge "redirect RIL_UNSOL_OEM_HOOK_RAW to system app" into lmp-sprout-dev

* commit 'c13bf07d53acaa87f6cd42328c88eae1061c294d':
redirect RIL_UNSOL_OEM_HOOK_RAW to system app
c13bf07d53acaa87f6cd42328c88eae1061c294d 01-Oct-2014 Etan Cohen <etancohen@google.com> Merge "redirect RIL_UNSOL_OEM_HOOK_RAW to system app" into lmp-sprout-dev
5e3aca3c5ba7ab2431d9f2de17402dad6b46e04b 01-Oct-2014 Wink Saville <wink@google.com> am ba2cc792: Merge "Rename mDcSwitchState to mDcSwitchStateMachine." into lmp-sprout-dev

* commit 'ba2cc792e5d696b7128df35a9f085c4950067c28':
Rename mDcSwitchState to mDcSwitchStateMachine.
40111da2a60fbade34fb0dc6f1adb589cdc9b5d8 01-Oct-2014 Wink Saville <wink@google.com> am e27408ec: No data connectivity.

* commit 'e27408ec980c598a29d2122ce157037c4707eb81':
No data connectivity.
ba2cc792e5d696b7128df35a9f085c4950067c28 01-Oct-2014 Wink Saville <wink@google.com> Merge "Rename mDcSwitchState to mDcSwitchStateMachine." into lmp-sprout-dev
110eda521d7a40ffcb09f31fd02d3d65a10cdcc3 11-Sep-2014 New Author Steven Liu <stevenliu@motorola.com> redirect RIL_UNSOL_OEM_HOOK_RAW to system app

add notifyOemHookRawEvent

Bug: 17298769
Change-Id: Iaea054d3cc2925eea1e11f8871faabc7bc9dfb2d
ommandsInterface.java
efaultPhoneNotifier.java
honeBase.java
honeNotifier.java
e27408ec980c598a29d2122ce157037c4707eb81 30-Sep-2014 Wink Saville <wink@google.com> No data connectivity.

Some devices aren't getting data connectivity, Motorola has supplied
this patch which fixes it. We may refine this change in the future.

Bug: 17696051
Change-Id: I84c916f498411eb808d8569fb30ec3acbab367c4
honeProxy.java
ataconnection/DctController.java
cb63912021131116635c270a3822ab244c8bfe04 26-Sep-2014 w19976 <w19976@motorola.com> Roaming blacklist

Rename isSameOperatorConsideredRoaming to isOperatorConsideredRoaming.
Have isOperatorConsideredRoaming take precedence over isOperatorConsideredNonRoaming.
This makes it easier to blacklist specific networks that lie within a
whitelist range (eg, whitelist all carriers under 310xxx except 310410).

Bug: 17684236
Change-Id: I2275cd3375e810a0a17ff28bf518e4ff5420cc14
sm/GsmServiceStateTracker.java
6bac33f472fbf66697b8eedd9b54a40daaba3086 30-Sep-2014 Wink Saville <wink@google.com> Rename mDcSwitchState to mDcSwitchStateMachine.

Add a couple log statements.

Change-Id: I1cdc307459e814f79a520e7d4ef8739dda37c056
ataconnection/DctController.java
2a55b18dccc16acc6fdbe1ff88d960f4e4037b2a 30-Sep-2014 Paul Jensen <pauljensen@google.com> am 44099501: resolved conflicts for merge of e818d6a4 to lmp-sprout-dev

* commit '44099501f5c43b316d7d61216953269963446be2':
Move mobile provisioning APN support into telephony and rework.
44099501f5c43b316d7d61216953269963446be2 30-Sep-2014 Paul Jensen <pauljensen@google.com> resolved conflicts for merge of e818d6a4 to lmp-sprout-dev

Change-Id: I260e385eac19c18b3ee89ad799316db3a9c52bf2
7f2728536d27c2410880ea7576e7dbb8b9b3083f 30-Sep-2014 Junda Liu <junda@google.com> am b30d3481: Merge "Fixes: SIM records loaded not firing on refresh reset." into lmp-dev

* commit 'b30d3481987401d1f3ede9317b0d6f80ebbd0e57':
Fixes: SIM records loaded not firing on refresh reset.
b30d3481987401d1f3ede9317b0d6f80ebbd0e57 30-Sep-2014 Junda Liu <junda@google.com> Merge "Fixes: SIM records loaded not firing on refresh reset." into lmp-dev
b9fa15f28c9411a18e8b65cf1f1510aa48d27a56 30-Sep-2014 Amit Mahajan <amitmahajan@google.com> am 33b32317: Merge "Update mRecordsRequested on sending request instead of onLocked." into lmp-dev

* commit '33b32317a7ac74e331b1e66479ad9f9fa60b449b':
Update mRecordsRequested on sending request instead of onLocked.
33b32317a7ac74e331b1e66479ad9f9fa60b449b 30-Sep-2014 Amit Mahajan <amitmahajan@google.com> Merge "Update mRecordsRequested on sending request instead of onLocked." into lmp-dev
ed9c051a9582c806303029d8e98a8981ed468430 30-Sep-2014 Anthony Lee <anthonylee@google.com> am 8574e746: Merge "Create and track different Handler instances for each Phone." into lmp-dev

* commit '8574e746e25a3b8e8352d20c437f4194271d1e60':
Create and track different Handler instances for each Phone.
8574e746e25a3b8e8352d20c437f4194271d1e60 29-Sep-2014 Anthony Lee <anthonylee@google.com> Merge "Create and track different Handler instances for each Phone." into lmp-dev
56070d81b56a950a027d5adf87890221548ca666 25-Sep-2014 Shishir Agrawal <shishir@google.com> Fixes: SIM records loaded not firing on refresh reset.

On a refresh reset, the carrier privileges are not reloaded, so we should not
block the sim loaded notification on it. Also avoid firing sim_loaded on sim absent.

Bug: 17620642
Bug: 17697575

Change-Id: I62d810fcf47c9ca0b75e36bc7c99476acb1adcf1
icc/IccCardProxy.java
icc/UiccCard.java
cf32199fbe01f59a2c82e4f3ecaef2c0204b4a6b 29-Sep-2014 New Author Steven Liu <stevenliu@motorola.com> am ca117227: redirect RIL_UNSOL_OEM_HOOK_RAW to system app

* commit 'ca117227299fb662cbd2c0cfe41d17ff0f903bef':
redirect RIL_UNSOL_OEM_HOOK_RAW to system app
4d9df4d18df2fdc9becdc72e320eb98db1b9e829 29-Sep-2014 Paul Jensen <pauljensen@google.com> am e818d6a4: Merge "Move mobile provisioning APN support into telephony and rework." into lmp-dev

* commit 'e818d6a43cbe831ea4e0274670f748a04b600ae8':
Move mobile provisioning APN support into telephony and rework.
9cdb1a9df016621110d07ca5ae6a4b6c0528ee30 29-Sep-2014 Etan Cohen <etancohen@google.com> am 1321ae8e: DctController onSettingsChange race condition with active phone ID - crash (NPE).

* commit '1321ae8e44e3339ace5dabc4daf9512347c0fcc4':
DctController onSettingsChange race condition with active phone ID - crash (NPE).
ca117227299fb662cbd2c0cfe41d17ff0f903bef 11-Sep-2014 New Author Steven Liu <stevenliu@motorola.com> redirect RIL_UNSOL_OEM_HOOK_RAW to system app

add notifyOemHookRawEvent

Bug: 17298769
Change-Id: Iaea054d3cc2925eea1e11f8871faabc7bc9dfb2d
ommandsInterface.java
efaultPhoneNotifier.java
honeBase.java
honeNotifier.java
5a514e8e8193bbd09687cc1fb286122b79eca612 29-Sep-2014 Anthony Lee <anthonylee@google.com> Create and track different Handler instances for each Phone.

Phone objects used the same handler in CallManager to
register/unregister callbacks with RIL. This means that, if the
last operation was an unregister, the CallManager would not
be a listener for certain events from the RIL.

Bug: 17414427
Change-Id: I217fad94c64edf479141c1f28f0c1ec8a9e89032
allManager.java
1321ae8e44e3339ace5dabc4daf9512347c0fcc4 29-Sep-2014 Etan Cohen <etancohen@google.com> DctController onSettingsChange race condition with active phone ID - crash (NPE).

Change-Id: I84d8e97a9854638fb78b4c68ae9248188de5f57c
ataconnection/DctController.java
ad31aa03d7cab4d719d81c23df2db33e029c8ced 29-Sep-2014 Amit Mahajan <amitmahajan@google.com> Treat SIGNAL_LOST error in dataCallResponse as permanent failure.

Bug: 17632875
Change-Id: Ic2dfcf27039206f9eb4ed29b0a035920b14e2890
ataconnection/DcFailCause.java
ab55739495b38cf403e7c4514e00f4661034c838 29-Sep-2014 Amit Mahajan <amitmahajan@google.com> Update mRecordsRequested on sending request instead of onLocked.

Bug: 17668819
Change-Id: Ib982149c665258dba8fbb4b58a35449b40529913
icc/SIMRecords.java
e818d6a43cbe831ea4e0274670f748a04b600ae8 29-Sep-2014 Paul Jensen <pauljensen@google.com> Merge "Move mobile provisioning APN support into telephony and rework." into lmp-dev
06e766c63627046eab7448d459dfaab2cb6d5e0d 27-Sep-2014 Amit Mahajan <amitmahajan@google.com> am 8fdd68af: am 283b98ea: Merge "Notify registrant (phone) of Icc event on registration." into lmp-dev

* commit '8fdd68af916fc065e414d50fd3723f45e9d399d6':
Notify registrant (phone) of Icc event on registration.
80111bd9a39f8c4b6828b68e7f326172e251c78e 24-Sep-2014 Etan Cohen <etancohen@google.com> Provide a hybrid ServiceState consisting of base phone object and IMS SS.

Original code used either base phone SS or IMS phone SS (if base phone
was not in service). Now merge the two to provide the baseline SS information
from the base phone and only the voice SS information from the IMS phone
(and only if the base phone is not in service).

Bug: 17627405
Change-Id: I3ace832f9be700282105a52088715b8039e56666
dma/CDMAPhone.java
sm/GSMPhone.java
8fdd68af916fc065e414d50fd3723f45e9d399d6 27-Sep-2014 Amit Mahajan <amitmahajan@google.com> am 283b98ea: Merge "Notify registrant (phone) of Icc event on registration." into lmp-dev

* commit '283b98ea941fdfc11d952b4da94ea105f0614bdf':
Notify registrant (phone) of Icc event on registration.
7bce45bc1b094fcb38fdaa07f224ac54b78b5645 27-Sep-2014 Amit Mahajan <amitmahajan@google.com> am 283b98ea: Merge "Notify registrant (phone) of Icc event on registration." into lmp-dev

* commit '283b98ea941fdfc11d952b4da94ea105f0614bdf':
Notify registrant (phone) of Icc event on registration.
283b98ea941fdfc11d952b4da94ea105f0614bdf 27-Sep-2014 Amit Mahajan <amitmahajan@google.com> Merge "Notify registrant (phone) of Icc event on registration." into lmp-dev
94f1ebd9171eea39c6c55ac99d251fb8f14211ec 27-Sep-2014 Xia Ying <yingxia@motorola.com> am 2d265969: Handling service number convert while roaming.

* commit '2d265969ca301ba3720458ea9da2ec8d6a18bb8d':
Handling service number convert while roaming.
72a020b1b8abdc07e26dfa76f7632aff4d90d8e8 27-Sep-2014 Xia Ying <yingxia@motorola.com> am 2d265969: Handling service number convert while roaming.

* commit '2d265969ca301ba3720458ea9da2ec8d6a18bb8d':
Handling service number convert while roaming.
e43045f54ba97cfb95dd19bc59bb7978239fea22 27-Sep-2014 Amit Mahajan <amitmahajan@google.com> Notify registrant (phone) of Icc event on registration.

Notify registrant of all the possible events. This is to make sure
registrant is notified even if event occurred in the past.

Bug: 17585301
Change-Id: I10cbe4bda942b45d7990d542dbfad85d287a0d39
icc/IccRecords.java
2d265969ca301ba3720458ea9da2ec8d6a18bb8d 22-Sep-2014 Xia Ying <yingxia@motorola.com> Handling service number convert while roaming.

When roaming in GSM/UMTS and internal CDMA network,
(1)change VZW custumer service numeber *611 to +19085594899.
(2)change VZW voice mail number *86 to +1MDN.

Change-Id: I69f69fb698f059b7a2365d2906fe0f7cc41636d7
allTracker.java
onnection.java
honeBase.java
dma/CDMAPhone.java
dma/CdmaCallTracker.java
dma/CdmaConnection.java
sm/GsmCallTracker.java
sm/GsmConnection.java
bfd528dda15c0a7206844555b6de4ceaf6e05b0e 27-Sep-2014 Amit Mahajan <amitmahajan@google.com> am 1de01965: Merge "Change to show correct number of unheard voicemail in notification." into lmp-dev

* commit '1de0196530d8b8e5aa7df7db09c62d79b2eb80ec':
Change to show correct number of unheard voicemail in notification.
07d8f7e1869ce18541f063e56f171572c17eb82e 27-Sep-2014 Amit Mahajan <amitmahajan@google.com> am 0ac27121: Merge "Bubble up CARD_IO_ERROR" into lmp-dev

* commit '0ac2712110a386ed763c16cf590067fa707a8023':
Bubble up CARD_IO_ERROR
c4c9d0b183651b9f439795cc49f3b3f734ae8119 27-Sep-2014 Amit Mahajan <amitmahajan@google.com> am 1de01965: Merge "Change to show correct number of unheard voicemail in notification." into lmp-dev

* commit '1de0196530d8b8e5aa7df7db09c62d79b2eb80ec':
Change to show correct number of unheard voicemail in notification.
47b83a09b03fe159a0cc7f7a60f9120a9fb4fca7 27-Sep-2014 Amit Mahajan <amitmahajan@google.com> am 0ac27121: Merge "Bubble up CARD_IO_ERROR" into lmp-dev

* commit '0ac2712110a386ed763c16cf590067fa707a8023':
Bubble up CARD_IO_ERROR
1de0196530d8b8e5aa7df7db09c62d79b2eb80ec 27-Sep-2014 Amit Mahajan <amitmahajan@google.com> Merge "Change to show correct number of unheard voicemail in notification." into lmp-dev
0ac2712110a386ed763c16cf590067fa707a8023 27-Sep-2014 Amit Mahajan <amitmahajan@google.com> Merge "Bubble up CARD_IO_ERROR" into lmp-dev
d4c858abee72a9c4935855b62418d2b306ceda4b 25-Sep-2014 Amit Mahajan <amitmahajan@google.com> Bubble up CARD_IO_ERROR

Bug: 16871406
Change-Id: I57d84640a03fc084b3c375b6ce76a12ef9387882
icc/IccCardProxy.java
6aa799c9d555854ecac94b15967e9016c55b4340 26-Sep-2014 Amit Mahajan <amitmahajan@google.com> Change to show correct number of unheard voicemail in notification.

Bug: 17299884
Change-Id: Ie26a61cbfc2254f95686b8031a0988b9cd58609d
sm/GsmInboundSmsHandler.java
sm/SmsMessage.java
0c82c7409844cd04d70511a70020f37ecefdfb29 26-Sep-2014 Wink Saville <wink@google.com> Merge "Reorganize and add more dumps within opt/telephony." into lmp-sprout-dev
d03def085b2a430697f2da10e3f1992fd82c5e01 26-Sep-2014 Elliott Hughes <enh@google.com> am fc0a4918: The countries HU and HR both have an obvious default language.

* commit 'fc0a491803c3cec2d1c1531ace7d0eaa7cb76eda':
The countries HU and HR both have an obvious default language.
c8639cf1d65a452bf920680adcd20f2250c84818 26-Sep-2014 Elliott Hughes <enh@google.com> am fc0a4918: The countries HU and HR both have an obvious default language.

* commit 'fc0a491803c3cec2d1c1531ace7d0eaa7cb76eda':
The countries HU and HR both have an obvious default language.
1484bfe9c58cfd2ddf59a5b8dad7373a36de946d 22-Sep-2014 Robert Greenwalt <rgreenwalt@google.com> Support bearer-specific DUN APN on CDMA

The DUN apn needs to be listed last, and this should only be used on networks
that don't show the apn editor.

bug:17571681
Change-Id: Iefa676d3c741ffb2eef201a8683429ed9dbe44d1
ataconnection/DataConnection.java
ataconnection/DcTracker.java
e97be3971cb6b55e019433c32524cc60ce0d037b 26-Sep-2014 Wink Saville <wink@google.com> Reorganize and add more dumps within opt/telephony.

In particular dump is added to PhoneProxy which dumps
PhoneSubInfoProxy which dumps PhoneSubInfo this should
provide the desired information.

Also add some additional pw.flush() statements to
minimize the buffer overflows and truncate the output.

Bug: 17545077
Change-Id: I39787a84c97a8fc0410419965f6be2468dec7568
ebugService.java
honeBase.java
honeFactory.java
honeProxy.java
roxyController.java
erviceStateTracker.java
ubscriptionController.java
dma/CdmaServiceStateTracker.java
ataconnection/DctController.java
sm/GsmServiceStateTracker.java
b449dc75ef4b9cb996c34a11e758f7e6ca193240 17-Sep-2014 Paul Jensen <pauljensen@google.com> Move mobile provisioning APN support into telephony and rework.

This code had to be reworked to cooperate with the new multi-network
logic. The provisioning flow when using a provisioning APN is:
1. DcTracker detects connecting to provisioning APN, puts up
notification, and turns off radio (as per b/13190133, b/10328264).
2. User selects notification. ProvisionNotificationBroadcastReceiver
receives intent, turns on radio, enables fail-fast mode,
sets up provisioning logic in DcTrackerBase.
3. When radio connects again, DcTracker.completeConnection() launches
browser to facilitate activation. Note that activation can be
performed via any internet connection so it's not a problem that
browser isn't multi-network aware.

bug:17324098
Change-Id: Ibd1c42b1a75795f90a6483d3d0a5a14f88b193d8
ataconnection/DcTracker.java
fc0a491803c3cec2d1c1531ace7d0eaa7cb76eda 25-Sep-2014 Elliott Hughes <enh@google.com> The countries HU and HR both have an obvious default language.

Bug: 17614834
Bug: 17633631
Change-Id: Iecd82e28299548aaf197c8b6a28fb47b1a225bf8
ccTable.java
837cb68bcec68c025f366c905332146f8eb45c99 25-Sep-2014 Sreeram Ramachandran <sreeram@google.com> am 1b2607bd: Merge "Change type name of mobile from "Cellular" to "MOBILE"." into lmp-dev

* commit '1b2607bdf4ee998c914eefdcc82fbd5e1a9d0e59':
Change type name of mobile from "Cellular" to "MOBILE".
1031ed50bbf26c09daccbf1e6b0a2b4d9356021f 25-Sep-2014 Elliott Hughes <enh@google.com> am e6d46f65: Merge "Fix the locale matching logic in MccTable." into lmp-dev

* commit 'e6d46f65fd0b091268cd4164d3a22edaf4445b7c':
Fix the locale matching logic in MccTable.
de9e7d0ecf28f218369ac2dc78a6bd46cc462704 25-Sep-2014 Amit Mahajan <amitmahajan@google.com> am 9de6c7b1: Merge "add capability to initialize default locale from USIM EF_LI or EF_PL." into lmp-dev

* commit '9de6c7b167c9fd82afbf272b690225e963f5c951':
add capability to initialize default locale from USIM EF_LI or EF_PL.
1b55fc1e32eed284ed0fec3ec115a956ad4f828a 25-Sep-2014 Sukanya Rajkhowa <srajkh@codeaurora.org> am 17a89329: Trigger phone switch based on config

* commit '17a893295d021cd48ad0e2e6ccf9ceda3f97c70c':
Trigger phone switch based on config
78b51488d97844d6ab2962e7f0303e355ac3e347 25-Sep-2014 Sreeram Ramachandran <sreeram@google.com> am 1b2607bd: Merge "Change type name of mobile from "Cellular" to "MOBILE"." into lmp-dev

* commit '1b2607bdf4ee998c914eefdcc82fbd5e1a9d0e59':
Change type name of mobile from "Cellular" to "MOBILE".
e23a76d915f1f3b81989cb6fcdec4f2466837a1b 25-Sep-2014 Elliott Hughes <enh@google.com> am e6d46f65: Merge "Fix the locale matching logic in MccTable." into lmp-dev

* commit 'e6d46f65fd0b091268cd4164d3a22edaf4445b7c':
Fix the locale matching logic in MccTable.
1b2607bdf4ee998c914eefdcc82fbd5e1a9d0e59 25-Sep-2014 Sreeram Ramachandran <sreeram@google.com> Merge "Change type name of mobile from "Cellular" to "MOBILE"." into lmp-dev
e6d46f65fd0b091268cd4164d3a22edaf4445b7c 25-Sep-2014 Elliott Hughes <enh@google.com> Merge "Fix the locale matching logic in MccTable." into lmp-dev
aaf87159f290c573863038a4feb990f509d29ba0 25-Sep-2014 Sreeram Ramachandran <sreeram@google.com> Change type name of mobile from "Cellular" to "MOBILE".

Bug: 17609932
Change-Id: I22331426e04a5b45e73f9e768b7d88c1d4282c78
ataconnection/DataConnection.java
eb7b7eac9e673a8e8b44948d4a7f103c79ac449c 25-Sep-2014 Amit Mahajan <amitmahajan@google.com> am 9de6c7b1: Merge "add capability to initialize default locale from USIM EF_LI or EF_PL." into lmp-dev

* commit '9de6c7b167c9fd82afbf272b690225e963f5c951':
add capability to initialize default locale from USIM EF_LI or EF_PL.
6f3f06ec847dbd0fcbb24d2aecf6bd2d8caccbff 25-Sep-2014 Sukanya Rajkhowa <srajkh@codeaurora.org> am 17a89329: Trigger phone switch based on config

* commit '17a893295d021cd48ad0e2e6ccf9ceda3f97c70c':
Trigger phone switch based on config
9de6c7b167c9fd82afbf272b690225e963f5c951 25-Sep-2014 Amit Mahajan <amitmahajan@google.com> Merge "add capability to initialize default locale from USIM EF_LI or EF_PL." into lmp-dev
17a893295d021cd48ad0e2e6ccf9ceda3f97c70c 16-Sep-2014 Sukanya Rajkhowa <srajkh@codeaurora.org> Trigger phone switch based on config

When VOICE_REGISTRATION_STATE changes, phone switch
may not be needed as a previous switch would have
happened on receiving UNSOL_VOICE_RADIO_TECH_CHANGED.
Do a phone switch only if the config is true.

Bug: 17394282
Change-Id: I4a4aa98bd0af9eaca46b0d09458a126313e97611
erviceStateTracker.java
dma/CdmaLteServiceStateTracker.java
f62253c8dc91e37068dade8e40aac427ece7d57b 25-Sep-2014 Elliott Hughes <enh@google.com> Fix the locale matching logic in MccTable.

Bug: 17614129
Change-Id: I4a058b252f9da9173e6bb248e212863e1fe6496f
ccTable.java
230e46bdd850306dcc54ab6038d4d3132f5032ab 11-Apr-2013 nfjb73 <nfjb73@motorola.com> add capability to initialize default locale from USIM EF_LI or EF_PL.

if user has set the defalut locale, the locale from USIM will be ignored.

Bug: 17543708
Change-Id: I1f9fa8b73b84f27ef8414bb1fc1c01b4a021c791
ccTable.java
icc/IccConstants.java
icc/SIMRecords.java
icc/UsimFileHandler.java
c3b6aa70fad706fda9611f5d6cda30b51da534b9 24-Sep-2014 Junda Liu <junda@google.com> am e433881d: Merge "Postpone otasp_not_neeeded until SIM_LOADED." into lmp-dev

* commit 'e433881d31ceb7b63df5ea70647ce5b3147a8aae':
Postpone otasp_not_neeeded until SIM_LOADED.
d74a1fa0944d34db4fe2e62c63bbcdbcd4a42ecd 24-Sep-2014 Junda Liu <junda@google.com> am e433881d: Merge "Postpone otasp_not_neeeded until SIM_LOADED." into lmp-dev

* commit 'e433881d31ceb7b63df5ea70647ce5b3147a8aae':
Postpone otasp_not_neeeded until SIM_LOADED.
e433881d31ceb7b63df5ea70647ce5b3147a8aae 24-Sep-2014 Junda Liu <junda@google.com> Merge "Postpone otasp_not_neeeded until SIM_LOADED." into lmp-dev
0a8236f5edf50284f05bcb7b0e460166e814d091 24-Sep-2014 Junda Liu <junda@google.com> Postpone otasp_not_neeeded until SIM_LOADED.

Because platform begins w/ GSM phone even for CDMA devices, sending otasp_not_needed confuses SuW.

Bug: b/17572929
Change-Id: Ie19f5eac81a85cb4191bb7e5cf0294f4fb5cf0c1
sm/GsmServiceStateTracker.java
81bfdd972bce82a9c6545b748d4b91c88f09feb7 24-Sep-2014 Russell Brenner <russellbrenner@google.com> am 49404e45: Merge "Reset OTASP state during initialization" into lmp-dev

* commit '49404e45908d7f95c53caa1bef0d92feacf2db6e':
Reset OTASP state during initialization
9296d523092da305e5fe0bc4dccc5c345bb84a3e 24-Sep-2014 Russell Brenner <russellbrenner@google.com> am 49404e45: Merge "Reset OTASP state during initialization" into lmp-dev

* commit '49404e45908d7f95c53caa1bef0d92feacf2db6e':
Reset OTASP state during initialization
49404e45908d7f95c53caa1bef0d92feacf2db6e 24-Sep-2014 Russell Brenner <russellbrenner@google.com> Merge "Reset OTASP state during initialization" into lmp-dev
d72a14d9b9f22b3a8927c5e67331d259ff3e560c 24-Sep-2014 Wink Saville <wink@google.com> Merge "[DS] Data supports DSDS" into lmp-sprout-dev
0f0a38c35af9f5a3c23bf88f2189c987a106b8b9 23-Sep-2014 Russell Brenner <russellbrenner@google.com> Reset OTASP state during initialization

In case another service type had previously set the OTASP state,
reset it.

Bug: 17572929
Change-Id: I7a4274722c95036fc590a33201eadbf2ccd1880c
dma/CdmaServiceStateTracker.java
bda761320929f714951c328bfec6a51a1978db97 23-Sep-2014 Wink Saville <wink@google.com> [DS] Data supports DSDS

Main modification:
1. Handle network requests for different subscriptions according
to the priority of the ApnContext
2. Handle data attach and detach procedures when switching the active
data subscription

Modifications in TelephonyNetworkFactory:
1. needNetworkFor; network request are dispatched to DctController for
determining the active data subscription.
2. releaseNetworkFor; DctController is notified that the network request is
going to be released and the active data subscription may be changed
after the release of network request.

DctController maintains all cellular network requests. When a new request
is sent to DctController the active data subscription would be determined
again. If active data subscription has not changed, the reference count of
corresponding ApnContext is increased. Otherwise, data detach procedure
will be triggered on previous data subscription and a data attach procedure
is triggered on the new active data subscription.

After data is attached, all network requests for the subscription will be
executed. That means reference count of corresponding ApnContext will be
increased.

When a network request is going to be released, the rererence count of the
ApnContext will be decreased. DctController will determine active data
subscription again after the request is released and data detach and attach
procedures will be triggered appropriately.

Change-Id: Ie991096a986e4580efd453f0d20e43971e3fa9a2
ataconnection/DcSwitchAsyncChannel.java
ataconnection/DcSwitchState.java
ataconnection/DcSwitchStateMachine.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
ataconnection/DctController.java
1bf68fe08cbc83fbf57334856e13aa7a32046484 23-Sep-2014 Robert Greenwalt <rgreenwalt@google.com> am 8f7d6f25: Merge "Filter Settings-based DUN apn by bearer." into lmp-dev

* commit '8f7d6f25466b779dc2b5d8f52e0130c319e16d54':
Filter Settings-based DUN apn by bearer.
81d786d6755b0d18f1d0c6200d03a5c7757e06df 23-Sep-2014 Robert Greenwalt <rgreenwalt@google.com> am 8f7d6f25: Merge "Filter Settings-based DUN apn by bearer." into lmp-dev

* commit '8f7d6f25466b779dc2b5d8f52e0130c319e16d54':
Filter Settings-based DUN apn by bearer.
8f7d6f25466b779dc2b5d8f52e0130c319e16d54 23-Sep-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Filter Settings-based DUN apn by bearer." into lmp-dev
1e658c5f01b470c9e662035630bf6d145f582b01 23-Sep-2014 Etan Cohen <etancohen@google.com> am 08854aab: Use overlay to determine phone type when Voice RAT is UNKNOWN.

* commit '08854aabd68ab6308c49c2150bf80e0a1582a712':
Use overlay to determine phone type when Voice RAT is UNKNOWN.
2a3852b3b8bffde75db75997c82831120e28cb9d 23-Sep-2014 Etan Cohen <etancohen@google.com> am 08854aab: Use overlay to determine phone type when Voice RAT is UNKNOWN.

* commit '08854aabd68ab6308c49c2150bf80e0a1582a712':
Use overlay to determine phone type when Voice RAT is UNKNOWN.
08854aabd68ab6308c49c2150bf80e0a1582a712 20-Sep-2014 Etan Cohen <etancohen@google.com> Use overlay to determine phone type when Voice RAT is UNKNOWN.

Current code used overlay when Voice RAT was ambiguous (LTE). Adding
UKNOWN as another condition to use overlay rather than default GSM.

Bug: 16962905
Change-Id: I2b55749a632eab8c00dd7b2c8a0df7b4152f71b6
honeProxy.java
ce3209833d2bb66cb23a3348a723474505953eb9 23-Sep-2014 Amit Mahajan <amitmahajan@google.com> am 81cd6c4b: Merge "Take care of invalid mcc first when updating time based on nitz." into lmp-dev

* commit '81cd6c4bb83be18117405e5e87ad8092885c8e23':
Take care of invalid mcc first when updating time based on nitz.
bcb7ef0960c26cbd4077479fe63d11d3de32e28b 23-Sep-2014 Amit Mahajan <amitmahajan@google.com> am 491ed0cc: Merge "Don\'t disconnect data for some carrier" into lmp-dev

* commit '491ed0cc6eb8ae15af76bb2df2d110be0b34849b':
Don't disconnect data for some carrier
0905652012e1367a871d226965fc7419f96dc679 23-Sep-2014 xinhe <xinhe@google.com> am 1fc8906c: Merge "Fix for empty RSSI triangle after boot" into lmp-dev

* commit '1fc8906caa9ee879f0343dd3a120cde6d695798b':
Fix for empty RSSI triangle after boot
f65e05a5405eb0dd86d57888f538264df26c9389 23-Sep-2014 Amit Mahajan <amitmahajan@google.com> am 81cd6c4b: Merge "Take care of invalid mcc first when updating time based on nitz." into lmp-dev

* commit '81cd6c4bb83be18117405e5e87ad8092885c8e23':
Take care of invalid mcc first when updating time based on nitz.
38bb6dda49db7023e847d2e827199d7a87cba229 23-Sep-2014 Amit Mahajan <amitmahajan@google.com> am 491ed0cc: Merge "Don\'t disconnect data for some carrier" into lmp-dev

* commit '491ed0cc6eb8ae15af76bb2df2d110be0b34849b':
Don't disconnect data for some carrier
6e28caa9f87c36adac03a399837c0bf4ac5c968b 23-Sep-2014 xinhe <xinhe@google.com> am 1fc8906c: Merge "Fix for empty RSSI triangle after boot" into lmp-dev

* commit '1fc8906caa9ee879f0343dd3a120cde6d695798b':
Fix for empty RSSI triangle after boot
81cd6c4bb83be18117405e5e87ad8092885c8e23 23-Sep-2014 Amit Mahajan <amitmahajan@google.com> Merge "Take care of invalid mcc first when updating time based on nitz." into lmp-dev
491ed0cc6eb8ae15af76bb2df2d110be0b34849b 23-Sep-2014 Amit Mahajan <amitmahajan@google.com> Merge "Don't disconnect data for some carrier" into lmp-dev
1fc8906caa9ee879f0343dd3a120cde6d695798b 23-Sep-2014 xinhe <xinhe@google.com> Merge "Fix for empty RSSI triangle after boot" into lmp-dev
b90dee72e22de99d49535a085f7df239f6b0563e 09-Sep-2014 Jing Zhao <zhaojing@motorola.com> Take care of invalid mcc first when updating time based on nitz.

[ADR] PTCRB: 26.7.6.1.1 test from 3GPP TS 51.010-1

Bug: 17425395
Change-Id: I44cb366f4a0b5595f31c30a60dac52618431a109
sm/GsmServiceStateTracker.java
a055c6e35a8b4cc3ffb9e2c1c6c5de87155d42a2 23-Sep-2014 Robert Greenwalt <rgreenwalt@google.com> Filter Settings-based DUN apn by bearer.

bug:17330745
Change-Id: Icae2cbc6db10c9cebc20f445ca0d71ea4ed6be77
ataconnection/DcTrackerBase.java
75c934492b242f8ba750b11d9dae4304c76bbc07 06-Aug-2014 Jing Zhao <zhaojing@motorola.com> Don't disconnect data for some carrier

In some network, deactivate PDP connection cause releasing of RRC connection,
which MM/IMSI detaching request needs. Without this detaching, network can
not release the network resources previously attached.
So we are avoiding data detaching on these networks.

Bug: 16207801
Change-Id: Ib2ccc04d67f313e1241872b17ab38416607b0b48
erviceStateTracker.java
6b4088e8780d14db8d1f8dc2b390562d29020143 21-Sep-2014 Yorke Lee <yorkelee@google.com> am a85da71e: Merge "Don\'t call TelephonyNotifyCallState from DefaultPhoneNotifier anymore" into lmp-dev

* commit 'a85da71e199a5c0790f79632bf80bcba242c59c5':
Don't call TelephonyNotifyCallState from DefaultPhoneNotifier anymore
a5bdabb913fb55bde4c25ad84dcf7d73deb6f528 21-Sep-2014 Yorke Lee <yorkelee@google.com> am a85da71e: Merge "Don\'t call TelephonyNotifyCallState from DefaultPhoneNotifier anymore" into lmp-dev

* commit 'a85da71e199a5c0790f79632bf80bcba242c59c5':
Don't call TelephonyNotifyCallState from DefaultPhoneNotifier anymore
a85da71e199a5c0790f79632bf80bcba242c59c5 21-Sep-2014 Yorke Lee <yorkelee@google.com> Merge "Don't call TelephonyNotifyCallState from DefaultPhoneNotifier anymore" into lmp-dev
ba3ec6749d1b91877d880700af99f4638d28837d 20-Sep-2014 Hui Wang <huiwang@motorola.com> am 1ed33192: Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable

* commit '1ed331920d5a765da8b926e6aad2cb668203be53':
Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable
613bfe52e5932da4aa3ad37891d8a04df5b48055 20-Sep-2014 Hui Wang <huiwang@motorola.com> am 1ed33192: Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable

* commit '1ed331920d5a765da8b926e6aad2cb668203be53':
Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable
918f6edc0a1fe0d5df705ea6f7a1d83b2dcaa77b 20-Sep-2014 Vineeta Srivastava <vsrivastava@google.com> am 33c5842f: Merge "Telephony: default subId updating on single slot device" into lmp-dev

* commit '33c5842f1140b7036f7b7c4d2260b9dc5b9adaee':
Telephony: default subId updating on single slot device
1ed331920d5a765da8b926e6aad2cb668203be53 19-Sep-2014 Hui Wang <huiwang@motorola.com> Control radio restart on PDP_FAIL_REGULAR_DEACTIVATION by a config variable

Bug: 17567651, 16308209
Change-Id: I6bb1519a795dcb7e99a94d366afdfaec21c43d84
ataconnection/DcFailCause.java
ee2eddcb23cc11b17f3628ba51299e7ccf1e1e09 20-Sep-2014 Vineeta Srivastava <vsrivastava@google.com> am 33c5842f: Merge "Telephony: default subId updating on single slot device" into lmp-dev

* commit '33c5842f1140b7036f7b7c4d2260b9dc5b9adaee':
Telephony: default subId updating on single slot device
33c5842f1140b7036f7b7c4d2260b9dc5b9adaee 20-Sep-2014 Vineeta Srivastava <vsrivastava@google.com> Merge "Telephony: default subId updating on single slot device" into lmp-dev
281281bfbb7a9def377de26b3ad160188da4da7d 19-Sep-2014 duho.ro <duho.ro@lge.com> Telephony: default subId updating on single slot device

The default sub Id should be updated on single slot device when card
hot-swapped.

Bug: 17400805

Change-Id: If42d4a218e508e65f3e97f2fcd974f622f8011b1
ubscriptionController.java
24d1420627d01553f5cc62aafbddaedb8905d298 19-Sep-2014 w19976 <w19976@motorola.com> am 4bd290e3: Handling service number convert while roaming.

* commit '4bd290e38a3eb70e153b7bffa101a0c9f130e32e':
Handling service number convert while roaming.
0c8e32de5d6f310775193deccaecbd4ef4e14cba 19-Sep-2014 w19976 <w19976@motorola.com> am 4bd290e3: Handling service number convert while roaming.

* commit '4bd290e38a3eb70e153b7bffa101a0c9f130e32e':
Handling service number convert while roaming.
d1a60dfe521f376e3500946d5371f126dbd36767 19-Sep-2014 xinhe <xinhe@google.com> Fix for empty RSSI triangle after boot

After device bootup, the signal strength triangle is empty although there is
both voice and data connection. This is due to when TelephonyRegistry doing call
back listen register, some APP use mDefaultSubID. However, when the reigister
happen, the mDefaultSubId does not exist. Althouhgh it can be update later, if
the update event comes too late (especially after the steady state), no
ServiceStatechange event can be received anymore. Thus the service is always not
available and the signal stength trangle has no chance to be updated anymore.
This is a risk condition.

Bug:17472622

Change-Id: I8e6e37469086eecabbc4b9abcdb0d32eb09e0635
efaultPhoneNotifier.java
9d93488b266b43daffa039688f226df9165fdce8 19-Sep-2014 Amit Mahajan <amitmahajan@google.com> am d1f95a9e: Merge "Fix voice mail number to modify for some carrier card." into lmp-dev

* commit 'd1f95a9e919645586fd2e1afce24c89586a4d927':
Fix voice mail number to modify for some carrier card.
0a81dec9b07330389116e6862d3099212a382988 19-Sep-2014 Amit Mahajan <amitmahajan@google.com> am d1f95a9e: Merge "Fix voice mail number to modify for some carrier card." into lmp-dev

* commit 'd1f95a9e919645586fd2e1afce24c89586a4d927':
Fix voice mail number to modify for some carrier card.
4bd290e38a3eb70e153b7bffa101a0c9f130e32e 13-Sep-2014 w19976 <w19976@motorola.com> Handling service number convert while roaming.

Bug: 17202092
Change-Id: I57221b314cd9136a19216119911e3342d42cdfde
sm/GsmCallTracker.java
sm/GsmConnection.java
a79810b528ddbf224fe17b3529d365c9ce247369 19-Sep-2014 Yorke Lee <yorkelee@google.com> Don't call TelephonyNotifyCallState from DefaultPhoneNotifier anymore

Telecom now sends out this consolidated call state so this method is now
unnecessary.

Bug: 17553837
Change-Id: I76f67939a35add5f84f1e7f9d5727d2537a70e09
efaultPhoneNotifier.java
d1f95a9e919645586fd2e1afce24c89586a4d927 19-Sep-2014 Amit Mahajan <amitmahajan@google.com> Merge "Fix voice mail number to modify for some carrier card." into lmp-dev
6e8a220a642aa479d2f430ff810f4140e80cc2e4 06-May-2014 giseok.seo <giseok.seo@lge.com> Fix voice mail number to modify for some carrier card.

1.H3G Denmark SIM Card is set to "not available" in UST(Usim service Table) to
EF_MBDN file of SIM CARD. so do not edit voicemail number.

2.AOSP default voicemail number is empty.
so if inserted H3G Denmark SIM card,
User can't edit voicemail number and do not use voicemail service.

Bug: 14093735
Change-Id: I2469ef8e8bda376adcdc9549bf4227bc4c0ddb2e
icc/SIMRecords.java
85dbda640ed714ade402a550c934dab842fc7a90 19-Sep-2014 Amit Mahajan <amitmahajan@google.com> am 7d61df73: Merge "telephony : Support for voicemail in TP-UDH of SMS" into lmp-dev

* commit '7d61df73dc6eb2dcc9c4666446c1cbd488d8260c':
telephony : Support for voicemail in TP-UDH of SMS
2d82aa7ea2adc8421fecab12c2202bd17dbcc104 19-Sep-2014 Amit Mahajan <amitmahajan@google.com> am 7d61df73: Merge "telephony : Support for voicemail in TP-UDH of SMS" into lmp-dev

* commit '7d61df73dc6eb2dcc9c4666446c1cbd488d8260c':
telephony : Support for voicemail in TP-UDH of SMS
299a348cd9bdcc21c5c4a6cd6c9a825e5d711908 10-Jul-2012 Uma Maheswari Ramalingam <umam@codeaurora.org> telephony : Support for voicemail in TP-UDH of SMS

Added support for processing special message indication
for voice mail in TP user data header for SMS
Spec reference: 3GPP TS 23.040 V6.8.1

CPHS method does not use message count.
0xff is used to indicate unknown message count for CPHS
Ref[Adapt requirement CDR-MWI-120, TC: GSM-BTR-1-4700]

bug: 17299884
Change-Id: I893252d5cacd5c1c8680a8ca6c3a6dba95ef3e1f
msHeader.java
sm/SmsMessage.java
3eacec465269911eb5e30e1f5aca4dc523e3075f 18-Sep-2014 Amit Mahajan <amitmahajan@google.com> am f3e102d8: Merge "Change to timeout if cell_info_list is not received from modem for 5s." into lmp-dev

* commit 'f3e102d889f223354f568b97324b1ce5fcb73bc7':
Change to timeout if cell_info_list is not received from modem for 5s.
d5eaf6c9015c1f36064fb571e1326f98a184ffa1 18-Sep-2014 Amit Mahajan <amitmahajan@google.com> am f3e102d8: Merge "Change to timeout if cell_info_list is not received from modem for 5s." into lmp-dev

* commit 'f3e102d889f223354f568b97324b1ce5fcb73bc7':
Change to timeout if cell_info_list is not received from modem for 5s.
f3e102d889f223354f568b97324b1ce5fcb73bc7 18-Sep-2014 Amit Mahajan <amitmahajan@google.com> Merge "Change to timeout if cell_info_list is not received from modem for 5s." into lmp-dev
de1e9a427d643a23f0bf558295eb1ff6ff9fbda5 18-Sep-2014 Shishir Agrawal <shishir@google.com> am 3760e4ad: Merge "Fix null IMSI in CDMALTEPhone on bootup." into lmp-dev

* commit '3760e4ad8fa2c6ccc9320772eed6e0d8ddfe9afd':
Fix null IMSI in CDMALTEPhone on bootup.
91598c51de4736a9dd51cebd2acff6d10ffe3c06 18-Sep-2014 Shishir Agrawal <shishir@google.com> am 3760e4ad: Merge "Fix null IMSI in CDMALTEPhone on bootup." into lmp-dev

* commit '3760e4ad8fa2c6ccc9320772eed6e0d8ddfe9afd':
Fix null IMSI in CDMALTEPhone on bootup.
3760e4ad8fa2c6ccc9320772eed6e0d8ddfe9afd 18-Sep-2014 Shishir Agrawal <shishir@google.com> Merge "Fix null IMSI in CDMALTEPhone on bootup." into lmp-dev
bed429d6d0a0dbc6384b04e0641aa1e03e406f42 18-Sep-2014 Amit Mahajan <amitmahajan@google.com> Change to timeout if cell_info_list is not received from modem for 5s.

Bug: 17348559
Change-Id: I94c4a14ea6e88330082e79a7ba633ac7b18a1a2e
erviceStateTracker.java
2e41209f95670cb26aba5897b9bc0dcd9679e908 17-Sep-2014 Shishir Agrawal <shishir@google.com> Fix null IMSI in CDMALTEPhone on bootup.

Using the UiccController call without passing in phone ID results in invoking
the SubscriptionController logic which is not necessarily initialized at
ICC_CHANGED.

Bug: 17418219
Change-Id: Id84e33aa6c77c3f12ebacf234c05af5c4901870c
dma/CDMALTEPhone.java
c8bfee0622f0287214bd209d89d3307ea9fb575f 17-Sep-2014 Junda Liu <junda@google.com> am f5c0afa0: Handle unprovisioned ruim and update otasp as needed.

* commit 'f5c0afa0fdcf84c226bc2ec8fe37d9718102ebe8':
Handle unprovisioned ruim and update otasp as needed.
25b7e35d46d1903989a60c57d1f2637134bbaa7d 17-Sep-2014 Junda Liu <junda@google.com> am f5c0afa0: Handle unprovisioned ruim and update otasp as needed.

* commit 'f5c0afa0fdcf84c226bc2ec8fe37d9718102ebe8':
Handle unprovisioned ruim and update otasp as needed.
f5c0afa0fdcf84c226bc2ec8fe37d9718102ebe8 16-Sep-2014 Junda Liu <junda@google.com> Handle unprovisioned ruim and update otasp as needed.

The old code skips updateotasp if ruim is not provisioned, so otasp
needed is never sent to registrants.

Bug: b/17200971
Change-Id: If098dd8e3159f289e3a6c0007e421fd8c40555d2
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
21350668b0f96821ff79a2af73df7abd6c7818ac 16-Sep-2014 Tom Taylor <tomtaylor@google.com> am edcd616e: Merge "PT:VZW:CV MMS not able to be sent with messenger app" into lmp-dev

* commit 'edcd616ed3d7be8a24ec5f376230c40c434c8f83':
PT:VZW:CV MMS not able to be sent with messenger app
27a83cc7fdbf7c044e10db0da26af7fbddaf5db8 16-Sep-2014 Shishir Agrawal <shishir@google.com> am 36e3fae9: Merge "IsimUiccRecords: Do not set radio power off if not required on REFRESH reset." into lmp-dev

* commit '36e3fae9c157969e65d1d2777d014e99eb204e7a':
IsimUiccRecords: Do not set radio power off if not required on REFRESH reset.
45e3ac60e25a5f1fc4cbe2698873feb50c78088c 16-Sep-2014 Sukanya Rajkhowa <srajkh@codeaurora.org> am 38bbd523: Use VOLTE Replacement RAT from config if defined

* commit '38bbd5235af46cf4721831ee4c620d6c552892a8':
Use VOLTE Replacement RAT from config if defined
f9766d854ef38ae96d92aa03c7c8afdeabe7ccc1 16-Sep-2014 Tom Taylor <tomtaylor@google.com> am edcd616e: Merge "PT:VZW:CV MMS not able to be sent with messenger app" into lmp-dev

* commit 'edcd616ed3d7be8a24ec5f376230c40c434c8f83':
PT:VZW:CV MMS not able to be sent with messenger app
edcd616ed3d7be8a24ec5f376230c40c434c8f83 16-Sep-2014 Tom Taylor <tomtaylor@google.com> Merge "PT:VZW:CV MMS not able to be sent with messenger app" into lmp-dev
f1aa3a45dd5dbd7ef83feebb3972e1a870425520 16-Sep-2014 Shishir Agrawal <shishir@google.com> am 36e3fae9: Merge "IsimUiccRecords: Do not set radio power off if not required on REFRESH reset." into lmp-dev

* commit '36e3fae9c157969e65d1d2777d014e99eb204e7a':
IsimUiccRecords: Do not set radio power off if not required on REFRESH reset.
6d3a10f6773236fa117b0b88bdb5384de41d6048 16-Sep-2014 Sukanya Rajkhowa <srajkh@codeaurora.org> am 38bbd523: Use VOLTE Replacement RAT from config if defined

* commit '38bbd5235af46cf4721831ee4c620d6c552892a8':
Use VOLTE Replacement RAT from config if defined
36e3fae9c157969e65d1d2777d014e99eb204e7a 16-Sep-2014 Shishir Agrawal <shishir@google.com> Merge "IsimUiccRecords: Do not set radio power off if not required on REFRESH reset." into lmp-dev
d6058f11ffdf30ecfc19fc22a0878cae4feb15fd 16-Sep-2014 Shishir Agrawal <shishir@google.com> IsimUiccRecords: Do not set radio power off if not required on REFRESH reset.

Bug: 17154939
Change-Id: Ied4709ea8b61a8402211d11bb582feb830ab61d9
icc/IsimUiccRecords.java
38bbd5235af46cf4721831ee4c620d6c552892a8 11-Sep-2014 Sukanya Rajkhowa <srajkh@codeaurora.org> Use VOLTE Replacement RAT from config if defined

Operators may define the replacement RAT when voice
is registered on LTE. Use the operator specific RAT
defined in mcc-mnc config if defined

Bug: 17394282
Change-Id: I0974190df04b62f23527015a1f3e4086fb38e83c
dma/CdmaLteServiceStateTracker.java
b9adaa1c4a12df8c8bd44b4803d452662b53e0d8 15-Sep-2014 Tom Taylor <tomtaylor@google.com> PT:VZW:CV MMS not able to be sent with messenger app

Bug 17506557

I missed a spot where the mcc/mnc was getting set without updating the
siminfo record. This affected Sprint phones and perhaps others. As a result,
the mcc/mnc for the one and only subscription record had an mcc/mnc of zero
and the default mms_config for that mcc/mnc couldn't be loaded.

Change-Id: Iea0222a29a1f9426a4cdf4b9946620e2d02615e7
icc/SIMRecords.java
4fecfb9e39b367b5eb2aaff090ad9ae8f6224859 13-Sep-2014 Tyler Gunn <tgunn@google.com> am dc2b5d1c: Renaming Telecomm to Telecom.

* commit 'dc2b5d1c32cad5269106d00fd106bd64097238f4':
Renaming Telecomm to Telecom.
af8b9442da9d57a290cdcdf07af7164531961ab1 13-Sep-2014 Tyler Gunn <tgunn@google.com> am dc2b5d1c: Renaming Telecomm to Telecom.

* commit 'dc2b5d1c32cad5269106d00fd106bd64097238f4':
Renaming Telecomm to Telecom.
dc2b5d1c32cad5269106d00fd106bd64097238f4 11-Sep-2014 Tyler Gunn <tgunn@google.com> Renaming Telecomm to Telecom.

- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.

Bug: 17364651
Change-Id: I2fa094034f8a32ac887a6f653ba6d40d7a1761e2
allManager.java
onnection.java
honeBase.java
sm/GSMPhone.java
msphone/ImsPhoneCallTracker.java
e3048a448ff08e65c9348a10fdb32e26eafd1bf3 13-Sep-2014 Uma Maheswari Ramalingam <umam@codeaurora.org> am 772f5f72: IMS USSD Routing Over CS Pipe

* commit '772f5f72ef0b872d1a0cb1a099e7d78998f1dac2':
IMS USSD Routing Over CS Pipe
776777532aa4120ebd6d12af285023a5d7bcf0b5 13-Sep-2014 Libin.Tang@motorola.com <w16529@motorola.com> am 97fba207: IMS: release the imsphoneconnection wakelock when handover occurs from volte to cs.

* commit '97fba207643a87dd718395010a98ded3e809a3d7':
IMS: release the imsphoneconnection wakelock when handover occurs from volte to cs.
6473c87881583d5ddff68278b7550897d76bf322 13-Sep-2014 Uma Maheswari Ramalingam <umam@codeaurora.org> am 772f5f72: IMS USSD Routing Over CS Pipe

* commit '772f5f72ef0b872d1a0cb1a099e7d78998f1dac2':
IMS USSD Routing Over CS Pipe
8bebaa2371dcab0565793c55cac756ad3a835bc5 13-Sep-2014 Libin.Tang@motorola.com <w16529@motorola.com> am 97fba207: IMS: release the imsphoneconnection wakelock when handover occurs from volte to cs.

* commit '97fba207643a87dd718395010a98ded3e809a3d7':
IMS: release the imsphoneconnection wakelock when handover occurs from volte to cs.
772f5f72ef0b872d1a0cb1a099e7d78998f1dac2 12-Sep-2014 Uma Maheswari Ramalingam <umam@codeaurora.org> IMS USSD Routing Over CS Pipe

Adding logic to reroute USSD
requests through voice phone in
AP. The actual routing logic
(CS/IMS) resides in the lower
layers.

Bug: 17431456
Change-Id: Ieec8130ae9f5b62f6dc1aaf0066d41b31c5b8d0b
msphone/ImsPhoneMmiCode.java
97fba207643a87dd718395010a98ded3e809a3d7 12-Sep-2014 Libin.Tang@motorola.com <w16529@motorola.com> IMS: release the imsphoneconnection wakelock when handover occurs from volte to cs.

Bug: 17469563
Change-Id: I3652de773da0398cb9d7455d0c82e6c9504171af
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
45cc0e64298373e390ac10471b6ff275b93fbd35 12-Sep-2014 Robert Greenwalt <rgreenwalt@google.com> am 4c268833: Merge "Don\'t advertise dun insecurely" into lmp-dev

* commit '4c268833fd406b13b95f77f6d52fda25cd3901dd':
Don't advertise dun insecurely
2e784410d9fa883b8d48361c4ccd6341daa75d7c 12-Sep-2014 Robert Greenwalt <rgreenwalt@google.com> am 4c268833: Merge "Don\'t advertise dun insecurely" into lmp-dev

* commit '4c268833fd406b13b95f77f6d52fda25cd3901dd':
Don't advertise dun insecurely
4c268833fd406b13b95f77f6d52fda25cd3901dd 11-Sep-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Don't advertise dun insecurely" into lmp-dev
14edff1eb907b9118dcf81704d7f7416dcacf17d 11-Sep-2014 Jing Zhao <zhaojing@motorola.com> am bb097a7b: Send empty flash for some CDMA carriers for 3way call

* commit 'bb097a7ba08252c516e578ce30cdb658b63d7c9b':
Send empty flash for some CDMA carriers for 3way call
40b2a2152b664ee70afd29610ca1cb65c415d1ad 11-Sep-2014 Jing Zhao <zhaojing@motorola.com> am bb097a7b: Send empty flash for some CDMA carriers for 3way call

* commit 'bb097a7ba08252c516e578ce30cdb658b63d7c9b':
Send empty flash for some CDMA carriers for 3way call
bb097a7ba08252c516e578ce30cdb658b63d7c9b 30-Aug-2014 Jing Zhao <zhaojing@motorola.com> Send empty flash for some CDMA carriers for 3way call

Some carrier need a empty flash before the normal one to connect the 3way call

Bug: 17331584
Change-Id: Ie8f774de909056e398972ea460029d903f059fec
allTracker.java
dma/CdmaCallTracker.java
eaa5f9485a0abd43a4161d351669ca5fab9caab7 11-Sep-2014 Derek Tan <derektan@google.com> am 946ef717: Merge "Make public the getIccId function." into lmp-dev

* commit '946ef7174c14c295d229ae682b2079956291594d':
Make public the getIccId function.
aead034745e741f6813c2775f5688389a6367597 11-Sep-2014 Wink Saville <wink@google.com> am 9019a6d7: Merge "Reduce log spam - moving some subscription messages to verbose from debug logging." into lmp-dev

* commit '9019a6d7cab1d114cf81af7196ede027ff55d3e3':
Reduce log spam - moving some subscription messages to verbose from debug logging.
8f6f52e4f7598e44cea1f9e5f4781291f9060d1d 11-Sep-2014 Wink Saville <wink@google.com> Merge commit '3f52153a5409861eaa6e9aee5c8560bf3447cf48' into fix-merge-conflict

* commit '3f52153a5409861eaa6e9aee5c8560bf3447cf48':
setup data on connectable apns on apn changed even there have already been some apns connected

To fix this conflict I removed the "if (isDisconnected" but left the
test for defaultSubId. This needs to be retested on Sprout with multiple
SIMs and HH with one SIM.

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

Bug: 17426028
Change-Id: I9bf2738b744cee819a3e551080e4098508e1e7fe
7d3f6e2e70d94f595351d71b64c2fbabc2d73c20 11-Sep-2014 Derek Tan <derektan@google.com> am 946ef717: Merge "Make public the getIccId function." into lmp-dev

* commit '946ef7174c14c295d229ae682b2079956291594d':
Make public the getIccId function.
946ef7174c14c295d229ae682b2079956291594d 11-Sep-2014 Derek Tan <derektan@google.com> Merge "Make public the getIccId function." into lmp-dev
c149ab8bbbbf21b09b343878009d381bd4f2adf5 11-Sep-2014 Robert Greenwalt <rgreenwalt@google.com> Don't advertise dun insecurely

If there is a carrier specified apn from config.xml unless the current connection
is that setting, don't advertise dun.

If there is no carrier specified apn, the we're ok.

bug:17286525
Change-Id: I6c6f66e9b4dcc9a1dda6fa0fbfea7b7dcc155530
ataconnection/DataConnection.java
5bbd55528ecbad3ad149d30ff26da254dbedb500 11-Sep-2014 Wink Saville <wink@google.com> am 9019a6d7: Merge "Reduce log spam - moving some subscription messages to verbose from debug logging." into lmp-dev

* commit '9019a6d7cab1d114cf81af7196ede027ff55d3e3':
Reduce log spam - moving some subscription messages to verbose from debug logging.
fe4d2c7d70d70b524e8cb549e2f3046b20d0aa8d 11-Sep-2014 xin He <xinhe@google.com> am a8a7e3d7: Merge "setup data on connectable apns on apn changed even there have already been some apns connected" into lmp-dev

* commit 'a8a7e3d73dc6f6f1b791fd30be5aa6896abbbe9a':
setup data on connectable apns on apn changed even there have already been some apns connected
9019a6d7cab1d114cf81af7196ede027ff55d3e3 11-Sep-2014 Wink Saville <wink@google.com> Merge "Reduce log spam - moving some subscription messages to verbose from debug logging." into lmp-dev
a8a7e3d73dc6f6f1b791fd30be5aa6896abbbe9a 11-Sep-2014 xin He <xinhe@google.com> Merge "setup data on connectable apns on apn changed even there have already been some apns connected" into lmp-dev
b66469cd64077d31fc67087708638a985d9cb449 10-Sep-2014 Etan Cohen <etancohen@google.com> Reduce log spam - moving some subscription messages to verbose from debug logging.

Change-Id: I1a8d541cd9547d049559c26744b7d61690304840
ubscriptionController.java
3f52153a5409861eaa6e9aee5c8560bf3447cf48 09-Sep-2014 Hui Wang <huiwang@motorola.com> setup data on connectable apns on apn changed even there have already
been some apns connected

If default apn setting is added after other apn types connected, deafult apn
may not be able to be connected

Bug: 17426028
Change-Id: I5022ebde6ed1f8448755d9076aa5583a84895e00
ataconnection/DcTracker.java
74e15cd3d5abf6c4ed94d568e7d843e2ce50a948 10-Sep-2014 Junda Liu <junda@google.com> am 2c1d3407: Merge "Update telemgr calls with subId to new APIs with ForSubscriber suffix." into lmp-dev

* commit '2c1d340751338c77050e36f4bf77635eeba794a2':
Update telemgr calls with subId to new APIs with ForSubscriber suffix.
9e5e03616c64ee889ef7a45d839eea1238003ac9 10-Sep-2014 Junda Liu <junda@google.com> am 2c1d3407: Merge "Update telemgr calls with subId to new APIs with ForSubscriber suffix." into lmp-dev

* commit '2c1d340751338c77050e36f4bf77635eeba794a2':
Update telemgr calls with subId to new APIs with ForSubscriber suffix.
2c1d340751338c77050e36f4bf77635eeba794a2 10-Sep-2014 Junda Liu <junda@google.com> Merge "Update telemgr calls with subId to new APIs with ForSubscriber suffix." into lmp-dev
d3876eb553e00181b52454bd719bc39cd981d01a 10-Sep-2014 Amit Mahajan <amitmahajan@google.com> am b5a68902: Merge "Support to load default voicemail number from the configuration." into lmp-dev

* commit 'b5a68902bcc5010be1678f8c1720d73538d66063':
Support to load default voicemail number from the configuration.
d59d516449854e741ad7cbc7ed6759f07b8dd848 10-Sep-2014 Amit Mahajan <amitmahajan@google.com> am a08ffceb: Merge "Voicemail notification disappears after power cycle" into lmp-dev

* commit 'a08ffceb57e0c176447cb557cb0173f54dbb2ee6':
Voicemail notification disappears after power cycle
8cf9f0769f8fadc2a194cd38a3c88b47efe888e7 10-Sep-2014 Amit Mahajan <amitmahajan@google.com> am b5a68902: Merge "Support to load default voicemail number from the configuration." into lmp-dev

* commit 'b5a68902bcc5010be1678f8c1720d73538d66063':
Support to load default voicemail number from the configuration.
2ca6da4ba265d37531489837df0d29e6d7e78aee 10-Sep-2014 Amit Mahajan <amitmahajan@google.com> am a08ffceb: Merge "Voicemail notification disappears after power cycle" into lmp-dev

* commit 'a08ffceb57e0c176447cb557cb0173f54dbb2ee6':
Voicemail notification disappears after power cycle
b5a68902bcc5010be1678f8c1720d73538d66063 10-Sep-2014 Amit Mahajan <amitmahajan@google.com> Merge "Support to load default voicemail number from the configuration." into lmp-dev
a08ffceb57e0c176447cb557cb0173f54dbb2ee6 10-Sep-2014 Amit Mahajan <amitmahajan@google.com> Merge "Voicemail notification disappears after power cycle" into lmp-dev
4fe735103bd4d8026a25f4b0b40784fe60cddac4 04-Sep-2014 Xia Ying <yingxia@motorola.com> Support to load default voicemail number from the configuration.

If there is no preload VM number in the sim card, carriers such as
Verizon require to load a default vm number from the configurantion.

Bug: 17209959
Change-Id: I04df49b29452135edfebd9ea2bc047e91b7f208c
dma/CDMAPhone.java
sm/GSMPhone.java
0379adba01db1e6a4d7b8563c9062baf1461e438 10-Sep-2014 Wink Saville <wink@google.com> Merge commit 'f54d520ee2eaeb081c208b3d33b0d1fb6ae49254' into fix-merge-conflict

* commit 'f54d520ee2eaeb081c208b3d33b0d1fb6ae49254':
Fix ArrayOutOfBounds bug, tighten parameter checking.

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

Change-Id: I1b1e6714430eac7e808112e89e8f10e15286cb67
4bf26bda6f06dfc66ac7b0fe0ee0099d23f8b36c 09-Sep-2014 Xia Ying <yingxia@motorola.com> Voicemail notification disappears after power cycle

Fail to notify messageWaitingChanged to App, it is
due to could not get subid before Ruim records loaded.

Bug: 17427871
Change-Id: I6d2dddfecda4747a72d6a4ac53bbaa86becd966b
dma/CDMALTEPhone.java
dma/CDMAPhone.java
c23d773276008a5a512659323532e5fc2a2610e4 09-Sep-2014 Wink Saville <wink@google.com> am b6abb3eb: Merge "Use SubscriptionController.getSubIdUsingPhoneId for getSubId" into lmp-dev

* commit 'b6abb3eb25f5f3a547212e5de6745b1ca6f9faef':
Use SubscriptionController.getSubIdUsingPhoneId for getSubId
393dd598a4aee06e31396756186c2f779627b6b3 09-Sep-2014 Wink Saville <wink@google.com> am 5df100e3: Merge "Fix ArrayOutOfBounds bug, tighten parameter checking." into lmp-dev

* commit '5df100e394bfa860615fd62f0eb0ee439bbd7e38':
Fix ArrayOutOfBounds bug, tighten parameter checking.
6530bd6fce3a5e108e9b72dd3e7640ab295269c3 09-Sep-2014 Etan Cohen <etancohen@google.com> am 8756c834: Validate that Handler being cleared is the one currently registered.

* commit '8756c83413829be5b6530d122772959ad8414698':
Validate that Handler being cleared is the one currently registered.
b6abb3eb25f5f3a547212e5de6745b1ca6f9faef 09-Sep-2014 Wink Saville <wink@google.com> Merge "Use SubscriptionController.getSubIdUsingPhoneId for getSubId" into lmp-dev
5df100e394bfa860615fd62f0eb0ee439bbd7e38 09-Sep-2014 Wink Saville <wink@google.com> Merge "Fix ArrayOutOfBounds bug, tighten parameter checking." into lmp-dev
84b20011df0d5fb3e134982434f0f91cbe7c13be 09-Sep-2014 Etan Cohen <etancohen@google.com> am 8756c834: Validate that Handler being cleared is the one currently registered.

* commit '8756c83413829be5b6530d122772959ad8414698':
Validate that Handler being cleared is the one currently registered.
a94991d3beeb627ad58b79938448fc32f59fe618 09-Sep-2014 Wink Saville <wink@google.com> Use SubscriptionController.getSubIdUsingPhoneId for getSubId

This is slightly better as code in getSubIdUsingPhoneId also returns
INVALID_SUB_ID if the length is 0.

Bug: 17399710
Change-Id: I47484c0001ea4606029dbf42e135a33031beb8da
honeBase.java
f54d520ee2eaeb081c208b3d33b0d1fb6ae49254 09-Sep-2014 Wink Saville <wink@google.com> Fix ArrayOutOfBounds bug, tighten parameter checking.

Also, make logging consistent.

Bug: 17424200
Change-Id: Ie5bef1f557bf88b01eeb97c117807a40689c28e4
ataconnection/DctController.java
8756c83413829be5b6530d122772959ad8414698 09-Sep-2014 Etan Cohen <etancohen@google.com> Validate that Handler being cleared is the one currently registered.

The BaseCommands.unsetOnXXX(Handler h) cleared the current singleton
registrant without validating that it was the same Handler used in the
argument. Out-of-order set/unset would cause a problem.

Bug: 17436226
Change-Id: I53a264e517f7cbef9e243c628102817a376da29d
aseCommands.java
6fb3e13845692bc781cad7c7974b20d7290ceba6 09-Sep-2014 Wink Saville <wink@google.com> Merge commit '691b8d29' into fix-merge-conflict

* commit '691b8d29':
Change suffix UsingSubId to ForSubscriber.

Conflicts:
src/java/com/android/internal/telephony/PhoneSubInfoProxy.java

Change-Id: I17b7a9bea56c993eeaf1496a3ac74ad6e587f057
7f3b26e2f8d9de63c190c83976d0167b0a2e0ee2 09-Sep-2014 Wink Saville <wink@google.com> am 691b8d29: Merge "Change suffix UsingSubId to ForSubscriber." into lmp-dev

* commit '691b8d29a0c77bdf20d209c01461a176ccd7a2f7':
Change suffix UsingSubId to ForSubscriber.
691b8d29a0c77bdf20d209c01461a176ccd7a2f7 09-Sep-2014 Wink Saville <wink@google.com> Merge "Change suffix UsingSubId to ForSubscriber." into lmp-dev
b53a62b880100104ddfcb01ed89ea62ce7ce01fd 09-Sep-2014 Etan Cohen <etancohen@google.com> am 231c3c62: Fix NPE due to access before checking for NULL of APN setting.

* commit '231c3c6271a27b5f03444f4d24b52c41c46566ab':
Fix NPE due to access before checking for NULL of APN setting.
f013b229922b88112f5b56c4ed1734c506e6ede7 09-Sep-2014 Etan Cohen <etancohen@google.com> am 231c3c62: Fix NPE due to access before checking for NULL of APN setting.

* commit '231c3c6271a27b5f03444f4d24b52c41c46566ab':
Fix NPE due to access before checking for NULL of APN setting.
9bb769eaa748ca013ed35ad9dca9a555a7a8eaf8 09-Sep-2014 Amit Mahajan <amitmahajan@google.com> am 6638d38a: Merge "Assisted dialing support of MO SMS" into lmp-dev

* commit '6638d38a41076d7ba935df3931cd62ea51efad00':
Assisted dialing support of MO SMS
231c3c6271a27b5f03444f4d24b52c41c46566ab 09-Sep-2014 Etan Cohen <etancohen@google.com> Fix NPE due to access before checking for NULL of APN setting.

Change-Id: I7bac303a2a5d562f7f1b2569ecfa467160be52a1
ataconnection/DcTracker.java
0fe68ce4a5a05d16a647c9b886684ff2badfd632 09-Sep-2014 Amit Mahajan <amitmahajan@google.com> am 6638d38a: Merge "Assisted dialing support of MO SMS" into lmp-dev

* commit '6638d38a41076d7ba935df3931cd62ea51efad00':
Assisted dialing support of MO SMS
6638d38a41076d7ba935df3931cd62ea51efad00 09-Sep-2014 Amit Mahajan <amitmahajan@google.com> Merge "Assisted dialing support of MO SMS" into lmp-dev
70dad6e7c56847c91bc55755c645680ea6c6fac3 22-Jul-2014 Xia Ying <yingxia@motorola.com> Assisted dialing support of MO SMS

This is special for VZW requirement. Follow the specificaitons
of assisted dialing of MO SMS while traveling on VZW CDMA,
international CDMA or GSM markets.

Change-Id: I8976e596040e9eab9e4bc5168fc68e9d976c4df5
ccSmsInterfaceManager.java
msNumberUtils.java
87cef532d1595264fd811d26c3331cd33ed6c78f 09-Sep-2014 Wink Saville <wink@google.com> am badfc720: Merge "getSubId returns INVALID_SUB_ID if there are no subIds for a phone." into lmp-dev

* commit 'badfc720aeddce6dc0807549d7609840a9669e11':
getSubId returns INVALID_SUB_ID if there are no subIds for a phone.
177b38b27e3af1c044f4283ccaa0e20e9030a047 09-Sep-2014 Wink Saville <wink@google.com> getSubId returns INVALID_SUB_ID if there are no subIds for a phone.

Bug: 17399710
Change-Id: Ice47ee47ecc516d9d1ebe7cada8d1a145803d6c7
honeBase.java
6a5ef38e6ae3d3a3ad90ae180388fe85de0495a2 08-Sep-2014 Wink Saville <wink@google.com> Change suffix UsingSubId to ForSubscriber.

Bug: 17255752
Change-Id: Ifd522888b5aaae111f642d1e35bd1bb939e539d4
efaultPhoneNotifier.java
IccPhoneBook.aidl
ccProvider.java
honeSubInfoController.java
honeSubInfoProxy.java
ubInfoRecordUpdater.java
ubscriptionController.java
iccPhoneBookController.java
iccSmsController.java
apPushOverSms.java
a78b89580413cda352dbba21c4b0227dbb0211d3 06-Sep-2014 Derek Tan <derektan@google.com> Make public the getIccId function.

Bug: 17255752

Change-Id: Id1ffc49e0b2c9674b1631bbd5662be8889d97ed7
icc/UiccCard.java
09edbacf7649b71448677e94979de2c138384465 06-Sep-2014 Uma Maheswari Ramalingam <umam@codeaurora.org> am 17e77849: Add null check for IMS Connection when conference call ends

* commit '17e77849f88cf20dc5a28aeede66b839fbbdb831':
Add null check for IMS Connection when conference call ends
0768342bca4ad72a31784dfac0134308fc1be5fa 06-Sep-2014 Uma Maheswari Ramalingam <umam@codeaurora.org> am 17e77849: Add null check for IMS Connection when conference call ends

* commit '17e77849f88cf20dc5a28aeede66b839fbbdb831':
Add null check for IMS Connection when conference call ends
17e77849f88cf20dc5a28aeede66b839fbbdb831 03-Sep-2014 Uma Maheswari Ramalingam <umam@codeaurora.org> Add null check for IMS Connection when conference call ends

Add null check before accessing ImsConnection object when
conference call is ended as findConnection() may return null
when there is no connection associated with the call object

Bug: 17332291
Change-Id: I3b74277b20f3a26c1b026bfa15ef4d368fb6f8af
msphone/ImsPhoneCallTracker.java
96d961419690d3b78fbebe037889f5e922650251 06-Sep-2014 Junda Liu <junda@google.com> Update telemgr calls with subId to new APIs with ForSubscriber suffix.

Bug: b/17255752
Change-Id: Ib4447f280a76424751a3d5c25a8ba400a1f789ee
ubInfoRecordUpdater.java
ubscriptionController.java
b7644f1f9f9b03ee620c98bc523960fed6c26a9e 06-Sep-2014 Shishir Agrawal <shishir@google.com> am 25a519fa: Merge "API change: SetOperatorBrandOverride should not take iccId as a param." into lmp-dev

* commit '25a519fa55e0d193ee2652d407b869d9e61d7043':
API change: SetOperatorBrandOverride should not take iccId as a param.
8dc693ad5c0b583a10fe266bc20f3957c311f896 06-Sep-2014 Shishir Agrawal <shishir@google.com> am 25a519fa: Merge "API change: SetOperatorBrandOverride should not take iccId as a param." into lmp-dev

* commit '25a519fa55e0d193ee2652d407b869d9e61d7043':
API change: SetOperatorBrandOverride should not take iccId as a param.
25a519fa55e0d193ee2652d407b869d9e61d7043 06-Sep-2014 Shishir Agrawal <shishir@google.com> Merge "API change: SetOperatorBrandOverride should not take iccId as a param." into lmp-dev
29563963f6dc842d7951fb769e11c0f514e0c55e 06-Sep-2014 Vineeta Srivastava <vsrivastava@google.com> am 99ae0785: Merge "Supporting Plus code dialing for non-NANP CDMA carrier" into lmp-dev

* commit '99ae0785718f4350268e0d022398d3db0d0071c4':
Supporting Plus code dialing for non-NANP CDMA carrier
62df1e2cbd7a4eb3141f3f255e608f95358f05f0 06-Sep-2014 Vineeta Srivastava <vsrivastava@google.com> am 99ae0785: Merge "Supporting Plus code dialing for non-NANP CDMA carrier" into lmp-dev

* commit '99ae0785718f4350268e0d022398d3db0d0071c4':
Supporting Plus code dialing for non-NANP CDMA carrier
99ae0785718f4350268e0d022398d3db0d0071c4 06-Sep-2014 Vineeta Srivastava <vsrivastava@google.com> Merge "Supporting Plus code dialing for non-NANP CDMA carrier" into lmp-dev
279a26768a5fde8f0dd72e4b9e951c1c32265aab 04-Sep-2014 Shishir Agrawal <shishir@google.com> API change: SetOperatorBrandOverride should not take iccId as a param.

Taking ICCID as a parameter is not scure since a carrier can override the
brand for other carriers. We should override only the current ICCID.

Bug: 17390144

Change-Id: I8128695205b893b51bd5ca7f78b2980a49173768
hone.java
honeBase.java
honeProxy.java
dma/CDMAPhone.java
sm/GSMPhone.java
icc/UiccCard.java
bb1c968287bd746a93036ca41f5b46d4ad6a3977 10-Jul-2014 Steven Liu <stevenliu@motorola.com> Supporting Plus code dialing for non-NANP CDMA carrier

Plus Code Dialing in CDMA need to know the current IDD, which is
associated with the current operator MCC, but most of Network won't
broadcast the current operator MCC via OTA, we need to use the other
OTA parameters, such as SID, time zone etc. to find right MCC, and
get right IDD further to be used by Plus Code Dialing.

Change-Id: I369083169bb3504f8de9774b65f3993dd561c525

Conflicts:
src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
bpcdLookup.java
bpcdUtils.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
ddfa187522c7b483bb9594722fce5d85370abfea 05-Sep-2014 Amit Mahajan <amitmahajan@google.com> am 7bfb61e8: Merge "Voicemail notification disappears after power cycle" into lmp-dev

* commit '7bfb61e8d99661c5ae176cd2d80602917dbe9b07':
Voicemail notification disappears after power cycle
1cdabf329aa8302a2b837f63252d09c7585e233d 05-Sep-2014 Amit Mahajan <amitmahajan@google.com> am 7bfb61e8: Merge "Voicemail notification disappears after power cycle" into lmp-dev

* commit '7bfb61e8d99661c5ae176cd2d80602917dbe9b07':
Voicemail notification disappears after power cycle
7bfb61e8d99661c5ae176cd2d80602917dbe9b07 05-Sep-2014 Amit Mahajan <amitmahajan@google.com> Merge "Voicemail notification disappears after power cycle" into lmp-dev
3e0c725a827ce60fbe4afa71a184e9addaa58b8c 05-Sep-2014 Wink Saville <wink@google.com> am 1b0477da: Merge "More cleanup prior to unhiding" into lmp-dev

* commit '1b0477da03b091bd0caa8de934c5906f5689e594':
More cleanup prior to unhiding
c20377f71f40185f63a35c55716f19211160557d 05-Sep-2014 Wink Saville <wink@google.com> am 1b0477da: Merge "More cleanup prior to unhiding" into lmp-dev

* commit '1b0477da03b091bd0caa8de934c5906f5689e594':
More cleanup prior to unhiding
1b0477da03b091bd0caa8de934c5906f5689e594 05-Sep-2014 Wink Saville <wink@google.com> Merge "More cleanup prior to unhiding" into lmp-dev
ba2ee8969eb4a6c7292dc257beb1a125b34b30b6 05-Sep-2014 Wink Saville <wink@google.com> More cleanup prior to unhiding

Rename public SubInfoRecord instance variables

Change-Id: I25a56d779c63a3f483d7a43c5c123404bf489fa3
ccProvider.java
ubInfoRecordUpdater.java
ubscriptionController.java
945b358f075e984d817569fc5055483d51042c69 05-Sep-2014 Vineeta Srivastava <vsrivastava@google.com> am 48b86316: Merge "StkAppService couldn\'t get the CatService instance." into lmp-dev

* commit '48b863166bf17184b26b50d302c38115ed48096f':
StkAppService couldn't get the CatService instance.
53646a0f81d13ba5505c003a706e63729cf1b880 05-Sep-2014 Vineeta Srivastava <vsrivastava@google.com> am 48b86316: Merge "StkAppService couldn\'t get the CatService instance." into lmp-dev

* commit '48b863166bf17184b26b50d302c38115ed48096f':
StkAppService couldn't get the CatService instance.
48b863166bf17184b26b50d302c38115ed48096f 05-Sep-2014 Vineeta Srivastava <vsrivastava@google.com> Merge "StkAppService couldn't get the CatService instance." into lmp-dev
439b8e8be29b4ff14dc5cbdcf316562995ada0ed 05-Sep-2014 nfjb73 <nfjb73@motorola.com> am 004f7009: Fix incoming call name presentation

* commit '004f70095ae49451757f89dfafce2b26294a5f32':
Fix incoming call name presentation
e314d86692c56e60d7c42d8f0c7212c1e06ff628 05-Sep-2014 nfjb73 <nfjb73@motorola.com> am 004f7009: Fix incoming call name presentation

* commit '004f70095ae49451757f89dfafce2b26294a5f32':
Fix incoming call name presentation
ec3a0c19932bb09778fa06566c50ba101643b310 04-Sep-2014 Tom Taylor <tomtaylor@google.com> resolved conflicts for merge of 91e062f3 to lmp-sprout-dev

Change-Id: Ief6e0af92faa8556ff93f184d058730aae84909f
1dc6e277a1264c62f8a2d1a5665bd04be47b1f17 04-Sep-2014 Tom Taylor <tomtaylor@google.com> am 91e062f3: Merge "Save mcc/mnc in SubInfoRecord" into lmp-dev

* commit '91e062f3236b108cd82c127513f14ff96349c542':
Save mcc/mnc in SubInfoRecord
004f70095ae49451757f89dfafce2b26294a5f32 14-May-2013 nfjb73 <nfjb73@motorola.com> Fix incoming call name presentation

According to ril.h, namePresention should be handled as
numberPresention as they are using same value scope. In RIL.java,
only numberPresention is matched to that definition in DriveCall,
but namePresention is not matched.

Bug: 17327806
Change-Id: Iba985cbef98318181f93a9eab740db3d23a49a10
IL.java
91e062f3236b108cd82c127513f14ff96349c542 04-Sep-2014 Tom Taylor <tomtaylor@google.com> Merge "Save mcc/mnc in SubInfoRecord" into lmp-dev
9ec7796750941f75a69fb459f2f66aaf1fa7e837 04-Sep-2014 Vineeta Srivastava <vsrivastava@google.com> am 2852a88a: Merge "AT&T short dialing code" into lmp-dev

* commit '2852a88a2e2d3b3248e8d73d936090418b3015d4':
AT&T short dialing code
ab57aa5d465ef3a6dc0895b2408276617a2f6fa0 04-Sep-2014 Tom Taylor <tomtaylor@google.com> Save mcc/mnc in SubInfoRecord

Bug 17157686

Add MCC/MNC columns to siminfo table.
Set the sub info's mcc and mnc when it changes.

Change-Id: I543018c3960af46a14dd234540549d13bc49e579
ubscriptionController.java
dma/CDMALTEPhone.java
dma/CDMAPhone.java
icc/IccCardProxy.java
ef79d32b444fd592c6272fd092a4adacd026e87e 04-Sep-2014 Vineeta Srivastava <vsrivastava@google.com> am 2852a88a: Merge "AT&T short dialing code" into lmp-dev

* commit '2852a88a2e2d3b3248e8d73d936090418b3015d4':
AT&T short dialing code
d14886b2a393c8b3e844d38f5edee651e75c4f95 03-Sep-2014 Steven Liu <stevenliu@motorola.com> StkAppService couldn't get the CatService instance.

Stk app doesn't work.

Bug: 17298789
Change-Id: I0201cc0cdaf295eacbec36c4becfdb4862b63050
at/CatService.java
633cfab71fd9d2fba4d7ef2fa5e833bb1561e318 14-Aug-2014 Xia Ying <yingxia@motorola.com> Voicemail notification disappears after power cycle

For CDMA phone, use VM_COUNT_CDMA + phoneId as key to save
voice mail count, but using VM_COUNT_CDMA as key to read
voice mail count when powering up is not right, should use
VM_COUNT_CDMA + phoneId as key to check vm count.

Bug: 17016403
Change-Id: Iba12a753ac3c042f5e10e8b8d68b5b62b72a0e3d
dma/CDMAPhone.java
6103b5df6705c89193f452c35eaf5e9a26c188cf 29-Aug-2014 Jing Zhao <zhaojing@motorola.com> AT&T short dialing code

User should be able to dial 0 or 00 in AT&T network.
The code should not be taken as MMI Code.

Bug: 17314389
Change-Id: I2f4187ddcbad6d78ee8d8c1881648b96a9da76dd
sm/GsmMmiCode.java
msphone/ImsPhoneMmiCode.java
e319207742c15c92bf42405c468a44e243c3f5da 04-Sep-2014 Etan Cohen <etancohen@google.com> am 121eaf87: Fix CDMA missing call notification

* commit '121eaf87527829acc2a909e4a0515cada28a674e':
Fix CDMA missing call notification
3119aaa95a02f0d1f3e6fffdb2b94a56124e322e 04-Sep-2014 Etan Cohen <etancohen@google.com> am 30862cd2: Remove race condition due to RAT technology change.

* commit '30862cd26cbde4397d984c9afd1780ffbc9adbc2':
Remove race condition due to RAT technology change.
e03cd699f29e6815731e4e007b315d47f8eb158a 04-Sep-2014 Etan Cohen <etancohen@google.com> am 121eaf87: Fix CDMA missing call notification

* commit '121eaf87527829acc2a909e4a0515cada28a674e':
Fix CDMA missing call notification
a89200166ac87a877b651cb7475edef1a0439ea7 04-Sep-2014 Etan Cohen <etancohen@google.com> am 30862cd2: Remove race condition due to RAT technology change.

* commit '30862cd26cbde4397d984c9afd1780ffbc9adbc2':
Remove race condition due to RAT technology change.
121eaf87527829acc2a909e4a0515cada28a674e 04-Sep-2014 Etan Cohen <etancohen@google.com> Fix CDMA missing call notification

Mis-coding: left a derived class mIsIncoming member when moving functionality to base class -
i.e. derived class variable aliasing base class. Introduced in CL 179998 (partner repo).

Bug: 17142654
Change-Id: I88d8f649c1b5abaabae333854b203d4ecf182ba5
dma/CdmaCallTracker.java
dma/CdmaConnection.java
30862cd26cbde4397d984c9afd1780ffbc9adbc2 03-Sep-2014 Etan Cohen <etancohen@google.com> Remove race condition due to RAT technology change.

On RAT technology change old phone is destroyed and new phone created.
Original code performed unregistration of old phone and then registration
of new phone - small window where CallManager.getDefaultPhone() returned NULL.

Code changes order to make sure new phone is registered before old phone
is unregistered.

Bug: 17347478
Change-Id: Ife5b995de90bb5f8fab51af89f7b9aa50e7ec306
honeBase.java
honeProxy.java
05b2e5d2900cc596edf5140321977f151eef7ea1 04-Sep-2014 Shishir Agrawal <shishir@google.com> am b6f7017f: Merge "SIM state loaded should wait for carrier priviliges to load." into lmp-dev

* commit 'b6f7017fba093b7f7a793d651b2c2ef72420ea9d':
SIM state loaded should wait for carrier priviliges to load.
a4eb09b8d7bd8f78b888b6e9dc1a680416ec762d 04-Sep-2014 Shishir Agrawal <shishir@google.com> am b6f7017f: Merge "SIM state loaded should wait for carrier priviliges to load." into lmp-dev

* commit 'b6f7017fba093b7f7a793d651b2c2ef72420ea9d':
SIM state loaded should wait for carrier priviliges to load.
b6f7017fba093b7f7a793d651b2c2ef72420ea9d 04-Sep-2014 Shishir Agrawal <shishir@google.com> Merge "SIM state loaded should wait for carrier priviliges to load." into lmp-dev
cac9270dcc0b4169d51b8319fa6babed5a21f1fe 04-Sep-2014 Shishir Agrawal <shishir@google.com> am 31d370f2: Merge "Control radio poweroff on SIM reset using a config variable." into lmp-dev

* commit '31d370f22fbbd39cf097b37bbcb992414174076d':
Control radio poweroff on SIM reset using a config variable.
01233f83adb8c9fb1040b874396967df16124726 04-Sep-2014 Shishir Agrawal <shishir@google.com> am 11eb5d9c: Merge "NPE fix Check parent app for null in SIMRecords." into lmp-dev

* commit '11eb5d9c84d7ce57180105efc5dc39e71fa3c6c6':
NPE fix Check parent app for null in SIMRecords.
ca7d922058be8d14a8ed6fbd1db9da9b778c1ddd 04-Sep-2014 Shishir Agrawal <shishir@google.com> am 31d370f2: Merge "Control radio poweroff on SIM reset using a config variable." into lmp-dev

* commit '31d370f22fbbd39cf097b37bbcb992414174076d':
Control radio poweroff on SIM reset using a config variable.
e6c1b5f56e3ec415d26f73d8767e3155733e7afd 04-Sep-2014 Shishir Agrawal <shishir@google.com> am 11eb5d9c: Merge "NPE fix Check parent app for null in SIMRecords." into lmp-dev

* commit '11eb5d9c84d7ce57180105efc5dc39e71fa3c6c6':
NPE fix Check parent app for null in SIMRecords.
31d370f22fbbd39cf097b37bbcb992414174076d 04-Sep-2014 Shishir Agrawal <shishir@google.com> Merge "Control radio poweroff on SIM reset using a config variable." into lmp-dev
11eb5d9c84d7ce57180105efc5dc39e71fa3c6c6 04-Sep-2014 Shishir Agrawal <shishir@google.com> Merge "NPE fix Check parent app for null in SIMRecords." into lmp-dev
c3e37a01b74d28ebf10572bb0811c8a01916d941 03-Sep-2014 Shishir Agrawal <shishir@google.com> Control radio poweroff on SIM reset using a config variable.

Radio power off should not be required on SIM reset and currently causes
issues due to missed SIM notifications after a reset while the radio is off.
This was required for legacy devices where radios did not handle the reset
completely before the reset notification was sent to device.

Bug: 17154939
Change-Id: I53638a28998ef3b3dc41aae8948b1aef74ec49e2
icc/IccRecords.java
icc/RuimRecords.java
icc/SIMRecords.java
d849e916e35d6dab66e087f2cd37587e5370e4d7 04-Sep-2014 Wink Saville <wink@google.com> am e85a2347: Merge "Rename getActivatedXxx to getActiveXxx" into lmp-dev

* commit 'e85a234743d0f2cb03ae4628a5ddc88d245d8a35':
Rename getActivatedXxx to getActiveXxx
fd82186d4219015438aaa4d64082c37c2d511adc 04-Sep-2014 Wink Saville <wink@google.com> am 7419b297: Merge "Prepare to make SubscriptionManager public." into lmp-dev

* commit '7419b297b9e15512a130bde9e7d54f036a1e891f':
Prepare to make SubscriptionManager public.
55b7bddfb35d0f162e73f7fc05d5b359f4d61d8d 04-Sep-2014 Wink Saville <wink@google.com> am e85a2347: Merge "Rename getActivatedXxx to getActiveXxx" into lmp-dev

* commit 'e85a234743d0f2cb03ae4628a5ddc88d245d8a35':
Rename getActivatedXxx to getActiveXxx
027e0b5a5b88279cc5320e219182b52d633da482 04-Sep-2014 Wink Saville <wink@google.com> Merge commit '7419b297' into fix-merge-conflict

* commit '7419b297':
Prepare to make SubscriptionManager public.

Conflicts:
src/java/com/android/internal/telephony/IccProvider.java
src/java/com/android/internal/telephony/SubInfoRecordUpdater.java
src/java/com/android/internal/telephony/SubscriptionController.java

Change-Id: Ibec2f9135f3073e02fc667ea91b1faf7e6236436
62d026a3882d133aa81995f8dfd2c1d25b1b0649 03-Sep-2014 Shishir Agrawal <shishir@google.com> NPE fix Check parent app for null in SIMRecords.

Bug: 17354388
Change-Id: I2b2255b1c8fd9c7a8572d54060c1836030198a90
icc/SIMRecords.java
c9877fe39ad8f3641d16fd980404916da7f6ce70 13-Aug-2014 Shishir Agrawal <shishir@google.com> SIM state loaded should wait for carrier priviliges to load.

Currently the notification only waits for the IccRecords to load.

Bug: 16650402

Change-Id: I7bc011f1fba58ee23f47375d60f976fb816dea6b
icc/IccCardProxy.java
icc/UiccCard.java
icc/UiccCarrierPrivilegeRules.java
fb87258e809cc6e386faafd8ad1ea5585760a36d 03-Sep-2014 Wink Saville <wink@google.com> Rename getActivatedXxx to getActiveXxx

Change-Id: Iba6d2805a69d3385c93b7ed3c6267b5b8b252a28
ubscriptionController.java
7419b297b9e15512a130bde9e7d54f036a1e891f 03-Sep-2014 Wink Saville <wink@google.com> Merge "Prepare to make SubscriptionManager public." into lmp-dev
24af96f163cfb9e0882f50adc6a41975a2f9c312 03-Sep-2014 Tom Taylor <tomtaylor@google.com> resolved conflicts for merge of 917cd56b to lmp-sprout-dev

Change-Id: I668fa67933a586b9adfc05d512a161eeb27bd5b6
1e3725dea0ad291984ced5238670331c05f9ced3 03-Sep-2014 Tom Taylor <tomtaylor@google.com> am 917cd56b: Change SmsManager.getSmsManagerForSubId to getSmsManagerUsingSubId

* commit '917cd56bf468b599ae1aca56773d18ee4a5d4df8':
Change SmsManager.getSmsManagerForSubId to getSmsManagerUsingSubId
917cd56bf468b599ae1aca56773d18ee4a5d4df8 03-Sep-2014 Tom Taylor <tomtaylor@google.com> Change SmsManager.getSmsManagerForSubId to getSmsManagerUsingSubId

Bug 17371475

The agreed upon convention for SubId methods is xxxUsingSubId.

Change-Id: I3df09c5225f4331abe65868aded844a1334208c7
apPushOverSms.java
541eac28e7e7eda38376e59e5a658cb3f8948f5f 03-Sep-2014 Shri Borde <shri@google.com> resolved conflicts for merge of 038b5c11 to lmp-sprout-dev

Change-Id: I9e5b60773692ade2e2768324a8e3089216214639
6de613bd4ab29c00bbba5483bc563385e9ea69dc 03-Sep-2014 Shri Borde <shri@google.com> am 038b5c11: MessagingConfigurationManager and SmsManager api changes

* commit '038b5c11030741f103c15741db74068ce099cb53':
MessagingConfigurationManager and SmsManager api changes
440b44eb71b8d5afeeaa5fda8912f3a61b4c1588 03-Sep-2014 Wink Saville <wink@google.com> Prepare to make SubscriptionManager public.

Sync SubscriptionManager and its dependentes between lmp-dev
and lmp-sprout-dev.

In SubscriptionController
-Rename getActivatedSubInfoList to getActiveSubInfoList.
-Remove @param context in java docs
-Cleanup

In SubInfoRecordUpdater
-Cleanup

Change-Id: Ie06ced3e7ff5a3d06b3b47892fed22b4bb8972c7
ccProvider.java
honeBase.java
honeFactory.java
ubInfoRecordUpdater.java
ubscriptionController.java
iccSmsController.java
icc/SpnOverride.java
038b5c11030741f103c15741db74068ce099cb53 02-Sep-2014 Shri Borde <shri@google.com> MessagingConfigurationManager and SmsManager api changes

Bug 17243357: MessagingConfigurationManager is replaced with
SmsManager.getCarrierConfigValues

Remove the newly added SmsManager APIs taking a subId parameter. We now
create SmsManagers per requested subId.

Change-Id: Ifa95802b6f723c4986197a2b7d6fcbc43f4e0792
apPushOverSms.java
6bc4098827f3070a44b5e51508b455d7c7be9c07 01-Sep-2014 Wink Saville <wink@google.com> ksd to lmp-sprout-dev

Change-Id: I94eb65c62231b5831570bb0cbbbd9c916bee0a37
aseCommands.java
allManager.java
ebugService.java
ccProvider.java
hone.java
honeBase.java
honeFactory.java
honeProxy.java
honeSubInfoController.java
honeSubInfoProxy.java
roxyController.java
IL.java
erviceStateTracker.java
ubInfoRecordUpdater.java
ubscription.java
ubscriptionController.java
ubscriptionData.java
iccSmsController.java
apPushOverSms.java
at/IconLoader.java
at/RilMessageDecoder.java
dma/CDMALTEPhone.java
dma/CdmaServiceStateTracker.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
ataconnection/DctController.java
sm/GSMPhone.java
sm/GsmServiceStateTracker.java
msphone/ImsPhone.java
icc/IccCardProxy.java
icc/IccRecords.java
icc/RuimRecords.java
icc/SIMRecords.java
icc/SpnOverride.java
icc/UiccCard.java
icc/UiccCardApplication.java
d9da6693a707e1d294edf24f698f4c58278c1bec 31-Aug-2014 Wink Saville <wink@google.com> am 5340687b: Merge "Include IMS service state when determining GSM/CDMA Phone service state." into lmp-dev

* commit '5340687beae29f149479d32c541965461d6d4b29':
Include IMS service state when determining GSM/CDMA Phone service state.
b9366c11ae4a8f25d571753fbc8d4c2738b8c833 31-Aug-2014 Uma Maheswari Ramalingam <umam@codeaurora.org> am 5b2302a7: Add null check for ims call during conference call updates

* commit '5b2302a78231998589d06a2bc7b4ae9ef00fe5b8':
Add null check for ims call during conference call updates
5340687beae29f149479d32c541965461d6d4b29 31-Aug-2014 Wink Saville <wink@google.com> Merge "Include IMS service state when determining GSM/CDMA Phone service state." into lmp-dev
5b2302a78231998589d06a2bc7b4ae9ef00fe5b8 29-Aug-2014 Uma Maheswari Ramalingam <umam@codeaurora.org> Add null check for ims call during conference call updates

Add null check before accessing imscall object.
For conference call updates are forced by
using a null object for imscall
argument.
This enables UI update for conference calls

Bug: 17321414

Change-Id: I5667bf136af37e425040edc34dacad46de084ec4
msphone/ImsPhoneConnection.java
e84571be717f0b45c60aa5ad5d07337d81cf23b8 29-Aug-2014 Wink Saville <wink@google.com> Include IMS service state when determining GSM/CDMA Phone service state.

Also, made both getServiceState calls identical, it would be desirable
to promote getServiceState to PhoneBase but since the mSST variable is
Object Specific that wasn't trivial to do, so for now the code is
duplicated.

Bug: 17326988
Change-Id: I548abf213ab098cd31e9f9c90d231135fba3be6a
dma/CDMAPhone.java
sm/GSMPhone.java
2f0e457048cf3d4711ec928d86cf7aff15c68144 30-Aug-2014 Shishir Agrawal <shishir@google.com> am 73e6d2b8: Merge "Allow MVNO tethering APNS through gservices flags." into lmp-dev

* commit '73e6d2b8b8d24b21d13bc22f346d3ba29c905eaa':
Allow MVNO tethering APNS through gservices flags.
73e6d2b8b8d24b21d13bc22f346d3ba29c905eaa 30-Aug-2014 Shishir Agrawal <shishir@google.com> Merge "Allow MVNO tethering APNS through gservices flags." into lmp-dev
3262c21feb1eede2917450cfdfd3faa86ee70cab 25-Aug-2014 Shishir Agrawal <shishir@google.com> Allow MVNO tethering APNS through gservices flags.

The change allows multiple APNs to be specified in
Settings.Global.TETHER_DUN_APN. It also adds mvnoType, and mvnoMatchData
support to the ApnSetting class.

Bug: 12977533

Change-Id: I424fc405c1e6270bf55eadb130ed839d50575cf1
ataconnection/ApnSetting.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
678a9f9d1edf474f881b2f3399defb7c8fd3a80b 29-Aug-2014 Wink Saville <wink@google.com> am 26e96375: Merge "Resp. handling of CLIR/P, COLR/P, Call Barring" into lmp-dev

* commit '26e963755e62c785d77f97a94e6116bcd5fb9e11':
Resp. handling of CLIR/P, COLR/P, Call Barring
0662676611fb08b8eed2fe43b6249e839f613eaa 29-Aug-2014 Wink Saville <wink@google.com> am 8ae713fe: Merge "Add support for Silent Redial and SRVCC" into lmp-dev

* commit '8ae713fef62a078cbf1ab915d37ed3e0d1bbad69':
Add support for Silent Redial and SRVCC
2015033a806c3ff0c772c14f5af1ba0904c1e202 29-Aug-2014 Shri Borde <shri@google.com> am c16a3357: Merge "Complete MSIM support in MmsService" into lmp-dev

* commit 'c16a3357d2987eef32c0aceab99b66d7a290a2ed':
Complete MSIM support in MmsService
26e963755e62c785d77f97a94e6116bcd5fb9e11 29-Aug-2014 Wink Saville <wink@google.com> Merge "Resp. handling of CLIR/P, COLR/P, Call Barring" into lmp-dev
8ae713fef62a078cbf1ab915d37ed3e0d1bbad69 29-Aug-2014 Wink Saville <wink@google.com> Merge "Add support for Silent Redial and SRVCC" into lmp-dev
c16a3357d2987eef32c0aceab99b66d7a290a2ed 29-Aug-2014 Shri Borde <shri@google.com> Merge "Complete MSIM support in MmsService" into lmp-dev
a8cd97e94b97b924e44377476cfe4e1fbfe49dae 28-Aug-2014 Uma Maheswari Ramalingam <umam@codeaurora.org> Resp. handling of CLIR/P, COLR/P, Call Barring

Adding fixes to properly display service status
on the UI for IMS (UT) CLIR/P, COLR/P and Call
Barring queries.

Bug: 17321315
Change-Id: I17823c3786a0e9a24c89480b7537dccc549c9516
msphone/ImsPhoneMmiCode.java
e64a413b850aae224e2f56e7dfc6e0bcd667643e 29-Aug-2014 Uma Maheswari Ramalingam <umam@codeaurora.org> Add support for Silent Redial and SRVCC

1. Silent Redial uses the same notifications as SRVCC.
Add support to handle the notifications in CDMA mode.
2. Frameworks and UI support for connection handover.

Bug: 17307064, 17288974
Change-Id: Icc1f9ad50a1dcb53a2af1aae8d296af7101676aa
onnection.java
hone.java
honeBase.java
honeProxy.java
dma/CdmaCallTracker.java
dma/CdmaConnection.java
sm/GsmCallTracker.java
sm/GsmConnection.java
msphone/ImsPhoneBase.java
msphone/ImsPhoneConnection.java
ip/SipPhoneBase.java
de4e3cdbea2a3275beacf4fef5dfb4e6cb7f15f1 29-Aug-2014 Diego Pontoriero <diegs@google.com> am 934a24a6: Generalize getCarrierPackageNamesForBroadcastIntent utility method to work for all intent types.

* commit '934a24a6aa2b7a981e872fa350648904ed80280a':
Generalize getCarrierPackageNamesForBroadcastIntent utility method to work for all intent types.
934a24a6aa2b7a981e872fa350648904ed80280a 28-Aug-2014 Diego Pontoriero <diegs@google.com> Generalize getCarrierPackageNamesForBroadcastIntent utility method to work for all intent types.

Bug: 17163860
Change-Id: I4b013db09a521fbc41401e11cd60a0c7b0172b64
nboundSmsHandler.java
MSDispatcher.java
icc/UiccCard.java
icc/UiccCarrierPrivilegeRules.java
02f22fa9a305cb2bec57a5534b8d00538cdcc647 28-Aug-2014 Selim Cinek <cinek@google.com> am b496aaca: Colored notifications

* commit 'b496aacaf6811afb18910dba756f5bc2c83b5fad':
Colored notifications
b496aacaf6811afb18910dba756f5bc2c83b5fad 27-Aug-2014 Selim Cinek <cinek@google.com> Colored notifications

Bug: 17128331
Change-Id: Icf0a97a5aa472a1358380f5b0b5180b6a2b8e9f9
sm/GsmServiceStateTracker.java
eb85cae0734a2cfa99fae561eaa6110f1cd534b5 27-Aug-2014 Amith Yamasani <yamasani@google.com> am 9dd5a8af: Merge "Don\'t invoke resultReceiver more than once" into lmp-dev

* commit '9dd5a8afd94de99f26a2064dce2f2979478b5411':
Don't invoke resultReceiver more than once
9dd5a8afd94de99f26a2064dce2f2979478b5411 27-Aug-2014 Amith Yamasani <yamasani@google.com> Merge "Don't invoke resultReceiver more than once" into lmp-dev
1dd55df4bcba73c42f724477284df2bd0edd4ff5 26-Aug-2014 Tom Taylor <tomtaylor@google.com> Complete MSIM support in MmsService

Bug 16681645

Use the subId to get the correct mms_config parameter.

Change-Id: Ie43d0979a5b5185c3c22bd171b9676a98b916e70
apPushOverSms.java
5e8faee2a2c2e46c2001cc2f70e085d66ff98de8 26-Aug-2014 Libin.Tang@motorola.com <w16529@motorola.com> am bc040685: IMS: fix missed call notification not shown. Differentiate the missed call/rejected call during onCallTerminated callback. Also remove the onCallTerminiated from onCallStartFailed as onCallTerminated should be triggered by the vendor ims.

* commit 'bc0406859056e2de6d36cbddf39e15fcfa8155b0':
IMS: fix missed call notification not shown. Differentiate the missed call/rejected call during onCallTerminated callback. Also remove the onCallTerminiated from onCallStartFailed as onCallTerminated should be triggered by the vendor ims.
bb1384c3ec196bad9c1c65dea20177ca3f366156 26-Aug-2014 Libin.Tang@motorola.com <w16529@motorola.com> am 2e081b3f: IMS: modify sendDtmf to pass char input since vendor ril will translate the char input to int.

* commit '2e081b3f9e8cfaae482a08cb885b6f79a39f5a4c':
IMS: modify sendDtmf to pass char input since vendor ril will translate the char input to int.
3bbc4c2d64bddd4c64f0f9f3b50eab38f43a1341 26-Aug-2014 Etan Cohen <etancohen@google.com> am c6bfb9fe: Conference calling for IMS: add code to delegate from parent GSM/CDMA phone.

* commit 'c6bfb9fe8381b05d9f3cfdf842e9381ca9d4c8f4':
Conference calling for IMS: add code to delegate from parent GSM/CDMA phone.
bc0406859056e2de6d36cbddf39e15fcfa8155b0 24-Aug-2014 Libin.Tang@motorola.com <w16529@motorola.com> IMS: fix missed call notification not shown.
Differentiate the missed call/rejected call during onCallTerminated callback.
Also remove the onCallTerminiated from onCallStartFailed as
onCallTerminated should be triggered by the vendor ims.

Bug: 17142654
Change-Id: I107717c21f7da89e945cf74d14fbe2d2d24f94b3
msphone/ImsPhoneCallTracker.java
2e081b3f9e8cfaae482a08cb885b6f79a39f5a4c 24-Aug-2014 Libin.Tang@motorola.com <w16529@motorola.com> IMS: modify sendDtmf to pass char input since vendor ril will translate the
char input to int.

Bug: 17282921
Change-Id: If30470868db4fb50154cf84f56aecd6daef7ddd5
msphone/ImsPhoneCallTracker.java
8d135fd107e64d9bbdc082c2fdf45c6f494cafd3 26-Aug-2014 Amith Yamasani <yamasani@google.com> Don't invoke resultReceiver more than once

When delivering the SMS_RECEIVED broadcasts to multiple users,
don't invoke the resultReceiver for each of them. Only invoke
for the primary user.

Bug: 17058511
Change-Id: Id59c8c7b1cbaf1d7d7fd05134465e1987cded817
nboundSmsHandler.java
c6bfb9fe8381b05d9f3cfdf842e9381ca9d4c8f4 09-Aug-2014 Etan Cohen <etancohen@google.com> Conference calling for IMS: add code to delegate from parent GSM/CDMA phone.

Bug: 17221493
Change-Id: I261922349cb0574a0b726e831bc5205bb2b37019
dma/CDMAPhone.java
sm/GSMPhone.java
8fd9baa1919e02cf62c6b3d74df57a8fee63f7af 26-Aug-2014 Matthew Xie <mattx@google.com> am f7425365: Merge "Fixed AT+CHUP issue in the case of a waiting call" into lmp-dev

* commit 'f7425365551b3f86815b2b08bb89c27f8721d97d':
Fixed AT+CHUP issue in the case of a waiting call
f7425365551b3f86815b2b08bb89c27f8721d97d 26-Aug-2014 Matthew Xie <mattx@google.com> Merge "Fixed AT+CHUP issue in the case of a waiting call" into lmp-dev
e75989ef942d35158046b8e0b6fb17759516bb03 23-Aug-2014 Libin.Tang@motorola.com <w16529@motorola.com> am d2ab0922: When registered in LTE, phone object is switched to GSM. Attempting a CSFB MO call will cause the phone object to be switched to CDMA resulting in local hangup of the dialled call. To fix this, do not switch phone object to GSM when camped to LTE in CDMA-

* commit 'd2ab0922d03f74f2d69d8f58427ffdd524c0c75b':
When registered in LTE, phone object is switched to GSM. Attempting a CSFB MO call will cause the phone object to be switched to CDMA resulting in local hangup of the dialled call. To fix this, do not switch phone object to GSM when camped to LTE in CDMA-LTE mode. If there is a real need to switch to GSM it is done via RIL_UNSOL_VOICE_RADIO_TECH_CHANGED.
ace15af2c7d894b872786bfeebba1ec86cc36fda 23-Aug-2014 Amit Mahajan <amitmahajan@google.com> am 07cacec1: Merge "Revert "Revert "Add code to handle voice radio technology of LTE.""" into lmp-dev

* commit '07cacec1e947abee67aeca1e004d76d14ca42158':
Revert "Revert "Add code to handle voice radio technology of LTE.""
d2ab0922d03f74f2d69d8f58427ffdd524c0c75b 22-Jul-2014 Libin.Tang@motorola.com <w16529@motorola.com> When registered in LTE, phone object is switched to GSM.
Attempting a CSFB MO call will cause the phone object to be
switched to CDMA resulting in local hangup of the dialled call.
To fix this, do not switch phone object to GSM when camped to LTE
in CDMA-LTE mode.
If there is a real need to switch to GSM it is done via
RIL_UNSOL_VOICE_RADIO_TECH_CHANGED.

Bug: 17035252
Change-Id: I52ab9eab2213da8cea5d7a2c437204dfeae2199c
dma/CdmaLteServiceStateTracker.java
07cacec1e947abee67aeca1e004d76d14ca42158 23-Aug-2014 Amit Mahajan <amitmahajan@google.com> Merge "Revert "Revert "Add code to handle voice radio technology of LTE.""" into lmp-dev
bc8de846fcd3dab9da5b87fb74af315bceaa7da7 22-Aug-2014 Etan Cohen <etancohen@google.com> am ac82d4da: Fix crash on hangup: Runtime exception thrown rather than CallStateException

* commit 'ac82d4da0473991006a752e2337ccb93e85f0946':
Fix crash on hangup: Runtime exception thrown rather than CallStateException
ac82d4da0473991006a752e2337ccb93e85f0946 22-Aug-2014 Etan Cohen <etancohen@google.com> Fix crash on hangup: Runtime exception thrown rather than CallStateException

This is still an invalid state to reach to. However, all other invalid states
in this routine also throw CallStateException.

Bug: 17205457
Change-Id: Ib8c958a49f303f6babfeceeb900090a57116a17b
msphone/ImsPhoneCallTracker.java
9419d82af275a17166f8cf770de5a4a766a82002 22-Aug-2014 Libin.Tang@motorola.com <w16529@motorola.com> am cf91ae7a: IMS: add isVolteEnabled/isVtEnabled based on registrationFeatureCapabilityChanged.

* commit 'cf91ae7acc62eba22d9e652e5de5fb90a89e2ac8':
IMS: add isVolteEnabled/isVtEnabled based on registrationFeatureCapabilityChanged.
cf91ae7acc62eba22d9e652e5de5fb90a89e2ac8 19-Aug-2014 Libin.Tang@motorola.com <w16529@motorola.com> IMS: add isVolteEnabled/isVtEnabled based on registrationFeatureCapabilityChanged.

Bug: 17182366
Change-Id: Ib203320c6fdb2242263c526b1d73c8c8bce2f1e4
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
27fd1e94bd6dc6c66b0bde665c766070d4eb7ee1 22-Aug-2014 Jing Zhao <zhaojing@motorola.com> am 12fffcf0: Fix improper mobile data connecting event

* commit '12fffcf0d8df6b8268806d9aa7cc7a662e73743b':
Fix improper mobile data connecting event
12fffcf0d8df6b8268806d9aa7cc7a662e73743b 30-Jul-2014 Jing Zhao <zhaojing@motorola.com> Fix improper mobile data connecting event

mAutoAttachOnCreation keeps DataConnection retry connecting
while ApnContext could still be turned into IDLE state.
Make mAutoAttachOnCreation configuable and keep consistency
between DataConnection and ApnContext

Bug: 17131842
Change-Id: Iebd4886959f5458c1b10c34d2e7f96f29c71d527
ataconnection/DataConnection.java
ataconnection/DcAsyncChannel.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
03b37b67755a4033c6be32ae2e389c310e06e7d1 22-Aug-2014 Amit Mahajan <amitmahajan@google.com> Revert "Revert "Add code to handle voice radio technology of LTE.""

This reverts commit 3beec5e255c514dc419e5cc3021d178b3a416d40.

Bug: 17035252
Change-Id: Ife832f79627f64aa419af5881b8ac0ef32954c3c
hone.java
honeBase.java
honeProxy.java
erviceStateTracker.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
sm/GsmServiceStateTracker.java
f1bd490fb1ed3d06122d17924bfd88d89be45745 22-Aug-2014 Jing Zhao <zhaojing@motorola.com> am d325833e: VoLTE incoming call number

* commit 'd325833e9248c05305b1edabb1d8efc827803f75':
VoLTE incoming call number
d325833e9248c05305b1edabb1d8efc827803f75 19-Aug-2014 Jing Zhao <zhaojing@motorola.com> VoLTE incoming call number

Set incoming call number in OIR to be shown to user

Bug: 17032453
Change-Id: Iceadb0f537fb35f685cbcf8279ccef7d86036600
msphone/ImsPhoneConnection.java
858cd6e662eefd604355e63bc1fddb1e418626ff 21-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> am 1dabad60: Merge "Handle case when switching phones." into lmp-dev

* commit '1dabad60010f426c6c9abdb70efe3c7f82659bee':
Handle case when switching phones.
e21826d3c297ee967773da63a2103918793a4bc7 21-Aug-2014 John Huang <jsh@google.com> am 26d5dc92: Merge "Add page info in each segment if carrier does not support EMS." into lmp-dev

* commit '26d5dc925c83f2816604a3581c9d89bf86ac804e':
Add page info in each segment if carrier does not support EMS.
1dabad60010f426c6c9abdb70efe3c7f82659bee 21-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Handle case when switching phones." into lmp-dev
26d5dc925c83f2816604a3581c9d89bf86ac804e 21-Aug-2014 John Huang <jsh@google.com> Merge "Add page info in each segment if carrier does not support EMS." into lmp-dev
4a4195a11b125e56e25117e92c4c92543b14a5cb 21-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> Handle case when switching phones.

If the DC exits the mApnContexts may be set to null - handle that case
and don't crash. We had nothing left to do anyway.

bug:17172374
Change-Id: I365c7903e91b9f7f6e95e23761ae57d138d57c0d
ataconnection/DataConnection.java
faddb93080a9e3b42875429e8f484139aaf80a94 21-Aug-2014 Wink Saville <wink@google.com> am 63557e1b: Merge "Protect getPhone and getPhones APIs with a lock" into lmp-dev

* commit '63557e1b0b2db98d0430e72a83b996893a1f50f1':
Protect getPhone and getPhones APIs with a lock
d2f6d288553c53b8107d414750e52f660c0a4105 21-Aug-2014 Naveen Kalla <nkalla@codeaurora.org> am 03586878: Send Shutdown Request to RIL.

* commit '03586878fb3d870373f2fdf65afb81cc5ae97067':
Send Shutdown Request to RIL.
63557e1b0b2db98d0430e72a83b996893a1f50f1 21-Aug-2014 Wink Saville <wink@google.com> Merge "Protect getPhone and getPhones APIs with a lock" into lmp-dev
6f5e6b5b4374d834734894d687dea58724b6c0b0 14-Aug-2014 Naveen Kalla <nkalla@codeaurora.org> Protect getPhone and getPhones APIs with a lock

Remove check for sLooper and protect sProxyPhone and sProxyPhones
with a lock

Change-Id: I1217f89b2b94f3db96c59e0619cf676f619fc90a
honeFactory.java
03586878fb3d870373f2fdf65afb81cc5ae97067 02-Aug-2014 Naveen Kalla <nkalla@codeaurora.org> Send Shutdown Request to RIL.

Send RIL_REQUEST_SHUTDOWN to RIL when device is shutting down.
RIL can use this request to shutdown the SIM card and modem gracefully.

Bug: 9773278
Change-Id: I6afa9e810cefc7855f7ae42e51f39cc51fa2aa6e
aseCommands.java
ommandsInterface.java
hone.java
honeBase.java
honeProxy.java
IL.java
erviceStateTracker.java
dma/CdmaServiceStateTracker.java
sm/GsmServiceStateTracker.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
eca10f29db01a772fa29e2b16c15530dc29a1f4f 21-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> am 75e63fd8: Merge "Allow overriding Telephony tcp buffer sizes." into lmp-dev

* commit '75e63fd850839856400ce41f5daa56819e09de39':
Allow overriding Telephony tcp buffer sizes.
e794c6870f3eb0581c151f11da9cd66392a7fa68 21-Aug-2014 Amit Mahajan <amitmahajan@google.com> am d14733be: Merge "Adding APIs to get IMEI/MEID" into lmp-dev

* commit 'd14733be2ce1783c0947b713733a33d98b25102d':
Adding APIs to get IMEI/MEID
d14733be2ce1783c0947b713733a33d98b25102d 21-Aug-2014 Amit Mahajan <amitmahajan@google.com> Merge "Adding APIs to get IMEI/MEID" into lmp-dev
054702be1e6900b20d825b24f34a4387572c2321 19-Aug-2014 Amit Mahajan <amitmahajan@google.com> Adding APIs to get IMEI/MEID

Change-Id: I553b7c019b20a64ff1049f35b0e3999ab82b7cce
honeSubInfo.java
honeSubInfoController.java
honeSubInfoProxy.java
dma/CDMAPhone.java
75e63fd850839856400ce41f5daa56819e09de39 21-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Allow overriding Telephony tcp buffer sizes." into lmp-dev
156217ea26708dda2808396b8402197dae2a6ef5 20-Aug-2014 Shishir Agrawal <shishir@google.com> am 6b124af0: Merge "Adding loggin to InboundSmsHandler." into lmp-dev

* commit '6b124af0591ae94db3b57203deec76adfc800d81':
Adding loggin to InboundSmsHandler.
8907ad8cddb8c67eae7cdb2991adfaa7f566628a 20-Aug-2014 Etan Cohen <etancohen@google.com> am 284fb669: Enable VoLTE/VT with overlay overrides.

* commit '284fb669478713333afe8ad2af329e4a6497911d':
Enable VoLTE/VT with overlay overrides.
284fb669478713333afe8ad2af329e4a6497911d 19-Aug-2014 Etan Cohen <etancohen@google.com> Enable VoLTE/VT with overlay overrides.

This reverts commit 24b1f38ee9ef3da624dde258da170c54649bf89b.

Bug: 17134661
Change-Id: I7c021017b257a221ca98c07c539b0c6d227ce1da
dma/CDMAPhone.java
sm/GSMPhone.java
8fa68fc28795817ce90fdf2a09b859a2d8453ffb 18-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> Allow overriding Telephony tcp buffer sizes.

bug:16549611
Change-Id: Id2504b3f91d54eab459be11b61027394ea5dd80e
ataconnection/DataConnection.java
0c2013dad71868066ce0c6580949431efeb41778 20-Aug-2014 Amit Mahajan <amitmahajan@google.com> am 0cda8612: Merge "Consider default subId during initialization of subscription controller" into lmp-dev

* commit '0cda861274cf2f5590eb25bbf15c927c647cdb2e':
Consider default subId during initialization of subscription controller
3e0dd6a897acb42e665b429dcd6ae67f19d76063 03-Jan-2014 MUDUMBA ANANTH <ananthm@broadcom.com> Fixed AT+CHUP issue in the case of a waiting call

> Update GsmCallTracker.java, to not auto-answer
waiting call on terminating an active call.

Bug: 16900298
Change-Id: Idfd64c18cec55f60b929bd1a538a1b557b692490
sm/GsmCallTracker.java
8ffb3a32f141d66b67fed7a25db7747e48724a09 19-Aug-2014 Shishir Agrawal <shishir@google.com> am ba891ddf: Merge "Fix possible NPE in SIMRecords and IccSmsInterfaceManager." into lmp-dev

* commit 'ba891ddf2edcaa23c1f1d8a5a17cb508b8593d74':
Fix possible NPE in SIMRecords and IccSmsInterfaceManager.
2578c75b1d22e0b8b3f5b3ed8de55e5e400917e3 19-Aug-2014 Shishir Agrawal <shishir@google.com> am 8777445c: Merge "UiccCarrierPrivilegeRules: Set state error on incorrect response from UICC." into lmp-dev

* commit '8777445caf72f1803f40698665c37c626269deb8':
UiccCarrierPrivilegeRules: Set state error on incorrect response from UICC.
6b124af0591ae94db3b57203deec76adfc800d81 20-Aug-2014 Shishir Agrawal <shishir@google.com> Merge "Adding loggin to InboundSmsHandler." into lmp-dev
4cab4152bd6d47059e4d7cb352b5f5add938c318 20-Aug-2014 Shishir Agrawal <shishir@google.com> Adding loggin to InboundSmsHandler.

To be able to detect crashes due to improper state transitions.

Bug: 17058511
Change-Id: I2893d7c1a5f4afaa77cd10429fb4a8738f79b980
nboundSmsHandler.java
8777445caf72f1803f40698665c37c626269deb8 19-Aug-2014 Shishir Agrawal <shishir@google.com> Merge "UiccCarrierPrivilegeRules: Set state error on incorrect response from UICC." into lmp-dev
ba891ddf2edcaa23c1f1d8a5a17cb508b8593d74 19-Aug-2014 Shishir Agrawal <shishir@google.com> Merge "Fix possible NPE in SIMRecords and IccSmsInterfaceManager." into lmp-dev
f3166841bf9df142e2fbd63b7647bae7da712044 15-Jul-2014 Xia Ying <yingxia@motorola.com> Add page info in each segment if carrier does not support EMS.

If EMS is not supported, framework breaks down EMS into single segment
SMS and adds page info " x/y".

In the case of UCS2 encoding type, we need 8 bytes for this, but we
only have 6 bytes from UDH, so truncate the limit for each segment by
2 bytes (1 char).

Change-Id: Ie4f7e233155ce392c14ae75946c9d62d4897013c
ccSmsInterfaceManager.java
dma/sms/BearerData.java
sm/SmsMessage.java
68515b655255005f653aec29e9f152412514982a 18-Aug-2014 Shishir Agrawal <shishir@google.com> Fix possible NPE in SIMRecords and IccSmsInterfaceManager.

Bug: 17108041

Change-Id: I2df5cb777d27b669f6b3ae7ad9d853a951270fcd
ccSmsInterfaceManager.java
icc/SIMRecords.java
0a0eb612fe7d99aeee09b423c9f6840d80858d0a 18-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> am 27176514: Set the tcp buffer sizes based on RAT.

* commit '27176514b825175a0f402fe7fc2eb4e281ce8bdd':
Set the tcp buffer sizes based on RAT.
27176514b825175a0f402fe7fc2eb4e281ce8bdd 07-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> Set the tcp buffer sizes based on RAT.

Replicates the behavior from KK and before.
Also fixes the use of TelephonyManager constants instead
of RIL constants when setting bandwidth number.

bug: 16549611
Change-Id: I44cbd24974f1eaa0ac0c6a2310afb2e23ee94c8c
ataconnection/DataConnection.java
0cda861274cf2f5590eb25bbf15c927c647cdb2e 20-Aug-2014 Amit Mahajan <amitmahajan@google.com> Merge "Consider default subId during initialization of subscription controller" into lmp-dev
374fb1f013fcddac3421720a7f2123e8f025c52a 19-Aug-2014 Hyejin Kim <hyejin.kim@lge.com> Consider default subId during initialization of subscription controller

Bug: 16445210, 16966396
Change-Id: I1d9cdc1d070af532ae25d10d8f7d5240bb272623
ubscriptionController.java
08d0e472f123a6b26e62b0e76c767782f2d9551b 16-Aug-2014 Etan Cohen <etancohen@google.com> am 24b1f38e: Force IMS disable.

* commit '24b1f38ee9ef3da624dde258da170c54649bf89b':
Force IMS disable.
24b1f38ee9ef3da624dde258da170c54649bf89b 16-Aug-2014 Etan Cohen <etancohen@google.com> Force IMS disable.

Work-around - needed until VZN provisioning code enabled.

Change-Id: I5c276d8da9d506ead3985c2e9c8a1b85854675df
dma/CDMAPhone.java
sm/GSMPhone.java
ba3b74ae8b8571c25bc99663436507a9d42660fe 16-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> am fb45e959: Merge "Configure MTU based on network PCO MTU parameter" into lmp-dev

* commit 'fb45e95982cccd51fe105b5df1942dabae5d7db6':
Configure MTU based on network PCO MTU parameter
fb45e95982cccd51fe105b5df1942dabae5d7db6 16-Aug-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Configure MTU based on network PCO MTU parameter" into lmp-dev
e9701717e43cc5aacbcf624f77a53be92350662c 08-Aug-2014 w19976 <w19976@motorola.com> Configure MTU based on network PCO MTU parameter

Add logic to obtain the mtu from the network PCO parameter and set it to kernel
when the mobile data connection is established. When there is no PCO mtu configured
from the network, the mtu size defined in the corresponding APN will be used. In case
no mtu size is defined for an APN used for data connection, the MCC/MNC based MTU
defined in the framework overaly will be applied.

bug:17046179
Change-Id: I6465d4b8f2076aaa380ae3617fb3f24adbe136d4
IL.java
ataconnection/ApnSetting.java
ataconnection/DataCallResponse.java
ataconnection/DataConnection.java
ataconnection/DcTracker.java
9d6fd682b12b7ec62537318b942379253587a4d2 15-Aug-2014 Vinit Deshpande <vinitd@google.com> am c862ea71: Merge "Enable EAP-SIM end-to-end" into lmp-dev

* commit 'c862ea7172855fa77cece249e90cbe9a7056e4d5':
Enable EAP-SIM end-to-end
7a01a947f75856fb53e028052094c9d88db8b89e 15-Aug-2014 Etan Cohen <etancohen@google.com> am e2aa4828: IMS default state hard-coded value replaced with reference to a defined constant.

* commit 'e2aa4828ce7a944d74da5cbb3094bfc05e07eff9':
IMS default state hard-coded value replaced with reference to a defined constant.
be81bd81428df4408110be5d354001a91368b8ee 15-Aug-2014 Jing Zhao <zhaojing@motorola.com> am 80bc1e5a: Use proper IccRecords in CDMALTEPhone to get mccmnc and update CURRENT carrier.

* commit '80bc1e5a6f0bd91b886351997b797e01732c1c67':
Use proper IccRecords in CDMALTEPhone to get mccmnc and update CURRENT carrier.
c862ea7172855fa77cece249e90cbe9a7056e4d5 15-Aug-2014 Vinit Deshpande <vinitd@google.com> Merge "Enable EAP-SIM end-to-end" into lmp-dev
756a3b34a69af01fcb029f279dca0754329d3f7d 15-Aug-2014 Amit Mahajan <amitmahajan@google.com> am 9d4ec7d4: Revert "Revert "add apn setting parameters, and set apn parameters to bp""

* commit '9d4ec7d45061f1da05f16cd244eb0a798e7f36bb':
Revert "Revert "add apn setting parameters, and set apn parameters to bp""
e2aa4828ce7a944d74da5cbb3094bfc05e07eff9 14-Aug-2014 Etan Cohen <etancohen@google.com> IMS default state hard-coded value replaced with reference to a defined constant.

Allows changing defaults from single definition.

Change-Id: I9b46fde36dcabc3a980a2ef8be305ed3f7fe362e
dma/CDMAPhone.java
sm/GSMPhone.java
cf916cfb2b4d8282def13e4553abff2ea73aca2b 14-Aug-2014 Vinit Deshpande <vinitd@google.com> Enable EAP-SIM end-to-end

This change fixes encoding of messages and updates authContext choice
to enable EAP-SIM authentication.

getIccSimChallengeResponse() API needs more restructuring; opened
a bug (17033378) to track that change.


Change-Id: I303084f45d307897da81816b7d70d5257bd02e45
honeSubInfo.java
IL.java
icc/IccRecords.java
279ace857d85b3409515983e0f62d127351594d8 14-Aug-2014 Shishir Agrawal <shishir@google.com> UiccCarrierPrivilegeRules: Set state error on incorrect response from UICC.

Bug: 17033027

Change-Id: I9f6c32525172a47b217246b187b18ed77233221b
icc/UiccCarrierPrivilegeRules.java
55b6839baaaa0e79790889ef38b4ce130f5b810d 14-Aug-2014 Libin.Tang@motorola.com <w16529@motorola.com> am 77c77080: IMS:fix phone crash caused by null pointer access.

* commit '77c77080eaf88cfc55eb16bff6fd2788817a6896':
IMS:fix phone crash caused by null pointer access.
80bc1e5a6f0bd91b886351997b797e01732c1c67 09-Aug-2014 Jing Zhao <zhaojing@motorola.com> Use proper IccRecords in CDMALTEPhone to get mccmnc and update CURRENT carrier.

Set SimRecords and IsimUiccRecords for CDMALTEPhone.
Get operator numeric by calling corresponding method of different IccRecords.

Bug: 16890364
Bug: 16190353

Change-Id: I9a3c74e1ed811cdb99d69daf6985b8e42fdb699d
dma/CDMALTEPhone.java
9d4ec7d45061f1da05f16cd244eb0a798e7f36bb 13-Aug-2014 Amit Mahajan <amitmahajan@google.com> Revert "Revert "add apn setting parameters, and set apn parameters to bp""

This reverts commit 01f27d2c616797e5ba821159f8aca7b75aa54ae1.

Change-Id: Id9e7cf180092f320f635084f805b97f6409d0f03
ommandsInterface.java
IL.java
ataconnection/ApnSetting.java
ataconnection/DataProfile.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
77c77080eaf88cfc55eb16bff6fd2788817a6896 13-Aug-2014 Libin.Tang@motorola.com <w16529@motorola.com> IMS:fix phone crash caused by null pointer access.

Change-Id: Ie98a8fcfa3488f9cce0a09c358e9f2297c7f5a42
msphone/ImsPhoneCall.java
msphone/ImsPhoneCallTracker.java
09eb4948e25990b9c00a354b5902f67e8d110d7e 13-Aug-2014 Ihab Awad <ihab@google.com> am d5c5a168: Final structural tweaks to Telecomm API (6/8)

* commit 'd5c5a168b4f5806701a4d146309c996acca7183d':
Final structural tweaks to Telecomm API (6/8)
d5c5a168b4f5806701a4d146309c996acca7183d 08-Aug-2014 Ihab Awad <ihab@google.com> Final structural tweaks to Telecomm API (6/8)

Bug: 16416927
Bug: 16494880
Change-Id: I6cd739b0fe525038ace0f213b05732e0cd95902a
allManager.java
onnection.java
honeBase.java
sm/GSMPhone.java
msphone/ImsPhoneCallTracker.java
e2c138535da4d1274071ca931b5fc5d3c4a3c7eb 12-Aug-2014 Tyler Gunn <tgunn@google.com> am 7c010881: Merge "Add null-check when setting up ImsVideoCallProviderWrapper." into lmp-dev

* commit '7c010881cd7dca51c1e5808a7930d8176a058307':
Add null-check when setting up ImsVideoCallProviderWrapper.
ddf4e9198761f47c52242da47a544cb54e4d69c5 12-Aug-2014 Amit Mahajan <amitmahajan@google.com> am 01f27d2c: Revert "add apn setting parameters, and set apn parameters to bp"

* commit '01f27d2c616797e5ba821159f8aca7b75aa54ae1':
Revert "add apn setting parameters, and set apn parameters to bp"
01f27d2c616797e5ba821159f8aca7b75aa54ae1 12-Aug-2014 Amit Mahajan <amitmahajan@google.com> Revert "add apn setting parameters, and set apn parameters to bp"

This reverts commit f4b74430a8c22ab58c3fbbd6c9e7a594514a8615.

Change-Id: I1f300741d858ff39ae573e576479613b084e4616
ommandsInterface.java
IL.java
ataconnection/ApnSetting.java
ataconnection/DataProfile.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
98786deebfc03ec964c9000221e90b76f369b197 12-Aug-2014 Junda Liu <junda@google.com> am 8071f9cd: Merge "Skip unknown tags in parsing." into lmp-dev

* commit '8071f9cde13df71af0c4c8b3810d24740279da9a':
Skip unknown tags in parsing.
4848faf80d154041d9bfdc151add2e98b04a4c67 12-Aug-2014 Hui Wang <huiwang@motorola.com> am f4b74430: add apn setting parameters, and set apn parameters to bp

* commit 'f4b74430a8c22ab58c3fbbd6c9e7a594514a8615':
add apn setting parameters, and set apn parameters to bp
f4b74430a8c22ab58c3fbbd6c9e7a594514a8615 10-Aug-2014 Hui Wang <huiwang@motorola.com> add apn setting parameters, and set apn parameters to bp

Change-Id: I395b499eb0730894620614b3261bb6a784d53f46
ommandsInterface.java
IL.java
ataconnection/ApnSetting.java
ataconnection/DataProfile.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
19c300a92c94ec3369570f1807969ba78cb57680 12-Aug-2014 Etan Cohen <etancohen@google.com> am 530036ca: Replace configuration used to control IMS MO calls with official config

* commit '530036ca1f522f477c438466c0577aad38c74d03':
Replace configuration used to control IMS MO calls with official config
530036ca1f522f477c438466c0577aad38c74d03 11-Aug-2014 Etan Cohen <etancohen@google.com> Replace configuration used to control IMS MO calls with official config

Use Enhanced 4G LTE Mode configuration to control MO. Replaces a temporary
Radio Info debug settings. Will most likely be enhanced by actual information
about feature provisioning (or registration).

Change-Id: I20e86bbbb2c881f62db75bf2f24498ab06a58f4d
dma/CDMAPhone.java
sm/GSMPhone.java
b20af230dbced6c390ccf66a11b4e53d401130d5 11-Aug-2014 Wink Saville <wink@google.com> am 48bb3adb: Merge "CatService: Correct Open Channel handling." into lmp-dev

* commit '48bb3adb8f9680977abeee15451c1898f97506bb':
CatService: Correct Open Channel handling.
1328a877ae35ea8bde61bef3332dbd0b33cc65bf 11-Aug-2014 Amith Yamasani <yamasani@google.com> am d6af5868: Merge "Make SmsApplication handle multiple users" into lmp-dev

* commit 'd6af58685ba97539b9c3b4b21aaf89d115405f3a':
Make SmsApplication handle multiple users
8071f9cde13df71af0c4c8b3810d24740279da9a 12-Aug-2014 Junda Liu <junda@google.com> Merge "Skip unknown tags in parsing." into lmp-dev
d6af58685ba97539b9c3b4b21aaf89d115405f3a 11-Aug-2014 Amith Yamasani <yamasani@google.com> Merge "Make SmsApplication handle multiple users" into lmp-dev
7c010881cd7dca51c1e5808a7930d8176a058307 12-Aug-2014 Tyler Gunn <tgunn@google.com> Merge "Add null-check when setting up ImsVideoCallProviderWrapper." into lmp-dev
7ea29fc7651195bbaf67028413278898a898ac00 12-Aug-2014 Tyler Gunn <tgunn@google.com> Add null-check when setting up ImsVideoCallProviderWrapper.

Bug: 16886403
Change-Id: I55b996fc3ef1ef37310565984eef3ae993844b9d
msphone/ImsPhoneCallTracker.java
48bb3adb8f9680977abeee15451c1898f97506bb 11-Aug-2014 Wink Saville <wink@google.com> Merge "CatService: Correct Open Channel handling." into lmp-dev
f2d28790a3f02c337d10592aa390cc8d4c75e978 11-Aug-2014 Ajay Dudani <adudani@codeaurora.org> CatService: Correct Open Channel handling.

STK open channel command requests are communicated to the
telephony framework via an UNSOL_STK_EVENT_NOTIFY followed by
UNSOL_STK_CALL_SETUP pair of RIL messages.

This communication is distinct from a proactive command
since the card is only looking to notify the framework
of an action that the modem will handle on its own.

Thus, we need to adjust the conditional block properly to
catch this situation and send the appropriate response
back to RIL.

bug: 16850377
Change-Id: If29911d9b1d0d6c6b1213abc644fff57cf3d7398
at/CatService.java
3bab72b216a1c69bcc399759ddac84e44f693a54 09-Aug-2014 Etan Cohen <etancohen@google.com> am f9a248ba: Do not reset IMS Phone status when containing phone RADIO_ON event received.

* commit 'f9a248ba28469d55ea75f032a9cc7e2f55c16c9f':
Do not reset IMS Phone status when containing phone RADIO_ON event received.
a2ce002a0327f0deb079cc6acad1c493e6ded442 05-Aug-2014 Amith Yamasani <yamasani@google.com> Make SmsApplication handle multiple users

Assume that there's one default app per user. Apps should be able
to register as the default app for even secondary users.
Read and write to the correct settings db.

Deliver DELIVER broadcast to primary user.
Deliver RECEIVED broadcast to all permitted and currently
running users.

Bug: 16681533
Change-Id: I08cf5318f267a8c55ac427ac2c3573b4319b5193
ccSmsInterfaceManager.java
nboundSmsHandler.java
msApplication.java
apPushOverSms.java
f9a248ba28469d55ea75f032a9cc7e2f55c16c9f 09-Aug-2014 Etan Cohen <etancohen@google.com> Do not reset IMS Phone status when containing phone RADIO_ON event received.

Change-Id: Ied7658fb4f6652e471430afc9bb892162beaa222
dma/CDMAPhone.java
sm/GSMPhone.java
fe8feb18254006d1de7f0db93bc12d8ea0c751e5 08-Aug-2014 Tyler Gunn <tgunn@google.com> am e883df66: Merge "Wiring HD audio call capability reporting. (1/2)" into lmp-dev

* commit 'e883df6630ac9e6e27c69042bae9027268c6da83':
Wiring HD audio call capability reporting. (1/2)
75a0b79070d449a4cb958b3a4f08de67dc75932d 08-Aug-2014 Andrew Lee <anwlee@google.com> am ea8cb632: Set VideoCallProvider on IMS connections.

* commit 'ea8cb63201520592011a92849ad3661d22776c87':
Set VideoCallProvider on IMS connections.
ea8cb63201520592011a92849ad3661d22776c87 08-Aug-2014 Andrew Lee <anwlee@google.com> Set VideoCallProvider on IMS connections.

Bug: 16886403
Change-Id: I912807f4dc7fce5b80c642d6275f3ad04af498e2
msphone/ImsPhoneCallTracker.java
2c2be36916d01239d7343438657ac5aa51973210 08-Aug-2014 Shishir Agrawal <shishir@google.com> am 4d20c5a1: Merge "Fix operator brand override." into lmp-dev

* commit '4d20c5a165ec548d68ad637776e98d1c05fc5493':
Fix operator brand override.
82f83af6dc8400375721dc82dcfe8aefea917193 08-Aug-2014 Etan Cohen <etancohen@google.com> am 9b0a3372: Add Ut COLP/COLR success/error message display.

* commit '9b0a3372e511d97bc57fd5a9e01f9d189871af04':
Add Ut COLP/COLR success/error message display.
68f1e44857dda913590ae8309a6281109c3c063b 08-Aug-2014 Santos Cordon <santoscordon@google.com> am 19658b53: Remove audio handling from telephony. (2/2)

* commit '19658b53263850aaeb414760559dff099c06f9ff':
Remove audio handling from telephony. (2/2)
9b0a3372e511d97bc57fd5a9e01f9d189871af04 07-Aug-2014 Etan Cohen <etancohen@google.com> Add Ut COLP/COLR success/error message display.

Change-Id: Ied4f836aabc616de9573c94ae7b49ff65c67b032
msphone/ImsPhoneMmiCode.java
19658b53263850aaeb414760559dff099c06f9ff 06-Aug-2014 Santos Cordon <santoscordon@google.com> Remove audio handling from telephony. (2/2)

Bug: 16175960
Change-Id: Id4ec9963f559b4cd1870c18b91521afca8d8f153
allManager.java
32bbe4213fc554ebf00553cd9935d17fe7530aa1 07-Aug-2014 Junda Liu <junda@google.com> Skip unknown tags in parsing.

Bug: b/16650010

Change-Id: I3b52d6201e4eb20096c2724103fd1463e0d9b908
icc/UiccCarrierPrivilegeRules.java
e883df6630ac9e6e27c69042bae9027268c6da83 08-Aug-2014 Tyler Gunn <tgunn@google.com> Merge "Wiring HD audio call capability reporting. (1/2)" into lmp-dev
7fa8ac39602ee9841dfcb0fb5c5f4d401925f8b5 08-Aug-2014 Tyler Gunn <tgunn@google.com> Wiring HD audio call capability reporting. (1/2)

- Modified ImsPhoneConnection to get the current audio quality from the
ImsStreamMediaProfile, mapping to an internal audio quality of standard
or high definition.
- Added listener to report audio quality changes.

Bug: 15987281
Change-Id: If24a14f8f3d79934229460dcac8eb0068a08466a
onnection.java
msphone/ImsPhoneConnection.java
4d20c5a165ec548d68ad637776e98d1c05fc5493 08-Aug-2014 Shishir Agrawal <shishir@google.com> Merge "Fix operator brand override." into lmp-dev
be6c87905a15d1e36e87189ad7df5d5a72a52f69 07-Aug-2014 Shishir Agrawal <shishir@google.com> Fix operator brand override.

1. Do not override operator name with ERI if brand override is set.
2. Do not use the SPN display condition in SIMRecords if operator brand
override is set.

BUG: 16705961
Change-Id: Id2580e4a23c6aca57a590cf4f4cf8df4d93ec14f
dma/CdmaLteServiceStateTracker.java
icc/SIMRecords.java
30da06bdf4e066f6fa4abb545dfff0b30c2ebef1 06-Aug-2014 Shishir Agrawal <shishir@google.com> am 4958c93a: Merge "UiccCarrierPrivilegeRules: Changing the APDU commands to match the GP spec." into lmp-dev

* commit '4958c93a4c2c38952071ff57a40166f2f83492e6':
UiccCarrierPrivilegeRules: Changing the APDU commands to match the GP spec.
a76d3107dde220c43d87d64314491f403f48fb92 06-Aug-2014 Wink Saville <wink@google.com> am 0f225e34: Merge "Pass cdma phone object to CellBroadcastHandler" into lmp-dev

* commit '0f225e34000a84890101a7c48a1d4f86e7d60c37':
Pass cdma phone object to CellBroadcastHandler
0f225e34000a84890101a7c48a1d4f86e7d60c37 06-Aug-2014 Wink Saville <wink@google.com> Merge "Pass cdma phone object to CellBroadcastHandler" into lmp-dev
fce951e90d421ba2ab3da3f64d0f5192ab769e22 29-Jul-2014 Sukanya Rajkhowa <srajkh@codeaurora.org> Pass cdma phone object to CellBroadcastHandler

Cdma phone object needs to be passed to create a CellBroadcastHandler
associated with that phone object. Otherwise it will result in a null
pointer crash

Change-Id: I9cdec874b1c1d26da452f6d25ee96c2c97621678
ellBroadcastHandler.java
dma/CdmaInboundSmsHandler.java
c24382abd27fd09e1a501d578eb51bdd49cdd796 06-Aug-2014 Uma Maheswari Ramalingam <umam@codeaurora.org> am 30b5eec9: Return active phone\'s IMS phone object properly.

* commit '30b5eec903ba5c6db94f3116c4c9dc6b63ebcefd':
Return active phone's IMS phone object properly.
30b5eec903ba5c6db94f3116c4c9dc6b63ebcefd 02-Aug-2014 Uma Maheswari Ramalingam <umam@codeaurora.org> Return active phone's IMS phone object properly.

Change-Id: I6577a46a177dd7b2f75b89aaf9ac55f848756754
honeProxy.java
elephonyCapabilities.java
21e85c2795eb1461e81ab54fd5206982a3f3344c 05-Aug-2014 Shriram Ganesh <sganesh@codeaurora.org> am 01b334cc: IMS MMI Support For CLIR/P, COLR/P & Call Barring.

* commit '01b334cc4f2538287f5c64b3ea8d2d9c6ee77772':
IMS MMI Support For CLIR/P, COLR/P & Call Barring.
01b334cc4f2538287f5c64b3ea8d2d9c6ee77772 24-Jun-2014 Shriram Ganesh <sganesh@codeaurora.org> IMS MMI Support For CLIR/P, COLR/P & Call Barring.

Adding MMI code support for CLIR/P, COLR/P
supplementary services. Services that are not
supported through ImsPhone/UI, go through the UT
interface directly.

Change-Id: Ibfdeaf775ec5ccf792ed1f0ba273597678e748c2
msphone/ImsPhone.java
msphone/ImsPhoneMmiCode.java
4958c93a4c2c38952071ff57a40166f2f83492e6 06-Aug-2014 Shishir Agrawal <shishir@google.com> Merge "UiccCarrierPrivilegeRules: Changing the APDU commands to match the GP spec." into lmp-dev
7b122b5ef07eca751ca8b6938562737d6e3de2c8 05-Aug-2014 Shishir Agrawal <shishir@google.com> UiccCarrierPrivilegeRules: Changing the APDU commands to match the GP spec.

The commands currently match the get binary command. We want to use the get
data command instead.

Change-Id: I762311cdbd983dfc5038593edfa4c4607be7eb10
icc/UiccCarrierPrivilegeRules.java
fe81de47af0d6ddb9d135e1b3f162d8adff271ed 03-Aug-2014 Uma Maheswari Ramalingam <umam@codeaurora.org> am 04e36a78: Add ECBM functionality for IMS

* commit '04e36a78936967df68d9175ac09dd3f087727888':
Add ECBM functionality for IMS
04e36a78936967df68d9175ac09dd3f087727888 01-Aug-2014 Uma Maheswari Ramalingam <umam@codeaurora.org> Add ECBM functionality for IMS

Code for adding ECBM functionality for IMS.

Change-Id: I2833c81baf0a55a18ac6433c47fd76bad7cf0ec9
dma/CDMAPhone.java
sm/GSMPhone.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
3336d5f449a56edcef605701cec6ba8ba5514e21 03-Aug-2014 Libin.Tang@motorola.com <w16529@motorola.com> am a89314bc: IMS:incoming call drops due to MT call intent delivery too late.

* commit 'a89314bcc94c43512299131609feea0c2c8167cf':
IMS:incoming call drops due to MT call intent delivery too late.
a4218157204899d782bac63b997a610b8d68b564 03-Aug-2014 Etan Cohen <etancohen@google.com> am 8c387936: Added debug system property to enable/disable IMS VoLTE/VT

* commit '8c3879362ce5a7a7c8151ec415e4d394812df357':
Added debug system property to enable/disable IMS VoLTE/VT
a89314bcc94c43512299131609feea0c2c8167cf 01-Aug-2014 Libin.Tang@motorola.com <w16529@motorola.com> IMS:incoming call drops due to MT call intent delivery too late.

Change-Id: I9f0e8f3ac2bdaf7bff9d1a198f3b134386bf6d69
msphone/ImsPhoneCallTracker.java
2881d4d49db478b6ee535c8b38ca2caa2e63909d 02-Aug-2014 Etan Cohen <etancohen@google.com> am 38b5fac0: Transfer ownership of IMS Phone when RAT tech change

* commit '38b5fac001d38ad7a4f886ba7fcaf7c417216b01':
Transfer ownership of IMS Phone when RAT tech change
8c3879362ce5a7a7c8151ec415e4d394812df357 02-Aug-2014 Etan Cohen <etancohen@google.com> Added debug system property to enable/disable IMS VoLTE/VT

If property is 0: IMS VoLTE isn't used.
If property is 1 then IMS VoLTE is used if provisioned, registered etc.

Action on property missing defined by defined constant.

Change-Id: If526c27b422811afe7b72283ee5e89555a313559
dma/CDMAPhone.java
sm/GSMPhone.java
38b5fac001d38ad7a4f886ba7fcaf7c417216b01 31-Jul-2014 Etan Cohen <etancohen@google.com> Transfer ownership of IMS Phone when RAT tech change

Transfer ownership of the IMS phone and performs needed unregistrations
and registrations when RAT tech change forces a phone destroy/create.

Update notify on ringing phone to delegate directly to the parent phone of
the IMS Phone.

Change-Id: I02a14366ff339a09115a438715e7ee1124bb2a56
hone.java
honeBase.java
honeProxy.java
dma/CDMAPhone.java
sm/GSMPhone.java
msphone/ImsPhone.java
msphone/ImsPhoneBase.java
a76e0eaee31b97027a36bfe32557831cde0aeeb2 01-Aug-2014 Wink Saville <wink@google.com> am 23d8b69e: Merge "Turn off extra debugging." into lmp-dev

* commit '23d8b69efc4127555f6aa7eb97d5e58b8c75826a':
Turn off extra debugging.
916832ab101e0a20937314ab8f1bb4a318c8f3c0 01-Aug-2014 Ye Wen <ywen@google.com> am 49754105: Need to clear Binder calling identity when query SmsProvider

* commit '49754105adf232419410cfca7507aa63a9d05e3b':
Need to clear Binder calling identity when query SmsProvider
49754105adf232419410cfca7507aa63a9d05e3b 01-Aug-2014 Ye Wen <ywen@google.com> Need to clear Binder calling identity when query SmsProvider

Change-Id: I446050c039a2663ff77a9d2a8a9b5373956ee954
ccSmsInterfaceManager.java
23d8b69efc4127555f6aa7eb97d5e58b8c75826a 01-Aug-2014 Wink Saville <wink@google.com> Merge "Turn off extra debugging." into lmp-dev
d2c79d28884203ad4f13ebdf443b3899d56b93d6 01-Aug-2014 Wink Saville <wink@google.com> Turn off extra debugging.

Change-Id: I768654652cf8d97a718af99dc21f0caf73c89b22
efaultPhoneNotifier.java
e4e48d4e2e3a815e76b8199ffca37542a002a0b5 31-Jul-2014 Shishir Agrawal <shishir@google.com> am 1bd8ccb3: Merge "For long SMS pass SMS header concat ref details to the carrier app." into lmp-dev

* commit '1bd8ccb365914082400ccbeb0d68cff45d8674f5':
For long SMS pass SMS header concat ref details to the carrier app.
acedee9c4a48af33dbda1d6cc241080bc3933d29 31-Jul-2014 Shishir Agrawal <shishir@google.com> am d14f07c6: Merge "Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager." into lmp-dev

* commit 'd14f07c6ef8ca062b898fbcc1016c2b264f843da':
Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager.
55976d3fd95e7cf9bc7089be1fb076be1e985c93 31-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> am c3560fc7: Merge "Fix DUN based Tethering." into lmp-dev

* commit 'c3560fc7f727ab0fdc5904a2634c4b59d50c89ec':
Fix DUN based Tethering.
2ef3d6603b89db2a7baa6caeea616586f45e90ea 30-Jul-2014 Amit Mahajan <amitmahajan@google.com> am cc6f05e3: Merge "Change to parse DataCallResponse correctly based on version." into lmp-dev

* commit 'cc6f05e35ebc6b6c3cf0772417f9ea18fe82dd89':
Change to parse DataCallResponse correctly based on version.
cc6f05e35ebc6b6c3cf0772417f9ea18fe82dd89 30-Jul-2014 Amit Mahajan <amitmahajan@google.com> Merge "Change to parse DataCallResponse correctly based on version." into lmp-dev
8f19c6d717bf0e00aeb33552a570a0f60af0ce3b 30-Jul-2014 Amit Mahajan <amitmahajan@google.com> Change to parse DataCallResponse correctly based on version.

Change-Id: I9c6dfb41f074da9558f721ca0432f40edc2d4d22
IL.java
4457f765b6c45296ab70ab480a9ccd58f96673d8 30-Jul-2014 Xia Ying <yingxia@motorola.com> am 4453a931: SMS 8-bit GSM characters decoding support

* commit '4453a9310857b7b5292522d97af4ca6c64379524':
SMS 8-bit GSM characters decoding support
4453a9310857b7b5292522d97af4ca6c64379524 17-Jul-2014 Xia Ying <yingxia@motorola.com> SMS 8-bit GSM characters decoding support

Support decoding the user data payload as pack GSM 8-bit (a GSM alphabet
string that's stored in 8-bit unpacked format) characters.

Change-Id: Iab92006db5cb218515b86dcfe65938c04e55620c
sm/SmsMessage.java
6b99ba1abd9086b5af10a8e80052465e111b0cfb 30-Jul-2014 Ye Wen <ywen@google.com> am 6dc23862: MmsService always has WRITE_SMS AppOps permission (1/2)

* commit '6dc23862ef345df2acd3ab36a432292d264d6a73':
MmsService always has WRITE_SMS AppOps permission (1/2)
1bd8ccb365914082400ccbeb0d68cff45d8674f5 31-Jul-2014 Shishir Agrawal <shishir@google.com> Merge "For long SMS pass SMS header concat ref details to the carrier app." into lmp-dev
78d39a9fab86a26f4f39585af5cfe2a07c756fce 30-Jul-2014 Shishir Agrawal <shishir@google.com> For long SMS pass SMS header concat ref details to the carrier app.

For Long SMS, either all the SMSes need to be sent by the carrier app or none.
To do this the carrier app needs to know information about the segmentation of
the message.

BUG: 16653081

Change-Id: I659ceafcbf93b3a88405174d4503b9eb30ad2764
MSDispatcher.java
dma/CdmaSMSDispatcher.java
sm/GsmSMSDispatcher.java
6dc23862ef345df2acd3ab36a432292d264d6a73 28-Jul-2014 Ye Wen <ywen@google.com> MmsService always has WRITE_SMS AppOps permission (1/2)

Use the same mechanism as phone app to grant MmsService write access to
Sms/Mms providers.

Change-Id: I38a0a67b75a4c3069259ce7284acca295dbd3e28
msApplication.java
df7b2c299da2fc8f1b96c855d5ebbbbb0cdf19be 29-Jul-2014 Tyler Gunn <tgunn@google.com> am 3a8f9358: Retrieving local video capabilities on creation of ImsPhoneConnection.

* commit '3a8f9358a827c2be7f33b62d435894906d4874de':
Retrieving local video capabilities on creation of ImsPhoneConnection.
3a8f9358a827c2be7f33b62d435894906d4874de 29-Jul-2014 Tyler Gunn <tgunn@google.com> Retrieving local video capabilities on creation of ImsPhoneConnection.

Bug: 16238919
Change-Id: I5239525280a89ec74bb8950e3891241fb2ae0138
msphone/ImsPhoneConnection.java
04ea38143aadc95a9185c4bec7add140470d6262 29-Jul-2014 Andrew Lee <anwlee@google.com> am ec2f1095: Merge "Update VideoState references." into lmp-dev

* commit 'ec2f10950977690648afed1ead46502257e529b6':
Update VideoState references.
d548ff85030210a4504e0d44940ff74c89938acc 29-Jul-2014 Amit Mahajan <amitmahajan@google.com> am 0c2d5634: Merge "Removed partner copyright comment from an AOSP file." into lmp-dev

* commit '0c2d5634a94785cde6aa1950c531c8a906ff4151':
Removed partner copyright comment from an AOSP file.
feb1ee51b42e053cfd82bf2149873a3445200e5b 29-Jul-2014 Amit Mahajan <amitmahajan@google.com> am 284caa8d: Merge "Enable eri.xml config by mcc mnc" into lmp-dev

* commit '284caa8d863983aaacdd56a35a5e7c348f2e3339':
Enable eri.xml config by mcc mnc
e45d0b6927d2be116f41d2f70e48ef0784f3b450 29-Jul-2014 Jing Zhao <zhaojing@motorola.com> am de49a50c: Enable config CDMA home system by mcc mnc

* commit 'de49a50c041b5d3c1423c4c2d04e3bab9db4372c':
Enable config CDMA home system by mcc mnc
de49a50c041b5d3c1423c4c2d04e3bab9db4372c 23-Jul-2014 Jing Zhao <zhaojing@motorola.com> Enable config CDMA home system by mcc mnc

CDMA home system is different between carriers.
Need to config it by carriers' mcc mnc

Change-Id: Ie10d838173df3095238c50d419bd9de589e34e55
dma/CdmaServiceStateTracker.java
5e9a94dbf6366900501fb32f98d6d3dfa6ef4080 28-Jul-2014 Amit Mahajan <amitmahajan@google.com> am 2998e6c1: Merge "Try decoding SPN to readable string" into lmp-dev

* commit '2998e6c108581ca535e8a3dd6b9c369d4963504f':
Try decoding SPN to readable string
2998e6c108581ca535e8a3dd6b9c369d4963504f 28-Jul-2014 Amit Mahajan <amitmahajan@google.com> Merge "Try decoding SPN to readable string" into lmp-dev
3d693b4462b48177df710e3f3171b069b25bae52 28-Jul-2014 Andrew Lee <anwlee@google.com> am 6afbd402: Update references while moving VideoCallProvider.

* commit '6afbd402eab6fcfd2ce896f87ef8bb5a4be85374':
Update references while moving VideoCallProvider.
6afbd402eab6fcfd2ce896f87ef8bb5a4be85374 25-Jul-2014 Andrew Lee <anwlee@google.com> Update references while moving VideoCallProvider.

Bug: 16494880
Change-Id: I06326d06968e9fc54cd901c2ec0b426e24d02e6e
onnection.java
d14f07c6ef8ca062b898fbcc1016c2b264f843da 31-Jul-2014 Shishir Agrawal <shishir@google.com> Merge "Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager." into lmp-dev
e3ea8115b0d558f6c6b57b201885948f4309e5c0 30-Jul-2014 Shishir Agrawal <shishir@google.com> Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager.

The new APIs are needed to support SEEK.

Also modifies TelephonyManager.iccOpenLogicalChannel to return the status of
the command.

Change-Id: Iff2674fb0e23210f2579cb883e64571347ade5e6
icc/UiccCard.java
0c2d5634a94785cde6aa1950c531c8a906ff4151 29-Jul-2014 Amit Mahajan <amitmahajan@google.com> Merge "Removed partner copyright comment from an AOSP file." into lmp-dev
0abfa4d97e46e04da4c195cf8abe902cf623f0cc 29-Jul-2014 Amit Mahajan <amitmahajan@google.com> Removed partner copyright comment from an AOSP file.

Based on request from the partner.

Change-Id: I50b7776fab28537e9f010b1e299e2122d40a858d
dma/sms/CdmaSmsSubaddress.java
b5d27d8e567ef835e961548b144cdad95d2361de 24-Jul-2014 Jing Zhao <zhaojing@motorola.com> Try decoding SPN to readable string

Some SIM has SPN programmed in different scheme.
Try ENCODING_GSM_7BIT_ALPHABET if it's not readable.

Change-Id: I23637b60c44ba4f15ec2a41f09b70aa746e8fe17
icc/RuimRecords.java
544477811f1c7bc56a5a8de085b16228aee0c275 25-Jul-2014 Jing Zhao <zhaojing@motorola.com> am 3beec5e2: Revert "Add code to handle voice radio technology of LTE."

* commit '3beec5e255c514dc419e5cc3021d178b3a416d40':
Revert "Add code to handle voice radio technology of LTE."
3beec5e255c514dc419e5cc3021d178b3a416d40 22-Jul-2014 Jing Zhao <zhaojing@motorola.com> Revert "Add code to handle voice radio technology of LTE."

This reverts commit b54cd09892e0676d719e6df00e60c77b663f993c.

PhoneProxy.java should not be reverted because we want phoneObjectUpdater() to always be called from the handler function. That is done in commit I2fc7220496e66fc2a48f2609e94cbd8eed6adc44

Change-Id: I83b4ffe40a30207ca01d4268de2fc1cde8fff602
hone.java
honeBase.java
honeProxy.java
erviceStateTracker.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
sm/GsmServiceStateTracker.java
7ed4d45c41e6fb61a3c5a188418f72dd5f3cce9f 25-Jul-2014 Amit Mahajan <amitmahajan@google.com> am dd888337: Merge "Code cleanup - removed unused functions in ProxyController.java" into lmp-dev

* commit 'dd888337294b0d6b6b0d47b6b1f081a58879caf4':
Code cleanup - removed unused functions in ProxyController.java
616cdc712f9fce593d7c962488af995102d64db4 25-Jul-2014 Andrew Lee <anwlee@google.com> am c695bcb2: Change telephony\'s connection to use VideoCallProvider.

* commit 'c695bcb2b387949a7e2b264523e570c9c242585f':
Change telephony's connection to use VideoCallProvider.
c695bcb2b387949a7e2b264523e570c9c242585f 24-Jul-2014 Andrew Lee <anwlee@google.com> Change telephony's connection to use VideoCallProvider.

Bug: 16494880
Change-Id: I10fa3b2e4e2b78b3fabeaf238dae5af963abff02
onnection.java
97ebfbc68579de83b9bbcefa024206cb3d7fd0aa 25-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> am 3317b038: Merge "Notify the world when our LinkProperties change." into lmp-dev

* commit '3317b0381e9b73176a7f139ce01c4414ef648382':
Notify the world when our LinkProperties change.
3317b0381e9b73176a7f139ce01c4414ef648382 25-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Notify the world when our LinkProperties change." into lmp-dev
1c0eecf72181eff8c4e6bb5acd48bfba255f6bfe 25-Jul-2014 Wink Saville <wink@google.com> am a608f336: Merge "When a SIM is removed NPE\'s can occur." into lmp-dev

* commit 'a608f336ee3090c8066fc3aaf0ce510bca0e5745':
When a SIM is removed NPE's can occur.
498b5ae74caec7d2946befe64a829b07b34ea860 25-Jul-2014 ram <ram.pl@samsung.com> am 76f43316: IMS: Adding emergency PDN handling for no sim case. (Changes already reviewed on klp-wireless-dev with CL 171814)

* commit '76f43316a5a6082d601bffd4b6898d0bd81e11fc':
IMS: Adding emergency PDN handling for no sim case. (Changes already reviewed on klp-wireless-dev with CL 171814)
d781fb47e89bb978bae989d96928851c1197c7d2 25-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> Notify the world when our LinkProperties change.

Change-Id: I19485346f0941e58c41ebdf5525a36f38800d081
ataconnection/DataConnection.java
dd888337294b0d6b6b0d47b6b1f081a58879caf4 25-Jul-2014 Amit Mahajan <amitmahajan@google.com> Merge "Code cleanup - removed unused functions in ProxyController.java" into lmp-dev
04e6542097e92b08aafaef1e81d87d74dfaaf2f7 25-Jul-2014 Amit Mahajan <amitmahajan@google.com> Code cleanup - removed unused functions in ProxyController.java

Change-Id: Ia928ee44edbcf5b208bc4d60c83d593df4ad8e7f
roxyController.java
76f43316a5a6082d601bffd4b6898d0bd81e11fc 17-Jul-2014 ram <ram.pl@samsung.com> IMS: Adding emergency PDN handling for no sim case.
(Changes already reviewed on klp-wireless-dev with CL 171814)

Change-Id: I732ad4ec350256478bb2ac974722f3b9cbd0e483
Signed-off-by: ram <ram.pl@samsung.com>
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
6a07ae54e30a0329fd8bcc1d6f7bbc6e81873ef6 24-Jul-2014 ram <ram.pl@samsung.com> am bc78e2f9: IMS: getPCSCF() API enhanced to support multiple APN types.

* commit 'bc78e2f9988f380a3b88d4cb4a9c0b80b8f44bee':
IMS: getPCSCF() API enhanced to support multiple APN types.
3ff0e0c2db460a9d5639e5f7f45f37b280ac580f 24-Jul-2014 Shishir Agrawal <shishir@google.com> am 7f1a3f0a: UiccCarrierPrivilegeRules: changing getCarrierPackageNamesForBroadcastIntent to return a list.

* commit '7f1a3f0ab65c144fde56e1246c5747b0c555034a':
UiccCarrierPrivilegeRules: changing getCarrierPackageNamesForBroadcastIntent to return a list.
c3560fc7f727ab0fdc5904a2634c4b59d50c89ec 30-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix DUN based Tethering." into lmp-dev
3ae69aa0ef2e02f140a2229e6a31cfd291528295 30-Jul-2014 Robert Greenwalt <rgreenwalt@google.com> Fix DUN based Tethering.

Turns out there was a case issue where the DUN commonly found in the tethering
apn config (in config.xml) didn't match the dun in PhoneConstants.APN_TYPE_DUN
so the NetworkCapabilities generating code din't mark it as DUN capable.

Fixed in the APNSetting as this is constructed infrequently.

bug:16242255
Change-Id: I90504e36bf58ee9b4eb1a757e7daf4786d47a875
ataconnection/ApnSetting.java
284caa8d863983aaacdd56a35a5e7c348f2e3339 29-Jul-2014 Amit Mahajan <amitmahajan@google.com> Merge "Enable eri.xml config by mcc mnc" into lmp-dev
7e44066c8710dc1867318f0a4ec6a900232fcd4c 23-Jul-2014 Jing Zhao <zhaojing@motorola.com> Enable eri.xml config by mcc mnc

reload eri definations after Icc records loaded.

Change-Id: I4527acb1f4fb5516bf3a85955b86dfb11e0c99f2
dma/CdmaLteServiceStateTracker.java
ec2f10950977690648afed1ead46502257e529b6 29-Jul-2014 Andrew Lee <anwlee@google.com> Merge "Update VideoState references." into lmp-dev
eb37adebf70275a8d8e5f2478637a66a44e71de8 28-Jul-2014 Andrew Lee <anwlee@google.com> Update VideoState references.

Bug: 16629892
Change-Id: I243b304d5b61ed530b965eab2abb9bfbd02893d5
allManager.java
honeBase.java
sm/GSMPhone.java
msphone/ImsPhoneCallTracker.java
a608f336ee3090c8066fc3aaf0ce510bca0e5745 24-Jul-2014 Wink Saville <wink@google.com> Merge "When a SIM is removed NPE's can occur." into lmp-dev
687d9ff95671d3b4a62ddd6fed3e43eebdbbe3cb 24-Jul-2014 Wink Saville <wink@google.com> When a SIM is removed NPE's can occur.

Make getServiceProviderName, onIccRefreshInit and
getIccSimChallengeResponse methods resilient to card
removal by adding null pointer checks.

Change-Id: I9e95914d80ef494045deedc673f4d65848114209
icc/IccRecords.java
bc78e2f9988f380a3b88d4cb4a9c0b80b8f44bee 18-Jul-2014 ram <ram.pl@samsung.com> IMS: getPCSCF() API enhanced to support multiple APN types.

Change-Id: I5e60d4f153deff5f4cb658e0548a7d9bc399e8b7
Signed-off-by: ram <ram.pl@samsung.com>
hone.java
honeBase.java
honeProxy.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
7f1a3f0ab65c144fde56e1246c5747b0c555034a 23-Jul-2014 Shishir Agrawal <shishir@google.com> UiccCarrierPrivilegeRules: changing getCarrierPackageNamesForBroadcastIntent to return a list.

Currently it returns the first matching package name. Now it will return a
list of all matching packages.

Change-Id: Icc0fc728e1e24235632ac38a482b06a7b829de78
nboundSmsHandler.java
MSDispatcher.java
icc/UiccCard.java
icc/UiccCarrierPrivilegeRules.java
c25bcac2c4c8754faae69efe2fc5c407f66a9240 18-Jul-2014 Narayan Kamath <narayan@google.com> Don't restrict locale handling to two letter locales.

Use Locale.forLanguageTag where appropriate and compare
languages and countries separately.

Note that we do all comparisons on locale objects so that
the same deprecated language code conversions occur.

(cherry picked from commit 37b4053b8f92a1f2a8afeb8d5184dc9b7c35b47b)

Change-Id: Ia4ae4b1760a023be103feb9ebf0e6be5f6731ff3
ccTable.java
honeBase.java
0cdae27a3afaf241764dc3a03bfff6ed012656db 14-Jul-2014 Narayan Kamath <narayan@google.com> Don't use substring matching on locales.

We can't assume that all languages will be 2 chars in length.
Language matching will need to parse the language subtag from
the locale, else we might end up matching a languages like
"fi" (finnish) to "fil" (filipino).

bug: 10090157

(cherry picked from commit f72d7c26c8f2895a1b32b60a7a106628fdc99d2c)

Change-Id: I7139ddc99dd7d71f82ecb2c1e77af077b659a5a5
icc/RuimRecords.java
1c15057c9cfa8afd0ebea2f28590939528f94053 23-Jul-2014 Shishir Agrawal <shishir@google.com> am a0c22039: Make SMS outbound over carrier app work in airplane mode over WIFI.

* commit 'a0c22039b77054d659151537896c1db90c7057f7':
Make SMS outbound over carrier app work in airplane mode over WIFI.
a0c22039b77054d659151537896c1db90c7057f7 22-Jul-2014 Shishir Agrawal <shishir@google.com> Make SMS outbound over carrier app work in airplane mode over WIFI.

Also fixes a security bug where an outbound message could be delivered to any
app, not just the carrier app for delivery.

Change-Id: Ic395b9340d88e5f00e38636f821bb5e2da89cddf
MSDispatcher.java
dma/CdmaSMSDispatcher.java
sm/GsmSMSDispatcher.java
6fe9df600d5c43351632e2b7c57e7356fed8fc52 22-Jul-2014 Narayan Kamath <narayan@google.com> resolved conflicts for merge of 93faaed9 to lmp-dev-plus-aosp

Change-Id: I01620d8afc9d67626b91a4d56541ca70cf1c61d1
a858e71d477f467b19382d11c7ceeec7de6dc1c9 22-Jul-2014 Tyler Gunn <tgunn@google.com> am 016f5aaf: Merge "Various IMS changes. (1/2)" into lmp-dev

* commit '016f5aaf01fa8fcb9b0e1d4678de469893a91548':
Various IMS changes. (1/2)
ec4ae976921d4699b1cb997bf1775403d78e6163 22-Jul-2014 Shishir Agrawal <shishir@google.com> am 951b6a91: NPE fix in InboundSmsHandler.

* commit '951b6a916c88ba25064bf4c7777eafdf86bc4622':
NPE fix in InboundSmsHandler.
951b6a916c88ba25064bf4c7777eafdf86bc4622 22-Jul-2014 Shishir Agrawal <shishir@google.com> NPE fix in InboundSmsHandler.

Bug: 16445149

Change-Id: I79cd51d39442fe27ff07b58d04ab35c00a6dacb2
nboundSmsHandler.java
deb2d36969cb8467969cd25f8da482c94bbb3fd2 22-Jul-2014 Shishir Agrawal <shishir@google.com> am a9552aa6: CarrierApp: Do not send broadcast if there is no carrier app.

* commit 'a9552aa6bf3ce12c75ad43165034d9a1233fb131':
CarrierApp: Do not send broadcast if there is no carrier app.
a9552aa6bf3ce12c75ad43165034d9a1233fb131 21-Jul-2014 Shishir Agrawal <shishir@google.com> CarrierApp: Do not send broadcast if there is no carrier app.

Avoids an unnecessary broadcast.

Also fixes an NPE bug.

BUG=16454767
Change-Id: Idc8bff4c7a35b7ea0bb7446cd74515cf1675868d
nboundSmsHandler.java
MSDispatcher.java
icc/UiccCard.java
icc/UiccCarrierPrivilegeRules.java
016f5aaf01fa8fcb9b0e1d4678de469893a91548 22-Jul-2014 Tyler Gunn <tgunn@google.com> Merge "Various IMS changes. (1/2)" into lmp-dev
2999afbcfeab69bf7473e1b9bcabb1c9c6935b19 21-Jul-2014 Tyler Gunn <tgunn@google.com> Various IMS changes. (1/2)

1. Passing through videoState to acceptCall in ImsPhone and below.
2. Fixing issue in GSMPhone where IMS calls are always dialed as
audio.
3. Adding setter on android.internal.telephony.Connection for
call video provider and passing through to telecomm.Connection

Bug: 15893156
Change-Id: Id7a53807873add408d59452e1b79cfa748f972e8
onnection.java
sm/GSMPhone.java
msphone/ImsPhone.java
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
157c4532507cf63d762b1a1db083e050ccb59eb3 20-Jul-2014 Shishir Agrawal <shishir@google.com> am e1ee2bd6: Merge "Adding the ability for carrier app to override SPN and carrier name." into lmp-dev

* commit 'e1ee2bd66189f70a127fa6d6c95750cbe655e227':
Adding the ability for carrier app to override SPN and carrier name.
5eab67dccc5ff7deedf3af231563e39fc89d1b5f 18-Jul-2014 Amit Mahajan <amitmahajan@google.com> am 6d43019e: Merge "Changes to add new parameter for Sim Authenticate" into lmp-dev

* commit '6d43019ef713376e38653a91b9f0b398d8315e62':
Changes to add new parameter for Sim Authenticate
788aa2944022b5e773031346169e2be4784aaa7b 18-Jul-2014 Tyler Gunn <tgunn@google.com> am d8580022: Merge "Adding videoState to telephony connections." into lmp-dev

* commit 'd8580022df83bcdf0fe5016b40a65df4ed61acd4':
Adding videoState to telephony connections.
fc85737b307284dde5217d6b1bf7f8f843829c70 18-Jul-2014 Etan Cohen <etancohen@google.com> am 5d0d72d9: Add support for incoming calls on voice phone

* commit '5d0d72d9b7dc34c93303f6732541bbb74fed53da':
Add support for incoming calls on voice phone
5d0d72d9b7dc34c93303f6732541bbb74fed53da 18-Jul-2014 Etan Cohen <etancohen@google.com> Add support for incoming calls on voice phone

Change-Id: I85775776427ead1482ea88683a755451e76f97c1

Conflicts:
src/java/com/android/internal/telephony/cdma/CDMAPhone.java
src/java/com/android/internal/telephony/gsm/GSMPhone.java
dma/CDMAPhone.java
sm/GSMPhone.java
msphone/ImsPhoneBase.java
msphone/ImsPhoneCall.java
37b4053b8f92a1f2a8afeb8d5184dc9b7c35b47b 18-Jul-2014 Narayan Kamath <narayan@google.com> Don't restrict locale handling to two letter locales.

Use Locale.forLanguageTag where appropriate and compare
languages and countries separately.

Note that we do all comparisons on locale objects so that
the same deprecated language code conversions occur.

Change-Id: Ifae2f7af4011ae0463ce89b5b0966bfdc7272d10
ccTable.java
honeBase.java
aa2e75cfc5e4e752967ecc092cb2690c4db46504 17-Jul-2014 Andrew Lee <anwlee@google.com> am 6d05f561: Include video state when accepting call on phone.

* commit '6d05f561549a66b597a5119665ccc3bf8a962d16':
Include video state when accepting call on phone.
6d43019ef713376e38653a91b9f0b398d8315e62 18-Jul-2014 Amit Mahajan <amitmahajan@google.com> Merge "Changes to add new parameter for Sim Authenticate" into lmp-dev
ce083ae9d277bea9fbc1c143766adf1013f4a50e 02-Jul-2014 Amit Mahajan <amitmahajan@google.com> Changes to add new parameter for Sim Authenticate

Change-Id: I393c18f878fe3e5efcd81543a9a38a4c353b6e03
ommandsInterface.java
honeSubInfo.java
IL.java
msphone/ImsPhoneCommandInterface.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
icc/IccRecords.java
icc/UiccCardApplication.java
ef1b01fcdca2774b4b58a00448cd8e9885bd65de 17-Jul-2014 Junda Liu <junda@google.com> am e5b5f10d: Add urls for spec and update AID to be spec compliant.

* commit 'e5b5f10d2d09f62c265381cab0816edfbdf566f0':
Add urls for spec and update AID to be spec compliant.
6d05f561549a66b597a5119665ccc3bf8a962d16 16-Jul-2014 Andrew Lee <anwlee@google.com> Include video state when accepting call on phone.

Bug: 16013878
Bug: 16015750
Change-Id: Iae14ea443394fe0c805cb0a9dfc01dcb600cff70
allManager.java
hone.java
honeProxy.java
dma/CDMAPhone.java
sm/GSMPhone.java
msphone/ImsPhone.java
ip/SipPhone.java
e5b5f10d2d09f62c265381cab0816edfbdf566f0 17-Jul-2014 Junda Liu <junda@google.com> Add urls for spec and update AID to be spec compliant.

Change-Id: I79580c8e510a8424b64436d8e6c57a8a3cc7fb1d
icc/UiccCarrierPrivilegeRules.java
d8580022df83bcdf0fe5016b40a65df4ed61acd4 18-Jul-2014 Tyler Gunn <tgunn@google.com> Merge "Adding videoState to telephony connections." into lmp-dev
64e62340aae85179a6468ccac4a401900eb4dc2f 18-Jul-2014 Tyler Gunn <tgunn@google.com> Adding videoState to telephony connections.

- Modify base telephony Connection to include abstract getVideoState
method.
- Override in CDMA, SIP, GSM connections to return AUDIO-ONLY.
- Override in ImsPhoneConnection to map from ImsCallProfile to
VideoCallProfile vidoe states.

Bug: 16285417
Change-Id: Icdf9ea3ae21475964f454ca4c92ab54791cb86aa
onnection.java
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneConnection.java
e1ee2bd66189f70a127fa6d6c95750cbe655e227 19-Jul-2014 Shishir Agrawal <shishir@google.com> Merge "Adding the ability for carrier app to override SPN and carrier name." into lmp-dev
b93bb3538c55f173f94a4ee7510d9d1521d8f731 18-Jul-2014 Shishir Agrawal <shishir@google.com> Adding the ability for carrier app to override SPN and carrier name.

The change allows system apps (holding MODIFY_PHONE_STATE permission) or
carrier apps to override the "carrier branding" on a per ICCID basis. The
override affects the service provider name as well as the network operator
name. The override is also saved as a SharedPreference and will persist for
the iccId across reboots.

Change-Id: I985ba247e10e2501e3d0d21567ccadc46f365879
hone.java
honeBase.java
honeProxy.java
erviceStateTracker.java
dma/CDMALTEPhone.java
dma/CDMAPhone.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
sm/GSMPhone.java
sm/GsmServiceStateTracker.java
icc/IccRecords.java
icc/RuimRecords.java
icc/SIMRecords.java
icc/UiccCard.java
icc/UiccCardApplication.java
6d86782d51d107b45a1736458a1993c21190bf87 17-Jul-2014 Sailesh Nepal <sail@google.com> am e516ffdc: Merge "Move TtyIntent.java from telephony to telecomm" into lmp-dev

* commit 'e516ffdc3d0df119679e738c92edfb6f3d024e5b':
Move TtyIntent.java from telephony to telecomm
b77e6243d5bc207da8c85b7d68a03cc66791a23e 17-Jul-2014 Junda Liu <junda@google.com> am b940944b: Merge "Fix UICC rule parsing." into lmp-dev

* commit 'b940944bb05346a9a3363a69c8f84ae54ca4b1ac':
Fix UICC rule parsing.
2451a2b5d84494cc5ec845c8b8659ef51b61586f 16-Jul-2014 Ye Wen <ywen@google.com> am f1aeeb51: Messaging auto persist switch (2/4)

* commit 'f1aeeb51f2c62420012122e0ccc75b3940c570e4':
Messaging auto persist switch (2/4)
f1aeeb51f2c62420012122e0ccc75b3940c570e4 15-Jul-2014 Ye Wen <ywen@google.com> Messaging auto persist switch (2/4)

b/14095333

Change-Id: I9dccdadd72d951d86f83cb7adea9b2f09fad08ce
nboundSmsHandler.java
MSDispatcher.java
msApplication.java
apPushOverSms.java
dma/CdmaSMSDispatcher.java
sm/GsmSMSDispatcher.java
b224e7496ce4cc30189a8f939e4d8a6956bff458 16-Jul-2014 Shishir Agrawal <shishir@google.com> am 87cf0a2e: Merge "Protecting messagings APIs for carrier access." into lmp-dev

* commit '87cf0a2ee4c4c1e3b34529210d15b69c74cc1ed3':
Protecting messagings APIs for carrier access.
b940944bb05346a9a3363a69c8f84ae54ca4b1ac 16-Jul-2014 Junda Liu <junda@google.com> Merge "Fix UICC rule parsing." into lmp-dev
004868eb3f91b06ef7e86b511bbb7b354036834a 11-Jul-2014 Junda Liu <junda@google.com> Fix UICC rule parsing.

Change-Id: I2fb81efba9fb749a23ee6fe59a24118782f502fc
icc/UiccCarrierPrivilegeRules.java
855ee0103d82d6705e9f20a75e8e7113ad117bce 16-Jul-2014 Narayan Kamath <narayan@google.com> am 9bd4aafc: Merge "Don\'t use substring matching on locales."

* commit '9bd4aafc2a096376defa10bf75f96f8d72a5d134':
Don't use substring matching on locales.
87cf0a2ee4c4c1e3b34529210d15b69c74cc1ed3 16-Jul-2014 Shishir Agrawal <shishir@google.com> Merge "Protecting messagings APIs for carrier access." into lmp-dev
c9394399180abbc32d04f6a3652ce22d5931e0b8 14-Jul-2014 Shishir Agrawal <shishir@google.com> Protecting messagings APIs for carrier access.

APIs protected by this CL:
- SMS injection.
- SMS filtering.
- SMS outbound broadcast.
- SMS outbound broadcast result.

Also moved much of the carrier checking logic from PhoneInterfaceManager to
the UiccCarrierPrivilegeRules for reusability.

BUG=15993876

Change-Id: I8309a1de23426dcc66a10383335cff9242920410
ccSmsInterfaceManager.java
nboundSmsHandler.java
MSDispatcher.java
dma/CdmaSMSDispatcher.java
sm/GsmSMSDispatcher.java
icc/UiccCard.java
icc/UiccCarrierPrivilegeRules.java
e516ffdc3d0df119679e738c92edfb6f3d024e5b 16-Jul-2014 Sailesh Nepal <sail@google.com> Merge "Move TtyIntent.java from telephony to telecomm" into lmp-dev
578935aec0c993035175ffe5516e336073574282 16-Jul-2014 Sailesh Nepal <sail@google.com> Move TtyIntent.java from telephony to telecomm

Moved TtyIntent constants to
android.telecomm.TelecommConstants.

Change-Id: I652b095af30cc2732a06829dc23492e5355660da
dma/TtyIntent.java
9f9aadee921db335adc891412a6e1e828153cfc6 12-Jul-2014 Etan Cohen <etancohen@google.com> MSIM support for IMS

Added support to handle IMS in MSIM scenarios. Supports an ImsService interface per
subscription.

Note: These individual ImsService interfaces can be implemented on a single or multiple
IMS stacks.

Change-Id: I6d4ce7dd1cc6f75f89a41951ef8fce78afde811c
honeBase.java
msphone/ImsPhoneCallTracker.java
f72d7c26c8f2895a1b32b60a7a106628fdc99d2c 14-Jul-2014 Narayan Kamath <narayan@google.com> Don't use substring matching on locales.

We can't assume that all languages will be 2 chars in length.
Language matching will need to parse the language subtag from
the locale, else we might end up matching a languages like
"fi" (finnish) to "fil" (filipino).

bug: 10090157
Change-Id: Ie394d9fa5e45e49a6d90bb107783de7a9e17b766
icc/RuimRecords.java
ebb556865dc92339fabae293c587c7f84f45d61a 13-Jul-2014 Wink Saville <wink@google.com> Merge "Don't display prompt when card inserted/removed"
eca4a2ab310bf8d96cf98b5e880e2f8eef7ffeb6 14-Feb-2013 Sandeep Gutta <sangutta@codeaurora.org> STK: Handle ICC refresh and card removal, and hotswap fix

--- Register for ICC refresh and let CatService's clients know when
an ICC refresh occurs.

Monitor card status. When card status moves to absent/present let
clients know.

Don't dispose CatService based on the number of applications.
Instead dispose it when UiccCard goes away

This helps avoid the race condition in the following scenario:
1. Radio is on and card is present
2. Turn Radio Off
3. Turn Radio On
4. Proactive command received

If CatService was disposed when card goes away on radio off
then it is possible for the unsol proactive command to be received
before Catservice is up and running on radio on.

--- Dispose objects properly for hotswap

During hotswap, CatService object is disposed and new object
is created. However RilMessageDecoder still holds reference to
old object of CatService, and hence sends decoded command
to old object of CatService leading to stk failure. In this fix
below objects are disposed properly when CatService is disposed.

1) RilMessageDecoder
2) CommandParamsFactory
3) IconLoader

Change-Id: Iee4ab009a0f9708a1ee2d87460e60765e46b4229
at/AppInterface.java
at/CatService.java
at/CommandParamsFactory.java
at/IconLoader.java
at/RilMessageDecoder.java
279e924fe355bf31c526be4d6578816ad08f0ae5 17-Jul-2013 Sandeep Gutta <sangutta@codeaurora.org> Don't display prompt when card inserted/removed

UiccCard displays a prompt to reboot the device when a card is
inserted or removed. Don't display this if the modem supports
hot swapping.

Change-Id: I43fc95e61382671f61286818304ec58e922e8605
(cherry picked from commit b056d5fcf4e5181e3d5098ac4000dc6d7e9aabf9)
(cherry picked from commit a7e8c9a6397b52c8f1b618d734a1762befae4cb7)
(cherry picked from commit 80a5464ba1af1cb9772cc932a418bf063245a1c4)
icc/UiccCard.java
b29851580bba4a13ddbf7a534d8b09295eb2c60f 10-Jul-2014 Ye Wen <ywen@google.com> New SMS and MMS APIs and semantics (2/4)

1. Rest of the new SMS and MMS APIs
2. Auto persisting MMS WAP Push
3. Partial multi-sim support
4. New SMS/MMS database columns: archived and creator
5. Record message creator
6. Mms config access APIs

b/14095333

Change-Id: Idb0ab75384b2c949f1a6ebe8f1c33e90a06a4d9b
ccSmsInterfaceManager.java
msSMSDispatcher.java
nboundSmsHandler.java
MSDispatcher.java
iccSmsController.java
apPushOverSms.java
dma/CdmaSMSDispatcher.java
sm/GsmSMSDispatcher.java
cafda9904d2804959d51697cdc63a185e687cb98 12-Jul-2014 Colin Cross <ccross@google.com> Revert "New SMS and MMS APIs and semantics (2/4)"

This reverts commit c5f9236283882b8e08390ac52e5b1fab2d3bc2fb.

Change-Id: I9585dabfc31611e68718859ea509b8f52535d9b5
ccSmsInterfaceManager.java
msSMSDispatcher.java
nboundSmsHandler.java
MSDispatcher.java
iccSmsController.java
apPushOverSms.java
dma/CdmaSMSDispatcher.java
sm/GsmSMSDispatcher.java
c5f9236283882b8e08390ac52e5b1fab2d3bc2fb 10-Jul-2014 Ye Wen <ywen@google.com> New SMS and MMS APIs and semantics (2/4)

1. Rest of the new SMS and MMS APIs
2. Auto persisting MMS WAP Push
3. Partial multi-sim support
4. New SMS/MMS database columns: archived and creator
5. Record message creator
6. Mms config access APIs

b/14095333

Change-Id: I9a4261753a803f520933b643c0bac708ab9f40a9
ccSmsInterfaceManager.java
msSMSDispatcher.java
nboundSmsHandler.java
MSDispatcher.java
iccSmsController.java
apPushOverSms.java
dma/CdmaSMSDispatcher.java
sm/GsmSMSDispatcher.java
e86a8d443e921caec2c398ef74f0b6d573a15bb1 10-Jul-2014 Sailesh Nepal <sail@google.com> Have SipPhone.canTake return a Connection

This CL changes the SipPhone method to take an incoming
call to return a Connection. This is used by the new
Telephony code to track new incoming SIP calls.

Change-Id: Ifa3e61c703100744bad3d227c52e3b7f9be4b3ca
ip/SipPhone.java
6bbcbfd62c9aa5787e7c33936e2246ff05b59d58 08-Jul-2014 Tyler Gunn <tgunn@google.com> Adding support for specifying videoState in dial methods in Phone.

In ImsPhoneCallTracker, wired up dial to start a call with
the correct IMS call type.

Bug: 16014224
Change-Id: If131529fee7eb03e63fa445d04e15246e51967be
allManager.java
hone.java
honeBase.java
honeProxy.java
dma/CDMAPhone.java
sm/GSMPhone.java
msphone/ImsPhone.java
msphone/ImsPhoneBase.java
msphone/ImsPhoneCallTracker.java
ip/SipPhone.java
ip/SipPhoneBase.java
cb104a615d1e44cf39d837c3dbcf9475a5be57eb 26-Jun-2014 Shriram Ganesh <sganesh@quicinc.com> Do not disconnect voice calls during phone object switch.

In cases like emergency call attempted in oos or IMS SRVCC
there is possibility that the phone object switch due to
RAT change can happen while a voice call is in progress.
To avoid call disconnect in such cases, do not hangup connections
while disposing CallTracker objects.

Change-Id: I890d6bcea958288eab8f557073f871820ddd3b52

Conflicts:
src/java/com/android/internal/telephony/cdma/CdmaCallTracker.java
src/java/com/android/internal/telephony/gsm/GsmCallTracker.java
dma/CdmaCallTracker.java
sm/GsmCallTracker.java
888c60a7fe1c8f3612ab8e8ec5f2f7ca8f24e766 03-Jul-2014 Etan Cohen <etancohen@google.com> Remove VoicePhone interface

VoicePhone interface was not a generic voice phone. It was a partial
implementation of an ImsPhone (i.e. served no added-value purpose but
confused functionality). Removed.

Change-Id: Ida5d0fb2b09dcc6ec295ddd7a03f2cf6536b840b

Conflicts:
CleanSpec.mk
allManager.java
hone.java
honeBase.java
honeFactory.java
honeProxy.java
oicePhone.java
dma/CDMAPhone.java
sm/GSMPhone.java
msphone/ImsPhone.java
msphone/ImsPhoneFactory.java
4baf17fd699249d1b387903b6db7328ad3f7b3e2 23-Jun-2014 Shishir Agrawal <shishir@google.com> SIM based carrier app privileges.

Adding support for SIM based carrier app privileges.

WIP - Missing bits:
- Notifications.
- Certificate check.

Change-Id: Ied3aa6c7d51cc0cde06f5bb58f30893d7a7b1c34
icc/UiccCard.java
icc/UiccCarrierPrivilegeRules.java
370971c25973d9d8061b76e756df2fb8c1ebd990 28-Jun-2014 Ye Wen <ywen@google.com> MMS auto persisting (2/4)

1. Added new MMS message box type for failed messages
2. Use global static flag to temporarily turn off new SMS API semantics

b/14095333

Change-Id: I150a08a4b26bba6f3a7a1d8f848fe07c8be9298b
nboundSmsHandler.java
MSDispatcher.java
cf5205f70eb1eac497164124187a088ecb03fff5 19-Jun-2014 Ram <ram.pl@samsung.com> IMS: Adding Support for Emergency APN in Telephony Framework (opt/telephony)

(NOTE: No SIM case will be covered in next patch)

Change-Id: I87e653e29674f0e4821484908f799d6b84659c72

Signed-off-by: Ram <ram.pl@samsung.com>
hone.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
sm/GSMPhone.java
077d04f2ca9fbf1b17302aff609aba5d1659f56b 31-May-2014 Shriram Ganesh <sganesh@quicinc.com> Allow ImsPhone to handle e911 calls

Allow ImsPhone to handle emergency calls

Change-Id: If40fb8326d165f5b1093c77982ed9747cba596ca
dma/CDMAPhone.java
sm/GSMPhone.java
befe0bf21cf06c47b1f099caed9e6c6b7125c0fe 03-Jun-2014 Shriram Ganesh <sganesh@quicinc.com> Handle Srvcc requirements

Change handles the following SRVCC requirements -
- Move SRVCC functionality to PhoneBase so
both CDMA & GSM phones can handle it.
- Srvcc wrt single ringing call

Change-Id: Ifc417bacf95364ff358651a59c84c377fe010ec6
allTracker.java
honeBase.java
sm/GSMPhone.java
sm/GsmCallTracker.java
msphone/ImsPhone.java
bd4d6093314c0d2afc4b4f69f352957d01d9bc58 29-May-2014 Uma Maheswari Ramalingam <uramalin@quicinc.com> Handle CallMerge Fail scenario

Handle Call Merge Fail scenario.

Change-Id: I0042d655f781d98b5b2db568885906a3a1b1dbc8
msphone/ImsPhoneCallTracker.java
e564f2b70ebab1390eee9b33c550fceb65837fde 01-Jul-2014 Amit Mahajan <amitmahajan@google.com> Merge "EAP-SIM RIL command name change."
2fbca951019df69146cf472adadc05c5c2ef4a32 26-Jun-2014 Amit Mahajan <amitmahajan@google.com> EAP-SIM RIL command name change.

Modified the name to match what was in QCRIL.

Change-Id: I41abfacb7bacd4cfa0d4543100ac9960c97184f9
IL.java
145c68db12c0fba4c6e1ff67329f02f29fc683e2 24-Jun-2014 Amit Mahajan <amitmahajan@google.com> Change to make sure waiting thread is notified (removed break that was causing notifyAll() to not be called).

Change-Id: If7da41ec3c09337ed133f2136925ac562afdde34
ccPhoneBookInterfaceManager.java
icc/IccRecords.java
icc/IsimUiccRecords.java
d4397df465323b2add2f5e532824ec0ed0d785f4 28-Jun-2014 Wink Saville <wink@google.com> If there is no IccFileHandler do not change sIccId[slotId].

In our master branch with a Sprint SIM I found that the call to
getIccFileHandler in queryIccId is returning null when sReceiver
receives a ACTION_SIM_STATE_CHANGED with a simStatus of
INTENT_VALUE_ICC_READY.

This causes queryIccId to set sIid[slotId] to ICCID_STRING_FOR_NO_SIM
and thus never get updated. Which causes addSubInfoRecord to never be
called so there is no Subscriptions.

The most obvious problem this causes is an Empty Triangle for the SSI
Icon.

This fix is to not change sIccId[slotId], instead it will be updated
when the sReceiver gets a ACTION_SIM_STATE_CHANGED with a simStatus of
INTENT_VALUE_ICC_LOADED a short while later.

Added some debug.

Change-Id: I8493fe14d4425f89144dda4bba129b4465fc41ac
honeBase.java
ubInfoRecordUpdater.java
fce79caf5d7628cde43c5f0cd3d369673bc15212 27-Jun-2014 Ye Wen <ywen@google.com> Send persisted SMS message URI through intent

1. Sent message URI is passed via sentIntent in sending API calls
2. Received message URI is passed via SMS deliver or received intent

Change-Id: I02ffd5294e41b2f81b03f79fc008bba44cf33d9f
nboundSmsHandler.java
MSDispatcher.java
f68da23264bb06736b62e9c1b95225f6ec997ca8 26-Jun-2014 Ye Wen <ywen@google.com> Auto persist received SMS

Change-Id: I729b9eef0c77b35704e51547169700c5d3e989c5
nboundSmsHandler.java
8f816a73f5635567f10fc219d54804810a94d3f2 26-Jun-2014 Ye Wen <ywen@google.com> Merge "SMS message auto persisting for sending"
775f100b20a5c978bc07f621a4087f79b1f73e3f 25-Jun-2014 Wink Saville <wink@google.com> Fix NPE caused by null mUiccApplication.

Bug: 15712558
Change-Id: Ieb35fa69d8002286e54e6f5d8e73e057300ae94c
icc/IccCardProxy.java
c99dab56e20222b28cbc6238645feac938f1c333 20-Jun-2014 Ye Wen <ywen@google.com> SMS message auto persisting for sending

1. Added auto persisting when sending SMS messages. This feature is
enabled by a system property to avoid breaking existing apps.
2. Removed SMSDispatcher.mRemainingMessages and added per message
sending part count for sending multipart messages.
3. Refactored code to handle message sent or failed. Fixed bug that in
some situation SendNextMsg is not sent for failures.

Change-Id: I3298b139e484f1238a5c04dcc39fa88398bba679
msSMSDispatcher.java
MSDispatcher.java
dma/CdmaSMSDispatcher.java
sm/GsmSMSDispatcher.java
91483068442750265a04f2ea25f7f30f261be6bc 23-Jun-2014 Cheuksan Wang <edwang@google.com> fix broken build

Change-Id: I8d0268daeffe439d2fcb14df88b19318119018a5
ccSmsInterfaceManager.java
iccSmsController.java
d6bf802a1afd6dbd99b35804ec0ec565f2ac8e9e 23-Jun-2014 Cheuksan Wang <edwang@google.com> Merge "Send outbound messages via the default carrier app. Initially, the message will go into a pending state. There is a new API call to update the status of a message. If the carrier app cannot send the message, it will fall back to the default GSM/CDMA network."
8d8e8f45200d17b78d196d8cba389fd9c547ac11 21-Jun-2014 Cheuksan Wang <edwang@google.com> Send outbound messages via the default carrier app. Initially, the
message will go into a pending state. There is a new API call to
update the status of a message. If the carrier app cannot send the
message, it will fall back to the default GSM/CDMA network.

This is the same cl as 476721 which has already been approved by jsh@

Change-Id: I51d732b9cc40b371f77fd26d28e0836a466afc71
ccSmsInterfaceManager.java
msSMSDispatcher.java
MSDispatcher.java
dma/CdmaSMSDispatcher.java
sm/GsmSMSDispatcher.java
d498f853cb523efef7bd06629e222ea105104b11 20-Jun-2014 Ji Yang <yangji@google.com> Merge "Sorry, clicked the wrong button."
f653f91baeb35b18a47c8f80b6ca1b1361dea238 20-Jun-2014 Ji Yang <yangji@google.com> Sorry, clicked the wrong button.

Revert "Send outbound message via the default carrier app. Initially, the message will go into a pending state. There is a new API call to update the status of a message. If the carrier app cannot send the message, it will fall back to the default GSM/CDMA networ"

This reverts commit 112c36a6080b6902925d317218acc14183e29842.

Change-Id: I087672cf17551bcef438df30e97e8859e1060a2a
ccSmsInterfaceManager.java
msSMSDispatcher.java
MSDispatcher.java
dma/CdmaSMSDispatcher.java
sm/GsmSMSDispatcher.java
7fac90e635330be124a709db5774b71ff3892348 20-Jun-2014 Ji Yang <yangji@google.com> Merge "Send outbound message via the default carrier app. Initially, the message will go into a pending state. There is a new API call to update the status of a message. If the carrier app cannot send the message, it will fall back to the default GSM/CDMA network."
112c36a6080b6902925d317218acc14183e29842 30-May-2014 Cheuksan Wang <edwang@google.com> Send outbound message via the default carrier app. Initially, the
message will go into a pending state. There is a new API call to
update the status of a message. If the carrier app cannot send the
message, it will fall back to the default GSM/CDMA network.

Change-Id: I12e4c16ee1f934561c453e125805d59a151271b4
ccSmsInterfaceManager.java
msSMSDispatcher.java
MSDispatcher.java
dma/CdmaSMSDispatcher.java
sm/GsmSMSDispatcher.java
6a22a5cf0ca0783b2f33b8f7ab8f3a37755aafcf 19-Jun-2014 Cheuksan Wang <edwang@google.com> Merge "Add SMS filtering intent and API for message deduping by the carrier app."
7320aa58e7fcbe113ec85e6ae7d41858af2e3270 19-Jun-2014 Ye Wen <ywen@google.com> Move IMms.aidl to frameworks/base (1/3)

Change-Id: I6299cf6b4e14248024baf8daa451e173141b3c0f
ms/IMms.aidl
3aed18eb1c0f0dc3ed9e5793d31995ead0a6afe7 19-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Comment out some subId code that failed

mPhone was giving subId == -1 and failing all retries even well after boot
during OMA DM process and killing the process. Needs to be resolved. This
is a workaround.

bug: 15563289
Change-Id: I43d7ac82a64375f319b5e16f9fff37a2aefa8325
ataconnection/DcTrackerBase.java
ed8ec7c629dccf60a2fc817f871bab879302fdbd 18-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Remove Obsolete enable/disableApn functions."
1522439d1c675a52aef5c217d6c74e980dc6cbff 18-Jun-2014 Ye Wen <ywen@google.com> Merge "Implement MMS APIs in SmsManager instead of MmsManager"
afa929f85b8f0c4f0c53b57956d1fd2ec7314904 18-Jun-2014 Ye Wen <ywen@google.com> Implement MMS APIs in SmsManager instead of MmsManager

Change-Id: I8dd9d50ef5f26fb74f60ccabf22a288dabf24fb8
ms/IMms.aidl
81dedf31ec616943147b0617c2912ec52360b8b7 18-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Don't tear down existing cell connections."
305122cd621385652826cf7d8cd4e651dc6b5e9f 17-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Don't tear down existing cell connections.

NetworkFactories signals indicate if we're interested in making new
connections, but should not be used to tear things down.
ConnectivityService will communicate disconnects directly with NetworkAgents
when it wants them to tear down.

This fixes broken lingers and also potential score ties.

bug:15612739
Change-Id: Ib39ddadaac84898d080764afc365f09f7dce4ffa
ataconnection/DataConnection.java
ataconnection/DcTracker.java
9456408aa20f8a441ccd9ab822fb74b427a081bf 18-Jun-2014 Wink Saville <wink@google.com> Merge "Empty triangle displayed for radio signal but calls & data work"
6f64a8956a101bd16c900017f7692f9284c6bdd6 18-Jun-2014 Anil Muthineni <anilmuthineni@google.com> Check that the PendingIntent is not null, before dispatching it.

Change-Id: I7e26d01ef9df3dc1e61135c4ae3287c619a93cd8
msSMSDispatcher.java
76b5625831e12343d195ebb509a6804774ca2c0f 18-Jun-2014 Wink Saville <wink@google.com> Empty triangle displayed for radio signal but calls & data work

Don't assume getSubId always returns an array and add a FIXME comment.
And explicitly set phoneId and subId in the intent so as not to relay
on a phones subId being valid.

Also cleanup some debug.

Bug: 15669560
Change-Id: I645ddb35b964b08dcb46f881c9d02b932d128950
ubscriptionController.java
58c7be5dc52e9847470112c95aaf6bbab28f9b92 17-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Remove Obsolete enable/disableApn functions.

ConnectivityService now uses NetworkAgents instead and apps should use
ConnectivityManager.

Change-Id: Ifc5c8f5be802183e70a5d92b224c819815de00e6
hone.java
honeBase.java
honeProxy.java
ataconnection/DcSwitchState.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
a537067b93624141ebeb3b1f6c3f2c2b971a301e 17-Jun-2014 Shishir Agrawal <shishir@google.com> PhoneSubInfoProxy should not register with ServiceManager.

PhoneSubInfoController is the new class that provides the "iphonesubinfo"
service.

BUG: 15682151

Change-Id: I2b3f9fc03dc92b2ac34d7f857426074f906de5c5
honeSubInfoProxy.java
913880b94d8b29d8dec34b2307c313e2180eb6f0 27-May-2014 Cheuksan Wang <edwang@google.com> Add SMS filtering intent and API for message deduping by the carrier app.

If a carrier app is active, the SMS_FILTER intent is sent for every
incoming SMS message. If the carrier app considers this message as a
duplicate, it may set a status code to filter out this SMS. It may
also set a pdu in result extras to overwrite the pdu.

Change-Id: I41526b21df31142b8f6373f3aefbe360c5938af3
nboundSmsHandler.java
b5e07a56c7dc687e31669ff99fad0a32bf3bd89c 14-Jun-2014 Wink Saville <wink@google.com> Merge "Fix build break."
fa8a17ed53a72fbc4fb22cc41a7abb088b2cb788 14-Jun-2014 Wink Saville <wink@google.com> Fix build break.

ISms has changed between my testing and submitting.

Change-Id: I26fbfa94e5689ef40d79497fdc63890dc024ae92
ccSmsInterfaceManager.java
iccSmsController.java
91f8e19cdafe6382ec1469167e208e2e928123cc 13-Jun-2014 Wink Saville <wink@google.com> Merge "Merge kwd to master"
a8467dd0c524787104b1ccdddc5e8af10ba729ed 13-Jun-2014 Wink Saville <wink@google.com> Merge kwd to master

Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
aseCommands.java
all.java
allManager.java
ellBroadcastHandler.java
ommandException.java
ommandsInterface.java
onnection.java
efaultPhoneNotifier.java
ardwareConfig.java
IccPhoneBook.aidl
ccPhoneBookInterfaceManager.java
ccPhoneBookInterfaceManagerProxy.java
ccProvider.java
ccSmsInterfaceManager.java
nboundSmsHandler.java
ccTable.java
miCode.java
hone.java
honeBase.java
honeFactory.java
honeNotifier.java
honeProxy.java
honeSubInfo.java
honeSubInfoController.java
honeSubInfoProxy.java
roxyController.java
IL.java
erviceStateTracker.java
msStorageMonitor.java
ubInfoRecordUpdater.java
ubscription.java
ubscriptionController.java
ubscriptionData.java
elephonyCapabilities.java
elephonyDevController.java
iccPhoneBookController.java
iccSmsController.java
oicePhone.java
apPushOverSms.java
at/CatService.java
at/RilMessageDecoder.java
dma/CDMALTEPhone.java
dma/CDMAPhone.java
dma/CdmaConnection.java
dma/CdmaInboundSmsHandler.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaMmiCode.java
dma/CdmaServiceCategoryProgramHandler.java
dma/CdmaServiceStateTracker.java
dma/CdmaSubscriptionSourceManager.java
dma/SmsMessage.java
ataconnection/DataCallResponse.java
ataconnection/DataConnection.java
ataconnection/DcAsyncChannel.java
ataconnection/DcController.java
ataconnection/DcSwitchAsyncChannel.java
ataconnection/DcSwitchState.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
ataconnection/DctController.java
sm/GSMPhone.java
sm/GsmCallTracker.java
sm/GsmConnection.java
sm/GsmMmiCode.java
sm/GsmSMSDispatcher.java
sm/GsmServiceStateTracker.java
msphone/ImsPhone.java
msphone/ImsPhoneBase.java
msphone/ImsPhoneCall.java
msphone/ImsPhoneCallTracker.java
msphone/ImsPhoneCommandInterface.java
msphone/ImsPhoneConnection.java
msphone/ImsPhoneFactory.java
msphone/ImsPhoneMmiCode.java
ip/SipCommandInterface.java
ip/SipConnectionBase.java
est/SimulatedCommands.java
icc/IccCardApplicationStatus.java
icc/IccCardProxy.java
icc/IccConstants.java
icc/IccFileHandler.java
icc/IccRecords.java
icc/IsimFileHandler.java
icc/IsimRecords.java
icc/IsimUiccRecords.java
icc/RuimRecords.java
icc/SIMRecords.java
icc/UiccCard.java
icc/UiccCardApplication.java
icc/UiccController.java
b36f67e82882badcf856451e1ffc78ed388c2252 12-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> am 781ada03: Merge "Make NetworkCapabilities publicly immutable." into lmp-preview-dev

* commit '781ada0374c0b111c5cf9488d171c046b3079ff3':
Make NetworkCapabilities publicly immutable.
63418bbd2a9d7cc88ae24cc5ae776c01d688fc3a 03-Jun-2014 Anil Muthineni <anilmuthineni@google.com> Add api to inject SMS PDUs

Change-Id: I58a518a7a6d6f43fef3d989bc0c8b21959404ed0
ccSmsInterfaceManager.java
msSMSDispatcher.java
nboundSmsHandler.java
MSDispatcher.java
dma/CdmaSMSDispatcher.java
sm/GsmSMSDispatcher.java
50a562c63bf42017fe260b0ea299c3419a06a46d 13-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Listen for retry intents."
d32b58c8e7cea693c98f49b2291455e917cd9301 13-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Listen for retry intents.

Re-adding code stripped out during the NetworkAgent changes. Going back
to having ApnContexts pre-initialized at startup since they are no longer
NetworkAgents. This also lets us preregister for each of their retry alarms.

Undo of damage done by: https://googleplex-android-review.googlesource.com/#/c/476836/

bug:15563289
Change-Id: I6f8855eb24d913c73fef647d4219ae7041216e2b
ataconnection/DcTracker.java
781ada0374c0b111c5cf9488d171c046b3079ff3 12-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Merge "Make NetworkCapabilities publicly immutable." into lmp-preview-dev
fd555a178c05e409917f22745743ed59402208e6 09-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Make NetworkCapabilities publicly immutable.

Applying API council comments.

bug: 15142362
Change-Id: Ie0bde68b72656a676d90c0343b9756fe9268d8d6
ataconnection/DataConnection.java
ataconnection/DcTracker.java
5efbe26116b51f55d623d482c43c44abf998c71a 07-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Apply new LinkProperties API change.

bug:15142362
Change-Id: I1457111da7d3bd09998f7e010febb8bb4c45c8bc
(cherry picked from commit d68ea30947e9b6cd0d7aa8da23d2373a03310e2b)
ataconnection/DataCallResponse.java
235dd822c4ff48409d974b4fa7e789ea1fdaa7aa 10-Jun-2014 Amit Mahajan <amitmahajan@google.com> am 45a6dd79: am db480f2b: am 63dce7fe: Handle provisioning APN by turning off/on radio.

* commit '45a6dd79c6a54f90fd3737cdf9434fe68cf65f14':
Handle provisioning APN by turning off/on radio.
45a6dd79c6a54f90fd3737cdf9434fe68cf65f14 09-Jun-2014 Amit Mahajan <amitmahajan@google.com> am db480f2b: am 63dce7fe: Handle provisioning APN by turning off/on radio.

* commit 'db480f2b7bd5ae373458e78b267f939dbb95f5c6':
Handle provisioning APN by turning off/on radio.
db480f2b7bd5ae373458e78b267f939dbb95f5c6 09-Jun-2014 Amit Mahajan <amitmahajan@google.com> am 63dce7fe: Handle provisioning APN by turning off/on radio.

* commit '63dce7fe9678c4610a410ebddd49518190f90386':
Handle provisioning APN by turning off/on radio.
63dce7fe9678c4610a410ebddd49518190f90386 07-Jun-2014 Amit Mahajan <amitmahajan@google.com> Handle provisioning APN by turning off/on radio.

The change is specific to AT&T as they want no signaling from device during provisioning.
I've tested following cases:
- expired AT&T SIM to make sure provisioning flow works as expected.
- airplane mode on/off with both active and expired AT&T SIM.
- wifi <-> mobile transitions work okay.
- LTE with Verizon SIM (basic sanity).

bug: 13190133

Change-Id: I215963174ae6000ae71d1dda693f95413f3d6e81
ataconnection/DcTrackerBase.java
d68ea30947e9b6cd0d7aa8da23d2373a03310e2b 07-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Apply new LinkProperties API change.

bug:15142362
Change-Id: I1457111da7d3bd09998f7e010febb8bb4c45c8bc
ataconnection/DataCallResponse.java
2b967cc8c303674fce005ba8aba6dfa0d1d60cba 07-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> am b372e784: Correctly set NetCap for "*" APNs

* commit 'b372e78452b9432b51cda43f6264240b04d62dd4':
Correctly set NetCap for "*" APNs
f4f5308a309d43fcfca8d0d5fbb54bc38c82ca3f 05-Jun-2014 Yorke Lee <yorkelee@google.com> Follow API change in PhoneNumberUtils

Bug: 15432083
Change-Id: I88b5ace925e3704bd032dc9694b0c2dd871b9cf9
dma/CdmaCallTracker.java
sm/GsmMmiCode.java
b372e78452b9432b51cda43f6264240b04d62dd4 06-Jun-2014 Robert Greenwalt <rgreenwalt@google.com> Correctly set NetCap for "*" APNs

bug: 15455750
Change-Id: I933502b417d7b15aaca98ec16f8d3c60de1e142d
ataconnection/DataConnection.java
b700ba75d7dbcf3cca1c44b541e8642063042d64 06-Jun-2014 Evan Charlton <evanc@google.com> am 8fa7267a: Merge "Use new post-dial DTMF flows" into lmp-preview-dev

* commit '8fa7267a0b87c1023f920d51ee553f5105ea4ebd':
Use new post-dial DTMF flows
8fa7267a0b87c1023f920d51ee553f5105ea4ebd 06-Jun-2014 Evan Charlton <evanc@google.com> Merge "Use new post-dial DTMF flows" into lmp-preview-dev
aa2f665dfdaf28c946f2d6c6f4e212c0c683ee27 06-Jun-2014 Adam Lesinski <adamlesinski@google.com> Merge commit '2f1e87b4' into manualmerge

Conflicts:
src/java/com/android/internal/telephony/DefaultPhoneNotifier.java

Change-Id: I46f2432de5873c19f42bb8a588719ec84e92f059
2f1e87b4ff0395a97a6a82134202be82d89ce6e7 06-Jun-2014 Adam Lesinski <adamlesinski@google.com> am 7961ac2c: SmsManager responds gracefully to no backing service

* commit '7961ac2c8d2e50d879bc6d5b272b7d972a335c0e':
SmsManager responds gracefully to no backing service
abdf18ba8c0f6aab302132337d054dc2901abeab 05-Jun-2014 Yorke Lee <yorkelee@google.com> DO NOT MERGE Follow API change in PhoneNumberUtils

Bug: 15432083
Change-Id: I88b5ace925e3704bd032dc9694b0c2dd871b9cf9
dma/CdmaCallTracker.java
sm/GsmMmiCode.java
0b9246d6254bed6f625fa9c551f7f9dcc33d4e38 03-Jun-2014 Evan Charlton <evanc@google.com> Use new post-dial DTMF flows

Migrate the post-dial DTMF call flows to use the new APIs.

Bug: 13734588
Change-Id: I5cc06268590c3c424ea6daf216cb205b9c470dac
onnection.java
dma/CdmaConnection.java
sm/GsmConnection.java
f11a4953b12a2d15fe07ae361b47fb5b37954bd4 04-Jun-2014 Lorenzo Colitti <lorenzo@google.com> am 48579fcc: Make requests for restricted networks not require unrestricted access.

* commit '48579fcccf584fbddbff59eaae27d434316a4248':
Make requests for restricted networks not require unrestricted access.
7961ac2c8d2e50d879bc6d5b272b7d972a335c0e 03-Jun-2014 Adam Lesinski <adamlesinski@google.com> SmsManager responds gracefully to no backing service

Previously we would get an NPE if there was no isms service
running on the device. Now we return sensible defaults
and throw UnsupportedOperationException for methods
that are meant to invoke actions and have a void
return type.

Change-Id: I894809a0d6431b7c6472ec6f69d3b8e84a1418ea
efaultPhoneNotifier.java
48579fcccf584fbddbff59eaae27d434316a4248 03-Jun-2014 Lorenzo Colitti <lorenzo@google.com> Make requests for restricted networks not require unrestricted access.

Currently, calling startUsingNetworkFeature for a restricted APN
type (e.g., IMS or FOTA) will create a request that requires
NET_CAPABILITY_NOT_RESTRICTED. Because these APNs are restricted,
when we bring them up we conclude that it does not match the
unrestricted requirement, and we tear them down.

1. Clear the NET_CAPABILITY_NOT_RESTRICTED capability when
creating requests in startUsingNetworkFeature.
2. Refactor the code to a common function so this cannot happen
again.

Bug: 15191336
Change-Id: Id1ec79c58ff79b1a83457ffaecc57d50b61ed4e4
ataconnection/DataConnection.java
72dd19208f0803c12daf10d52189d4cca95c1159 03-Jun-2014 Evan Charlton <evanc@google.com> Merge "Revert sendEnvelope changes [DO NOT MERGE]" into lmp-preview-dev
62c954a7a7c4199956c127fcb575ed9114d44491 27-May-2014 Robert Greenwalt <rgreenwalt@google.com> Apply refactored NetworkFactory.

Make NetworkFactory a concrete class and divide responsibilites between it and NetworkAgent.
Factory will track requests and by default give a single connect/disconnect api for ease
of use. Then NetworkAgent is created and destroyed as needed with very simple logic.

Change-Id: I401c14a6e5466f2fc63b04219b97ff85bb9af291
(cherry picked from commit 071b9f85ac559a35430ed37c03a66271977b9d17)
ataconnection/ApnContext.java
ataconnection/DataConnection.java
ataconnection/DcTracker.java
f3ab6ab303e1da929ce26b7c5d63565bff136221 23-May-2014 Robert Greenwalt <rgreenwalt@google.com> Revert "Switching to NetworkAgent API"

This reverts commit bce3d2575122929bb27ec8a37d56e96da39a3ca2.

Change-Id: Ia7d1752d4ba9f74f55657c7dbe4d64d60064394f
(cherry picked from commit 608588e9af271f0f5640236809f27c626f9d98e9)
ataconnection/ApnContext.java
ataconnection/DataConnection.java
ataconnection/DcAsyncChannel.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
071b9f85ac559a35430ed37c03a66271977b9d17 27-May-2014 Robert Greenwalt <rgreenwalt@google.com> Apply refactored NetworkFactory.

Make NetworkFactory a concrete class and divide responsibilites between it and NetworkAgent.
Factory will track requests and by default give a single connect/disconnect api for ease
of use. Then NetworkAgent is created and destroyed as needed with very simple logic.

Change-Id: I401c14a6e5466f2fc63b04219b97ff85bb9af291
ataconnection/ApnContext.java
ataconnection/DataConnection.java
ataconnection/DcTracker.java
608588e9af271f0f5640236809f27c626f9d98e9 23-May-2014 Robert Greenwalt <rgreenwalt@google.com> Revert "Switching to NetworkAgent API"

This reverts commit bce3d2575122929bb27ec8a37d56e96da39a3ca2.

Change-Id: Ia7d1752d4ba9f74f55657c7dbe4d64d60064394f
ataconnection/ApnContext.java
ataconnection/DataConnection.java
ataconnection/DcAsyncChannel.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
49abb46bedc84a79e5057caab9baf6a5452a8ab7 28-May-2014 Evan Charlton <evanc@google.com> Revert sendEnvelope changes [DO NOT MERGE]

Revert various CLs involving sendEnvelope changes from I/O preview.
The following changes were reverted:

Revert "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope."

This reverts commit 5b2ac9494f93e2b462ee08fa8560b697cd190c50.

Revert "Expose sendEnvelope." [DO NOT MERGE]

This reverts commit dcca0fbaf728212d182e08fe2239d9d4a5f96516.

Change-Id: I659d3aa16b8b9a5c33c8c64404f7d7442d9d0e57
icc/UiccCard.java
220d43e0611edd0f3a2eb7a33bb38a008fff0868 29-May-2014 Wink Saville <wink@google.com> Revert "Fix build: Revert "am 9349bd96: am 7d604d74: am ccb1ae5a: Merge "When Data RAT changes the new RAT retry connectable APN\'s"""

This reverts commit a82185ccdc6df168fcd093bf49b9c2ada0e1c080.

The original commit used EVENT_DATA_RAT_CHANGED but it was defined
in frameworks/base/telephony/*/DctConstants.java by this AOSP
change:

fb61bfa4470332a7ccfca7a2df5e13baca49d9fa

And I'd forgetten to submit it. Now that EVENT_DATA_RAT_CHANGED
is defined I am reverting the revert.

Change-Id: Ied6665136cb6c36053c8fe03eee5e9f87b637f38
ataconnection/DcTracker.java
a82185ccdc6df168fcd093bf49b9c2ada0e1c080 29-May-2014 Ed Heyl <edheyl@google.com> Fix build: Revert "am 9349bd96: am 7d604d74: am ccb1ae5a: Merge "When Data RAT changes the new RAT retry connectable APN\'s""

This reverts commit a259f97accfbad749731e4e95152f2ef3f1115f7, reversing
changes made to cbb34dc8c740d77506d51bb1c9045402301da32e.
ataconnection/DcTracker.java
a259f97accfbad749731e4e95152f2ef3f1115f7 29-May-2014 Wink Saville <wink@google.com> am 9349bd96: am 7d604d74: am ccb1ae5a: Merge "When Data RAT changes the new RAT retry connectable APN\'s"

* commit '9349bd96eb30f992b76d2a5a84eb593a093fdeef':
When Data RAT changes the new RAT retry connectable APN's
9349bd96eb30f992b76d2a5a84eb593a093fdeef 29-May-2014 Wink Saville <wink@google.com> am 7d604d74: am ccb1ae5a: Merge "When Data RAT changes the new RAT retry connectable APN\'s"

* commit '7d604d741a387ef1c8ab782890384dc2d4190629':
When Data RAT changes the new RAT retry connectable APN's
7d604d741a387ef1c8ab782890384dc2d4190629 29-May-2014 Wink Saville <wink@google.com> am ccb1ae5a: Merge "When Data RAT changes the new RAT retry connectable APN\'s"

* commit 'ccb1ae5a613a0ad714623f1cbb246dbbd43976b4':
When Data RAT changes the new RAT retry connectable APN's
50d5d9678ef0e14b2426979eb908afff773d40ec 01-Feb-2014 Zhang Wei-e7976c <e7976c@motorola.com> When Data RAT changes the new RAT retry connectable APN's

Issue: In the scenario where phone is in LTE and has data up and running, then user makes a voice
call. During voice call, devices moves out of LTE coverage and moves into 1X. Since 1X does not
support simultaneous voice and data, the data call will be dropped. When the device moves back
into LTE coverage later, device does not attempt to set up the data call again until the voice
call is ended. This causes the data stall.
Fix: register for EVENT_DATA_RAT_CHANGED and attempt SETUP_DATA_CALL upon receiving this event.

Change-Id: Ibe9e68295661f2f2ffaca3057d696df6a1db3f0c
ataconnection/DcTracker.java
980e8ba8312c4afb96adfee97ef17a2704c059b0 22-May-2014 Robert Greenwalt <rgreenwalt@google.com> Move dis/enable of mobile data to Telephony

ConnectivityService doesn't do this anymore.

bug:15077247
Change-Id: I3208c91b2c0369b594987f39ca29da7478435513
(cherry picked from commit 3a6fa6e964a0cb361f79302afe18b8d7f5f9ceef)
hone.java
honeProxy.java
dma/CDMAPhone.java
ataconnection/DcTrackerBase.java
sm/GSMPhone.java
ip/SipPhoneBase.java
3a6fa6e964a0cb361f79302afe18b8d7f5f9ceef 22-May-2014 Robert Greenwalt <rgreenwalt@google.com> Move dis/enable of mobile data to Telephony

ConnectivityService doesn't do this anymore.

bug:15077247
Change-Id: I3208c91b2c0369b594987f39ca29da7478435513
hone.java
honeProxy.java
dma/CDMAPhone.java
ataconnection/DcTrackerBase.java
sm/GSMPhone.java
ip/SipPhoneBase.java
4dfda5470a2582c0fb543ead6c79ccf598c580e0 16-May-2014 Robert Greenwalt <rgreenwalt@google.com> Add unregisterNetworkFactory

Telephony creates multiple network factories sometimes (Rat changes). Give
it the ability to unregister the prior ones first.

Also, pass a name for identification purposes.

bug: 15003007
Change-Id: I717d63363f25c446f8ecf38d933b1a35d744af6e
ataconnection/DcTracker.java
bce3d2575122929bb27ec8a37d56e96da39a3ca2 30-Apr-2014 Robert Greenwalt <rgreenwalt@google.com> Switching to NetworkAgent API

Change-Id: I7bca6f65ba1c616d821db50b0d24772520c787a7
ataconnection/ApnContext.java
ataconnection/DataConnection.java
ataconnection/DcAsyncChannel.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
faeca7a03229144acfbae4bb363087984025e680 13-May-2014 Derek Tan <derektan@google.com> am 3eb22bb4: Merge "Correct the comment in queryAvailableBandMode." into master-nova

* commit '3eb22bb488517c393e24bf214ef8fe7ddf6263bd':
Correct the comment in queryAvailableBandMode.
1bc71b448a90fefde8c741aa299a0248cd0d1581 13-May-2014 Shishir Agrawal <shishir@google.com> am fb186a5d: Merge "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope." into master-nova

* commit 'fb186a5d95223d060a6fb1f78c4ab043ea8ac879':
Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope.
171f8ab14db1c88b85e495bc6cf603d20132ffa8 13-May-2014 Derek Tan <derektan@google.com> am 81f99786: Merge "Expose sendEnvelope." into master-nova

* commit '81f99786f2d3754f641efa204ac8c289330e3ef1':
Expose sendEnvelope.
96cce86cf08e37e0f09ed5057b1196e26b302743 09-Apr-2014 Robert Greenwalt <rgreenwalt@google.com> Replace LinkCapabilities with NetworkCapabilities

bug:13885501
Change-Id: I4ebc184c29278c385364ab0993c8783dfd9086fb
efaultPhoneNotifier.java
hone.java
honeBase.java
honeProxy.java
ataconnection/DataConnection.java
ataconnection/DcAsyncChannel.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
0d6db1133927fc51d5d061f61ccb992b6adbd584 07-May-2014 Jason Monk <jmonk@google.com> Merge "Support renaming of ProxyProperties to ProxyInfo"
3eb22bb488517c393e24bf214ef8fe7ddf6263bd 05-May-2014 Derek Tan <derektan@google.com> Merge "Correct the comment in queryAvailableBandMode." into master-nova
9c180aedfc9f0d20525c0128487d3500e6c0a715 02-May-2014 Jason Monk <jmonk@google.com> Support renaming of ProxyProperties to ProxyInfo

Change-Id: I151bb50bfafac46ad375dec4908e0470f2823d8d
ataconnection/DataConnection.java
ataconnection/DcAsyncChannel.java
ataconnection/DcTracker.java
d154a229fc65814c3cf5609f970214dc9e8e4bf1 01-May-2014 Wink Saville <wink@google.com> am 00aa36e5: am 4d0313eb: am d5bc38bc: am 6f699fcf: Merge "Fix order of \'+\' in call forwarding return result in RTL locales"

* commit '00aa36e5e6c28a3ffc0fcfde40742d5759287197':
Fix order of '+' in call forwarding return result in RTL locales
00aa36e5e6c28a3ffc0fcfde40742d5759287197 01-May-2014 Wink Saville <wink@google.com> am 4d0313eb: am d5bc38bc: am 6f699fcf: Merge "Fix order of \'+\' in call forwarding return result in RTL locales"

* commit '4d0313ebb6483116ab37dd72ef796f19d55844c1':
Fix order of '+' in call forwarding return result in RTL locales
4d0313ebb6483116ab37dd72ef796f19d55844c1 01-May-2014 Wink Saville <wink@google.com> am d5bc38bc: am 6f699fcf: Merge "Fix order of \'+\' in call forwarding return result in RTL locales"

* commit 'd5bc38bce34aff0a494d4dfbf275c01fdd49bed1':
Fix order of '+' in call forwarding return result in RTL locales
d5bc38bce34aff0a494d4dfbf275c01fdd49bed1 01-May-2014 Wink Saville <wink@google.com> am 6f699fcf: Merge "Fix order of \'+\' in call forwarding return result in RTL locales"

* commit '6f699fcf414c6e50aa5cf473d32b76c81b666bf6':
Fix order of '+' in call forwarding return result in RTL locales
8697e0eb16fd00420efaf626ba4da3d548de3b59 19-Mar-2013 Magnus Karlsson <magnus3.karlsson@sonymobile.com> Fix order of '+' in call forwarding return result in RTL locales

The '+' is presented at the end of the phone number
instead of in the front.
Phone numbers should be presented left-to-right even
for right-to-left oriented languages (e.g. Hebrew),
hence the '+' should be placed accordingly.

Change-Id: I07d89078de4d81609e08099f93fc929a81ec172b
sm/GsmMmiCode.java
8a3cf2d80c0cdee7360404dd0ac08ca6f9a7e246 30-Apr-2014 Derek Tan <derektan@google.com> Correct the comment in queryAvailableBandMode.

The correction is based on RIL_REQUEST_QUERY_AVAILABLE_BAND_MODE defined
in ril.h and my experiment.

Change-Id: I1610bde07d9345c96c6962d2032130d36c5eecf8
ommandsInterface.java
hone.java
IL.java
est/SimulatedCommands.java
3980fd45c1cf0baac16411a07ec01b42f53435bc 29-Apr-2014 Bill Yi <byi@google.com> Merge commit 'ff1e89fdd2cc535c3ce15f6a5bbc6c90a23bdb18' into HEAD
4f74cb3130b505d733aff633cf91bdc43aa6cd0b 28-Apr-2014 Evan Charlton <evanc@google.com> Fix the build

Update method signature, as specified by I3623b0c49011d6db5e0060999d17963a7e58f775

Change-Id: Iafa1c8fdcaf042a57d3b59f6b6c412333d913e1f
hirdpartyphone/ThirdPartyPhone.java
1dd7a8168f4f1efefa1fb71f92a6798c8cd6a3db 26-Apr-2014 Wink Saville <wink@google.com> am ebdd8177: am 63114dbb: am a45ddc61: Merge "Do not set audioGroup ECHO SUPRESSION mode"

* commit 'ebdd8177293ea104b95c0450eb7d763132a6fd7e':
Do not set audioGroup ECHO SUPRESSION mode
114889e8a9294ec3b4a1f52bac9907f6a0b12984 26-Apr-2014 Wink Saville <wink@google.com> am 9a33dbff: am 044a35cf: am d1ae7c94: Merge "Handle ICC IO error"

* commit '9a33dbffcbdd0cc14b893edec1b385ecdbf07c46':
Handle ICC IO error
ebdd8177293ea104b95c0450eb7d763132a6fd7e 26-Apr-2014 Wink Saville <wink@google.com> am 63114dbb: am a45ddc61: Merge "Do not set audioGroup ECHO SUPRESSION mode"

* commit '63114dbbda418bd5ea37006cb9e3848373f60471':
Do not set audioGroup ECHO SUPRESSION mode
9a33dbffcbdd0cc14b893edec1b385ecdbf07c46 26-Apr-2014 Wink Saville <wink@google.com> am 044a35cf: am d1ae7c94: Merge "Handle ICC IO error"

* commit '044a35cfda5f45980ed188527119c6fdc423a667':
Handle ICC IO error
63114dbbda418bd5ea37006cb9e3848373f60471 26-Apr-2014 Wink Saville <wink@google.com> am a45ddc61: Merge "Do not set audioGroup ECHO SUPRESSION mode"

* commit 'a45ddc61054ea75f50c120b254854fa8135096af':
Do not set audioGroup ECHO SUPRESSION mode
044a35cfda5f45980ed188527119c6fdc423a667 26-Apr-2014 Wink Saville <wink@google.com> am d1ae7c94: Merge "Handle ICC IO error"

* commit 'd1ae7c941a4ea5f45aeca4171d75c1283a78039d':
Handle ICC IO error
a45ddc61054ea75f50c120b254854fa8135096af 26-Apr-2014 Wink Saville <wink@google.com> Merge "Do not set audioGroup ECHO SUPRESSION mode"
d1ae7c941a4ea5f45aeca4171d75c1283a78039d 26-Apr-2014 Wink Saville <wink@google.com> Merge "Handle ICC IO error"
49ab6d343c16beac4a491f096e5e1ff24e10bd5d 26-Apr-2014 Jake Hamby <jhamby@google.com> am 8baae705: am fa2c06ea: am e005c3c4: Merge "Telephony: Add \'ServiceCategory\' to SMS finger print"

* commit '8baae705c72525409ab5dd75b553195036fc3e38':
Telephony: Add 'ServiceCategory' to SMS finger print
8baae705c72525409ab5dd75b553195036fc3e38 26-Apr-2014 Jake Hamby <jhamby@google.com> am fa2c06ea: am e005c3c4: Merge "Telephony: Add \'ServiceCategory\' to SMS finger print"

* commit 'fa2c06eae1066b898f0dde8a9d3eb0b81eaca508':
Telephony: Add 'ServiceCategory' to SMS finger print
fa2c06eae1066b898f0dde8a9d3eb0b81eaca508 26-Apr-2014 Jake Hamby <jhamby@google.com> am e005c3c4: Merge "Telephony: Add \'ServiceCategory\' to SMS finger print"

* commit 'e005c3c44109c9b4a8d25f05e8b7133d5ef55ead':
Telephony: Add 'ServiceCategory' to SMS finger print
e005c3c44109c9b4a8d25f05e8b7133d5ef55ead 26-Apr-2014 Jake Hamby <jhamby@google.com> Merge "Telephony: Add 'ServiceCategory' to SMS finger print"
184ffb58812108624ea0be2732cdae511b99d09d 11-Jun-2013 Vidyakumar Athota <vathota@codeaurora.org> Do not set audioGroup ECHO SUPRESSION mode

when speaker enable, do not set AudioGroup EC mode
if EC already supported in hardware.

Change-Id: I3623b0c49011d6db5e0060999d17963a7e58f775
allManager.java
hone.java
honeBase.java
honeProxy.java
ip/SipPhone.java
984ff37a977c97789736f6d498f3589c74cf6b9a 24-Apr-2014 Wink Saville <wink@google.com> am 60cd6fd3: am a0883b4b: am 373b373b: Merge "Telephony:Prevent duplicate auto mode request on EF_CSP read"

* commit '60cd6fd33483ec58ce0bf27e74408a6c9cb0cba8':
Telephony:Prevent duplicate auto mode request on EF_CSP read
60cd6fd33483ec58ce0bf27e74408a6c9cb0cba8 24-Apr-2014 Wink Saville <wink@google.com> am a0883b4b: am 373b373b: Merge "Telephony:Prevent duplicate auto mode request on EF_CSP read"

* commit 'a0883b4bbfc003f085d2ab9ae4ba74f9a220753b':
Telephony:Prevent duplicate auto mode request on EF_CSP read
a0883b4bbfc003f085d2ab9ae4ba74f9a220753b 24-Apr-2014 Wink Saville <wink@google.com> am 373b373b: Merge "Telephony:Prevent duplicate auto mode request on EF_CSP read"

* commit '373b373bdeb45c774780dc0ed1fa5046e6fd4547':
Telephony:Prevent duplicate auto mode request on EF_CSP read
e16ec244df35cec3ce69b513ee48e0906edf1999 06-Feb-2013 Sandeep Kunta <skunta@codeaurora.org> Handle ICC IO error

Following changes have been made as part of this:
-> At present in Android all ICC Card states other than ICC
PRESENT are treated as ICC ABSENT. Adding functionality
to handle ICC IO error card state.
->IccCardProxy broadcasts card error intent when application index
received from UIM is invalid(i.e.mUiccAplication is null) during
initialization of card for fraction of time. As a result of which
"Invalid Card" is displayed on UI momentarily.

To fix this, When app index received from UIM is invalid broadcast
"NOT_READY" intent.

Change-Id: I229bd80cb5e487f4345bef9fb7fee60850f085d9
Bug: 10643652
icc/IccCardProxy.java
2bb44b616cb36b981dc5ee781d2b2580af3a05e6 18-Nov-2011 Uma Maheswari Ramalingam <umam@codeaurora.org> Telephony:Prevent duplicate auto mode request on EF_CSP read

Prevent duplicate auto network selection mode request
if triggered internally by Android due to
PLMN disabled in EF_CSP SIM record.
Allow mode change request if triggered by user.

Change-Id: I9f6828e59abada64fab66d6ff747bf83a3ec4d6c
sm/GSMPhone.java
b58d0ca6afbdd0bae73321441b0461d7914fe1de 16-Apr-2014 Wink Saville <wink@google.com> am 76edd9b9: am 94b4d47b: am 5706eba8: Merge "Allow tablets to send SMS if enabled in device overlays (2/2)"

* commit '76edd9b9f6d22c4a85c56c0f17ff790248c6e7a0':
Allow tablets to send SMS if enabled in device overlays (2/2)
76edd9b9f6d22c4a85c56c0f17ff790248c6e7a0 16-Apr-2014 Wink Saville <wink@google.com> am 94b4d47b: am 5706eba8: Merge "Allow tablets to send SMS if enabled in device overlays (2/2)"

* commit '94b4d47b81dcd2a0340ea42699ed022882612cb5':
Allow tablets to send SMS if enabled in device overlays (2/2)
94b4d47b81dcd2a0340ea42699ed022882612cb5 16-Apr-2014 Wink Saville <wink@google.com> am 5706eba8: Merge "Allow tablets to send SMS if enabled in device overlays (2/2)"

* commit '5706eba807efc5ff3ad6c9b6e27dd962a00dfbe9':
Allow tablets to send SMS if enabled in device overlays (2/2)
5706eba807efc5ff3ad6c9b6e27dd962a00dfbe9 16-Apr-2014 Wink Saville <wink@google.com> Merge "Allow tablets to send SMS if enabled in device overlays (2/2)"
3339fbe8e3500bcee2593e5a5d510ce648c646ce 16-Apr-2014 Wink Saville <wink@google.com> am a0bce270: Merge "Add notifyDataConnectionRealTimeInfo."

* commit 'a0bce270a3e9342e7a4945dd88b0f577f1edc431':
Add notifyDataConnectionRealTimeInfo.
a0bce270a3e9342e7a4945dd88b0f577f1edc431 16-Apr-2014 Wink Saville <wink@google.com> Merge "Add notifyDataConnectionRealTimeInfo."
8758315661d65c14d0e10d354a14f80ec1f65db7 16-Apr-2014 Wink Saville <wink@google.com> Add notifyDataConnectionRealTimeInfo.

Change-Id: Iadcbf9765af57c125bcdf74e3fc652ed6c8f7d42
efaultPhoneNotifier.java
honeBase.java
honeNotifier.java
ataconnection/DcController.java
28ed54e90e23d38ada8cf1ca33aae28e6369285c 16-Apr-2014 Shishir Agrawal <shishir@google.com> am 91ab02f8: Merge "Reset network selection mode to "automatic" for CDMA phones."

* commit '91ab02f8b21c93920e23d9ff7583f35edbcad04a':
Reset network selection mode to "automatic" for CDMA phones.
91ab02f8b21c93920e23d9ff7583f35edbcad04a 16-Apr-2014 Shishir Agrawal <shishir@google.com> Merge "Reset network selection mode to "automatic" for CDMA phones."
f61aaae6608243be4e0da97a56ff9fed488cb173 07-Apr-2014 Shishir Agrawal <shishir@google.com> Reset network selection mode to "automatic" for CDMA phones.

If a phone switches from a GSM phone to a CDMA phone, the network selection
mode is not changed. Given that CDMA phones do not allow a "manual" network
selection mode, this causes issues. This CL set the mode to "automatic"
on every CDMA NV ready and RUIM ready events.

Change-Id: I0166ecfe2abecf26270ae5330ae32af5b09ca57e
honeBase.java
dma/CDMALTEPhone.java
dma/CDMAPhone.java
dma/CdmaServiceStateTracker.java
sm/GSMPhone.java
e5313fa11f80780b0ff2a867521066abd6bf02b7 11-Apr-2014 Wink Saville <wink@google.com> am 5e2f0fb1: am 0764b3df: am b0b5c014: Merge "Telephony: Display of Operator name."

* commit '5e2f0fb1ffa6d207b35b5669e6880df728868b0e':
Telephony: Display of Operator name.
5e2f0fb1ffa6d207b35b5669e6880df728868b0e 11-Apr-2014 Wink Saville <wink@google.com> am 0764b3df: am b0b5c014: Merge "Telephony: Display of Operator name."

* commit '0764b3df0fdd465c260fc2180b0243194e7b1f31':
Telephony: Display of Operator name.
0764b3df0fdd465c260fc2180b0243194e7b1f31 11-Apr-2014 Wink Saville <wink@google.com> am b0b5c014: Merge "Telephony: Display of Operator name."

* commit 'b0b5c014448c55ff953f2a09e5d665ef220bdeb3':
Telephony: Display of Operator name.
b0b5c014448c55ff953f2a09e5d665ef220bdeb3 11-Apr-2014 Wink Saville <wink@google.com> Merge "Telephony: Display of Operator name."
0ba81c7b99e01e66275097d6a8eea30730394e56 08-Apr-2014 Wink Saville <wink@google.com> am bfd756ca: am 4c9e1a09: am 450669b5: Merge "Query GET_SIM_STATUS when radio state is OFF"

* commit 'bfd756ca839fb2a58d510e84a4a920f42fe87421':
Query GET_SIM_STATUS when radio state is OFF
bfd756ca839fb2a58d510e84a4a920f42fe87421 08-Apr-2014 Wink Saville <wink@google.com> am 4c9e1a09: am 450669b5: Merge "Query GET_SIM_STATUS when radio state is OFF"

* commit '4c9e1a0925b088cc92c5e8d6bdffa683fe646922':
Query GET_SIM_STATUS when radio state is OFF
4c9e1a0925b088cc92c5e8d6bdffa683fe646922 08-Apr-2014 Wink Saville <wink@google.com> am 450669b5: Merge "Query GET_SIM_STATUS when radio state is OFF"

* commit '450669b53d22c958f16caba084d6df2c63f82db8':
Query GET_SIM_STATUS when radio state is OFF
450669b53d22c958f16caba084d6df2c63f82db8 08-Apr-2014 Wink Saville <wink@google.com> Merge "Query GET_SIM_STATUS when radio state is OFF"
5dd225521e128cf6a21560cd5c8ba63f8e8ff21b 08-Apr-2014 Wink Saville <wink@google.com> am 05c6b46b: am 27f0cce0: am 022dc626: Merge "Set RESULT tag properly when sending TR"

* commit '05c6b46b174cf722c75a71d889a252a91da2bd5d':
Set RESULT tag properly when sending TR
05c6b46b174cf722c75a71d889a252a91da2bd5d 08-Apr-2014 Wink Saville <wink@google.com> am 27f0cce0: am 022dc626: Merge "Set RESULT tag properly when sending TR"

* commit '27f0cce09e1fc58a857e2cab96d361ea703c47d0':
Set RESULT tag properly when sending TR
27f0cce09e1fc58a857e2cab96d361ea703c47d0 08-Apr-2014 Wink Saville <wink@google.com> am 022dc626: Merge "Set RESULT tag properly when sending TR"

* commit '022dc626998aad5a6c71a80d3b3a23e23c4efe33':
Set RESULT tag properly when sending TR
022dc626998aad5a6c71a80d3b3a23e23c4efe33 08-Apr-2014 Wink Saville <wink@google.com> Merge "Set RESULT tag properly when sending TR"
12b97c475df734439d9904f964b2daf5a9206d5c 03-Apr-2014 Derek Tan <derektan@google.com> Merge "[DO NOT MERGE] Set RUIM as the default CDMA subscription source in Nova." into master-nova
58d16730a798a93e8665a63ec0776b01b1e62720 03-Apr-2014 Jake Hamby <jhamby@google.com> am f93def87: Do not use the CSIM IMSI for mobile operator MNC.

* commit 'f93def879c5225379e1542eedf50bfd6aca17779':
Do not use the CSIM IMSI for mobile operator MNC.
f93def879c5225379e1542eedf50bfd6aca17779 02-Apr-2014 Jake Hamby <jhamby@google.com> Do not use the CSIM IMSI for mobile operator MNC.

The IMSI on the CSIM application, if present, does not contain
the MNC. We can use it for country detection but not for
operator detection, so don't set the SIM operator based on it.

Bug: 13661632
Change-Id: I49957eba87aa323d7e5894026de6a1e42e47f812
icc/RuimRecords.java
60e3a52dad667a094af0c269176ee30da739ee84 06-Feb-2013 Sandeep Gutta <sangutta@codeaurora.org> Telephony: Display of Operator name.

Operator name is displaying in junk characters on CDMA network
due to wrong encoding scheme.Correct the same.

Change-Id: I4322126acf3bc900b47964f3967730151b8461b7
icc/RuimRecords.java
7c4a503ea7afa528f3750fd672a3fef5b2c7656d 28-Mar-2014 Evan Charlton <evanc@google.com> Fix the build

DisconnectCause is gone; welcome DisconnectCause!

Change-Id: I26da1b036aa5f590823a451814d884a100a69b82
hirdpartyphone/ThirdPartyConnection.java
9cb14a4e928a8255e30a92814f3309ee6557d6fa 28-Mar-2014 Anders Kristensen <andersk@google.com> am 397e60f6: am 76276c33: am 53f70140: Merge "Remove duplicate call disconnect codes."

* commit '397e60f6ab85b90ea6021bd25695e82d06a11ad0':
Remove duplicate call disconnect codes.
397e60f6ab85b90ea6021bd25695e82d06a11ad0 28-Mar-2014 Anders Kristensen <andersk@google.com> am 76276c33: am 53f70140: Merge "Remove duplicate call disconnect codes."

* commit '76276c33b9ab8592f2eb666e7927d7b031c76feb':
Remove duplicate call disconnect codes.
76276c33b9ab8592f2eb666e7927d7b031c76feb 28-Mar-2014 Anders Kristensen <andersk@google.com> am 53f70140: Merge "Remove duplicate call disconnect codes."

* commit '53f701402f24da366c69d749a020269b77e6a04e':
Remove duplicate call disconnect codes.
53f701402f24da366c69d749a020269b77e6a04e 28-Mar-2014 Anders Kristensen <andersk@google.com> Merge "Remove duplicate call disconnect codes."
b7b7a62112b79571adf74372c5f5366fd62d0031 27-Feb-2014 Anders Kristensen <andersk@google.com> Remove duplicate call disconnect codes.

The Android code base defines call disconnect codes in three places:
- android.telephony.DisconnectCause
- android.internal.telephony.Connection.DisconnectCause
- com.android.services.telephony.common.Call.DisconnectCause

This CL consolidates the code to use the integer codes from
android.telephony.DisconnectCause everywhere.

Change-Id: I84a3fd5182a51d07fc7d81076e4b2c15ff26c61c
onnection.java
efaultPhoneNotifier.java
honeNotifier.java
dma/CdmaCallTracker.java
dma/CdmaConnection.java
sm/GsmCallTracker.java
sm/GsmConnection.java
ip/SipConnectionBase.java
ip/SipPhone.java
bc480a2c69bbf867e53d1dc956367959d5dd4a70 26-Mar-2014 Wink Saville <wink@google.com> am 8b04bc31: am 2fe94539: am d6381a0b: Merge "FDN contacts not available after switching lines on twin SIM"

* commit '8b04bc3150674ab274f053e07b9fdd36ea75ec90':
FDN contacts not available after switching lines on twin SIM
8b04bc3150674ab274f053e07b9fdd36ea75ec90 26-Mar-2014 Wink Saville <wink@google.com> am 2fe94539: am d6381a0b: Merge "FDN contacts not available after switching lines on twin SIM"

* commit '2fe945394877c98706b4d56bcdc3dcde1eaccce8':
FDN contacts not available after switching lines on twin SIM
2fe945394877c98706b4d56bcdc3dcde1eaccce8 26-Mar-2014 Wink Saville <wink@google.com> am d6381a0b: Merge "FDN contacts not available after switching lines on twin SIM"

* commit 'd6381a0b69dbb76cbdf518199f4b683af01b1d96':
FDN contacts not available after switching lines on twin SIM
67aacea4e6b0199579a71b3a6a2f5d6778b8a002 27-Aug-2012 Kevin Li <kevin4.li@sonyericsson.com> FDN contacts not available after switching lines on twin SIM

After the profile changes without rebooting the UE, the FDN is
refreshed, but this is not handled.

Change-Id: I06bb138b1ab8c274ad8b46a38634b5f53377fa66
icc/SIMRecords.java
icc/UiccCardApplication.java
2242ed6f9e70c656978c98ef54d2cb974feee346 19-Mar-2014 Wink Saville <wink@google.com> am 6412b1f1: am e03d3718: am d5adcb04: am c187f0e9: Handle provisioning APN by turning off/on data.

* commit '6412b1f1b8233709cb82ed88beb3a15225c41a4f':
Handle provisioning APN by turning off/on data.
6412b1f1b8233709cb82ed88beb3a15225c41a4f 19-Mar-2014 Wink Saville <wink@google.com> am e03d3718: am d5adcb04: am c187f0e9: Handle provisioning APN by turning off/on data.

* commit 'e03d37181d0e1846e259813d8c7ddeeb33d4d1df':
Handle provisioning APN by turning off/on data.
e03d37181d0e1846e259813d8c7ddeeb33d4d1df 19-Mar-2014 Wink Saville <wink@google.com> am d5adcb04: am c187f0e9: Handle provisioning APN by turning off/on data.

* commit 'd5adcb0455a2253b4e62d72bd8d997081013b266':
Handle provisioning APN by turning off/on data.
d5adcb0455a2253b4e62d72bd8d997081013b266 19-Mar-2014 Wink Saville <wink@google.com> am c187f0e9: Handle provisioning APN by turning off/on data.

* commit 'c187f0e9bfb897405d6c41f669fc2aadacb0ee1e':
Handle provisioning APN by turning off/on data.
ff1e89fdd2cc535c3ce15f6a5bbc6c90a23bdb18 19-Mar-2014 Wink Saville <wink@google.com> am c187f0e9: Handle provisioning APN by turning off/on data.

* commit 'c187f0e9bfb897405d6c41f669fc2aadacb0ee1e':
Handle provisioning APN by turning off/on data.
fb186a5d95223d060a6fb1f78c4ab043ea8ac879 18-Mar-2014 Shishir Agrawal <shishir@google.com> Merge "Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope." into master-nova
5b2ac9494f93e2b462ee08fa8560b697cd190c50 14-Mar-2014 Shishir Agrawal <shishir@google.com> Modify TelephonyManager to expose sendEnvelopeWithStatus instead of sendEnvelope.

The RIL sendEnvelope command does not return the response from the SIM while
the sendEnvelopeWithStatus does. Since the response is required for certain
envelope commands, its better to expose sendEnvelopeWithStatus.

Change-Id: I209bfc59e396bb6f91345d6f99c51cfa35f2d650
icc/UiccCard.java
c187f0e9bfb897405d6c41f669fc2aadacb0ee1e 13-Mar-2014 Wink Saville <wink@google.com> Handle provisioning APN by turning off/on data.

This is a start and two tests succeed:

Tested expired AT&T SIM and waiting 15min for alarm to fire.
Tested a provisioned Verizon SIM and works normally.

I've NOT tested AT&T where I've properly completed the provisioning.
I've NOT tested T-Mobile SIM either provisioned or not-provisioned.
I've NOT tested provisioning over WiFi.
I've NOT tested that WiFi <-> Mobile works
I've NOT tested voice calls, SMS, MMS
...

The current bug is below, but it is poorly named either it should be
renamed or a new bug created.

Bug: 13190133
Change-Id: I0a09f642614cd27a8655e9dae764b8999ce485b8
ataconnection/DcTrackerBase.java
451b980c5ce096cb07f418b128810583ec360fa2 12-Mar-2014 Robert Greenwalt <rgreenwalt@google.com> am e175c545: am d47b57ab: am f810d58e: am b0b637db: Switch from SIM to carrier info for wifi country

* commit 'e175c54564f4668a7c7cad8a94fa30cf862da30a':
Switch from SIM to carrier info for wifi country
e175c54564f4668a7c7cad8a94fa30cf862da30a 12-Mar-2014 Robert Greenwalt <rgreenwalt@google.com> am d47b57ab: am f810d58e: am b0b637db: Switch from SIM to carrier info for wifi country

* commit 'd47b57ab12007d107d04eef324094972a12de735':
Switch from SIM to carrier info for wifi country
82d87aeb1a7694d6ba782fb80bb2ede4f242993a 21-Nov-2013 Sudheer Reddy Yampalla <syampa@codeaurora.org> Telephony: Add + for international number for MT SMS

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

Bug: 10951615
Bug: 11599528
Change-Id: I0000b0685181f17ba6b5b0eaaba60a77971e7908
dma/SmsMessage.java
d47b57ab12007d107d04eef324094972a12de735 11-Mar-2014 Robert Greenwalt <rgreenwalt@google.com> am f810d58e: am b0b637db: Switch from SIM to carrier info for wifi country

* commit 'f810d58e68c195c8559b551b5887c674531b8927':
Switch from SIM to carrier info for wifi country
f810d58e68c195c8559b551b5887c674531b8927 11-Mar-2014 Robert Greenwalt <rgreenwalt@google.com> am b0b637db: Switch from SIM to carrier info for wifi country

* commit 'b0b637dbf2a67c0e7eee917c0809f1cc54983986':
Switch from SIM to carrier info for wifi country
da105a77bd9a5b8943cc85f386d511070e9804af 10-Mar-2014 Robert Greenwalt <rgreenwalt@google.com> am b0b637db: Switch from SIM to carrier info for wifi country

* commit 'b0b637dbf2a67c0e7eee917c0809f1cc54983986':
Switch from SIM to carrier info for wifi country
b0b637dbf2a67c0e7eee917c0809f1cc54983986 06-Mar-2014 Robert Greenwalt <rgreenwalt@google.com> Switch from SIM to carrier info for wifi country

Now will also inform when no known country too.

bug:11062898
Change-Id: I4a938119c1c06898b39b3bcc6124031d2f66dd71
ccTable.java
erviceStateTracker.java
dma/CDMAPhone.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
sm/GsmServiceStateTracker.java
icc/RuimRecords.java
icc/SIMRecords.java
3ae7a034cf883ba2dbd58d325ae93549a991db33 08-Mar-2014 Robert Greenwalt <rgreenwalt@google.com> am fb36cdca: Fix isSameNamedOperatorConsideredRoaming [DO NOT MERGE]

* commit 'fb36cdca91cbbfd12ca680ce0e1a2b33f7e85ab6':
Fix isSameNamedOperatorConsideredRoaming [DO NOT MERGE]
fb36cdca91cbbfd12ca680ce0e1a2b33f7e85ab6 20-Dec-2013 Robert Greenwalt <rgreenwalt@google.com> Fix isSameNamedOperatorConsideredRoaming [DO NOT MERGE]

Does a loop checking data based on your current network,
but exits out based on the result of the first check rather
than doing the rest of the checks.

Bug: 11408729
Bug: 12121959
Change-Id: I37f98682702ec19467f374d64a23e15fb87e9697
sm/GsmServiceStateTracker.java
d6ea8df8468c93e970e07d86092434b2126a3e4a 07-Mar-2014 Wink Saville <wink@google.com> am 4a644652: Merge "Telephony: Handling of supplimentary services in Call"

* commit '4a6446528c86eb723882d9eabd88bd39e7249dbd':
Telephony: Handling of supplimentary services in Call
f1d345d4d5eed816193e7492c44cb5e4209fba8b 07-Mar-2014 Wink Saville <wink@google.com> am a29f56db: Merge "Handle DATA_CALL_LIST in DCC and update dataActivity properly"

* commit 'a29f56db119b93cc5f66c1cf2091a70ef886b30c':
Handle DATA_CALL_LIST in DCC and update dataActivity properly
c618b1363e298f000255e4d0acbbb515b8908fa5 07-Mar-2014 Wink Saville <wink@google.com> am 51a65426: Merge "Telephony API extension v2"

* commit '51a65426edfa3e5fdc36243aba940789001b5ad4':
Telephony API extension v2
9c47fd4df42538e87930f26b840ff197aafeb892 06-Mar-2014 Derek Tan <derektan@google.com> [DO NOT MERGE] Set RUIM as the default CDMA subscription source in Nova.

Change-Id: I6a1a042b193026d453a1db587c09007ca94c28f6
hone.java
dma/CdmaSubscriptionSourceManager.java
65ca59250bff7df8e6952e921891f3ae43d3946c 24-Feb-2014 Evan Charlton <evanc@google.com> Fix the build

setRadioMode was removed; remove it here, too.

Change-Id: I783bb0e0702cb23066f0d6e6b12f1c6918d855d6
hirdpartyphone/ThirdPartyCommandInterface.java
0f03cede425eba2b6bb1f664559c36cbe9c59fa0 24-Feb-2014 Jake Hamby <jhamby@google.com> am d17387e8: Merge "Remove unneeded new RIL command."

* commit 'd17387e87e60773f98981e633fd9937e27444b16':
Remove unneeded new RIL command.
d17387e87e60773f98981e633fd9937e27444b16 24-Feb-2014 Jake Hamby <jhamby@google.com> Merge "Remove unneeded new RIL command."
eaf76d3240ca1289ef64a61d37dce6ec1103dc88 21-Feb-2014 Shishir Agrawal <shishir@google.com> resolved conflicts for merge of b25da36f to master-nova

Change-Id: I82ec8f0c6ac1940cbd40145af8c2c2fec5bc089a
b25da36f791607b5fc9a68ae01dd8c5ea1d5652c 19-Feb-2014 Shishir Agrawal <shishir@google.com> Setting the Preferred Network Type correctly on SIM restart.

Currently the GsmServiceStateTracker sets the preferred network type to the
last set network type which can cause issues during a SIM swap/reset if the
network type changes. The CdmaServiceStateTracker does not set this value at
all.

This change modifies this behavior to set the preferred network type in the
same manner it is set when a phone reboots.

Change-Id: I88d61a5d545bdbaa4e4400f5f9e4af8f99dc5d2e
aseCommands.java
ommandsInterface.java
honeFactory.java
IL.java
dma/CdmaServiceStateTracker.java
sm/GsmServiceStateTracker.java
91c39249adddc058307c5fa54cd13215c5f21393 19-Feb-2014 Dan Sandler <dsandler@android.com> am ada922d0: Merge "Make GSM restrictions notifications public."

* commit 'ada922d0960604f74f4bdca6ae11a1f65f3c13cd':
Make GSM restrictions notifications public.
ada922d0960604f74f4bdca6ae11a1f65f3c13cd 19-Feb-2014 Dan Sandler <dsandler@android.com> Merge "Make GSM restrictions notifications public."
f4016c89cdb71c75b63b73a9f6d5b84681307142 06-Feb-2014 Jake Hamby <jhamby@google.com> Remove unneeded new RIL command.

Remove the recently added RIL_REQUEST_SET_RADIO_MODE command and update
the definition of the RIL_REQUEST_NV_RESET_CONFIG parameter.
Also, space out the NV item enum values so we can add new items per category.

Bug: 12864208
Change-Id: I1201c92198a8cd7e169efe7055b58259d975309b
ommandsInterface.java
hone.java
honeBase.java
honeProxy.java
IL.java
adioNVItems.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
aeeed2f8389c6b8d97aafeb5b60d7f52a7c45823 18-Feb-2014 Wink Saville <wink@google.com> am 720e10fe: am e0eab9dc: am 4a644652: Merge "Telephony: Handling of supplimentary services in Call"

* commit '720e10fe0e1725abb193e488eef525ef3860dba7':
Telephony: Handling of supplimentary services in Call
720e10fe0e1725abb193e488eef525ef3860dba7 18-Feb-2014 Wink Saville <wink@google.com> am e0eab9dc: am 4a644652: Merge "Telephony: Handling of supplimentary services in Call"

* commit 'e0eab9dceacb664229febcc1a8ded4537196383c':
Telephony: Handling of supplimentary services in Call
e0eab9dceacb664229febcc1a8ded4537196383c 18-Feb-2014 Wink Saville <wink@google.com> am 4a644652: Merge "Telephony: Handling of supplimentary services in Call"

* commit '4a6446528c86eb723882d9eabd88bd39e7249dbd':
Telephony: Handling of supplimentary services in Call
4a6446528c86eb723882d9eabd88bd39e7249dbd 18-Feb-2014 Wink Saville <wink@google.com> Merge "Telephony: Handling of supplimentary services in Call"
21450cc03c8a926018807b8eb8ba7729cd8cb0ff 14-Feb-2014 Wink Saville <wink@google.com> am 0d1cda09: am 88d4ed90: am a29f56db: Merge "Handle DATA_CALL_LIST in DCC and update dataActivity properly"

* commit '0d1cda09bc261960ad4991b8aa9d795c7f3aa2dd':
Handle DATA_CALL_LIST in DCC and update dataActivity properly
0d1cda09bc261960ad4991b8aa9d795c7f3aa2dd 14-Feb-2014 Wink Saville <wink@google.com> am 88d4ed90: am a29f56db: Merge "Handle DATA_CALL_LIST in DCC and update dataActivity properly"

* commit '88d4ed90c24f77c22755ea4a283b85f0388872ff':
Handle DATA_CALL_LIST in DCC and update dataActivity properly
88d4ed90c24f77c22755ea4a283b85f0388872ff 14-Feb-2014 Wink Saville <wink@google.com> am a29f56db: Merge "Handle DATA_CALL_LIST in DCC and update dataActivity properly"

* commit 'a29f56db119b93cc5f66c1cf2091a70ef886b30c':
Handle DATA_CALL_LIST in DCC and update dataActivity properly
a29f56db119b93cc5f66c1cf2091a70ef886b30c 14-Feb-2014 Wink Saville <wink@google.com> Merge "Handle DATA_CALL_LIST in DCC and update dataActivity properly"
a37ef22ea615888c90badf01416e0ca251dc137e 13-Feb-2014 Evan Charlton <evanc@google.com> Add missing method to ThirdPartyConnection

Connection introduced a new method; ThirdPartyConnection needs to
return _something_ to be compatible.

Change-Id: I6da6f86eb9fc125db208ca3e46ffa300cd819402
hirdpartyphone/ThirdPartyConnection.java
81f99786f2d3754f641efa204ac8c289330e3ef1 13-Feb-2014 Derek Tan <derektan@google.com> Merge "Expose sendEnvelope." into master-nova
9d46c5cd4e3ccde7317763f7ede30af846eb3619 13-Feb-2014 Wink Saville <wink@google.com> am 2a217d8c: am dfbdb663: am 51a65426: Merge "Telephony API extension v2"

* commit '2a217d8ce75d290d63fca765857677912770b833':
Telephony API extension v2
2a217d8ce75d290d63fca765857677912770b833 13-Feb-2014 Wink Saville <wink@google.com> am dfbdb663: am 51a65426: Merge "Telephony API extension v2"

* commit 'dfbdb663843414f4a5734fcb39405179f2f94761':
Telephony API extension v2
dfbdb663843414f4a5734fcb39405179f2f94761 13-Feb-2014 Wink Saville <wink@google.com> am 51a65426: Merge "Telephony API extension v2"

* commit '51a65426edfa3e5fdc36243aba940789001b5ad4':
Telephony API extension v2
fbb008083b0320521c3b8afa17541621f4fdfcc7 05-Feb-2014 Evan Charlton <evanc@google.com> Fix the build [DO NOT MERGE]

Some new CommandInterface methods were added; need to update the
ThirdPartyCommandInterface as well.

Change-Id: I3fce30dab186509ed300719ec947c0a81b95f795
hirdpartyphone/ThirdPartyCommandInterface.java
10f68cfb4088df3d57fde617103782e7ee61eadc 05-Feb-2014 Jake Hamby <jhamby@google.com> am 9e2cb635: Fix sending int params to new RIL calls.

* commit '9e2cb6350e698eaefe393cd652e0d0e264682d6e':
Fix sending int params to new RIL calls.
b3636df144a334af6aaafdeb595b498b25ba76b7 05-Feb-2014 Jake Hamby <jhamby@google.com> am f28ac81e: Add new RIL commands to read/write and reset NV items.

* commit 'f28ac81ec36df38307648d404cff4b2b11f46861':
Add new RIL commands to read/write and reset NV items.
9e2cb6350e698eaefe393cd652e0d0e264682d6e 15-Jan-2014 Jake Hamby <jhamby@google.com> Fix sending int params to new RIL calls.

For the two new RIL calls that send ints, we need to parcel the number
of ints (1) before the actual integer param.

Bug: 12864208
Change-Id: I7ddd0ed9d4278d1a23053cf9dbb05aded98127a0
IL.java
dcca0fbaf728212d182e08fe2239d9d4a5f96516 04-Feb-2014 Derek Tan <derektan@google.com> Expose sendEnvelope.

Change-Id: Ic8226a6302ee6a9ff07f46d68c59007dd3599803
icc/UiccCard.java
40aa66be8a62cdc31a6c12943a181b8751fc4b30 04-Feb-2014 duho.ro <duho.ro@lge.com> am 61ecc19b: am d0658fab: am 7af882af: UICC : delete adn cache after SIM REFRESH RESET

* commit '61ecc19baac8df755fedd81fe9cfab3bd16e897a':
UICC : delete adn cache after SIM REFRESH RESET
f28ac81ec36df38307648d404cff4b2b11f46861 15-Jan-2014 Jake Hamby <jhamby@google.com> Add new RIL commands to read/write and reset NV items.

Add new RIL commands to read/write and reset NV items.
Used by some operators for CDMA band config and PRL update.

Note that this CL depends on a typo fix in the corresponding
frameworks/base change and packages/services/Telephony depends
on a typo fix in this CL.

Bug: 12864208
Change-Id: I3081619a82af698a3197ce23870bf4de248fb3e7
ommandsInterface.java
hone.java
honeBase.java
honeProxy.java
IL.java
adioNVItems.java
dma/CdmaLteServiceStateTracker.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
61ecc19baac8df755fedd81fe9cfab3bd16e897a 31-Jan-2014 duho.ro <duho.ro@lge.com> am d0658fab: am 7af882af: UICC : delete adn cache after SIM REFRESH RESET

* commit 'd0658fab993c397463b60188f24fc6679bb52870':
UICC : delete adn cache after SIM REFRESH RESET
d0658fab993c397463b60188f24fc6679bb52870 31-Jan-2014 duho.ro <duho.ro@lge.com> am 7af882af: UICC : delete adn cache after SIM REFRESH RESET

* commit '7af882af5b1195e03881a61f177adf86e44ab76f':
UICC : delete adn cache after SIM REFRESH RESET
f95c5747663abd9fd84ababa0d69e5f477e11c69 30-Jan-2014 Dan Sandler <dsandler@android.com> Make GSM restrictions notifications public.

These notifications ("Restricted access changed", ...) will
now be readable on the secure keyguard for devices where
this behavior is enabled. See change I1552db36.

Change-Id: I1d4c5e3a032d09fe8ef9aa1db23c1d0abb107755
sm/GsmServiceStateTracker.java
48756d11b2cd42a359aabaa1a496f3e81f603d25 30-Jan-2014 Shishir Agrawal <shishir@google.com> am c6685a68: Do not rely on channel id to determine basic vs logical sim channel commands.

* commit 'c6685a68c55405300c798c087d95a882de54b900':
Do not rely on channel id to determine basic vs logical sim channel commands.
7af882af5b1195e03881a61f177adf86e44ab76f 27-Jan-2014 duho.ro <duho.ro@lge.com> UICC : delete adn cache after SIM REFRESH RESET

delete ADN cache after SIM REFRESH RESET for updating the SIM contacts

Bug: 12751374
Change-Id: I2d707dca3e76271f203b1b86212947e3287a8ed1
icc/SIMRecords.java
ac9c712e8ac929fec2f91f738d85148919ceeebe 29-Dec-2013 Dave Daynard <nardholio@gmail.com> Allow tablets to send SMS if enabled in device overlays (2/2)

Change-Id: I30299d44eb59e89104b9b0b90be10da2a6ce62ac
msApplication.java
b077af12dfe0abfcdd51ce5c9852940b89567e99 24-Aug-2013 Yashdev Singh <yashdevs@codeaurora.org> Handle DATA_CALL_LIST in DCC and update dataActivity properly

Update mActivity in DCC before notifyDataActivity. Without this change,
the notifyDataActivity was notifying incorrect data activity status
due to race condition between DCT when mActivity was updated and
DCC thread where notifyDataActivity was called.

Bug: 11596853
Change-Id: Iffb7bf369062264dd773338c732bc69318d90b73
ataconnection/DcController.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
0742246233c3f03f864d23e52d89e1845d994701 27-May-2013 Antonio Marín Cerezuela <amarin@swissms.ch> Telephony API extension v2

Added the following notifications:

public void notifyPreciseCallState(Phone sender);
public void notifyDisconnectCause(Connection.DisconnectCause cause, int preciseCause);
public void notifyPreciseDataConnectionFailed(Phone sender, String reason, String apnType, String apn, String failCause);

Change-Id: If3b88c679507c529b746046c4a17cf6d9974bd09
onnection.java
efaultPhoneNotifier.java
honeBase.java
honeNotifier.java
dma/CDMAPhone.java
dma/CdmaConnection.java
ataconnection/DcTracker.java
sm/GSMPhone.java
sm/GsmConnection.java
ip/SipConnectionBase.java
c6685a68c55405300c798c087d95a882de54b900 24-Dec-2013 Shishir Agrawal <shishir@google.com> Do not rely on channel id to determine basic vs logical sim channel commands.

For the RIL commands RIL_REQUEST_SIM_TRANSMIT_APDU_CHANNEL, and
RIL_REQUEST_SIM_TRANSMIT_APDU_BASIC we should not assume that the channel id 0
implies a logical channel.

Change-Id: I4cb9f53936dcaed39d9f0097406c69df0ae6e04c
IL.java
0ad446f732a4ab2fd6e4215f5821451054501640 20-Dec-2013 Robert Greenwalt <rgreenwalt@google.com> am 8f907c9c: Fix isSameNamedOperatorConsideredRoaming

* commit '8f907c9c49c5e441b0e9fe050f67be686e1c91f2':
Fix isSameNamedOperatorConsideredRoaming
8f907c9c49c5e441b0e9fe050f67be686e1c91f2 20-Dec-2013 Robert Greenwalt <rgreenwalt@google.com> Fix isSameNamedOperatorConsideredRoaming

Does a loop checking data based on your current network,
but exits out based on the result of the first check rather
than doing the rest of the checks.

bug:11408729
Change-Id: I37f98682702ec19467f374d64a23e15fb87e9697
sm/GsmServiceStateTracker.java
f2b88abdd45304a33dd124a8db528890920c8de7 17-Dec-2013 Shishir Agrawal <shishir@google.com> am 9e301b65: Merge "Adding support for SIM communication from Android over logical channels."

* commit '9e301b6532e041491806aa8ee451953c58a62770':
Adding support for SIM communication from Android over logical channels.
9e301b6532e041491806aa8ee451953c58a62770 17-Dec-2013 Shishir Agrawal <shishir@google.com> Merge "Adding support for SIM communication from Android over logical channels."
62ebc8d55e1a7b0bd81e7d1b3704ae10975a78d7 16-Dec-2013 Wink Saville <wink@google.com> am 6e333253: am 4e73876d: am 89edee05: Merge "Removing the error return value requirement for RIL_REQUEST_SIM_OPEN_CHANNEL."

* commit '6e3332539a14cda347d21cabe4c0220db2256415':
Removing the error return value requirement for RIL_REQUEST_SIM_OPEN_CHANNEL.
4e73876d66792cf5f9e307d3c0d7164a7cae7f2a 16-Dec-2013 Wink Saville <wink@google.com> am 89edee05: Merge "Removing the error return value requirement for RIL_REQUEST_SIM_OPEN_CHANNEL."

* commit '89edee054acf2d7fee73f9c3ba7d5ab75d0b1245':
Removing the error return value requirement for RIL_REQUEST_SIM_OPEN_CHANNEL.
1bedce664e0a12039294e8fd48a83ece0d271ce0 16-Dec-2013 Shishir Agrawal <shishir@google.com> Removing the error return value requirement for RIL_REQUEST_SIM_OPEN_CHANNEL.

On error, the RIL implementation should throw an error and the value returned
does not need to be valid.

Change-Id: Idf81e6f7e2aa5e967e97cef402dfd53150b9b183
ommandsInterface.java
2ff94e2cba3b3709a7d0b1aa6c3f18c2db9329d1 14-Dec-2013 Wink Saville <wink@google.com> am 039c240c: am 19e22266: am de9ca65e: Merge "Change in semantics for RIL_REQUEST_SIM_OPEN_CHANNEL: -1 indicates error."

* commit '039c240c1b6024a43d066418ebf6ee63f9b6d8fa':
Change in semantics for RIL_REQUEST_SIM_OPEN_CHANNEL: -1 indicates error.
19e22266a25a48700baf79e89deb728202384a80 13-Dec-2013 Wink Saville <wink@google.com> am de9ca65e: Merge "Change in semantics for RIL_REQUEST_SIM_OPEN_CHANNEL: -1 indicates error."

* commit 'de9ca65e9ecdef899ea2e3b7f07ba87bfb97a9a4':
Change in semantics for RIL_REQUEST_SIM_OPEN_CHANNEL: -1 indicates error.
bc3d0478e95b40f7ef6fa53e4cd60bbad91f7abe 13-Dec-2013 Shishir Agrawal <shishir@google.com> Change in semantics for RIL_REQUEST_SIM_OPEN_CHANNEL: -1 indicates error.

Changing the RIL_REQUEST_SIM_OPEN_CHANNEL comment to state that the modem
should return -1 on error and not 0.

Change-Id: Ied71c23857659048f080531b79f98eb9db221c96
ommandsInterface.java
300cc7bd83f881abd0653a42f975223e0ab60cd4 28-Oct-2013 Shishir Agrawal <shishir@google.com> Adding support for SIM communication from Android over logical channels.

Expose the following functions through through UiccCard:
- CommandsInterface.iccOpenLogicalChannel
- CommandsInterface.iccCloseLogicalChannel
- CommandsInterface.iccTransmitApduLogicalChannel

Change-Id: I89c08adc6f9738907e3b547c749f3cc61f300710
icc/UiccCard.java
7cbf26584b39faf6c20feb8ad7603ea1bfbcad28 15-Nov-2013 Sailesh Nepal <sail@google.com> DO NOT MERGE ThirdPartyPhone Implement post dial

Change-Id: I7c30566d7e0bd9838d17612ca7b61aec4208854b
hirdpartyphone/ThirdPartyCall.java
hirdpartyphone/ThirdPartyConnection.java
hirdpartyphone/ThirdPartyPhone.java
hirdpartyphone/ThirdPartyPostDialHelper.java
cfde4902ed7caa585de61234be3a07a03a398e71 06-Dec-2013 Jake Hamby <jhamby@google.com> am 7ee5574d: am ed38d9d3: am f39de086: am ddeba83b: Merge "Consider EF-SMS for both gsm and cdma"

* commit '7ee5574d721bb36ffa28c8f09debf0b684d8f157':
Consider EF-SMS for both gsm and cdma
ed38d9d37e67f68d09ad8b32158390a94549eba9 06-Dec-2013 Jake Hamby <jhamby@google.com> am f39de086: am ddeba83b: Merge "Consider EF-SMS for both gsm and cdma"

* commit 'f39de086fddea9e9f6b8c56b04d8dd38a84237db':
Consider EF-SMS for both gsm and cdma
f39de086fddea9e9f6b8c56b04d8dd38a84237db 06-Dec-2013 Jake Hamby <jhamby@google.com> am ddeba83b: Merge "Consider EF-SMS for both gsm and cdma"

* commit 'ddeba83b6c611b3c408df12ae6de8a22a4311047':
Consider EF-SMS for both gsm and cdma
ddeba83b6c611b3c408df12ae6de8a22a4311047 06-Dec-2013 Jake Hamby <jhamby@google.com> Merge "Consider EF-SMS for both gsm and cdma"
ef4e613fc172bb1fcc2152d3b7197bb1eb16417f 05-Dec-2013 Shishir Agrawal <shishir@google.com> Build fix due to changes in RIL interface.

Fixing the build breakage due to change Iee4d950d37a6097493cd945e611c914c40827215 on AOSP.

Change-Id: Iad7d42f0f745fd362e2f0337eb7a8d5b7cf35398
hirdpartyphone/ThirdPartyCommandInterface.java
7330d304407448eceababbe4772253b135674f27 05-Dec-2013 The Android Open Source Project <initial-contribution@android.com> Merge commit 'eb7d144424aae66b25737a8d8791d192c980d86b' into HEAD
f930403a0d325db8bac92049c25a8dfb7ed88880 05-Dec-2013 John Huang <jsh@android.com> am 759f35e3: am dc0a7a65: am 9e6a8351: Merge "RIL changes for supporting generic SIM communication."

* commit '759f35e38841b99f5eb4023abc12b044ad9cb56d':
RIL changes for supporting generic SIM communication.
dc0a7a65c806fd58baa5e189227f1d302d51c0a6 05-Dec-2013 John Huang <jsh@android.com> am 9e6a8351: Merge "RIL changes for supporting generic SIM communication."

* commit '9e6a8351f1ee21e7dd7d30583c7085fcbeb3a863':
RIL changes for supporting generic SIM communication.
4c38e9fdb127dc3e47da5940cd4c514a4d42b306 04-Dec-2013 Jake Hamby <jhamby@google.com> am 57d10b12: am 3818934e: am 023346cf: Fix OOBE crash/DoS after receiving 0-byte WAP push.

* commit '57d10b125dd24d160374155eb3824d47ddb25817':
Fix OOBE crash/DoS after receiving 0-byte WAP push.
3818934e36aa932bb134177858e68446df22869c 04-Dec-2013 Jake Hamby <jhamby@google.com> am 023346cf: Fix OOBE crash/DoS after receiving 0-byte WAP push.

* commit '023346cf9050c146a36eedd14886d0e9a679dc49':
Fix OOBE crash/DoS after receiving 0-byte WAP push.
023346cf9050c146a36eedd14886d0e9a679dc49 03-Dec-2013 Jake Hamby <jhamby@google.com> 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
apPushOverSms.java
40d1d394302d83eb56f66cf08daecc612c97cd28 28-Nov-2013 Shishir Agrawal <shishir@google.com> 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
ommandException.java
ommandsInterface.java
IL.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
543d79cc5e7281675345ba7ddb8baa930f548b50 22-Nov-2013 The Android Open Source Project <initial-contribution@android.com> Merge commit '3ab4c135be3d5d3bf529f63ef932f95526401feb' into HEAD
8e8fdf80a3885872099fc323177267a0665be951 22-Nov-2013 Wink Saville <wink@google.com> am e48f8ae8: am 41789901: am d84e5b87: Merge "Telephony: Add + for international number for MT SMS"

* commit 'e48f8ae8404d373ca3eecc0247ca563bb0f26cd6':
Telephony: Add + for international number for MT SMS
41789901b3111a86f464db4d396e18a249ea7fd5 22-Nov-2013 Wink Saville <wink@google.com> am d84e5b87: Merge "Telephony: Add + for international number for MT SMS"

* commit 'd84e5b87e46374fee5dbccc15cfe9a12208ceb65':
Telephony: Add + for international number for MT SMS
03a6ba71a72e9fdea38dd448e8a80a49efa034d6 21-Nov-2013 Wink Saville <wink@google.com> am b4b6c433: am eb7d1444: am 449cbf85: if provisioning apn conditionally restart the radio.

* commit 'b4b6c433a38346fb6740b98e3970089b8c87f5c9':
if provisioning apn conditionally restart the radio.
d84e5b87e46374fee5dbccc15cfe9a12208ceb65 21-Nov-2013 Wink Saville <wink@google.com> Merge "Telephony: Add + for international number for MT SMS"
190e9453b0f2be4fde4b5ed4144032b98ff36087 21-Nov-2013 Wink Saville <wink@google.com> am 1cddc127: am cb5e0c4b: am a28a290b: Merge "Telephony: unchange SIM info from CDMAPhone when SIM exists" into klp-dev

* commit '1cddc1276346d56c71d0d8afe7ca330064cb0495':
Telephony: unchange SIM info from CDMAPhone when SIM exists
7c1acc7e8b3b7e936d548056d4413e8a1931eccc 21-Nov-2013 David Braun <dabraun@google.com> am 5eaae88f: am f2b98644: am 98003f87: Merge "Do not attempt to configure null preferred activity" into klp-dev

* commit '5eaae88f5ef23ac720921c0028204357ba315255':
Do not attempt to configure null preferred activity
fb6993514d3ff6f0152dda7c8911411db028516b 21-Nov-2013 Robert Greenwalt <rgreenwalt@google.com> am f2e707c8: am 32581b37: am 088822a2: Merge "Use settings DB only when mcc/mnc matches SIM" into klp-dev

* commit 'f2e707c89d1a7248a9451eb058fd9896efac2af8':
Use settings DB only when mcc/mnc matches SIM
eb7d144424aae66b25737a8d8791d192c980d86b 15-Nov-2013 Wink Saville <wink@google.com> am 449cbf85: if provisioning apn conditionally restart the radio.

* commit '449cbf85380bd1d6716b7ab002da1efb9493bb02':
if provisioning apn conditionally restart the radio.
449cbf85380bd1d6716b7ab002da1efb9493bb02 15-Nov-2013 Wink Saville <wink@google.com> if provisioning apn conditionally restart the radio.

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

Bug: 11673637
Change-Id: Ie758a303fd751d204fd6baa60217e88df6376aae
ataconnection/DcTracker.java
dcd243a59c88eee16e58d2b3be88cbef0ebfe71e 15-Nov-2013 Sailesh Nepal <sail@google.com> Merge "ThirdPartyPhone: DTMF & callerDisplayName Impl DO NOT MERGE" into master-nova
cb5e0c4b2542d43872bbdab065190f86027e80d5 14-Nov-2013 Wink Saville <wink@google.com> am a28a290b: Merge "Telephony: unchange SIM info from CDMAPhone when SIM exists" into klp-dev

* commit 'a28a290b5747609a71ccb689ce1937e5787bb3e8':
Telephony: unchange SIM info from CDMAPhone when SIM exists
a28a290b5747609a71ccb689ce1937e5787bb3e8 14-Nov-2013 Wink Saville <wink@google.com> Merge "Telephony: unchange SIM info from CDMAPhone when SIM exists" into klp-dev
f2b98644e79f1abfc63e1d4f496927f19d503cdb 14-Nov-2013 David Braun <dabraun@google.com> am 98003f87: Merge "Do not attempt to configure null preferred activity" into klp-dev

* commit '98003f87d01a98d3fd2a0561d0cfa45912ba2325':
Do not attempt to configure null preferred activity
98003f87d01a98d3fd2a0561d0cfa45912ba2325 14-Nov-2013 David Braun <dabraun@google.com> Merge "Do not attempt to configure null preferred activity" into klp-dev
d8fb3ddda34db44297cf4b0f970b01bf58598960 14-Nov-2013 David Braun <dabraun@google.com> 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
msApplication.java
ce06370fc58f59abda3cb072326e9425da3d755d 13-Nov-2013 Wink Saville <wink@google.com> 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
dma/CDMALTEPhone.java
dma/CDMAPhone.java
32581b37e0d57fd1ba0e138a507b9620e722ec1b 13-Nov-2013 Robert Greenwalt <rgreenwalt@google.com> am 088822a2: Merge "Use settings DB only when mcc/mnc matches SIM" into klp-dev

* commit '088822a20462b9f364c22c88dbba2091000e2f4b':
Use settings DB only when mcc/mnc matches SIM
088822a20462b9f364c22c88dbba2091000e2f4b 13-Nov-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "Use settings DB only when mcc/mnc matches SIM" into klp-dev
c04ccade6ebce9380ec5ebbd4bc99ba2bc774ab0 13-Nov-2013 David Braun <dabraun@google.com> am 353d358d: am bb506aa0: am 4f7d3a53: Merge "Update preferred activity for SMS related SENDTO intents" into klp-dev

* commit '353d358df882f5211aadb30b11545f5d0bd39dcb':
Update preferred activity for SMS related SENDTO intents
bb506aa0380b79a8713891ea1877d9e2e89017f8 13-Nov-2013 David Braun <dabraun@google.com> am 4f7d3a53: Merge "Update preferred activity for SMS related SENDTO intents" into klp-dev

* commit '4f7d3a536463db34dd6613685eb27593596377ef':
Update preferred activity for SMS related SENDTO intents
4f7d3a536463db34dd6613685eb27593596377ef 13-Nov-2013 David Braun <dabraun@google.com> Merge "Update preferred activity for SMS related SENDTO intents" into klp-dev
ff51a1e0381b303e5bb7e4e0a8a6ad7d124437bd 12-Nov-2013 Sungmin Choi <sungmin.choi@lge.com> Use settings DB only when mcc/mnc matches SIM

Bug: 11600521
Change-Id: Iaeb1f279bf454ad0e7b933b8ac97d6384d599b59
ataconnection/DcTrackerBase.java
d2af9a59b3d47b32918a49630dfa160598f53247 13-Nov-2013 Sailesh Nepal <sail@google.com> ThirdPartyPhone: DTMF & callerDisplayName Impl DO NOT MERGE

This is the impl side of the DTMF and callerDisplayName support.

Change-Id: Ib7033e658c4e62f99acf12dd2a4ea357150fb317
hirdpartyphone/ThirdPartyCall.java
hirdpartyphone/ThirdPartyConnection.java
hirdpartyphone/ThirdPartyPhone.java
b0a2ca8940207a68860e94c3d526d86481b2dc99 13-Nov-2013 Robert Greenwalt <rgreenwalt@google.com> am c824c13c: am d4ae7c9a: am 53a0a7fd: Notify all ApnContexts on a conn of Disconnect

* commit 'c824c13c3f01a59cde72af40a026781d1f7b9b19':
Notify all ApnContexts on a conn of Disconnect
d4ae7c9a0862d0b8075573b5910fce40e79feea8 13-Nov-2013 Robert Greenwalt <rgreenwalt@google.com> am 53a0a7fd: Notify all ApnContexts on a conn of Disconnect

* commit '53a0a7fd4954c3fd140e1123fcb0ac65d9e6c6c3':
Notify all ApnContexts on a conn of Disconnect
8a4c72815186db4187587d4fc62125540a0e42a8 12-Nov-2013 David Braun <dabraun@google.com> 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
honeFactory.java
msApplication.java
53a0a7fd4954c3fd140e1123fcb0ac65d9e6c6c3 12-Nov-2013 Robert Greenwalt <rgreenwalt@google.com> 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
ataconnection/DataConnection.java
34678c32b95cfc697a9eb2ded099abe43d969ee7 09-Nov-2013 Wink Saville <wink@google.com> am 4069b13f: am 9e646252: am 1795b863: Fix documenation IMS registration state.

* commit '4069b13fb496dc15e421a9015752b20602dc9515':
Fix documenation IMS registration state.
978019a2de88fdd72a97dd5e807a530d4a133065 09-Nov-2013 Sailesh Nepal <sail@google.com> Merge "Set audio mode for ThirdPartyPhone DO NOT MERGE" into master-nova
9e64625225d9979f8ae842c21de23d55d3f9f8bf 09-Nov-2013 Wink Saville <wink@google.com> am 1795b863: Fix documenation IMS registration state.

* commit '1795b863255a10f7734b4beb1fdfce9012857a26':
Fix documenation IMS registration state.
1795b863255a10f7734b4beb1fdfce9012857a26 09-Nov-2013 Wink Saville <wink@google.com> Fix documenation IMS registration state.

Bug: 11599127
Change-Id: Id0016bca45ea84983c9280f55b0b1ccdcececc03
ommandsInterface.java
4fc7311ffd330545e562907644a80a3ec854a856 09-Nov-2013 Sailesh Nepal <sail@google.com> Set audio mode for ThirdPartyPhone DO NOT MERGE

With this CL we use MODE_IN_COMMUNICATION instead of
MODE_IN_CALL. This matches the behavior of SipPhone.

Using this mode also fixes an issue where echo cancellation wasn't
working.

Change-Id: Ic84c5cbf804bc85e24eddf56e9c95e6e221db3ea
allManager.java
8223a313fc835fe5769279f5f993cf560100fcf4 09-Nov-2013 Wink Saville <wink@google.com> am 486f0026: am 757cbf35: am 38c4118a: Merge "SMS over IMS bug fixes" into klp-dev

* commit '486f0026a388c295ef416f440304e3505dc3edf8':
SMS over IMS bug fixes
53d1d6d26da205c4f3f31c8f56fefb7092e71791 09-Nov-2013 Jake Hamby <jhamby@google.com> am e3f1e569: am 0fed7c48: am c0384e80: Merge "Fix GSMPhone.getServiceState() when mSST is null." into klp-dev

* commit 'e3f1e569757c10c13fabb269831d4c5f5e930a29':
Fix GSMPhone.getServiceState() when mSST is null.
e3f1e569757c10c13fabb269831d4c5f5e930a29 09-Nov-2013 Jake Hamby <jhamby@google.com> am 0fed7c48: am c0384e80: Merge "Fix GSMPhone.getServiceState() when mSST is null." into klp-dev

* commit '0fed7c48321e61315d658691759a39a8415d28bc':
Fix GSMPhone.getServiceState() when mSST is null.
757cbf355745298ee73aa25f77686070d21593d8 09-Nov-2013 Wink Saville <wink@google.com> am 38c4118a: Merge "SMS over IMS bug fixes" into klp-dev

* commit '38c4118a1a5bd8f4075063baa7b93244fa4f0263':
SMS over IMS bug fixes
38c4118a1a5bd8f4075063baa7b93244fa4f0263 09-Nov-2013 Wink Saville <wink@google.com> Merge "SMS over IMS bug fixes" into klp-dev
0fed7c48321e61315d658691759a39a8415d28bc 09-Nov-2013 Jake Hamby <jhamby@google.com> am c0384e80: Merge "Fix GSMPhone.getServiceState() when mSST is null." into klp-dev

* commit 'c0384e80b55813054add7904c78a583a180ffa76':
Fix GSMPhone.getServiceState() when mSST is null.
2ad65b760c52976fe3aa8740934f9cfa108ad4fc 08-Nov-2013 Jake Hamby <jhamby@google.com> 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
sm/GSMPhone.java
ace9a749c5a2a5e07527f728b7331423d16c36cd 30-Oct-2013 Sukanya Rajkhowa <srajkh@codeaurora.org> 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
aseCommands.java
ommandsInterface.java
ccSmsInterfaceManager.java
msSMSDispatcher.java
honeBase.java
IL.java
MSDispatcher.java
dma/CDMALTEPhone.java
dma/CDMAPhone.java
dma/CdmaSMSDispatcher.java
dma/SmsMessage.java
sm/GSMPhone.java
sm/GsmSMSDispatcher.java
sm/SmsMessage.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
1a792b265d929c27246c5b173f2f2694f30dc228 09-Jan-2013 Suresh Koleti <skolet@codeaurora.org> Query GET_SIM_STATUS when radio state is OFF

Boot up target in airplane mode with SIM, not showing any
card status on lock screen because telephony will query
GET_SIM_STATUS only if radio is ON.

Query GET_SIM_STATUS if radio is OFF to show the card
status on lock screen even in airplane mode.

Bug: 11539415
Change-Id: I9978b85798806bf35ab8aac69e528bb3d606959b
icc/UiccController.java
0e4839f120dfe91f93bd164257fe61851530449b 17-Oct-2012 Rakesh Pallerla <rakesh@codeaurora.org> Consider EF-SMS for both gsm and cdma

EF-SMS each record length is 176 for GSM and 255 for CDMA.
Consider proper length depending on phone type to avoid crash.

Spec Ref: TS 51.011 10.5.3 for GSM and C.S0023 3.4.27 for CDMA.

Bug: 9111160

Change-Id: I755ca0fa97745d2f9caa30177209a2efa45df409
ccSmsInterfaceManager.java
icc/IccConstants.java
dc2a2521bc7a7b3e9a0c47f98f8bd34da6b1b1bb 06-Nov-2013 Sailesh Nepal <sail@google.com> Merge "Add new phone type DO NOT MERGE" into master-nova
932572d2f17168e32da02feaab4a7ca284e4ca86 21-Oct-2013 Sailesh Nepal <sail@google.com> Add new phone type DO NOT MERGE

This CL adds a new phone type: PHONE_TYPE_THIRD_PARTY. If a 3rd party
app implements android.intent.action.THIRD_PARTY_CALL_SERVICE then
this phone can connect to it and have it implement all the
functionality.

This should be useful for VOIP apps that need to use the native call
UI.

With this patch things like the call log, mute, speaker phone work.
Things that aren't implemented yet are:
- hold and conferencing
- DTMF
- post dial

I'm currently testing this by patching PhoneFactory and creating an
instance of ThirdPartyPhone as the default phone. I'll send out a
CL later to dynamically choose the phone based on available services.

Change-Id: I40f53da12d4b1ebdb88b7a8b0969789be8fd4b7c
honeFactory.java
hirdpartyphone/ThirdPartyCall.java
hirdpartyphone/ThirdPartyCommandInterface.java
hirdpartyphone/ThirdPartyConnection.java
hirdpartyphone/ThirdPartyPhone.java
1a62dc651eb85eb13b60df4931daa8f2bc1df3ef 06-Nov-2013 Robert Greenwalt <rgreenwalt@google.com> am d9990230: am a500ee7f: Merge "Add single-pdn arbitration." into klp-dev

* commit 'd999023045e8ef75d48ebbafb6d6056d4b12094c':
Add single-pdn arbitration.
d999023045e8ef75d48ebbafb6d6056d4b12094c 06-Nov-2013 Robert Greenwalt <rgreenwalt@google.com> am a500ee7f: Merge "Add single-pdn arbitration." into klp-dev

* commit 'a500ee7fd60949cc1f5646442a95c4c4edc721c4':
Add single-pdn arbitration.
8aeea40d7eb02758170f8296d7b65fc1e87fe6d4 06-Nov-2013 Zhihai Xu <zhihaixu@google.com> am 5c37e0a0: am 64d48220: Merge "problem to send SMS message by bluetooth MAP profile." into klp-dev

* commit '5c37e0a073a89f5eb0a05a75fa0cc81a03497f66':
problem to send SMS message by bluetooth MAP profile.
3c848c0b160907b1d110aafe35038f62c24520ac 06-Nov-2013 Zhihai Xu <zhihaixu@google.com> am 22975471: am 3162ee6d: Merge "add SMS write permission for bluetooth package to support MAP profile." into klp-dev

* commit '229754718393378cbfd64c88e45cce7e0421cbba':
add SMS write permission for bluetooth package to support MAP profile.
5c37e0a073a89f5eb0a05a75fa0cc81a03497f66 06-Nov-2013 Zhihai Xu <zhihaixu@google.com> am 64d48220: Merge "problem to send SMS message by bluetooth MAP profile." into klp-dev

* commit '64d4822073f42857ee378e55d99ce642480fc223':
problem to send SMS message by bluetooth MAP profile.
229754718393378cbfd64c88e45cce7e0421cbba 06-Nov-2013 Zhihai Xu <zhihaixu@google.com> am 3162ee6d: Merge "add SMS write permission for bluetooth package to support MAP profile." into klp-dev

* commit '3162ee6dd59a205ce2f50bacc7793d59d33a5a81':
add SMS write permission for bluetooth package to support MAP profile.
a500ee7fd60949cc1f5646442a95c4c4edc721c4 06-Nov-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "Add single-pdn arbitration." into klp-dev
64d4822073f42857ee378e55d99ce642480fc223 06-Nov-2013 Zhihai Xu <zhihaixu@google.com> Merge "problem to send SMS message by bluetooth MAP profile." into klp-dev
3162ee6dd59a205ce2f50bacc7793d59d33a5a81 06-Nov-2013 Zhihai Xu <zhihaixu@google.com> Merge "add SMS write permission for bluetooth package to support MAP profile." into klp-dev
a344b729fc2ccd7339819167ad00b15812de540f 05-Nov-2013 Wink Saville <wink@google.com> am 5e98fb73: am 69601e44: Merge "Do not display dialog when PUK attempts remaining is 0." into klp-dev

* commit '5e98fb7366ac13e423b7a040c2795cbf306f4c72':
Do not display dialog when PUK attempts remaining is 0.
5e98fb7366ac13e423b7a040c2795cbf306f4c72 05-Nov-2013 Wink Saville <wink@google.com> am 69601e44: Merge "Do not display dialog when PUK attempts remaining is 0." into klp-dev

* commit '69601e4456a458ccad67429cb7462e33d0a9ef13':
Do not display dialog when PUK attempts remaining is 0.
3fad7daba62dcb7aafc4adc7f8cc123726ed5a7c 31-Oct-2013 Robert Greenwalt <rgreenwalt@google.com> 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
hone.java
ataconnection/ApnContext.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
13c54a4e9e72d41c97789f146a47b0f2375d04ea 05-Nov-2013 Jake Hamby <jhamby@google.com> am 8afaf915: am 8409d93c: Use new PhoneNumberUtils method for CDMA MO SMS formatting.

* commit '8afaf915e250524c199c33f49bbbf93cb2e60946':
Use new PhoneNumberUtils method for CDMA MO SMS formatting.
69601e4456a458ccad67429cb7462e33d0a9ef13 05-Nov-2013 Wink Saville <wink@google.com> Merge "Do not display dialog when PUK attempts remaining is 0." into klp-dev
8afaf915e250524c199c33f49bbbf93cb2e60946 05-Nov-2013 Jake Hamby <jhamby@google.com> am 8409d93c: Use new PhoneNumberUtils method for CDMA MO SMS formatting.

* commit '8409d93cf9f3ed23db12f24b4f49063ea416b30b':
Use new PhoneNumberUtils method for CDMA MO SMS formatting.
8409d93cf9f3ed23db12f24b4f49063ea416b30b 05-Nov-2013 Jake Hamby <jhamby@google.com> 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
dma/CdmaServiceCategoryProgramHandler.java
dma/SmsMessage.java
6d3c836bb8991e9cf7ffb322ebabf48c2446126d 04-Nov-2013 Wink Saville <wink@google.com> 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
dma/CdmaMmiCode.java
sm/GsmMmiCode.java
4931e2c19616ab5985f61f343b231efb33692241 01-Nov-2013 Zhihai Xu <zhihaixu@google.com> 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
MSDispatcher.java
msApplication.java
29d54de0fb4b933a396a5c664df6a33016c494cf 31-Oct-2013 Wink Saville <wink@google.com> am 1f1a9d73: am a3cfd73a: Merge "When phone changes update InBoundSmsHandlers and CellBroadcastHandlers." into klp-dev

* commit '1f1a9d7345aff34872b9eff5d473e5446a0f9ca7':
When phone changes update InBoundSmsHandlers and CellBroadcastHandlers.
1f1a9d7345aff34872b9eff5d473e5446a0f9ca7 31-Oct-2013 Wink Saville <wink@google.com> am a3cfd73a: Merge "When phone changes update InBoundSmsHandlers and CellBroadcastHandlers." into klp-dev

* commit 'a3cfd73ab9b464c93624839d2415981a00a44299':
When phone changes update InBoundSmsHandlers and CellBroadcastHandlers.
a3cfd73ab9b464c93624839d2415981a00a44299 31-Oct-2013 Wink Saville <wink@google.com> Merge "When phone changes update InBoundSmsHandlers and CellBroadcastHandlers." into klp-dev
9382b17d503c107b38610b217ba7c93525be206a 30-Oct-2013 Zhihai Xu <zhihaixu@google.com> add SMS write permission for bluetooth package to support MAP profile.

bug:11415002
Change-Id: I177210e4139560b066ae40f100ca09ea35805359
msApplication.java
d2feaf918ab0c1173d4ada182532e48d0c0d3f77 31-Oct-2013 Wink Saville <wink@google.com> 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
ellBroadcastHandler.java
msSMSDispatcher.java
nboundSmsHandler.java
akeLockStateMachine.java
dma/CdmaInboundSmsHandler.java
dma/CdmaServiceCategoryProgramHandler.java
sm/GsmCellBroadcastHandler.java
sm/GsmInboundSmsHandler.java
e9b51188f9a7f3d80d2fa1a50ddb135b4109ffb8 31-Oct-2013 Narayan Kamath <narayan@google.com> am 99de2417: Merge "Delete unused GSMPhone debugging code."

* commit '99de241766ea4bb63fc759e262cbfd42c7ac1f12':
Delete unused GSMPhone debugging code.
67a3ed2a55b65d9dfb0120c5c507e6325d2fa447 24-Oct-2013 Narayan Kamath <narayan@google.com> 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
sm/GSMPhone.java
df5b238a79f9632c1e4658a860f4c04234dbc76c 28-Oct-2013 duho.ro <duho.ro@lge.com> am 8e5be816: am 2a374a4a: Telephony: set default language of Canada as \'en\'

* commit '8e5be816b183c886bae5213060f351061855e5a3':
Telephony: set default language of Canada as 'en'
8e5be816b183c886bae5213060f351061855e5a3 28-Oct-2013 duho.ro <duho.ro@lge.com> am 2a374a4a: Telephony: set default language of Canada as \'en\'

* commit '2a374a4abef88e4cf7c6030ff831e3e0b9f658e3':
Telephony: set default language of Canada as 'en'
2a374a4abef88e4cf7c6030ff831e3e0b9f658e3 26-Oct-2013 duho.ro <duho.ro@lge.com> 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
ccTable.java
29eeb61196e231b27026a27c676004e2d3af08cc 25-Oct-2013 Wink Saville <wink@google.com> am d713fb65: am 3522c54a: Few PIN/PUK fixes

* commit 'd713fb65eab31f985d2aa8c9043349e913b5b478':
Few PIN/PUK fixes
d713fb65eab31f985d2aa8c9043349e913b5b478 25-Oct-2013 Wink Saville <wink@google.com> am 3522c54a: Few PIN/PUK fixes

* commit '3522c54a64f577f2b657a775dae9b4eb2d8003d5':
Few PIN/PUK fixes
3522c54a64f577f2b657a775dae9b4eb2d8003d5 25-Oct-2013 Wink Saville <wink@google.com> 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
ommandsInterface.java
ccCard.java
IL.java
dma/CDMAPhone.java
dma/CdmaMmiCode.java
sm/GSMPhone.java
sm/GsmMmiCode.java
icc/IccCardProxy.java
icc/UiccCardApplication.java
67d6ba34ef5299b98a8d53f19bd499be1ec176ba 24-Oct-2013 Narayan Kamath <narayan@google.com> Bring back deleted constant.

Turns out it's used by vendor/htc/packages/apps/HtcSettings.
This app isn't built by the build server at the mo' but I hit
this when running make checkbuild.

Change-Id: Ie95a48f9dbe97a6a33f6bf2ed535d7c473d44877
sm/GSMPhone.java
9bb18bb9f325269c213eaed8f25ff1f1843093f7 24-Oct-2013 Narayan Kamath <narayan@google.com> Delete unused GSMPhone debugging code

Change-Id: I8f943856093402ede5737b0c114912adcade5cc9
sm/GSMPhone.java
fba23c9bc4a0c716fe9aef67ddfde5b5437af512 23-Oct-2013 Narayan Kamath <narayan@google.com> Work around compiler bug.

A bug in the openjdk compiler results in incorrect bytecode
for the anonymous class defined within the scope of the
constructor. To workaround it, use a named class instead.

This transformation does not incur any additional cost in
terms of code size or memory usage.

bug: 8992787
Change-Id: I444f7983e2df95007705acec91d7f1a348252e27
sm/GSMPhone.java
5246a0945963dcce090ac4fed7e4a7dd0b64268d 23-Oct-2013 Robert Greenwalt <rgreenwalt@google.com> am 404180e4: Fix bug in isOperatorConsideredNonRoaming

* commit '404180e42c280437ddd14018ac948c9901186e73':
Fix bug in isOperatorConsideredNonRoaming
404180e42c280437ddd14018ac948c9901186e73 23-Oct-2013 Robert Greenwalt <rgreenwalt@google.com> Fix bug in isOperatorConsideredNonRoaming

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

bug:11136023
Change-Id: I04883d75f32214def360292c90b2f628c4e60991
sm/GsmServiceStateTracker.java
3718ac19d2a65fe1557b3612f979c254d8448aa3 18-Oct-2013 Robert Greenwalt <rgreenwalt@google.com> am 07a8295c: Merge "Change how we use provisioning url so post works" into klp-dev

* commit '07a8295c39cae39ff2b11100fe750d24abf9ad47':
Change how we use provisioning url so post works
07a8295c39cae39ff2b11100fe750d24abf9ad47 18-Oct-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "Change how we use provisioning url so post works" into klp-dev
c8dc0c8244aac9f3985a53bc94b8ec2e295db430 17-Oct-2013 Robert Greenwalt <rgreenwalt@google.com> 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
ataconnection/DcTracker.java
3ab4c135be3d5d3bf529f63ef932f95526401feb 17-Oct-2013 Wei Huang <weih@google.com> 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
81d2676f9c0d4edc315bb7e1ef2eec65bcd1b518 17-Oct-2013 Wei Huang <weih@google.com> 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
218c5c362e47d943a98813bac9e1eeae6f366434 17-Oct-2013 Wei Huang <weih@google.com> Merge "Do not allow SMS event receivers to abort the broadcast" into klp-dev
49c9c9f29092dfab12e455847e30bb77724064f5 17-Oct-2013 Wei Huang <weih@google.com> Merge "Persist SMS messages sent by other than the default SMS app" into klp-dev
617b112508e6404c281db4765fbd8554b5bf8f2f 17-Oct-2013 Jake Hamby <jhamby@google.com> am ffe6e682: Clear CDMA latitude/longitude when location setting is off.

* commit 'ffe6e68213ae3220497188fed814e271b472292a':
Clear CDMA latitude/longitude when location setting is off.
ffe6e68213ae3220497188fed814e271b472292a 16-Oct-2013 Jake Hamby <jhamby@google.com> 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
honeBase.java
dma/CDMAPhone.java
ip/SipPhoneBase.java
5bc59fe360f396811723ce8f0fbb462504edda2a 17-Oct-2013 David Braun <dabraun@google.com> 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
nboundSmsHandler.java
0217e2d6e60f7edd95407c7b385a627da9f1c1e3 17-Oct-2013 David Braun <dabraun@google.com> 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
MSDispatcher.java
dma/CdmaSMSDispatcher.java
sm/GsmSMSDispatcher.java
59f197282fbcd552f1b99655e07f8813cae34385 16-Oct-2013 Wink Saville <wink@google.com> 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
5eee0d4d68b2a768aa5d27875cd0f2e44c2bd272 16-Oct-2013 Wink Saville <wink@google.com> telephony: Fix "R" icon displayed when device is searching or in LTE

Bug: 10745813, 10771508
Change-Id: I6741e14785484fe6af19d60487f4d545e568ccf9
dma/CdmaServiceStateTracker.java
d480c28d17af7ba7072ecb0139edeab7d54ffad3 16-Oct-2013 Wink Saville <wink@google.com> am e3f6e6a1: Fix b10864885

* commit 'e3f6e6a186ac6efe15faa0aa9f1df0333e114ed7':
Fix b10864885
e3f6e6a186ac6efe15faa0aa9f1df0333e114ed7 15-Oct-2013 Wink Saville <wink@google.com> 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
ccTable.java
a5d5a233fb559808b9ef4ceefd1d823491eec593 14-Oct-2013 David Braun <dabraun@google.com> am 76e1ee73: Merge "Make SmsApplication checks more defensive" into klp-dev

* commit '76e1ee73bd112e78361e659dc97afb01ed9c7ca0':
Make SmsApplication checks more defensive
76e1ee73bd112e78361e659dc97afb01ed9c7ca0 14-Oct-2013 David Braun <dabraun@google.com> Merge "Make SmsApplication checks more defensive" into klp-dev
df566e9f13b64ce3b2dad757cc420c8a5d49345f 14-Oct-2013 duho.ro <duho.ro@lge.com> am 21fe62ac: telephony: redirect call barring MMI code to other purpose

* commit '21fe62acc2d11ace0410b2b6d83263a96081c092':
telephony: redirect call barring MMI code to other purpose
c67761d00a25bd095364e3ff4e4cb8e88b2e974c 13-Oct-2013 David Braun <dabraun@google.com> 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
honeFactory.java
msApplication.java
21fe62acc2d11ace0410b2b6d83263a96081c092 27-Sep-2013 duho.ro <duho.ro@lge.com> 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
sm/GsmMmiCode.java
7e3220ca1eb6e9c7d1d3054e114ea729bc1f3cc8 11-Oct-2013 Sukanya Rajkhowa <srajkh@codeaurora.org> am 1260f1c6: Support SMS over IMS

* commit '1260f1c6c909f2940989b72afe1b91fd83845eaa':
Support SMS over IMS
2b11696f63a949791f8ae0247b9bafb6802c07ad 11-Oct-2013 Sukanya Rajkhowa <srajkh@codeaurora.org> am 6f2a3e1e: Reorganize IccSmsInterfaceManager

* commit '6f2a3e1ea86ae7ae2e04eb95582e54eec7a2f864':
Reorganize IccSmsInterfaceManager
1260f1c6c909f2940989b72afe1b91fd83845eaa 14-Sep-2013 Sukanya Rajkhowa <srajkh@codeaurora.org> 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
aseCommands.java
ommandsInterface.java
ccSmsInterfaceManager.java
msSMSDispatcher.java
honeBase.java
IL.java
MSDispatcher.java
dma/CDMALTEPhone.java
dma/CDMAPhone.java
dma/CdmaSMSDispatcher.java
dma/SmsMessage.java
sm/GSMPhone.java
sm/GsmSMSDispatcher.java
sm/SmsMessage.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
6f2a3e1ea86ae7ae2e04eb95582e54eec7a2f864 14-Sep-2013 Sukanya Rajkhowa <srajkh@codeaurora.org> 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
ccSmsInterfaceManager.java
ccSmsInterfaceManagerProxy.java
hone.java
honeProxy.java
dma/CDMAPhone.java
dma/RuimSmsInterfaceManager.java
sm/GSMPhone.java
sm/SimSmsInterfaceManager.java
ip/SipPhoneBase.java
cf2e0901fbf4446efd6f16daaeaaf77ea74496a5 10-Oct-2013 Sungmin Choi <sungmin.choi@lge.com> am 45df2644: telephony: Set profile DATA_PROFILE_TETHERED when DUN type

* commit '45df26444864daad60afdd4d121ab4043da3834b':
telephony: Set profile DATA_PROFILE_TETHERED when DUN type
45df26444864daad60afdd4d121ab4043da3834b 07-Sep-2013 Sungmin Choi <sungmin.choi@lge.com> telephony: Set profile DATA_PROFILE_TETHERED when DUN type

Bug: 11152852
Change-Id: I018e3dfb9c8183b11faedc83cc40be658173c4a3

Conflicts:
src/java/com/android/internal/telephony/dataconnection/DcTracker.java
ataconnection/DcTracker.java
04187ec4d9cdef64cc1257815fa9e44e37202a86 22-Mar-2013 Sudheer Reddy Yampalla <syampa@codeaurora.org> Telephony: Add + for international number for MT SMS

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

Change-Id: I0000b0685181f17ba6b5b0eaaba60a77971e7908
Bug: 10951615
dma/SmsMessage.java
ddd786ad841c366183bbee116b2a3ba7d58d8394 07-Oct-2013 David Braun <dabraun@google.com> 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
002b8c6f5095a36bd09f2b6de6c4b3e1125c6158 07-Oct-2013 David Braun <dabraun@google.com> Merge "Do not allow default SMS application to be set or get on non-phone devices" into klp-dev
29569c31ed24dd8f48be3f898047d4d7b5665052 05-Oct-2013 David Braun <dabraun@google.com> 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
msApplication.java
f66c7db56be08ef57060fa3a1935805833f4632c 04-Oct-2013 Robert Greenwalt <rgreenwalt@google.com> 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."
e595a18f15d8073c8657ef7fa3da34986acb1a6d 04-Oct-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "Revert "Stop using the sim mnc/mcc to set wifi country."" into klp-dev
e0695876e8a7084cf4eaa8e6c71808f238a853a7 03-Oct-2013 Robert Greenwalt <rgreenwalt@google.com> Revert "Stop using the sim mnc/mcc to set wifi country."

This reverts commit 78d801a78087b6a2419f0820628d0273df53203f.

bug:11064682
Change-Id: I46f5b90de417636d03bfa5932684f0ace68a3f6e
ccTable.java
honeBase.java
f050f02b0373cd186941a84e0f2f9730aeebd592 02-Oct-2013 Robert Greenwalt <rgreenwalt@google.com> 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.
0b84f33ceffbccd035166f73ec12b22a039a1ba8 01-Oct-2013 Wink Saville <wink@google.com> am 1ec85a29: Handle SIGNAL_LOST(-3) as a retryable error.

* commit '1ec85a29a26bfab4e21ad68000afc637e0cf171c':
Handle SIGNAL_LOST(-3) as a retryable error.
98cad5c9c31f82eadaeada775937632a2a508147 30-Sep-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "Stop using the sim mnc/mcc to set wifi country." into klp-dev
78d801a78087b6a2419f0820628d0273df53203f 28-Sep-2013 Robert Greenwalt <rgreenwalt@google.com> Stop using the sim mnc/mcc to set wifi country.

bug:10513734
Change-Id: Idac32892db8ff9b5ca4c5bde4f3f3b12f0df1196
ccTable.java
honeBase.java
1ec85a29a26bfab4e21ad68000afc637e0cf171c 27-Sep-2013 Wink Saville <wink@google.com> 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
ataconnection/DcFailCause.java
d4bfb684d59b16b8e5c1438428f1359a89b13b2d 26-Sep-2013 Vineeta Srivastava <vsrivastava@google.com> 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""
a1a02608bdc7ab7248d8a7ae7cf45e0900e53c34 26-Sep-2013 Vineeta Srivastava <vsrivastava@google.com> Merge "Revert "Revert "telephony: Set roam though same named operator""" into klp-dev
1110f0fd89337adc1b09fe866750b8721ef882cf 26-Sep-2013 Vineeta Srivastava <vsrivastava@google.com> Revert "Revert "telephony: Set roam though same named operator""

This reverts commit cd338fdb16422f47788c3bc3cdf6391f1268bbfe.

Change-Id: Ib7aa6ce911a22098461c76b5e0be191852d34bb1
sm/GsmServiceStateTracker.java
ecf2d82fc31abffcff2fa7854cb9bed8eb75dc42 26-Sep-2013 Vineeta Srivastava <vsrivastava@google.com> am 81d0c210: Merge "Revert "telephony: Set roam though same named operator"" into klp-dev

* commit '81d0c210c9ffec188ec94afb2fe6dfe20add4b3c':
Revert "telephony: Set roam though same named operator"
81d0c210c9ffec188ec94afb2fe6dfe20add4b3c 26-Sep-2013 Vineeta Srivastava <vsrivastava@google.com> Merge "Revert "telephony: Set roam though same named operator"" into klp-dev
cd338fdb16422f47788c3bc3cdf6391f1268bbfe 26-Sep-2013 Vineeta Srivastava <vsrivastava@google.com> Revert "telephony: Set roam though same named operator"

This reverts commit ce0eb1a929a8abb9a99b042813e403b0d6f74fdd.

Change-Id: I324343a218e155ece9f8243cdc44ce9fffe8e5d5
sm/GsmServiceStateTracker.java
e0e3679f59cdbc4911adfb71bb0259d7e0366ff6 26-Sep-2013 Vineeta Srivastava <vsrivastava@google.com> am 14134b84: Merge "telephony: Set roam though same named operator" into klp-dev

* commit '14134b84407227c6be23ce927397433fa34907b8':
telephony: Set roam though same named operator
14134b84407227c6be23ce927397433fa34907b8 26-Sep-2013 Vineeta Srivastava <vsrivastava@google.com> Merge "telephony: Set roam though same named operator" into klp-dev
ce0eb1a929a8abb9a99b042813e403b0d6f74fdd 23-Sep-2013 Sungmin Choi <sungmin.choi@lge.com> 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
sm/GsmServiceStateTracker.java
a86813e21a1e5a20023aadf9b6a5a785b20c21cc 26-Sep-2013 Vineeta Srivastava <vsrivastava@google.com> am 21b2c181: Merge "UICC: to avoid overwriting ICC operator numeric" into klp-dev

* commit '21b2c1814fe47e88b3881d47983f79014682411e':
UICC: to avoid overwriting ICC operator numeric
21b2c1814fe47e88b3881d47983f79014682411e 26-Sep-2013 Vineeta Srivastava <vsrivastava@google.com> Merge "UICC: to avoid overwriting ICC operator numeric" into klp-dev
5ac29f043f579ebed89011ceb0f755942cfd7a5e 26-Sep-2013 Sungmin Choi <sungmin.choi@lge.com> am 13fa971b: wappush: Use valid index for pdu including garbages

* commit '13fa971b6c6eab1578f4732c8de6fa2ba3b57ce6':
wappush: Use valid index for pdu including garbages
8469152d2c6bdaf4632a07880bd1bcd6af78d10b 16-Sep-2013 duho.ro <duho.ro@lge.com> 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
dma/CDMAPhone.java
13fa971b6c6eab1578f4732c8de6fa2ba3b57ce6 29-Aug-2013 Sungmin Choi <sungmin.choi@lge.com> 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
apPushOverSms.java
df4716b3df68ea6015490b76969fca62b67a4129 25-Sep-2013 David Braun <dabraun@google.com> am d1b11a34: Merge "Update the requirements for being an SMS app in KLP" into klp-dev

* commit 'd1b11a349bb6310fb7902280856daf09cac20647':
Update the requirements for being an SMS app in KLP
d1b11a349bb6310fb7902280856daf09cac20647 25-Sep-2013 David Braun <dabraun@google.com> Merge "Update the requirements for being an SMS app in KLP" into klp-dev
041cfe21bd66c8cb002435e7dc54177db2e927aa 25-Sep-2013 David Braun <dabraun@google.com> Update the requirements for being an SMS app in KLP

SMS applications need to handle repsond-via-message (for rejecting a phone
call with an SMS message) and SENDTO with the smsto Uri scheme so that
contact applications can direct the user to the right app. This change also
adds permission requirements for the existing intents that SMS apps
implement.

Bug: 10870624 System should direct "SENDTO" intent with "sms" and "mms" schemes to the default SMS app
Bug: 10818880 Telephony needs to direct RESPOND_VIA_MESSAGE intent only to the default SMS app
Change-Id: I373268bb694f155fb08e2864ae86af345a85c4ff
msApplication.java
6eecb29d2af7d54e63a0136f97b6badad2120d23 06-Jun-2013 Sungmin Choi <sungmin.choi@lge.com> telephony: Add Explicit Call Transfer (ECT) feature

Use ECT as "4 + Send".

Bug: 9745857
Change-Id: If94d7ad33eb72dede86030c26e8a8c1b5b8125e3
allManager.java
sm/GsmCallTracker.java
536eeeb053efe3f1f60e61ff24bf1a8093d3c879 11-Jul-2013 duho.ro <duho.ro@lge.com> UICC : fix read EF Image Instance

The EFs(4Fxx) path under DF Graphics are not distinguish with
the EFs(4Fxx) path under DF Phonebook. So, getEFPath(EF_IIDF)
is not able to return correct path. Because getEFPath(EF_IMG)
is correct path, DF graphics, getEFPath(EF_IMG) is used instead of getEFPath(EF_IIDF),

EF_IMG is a linear fixed EF. The result of loading EF_IMG should be
processed as a LoadLinearFixedContext. So, it is needed to calculate the
number of EF_IMG records. If those changes are added, the changes are
duplicated with the codes of EVENT_GET_RECORD_SIZE_DONE. The codes
of EVENT_GET_RECORD_SIZE_IMG_DONE are removed and the event is treated
by the logic of the EVENT_GET_RECORD_SIZE_DONE. And then remove incorrect handler
events(EVENT_READ_IMG_DONE and EVENT_READ_ICON_DONE) are moved to the handler
events which have the procedure for loading same type EFs (EVENT_READ_RECORD_DONE
and the EVENT_READ_BINARY_DONE).

Bug: 9767739

Change-Id: I754ec5c40cff99adef11a9dfdc31b8e0446befbb
icc/IccFileHandler.java
icc/RuimFileHandler.java
4685be23d96831a123b8f430ccb51b4c8ef1e189 24-Sep-2013 Wink Saville <wink@google.com> am d4f9c583: Merge "telephony: Add Explicit Call Transfer (ECT) feature"

* commit 'd4f9c58351b8d1cb84dea6be807385fa7622099b':
telephony: Add Explicit Call Transfer (ECT) feature
d4f9c58351b8d1cb84dea6be807385fa7622099b 24-Sep-2013 Wink Saville <wink@google.com> Merge "telephony: Add Explicit Call Transfer (ECT) feature"
a6be2135c3459a9cf88271d1885afd0e8afd8128 24-Sep-2013 Wink Saville <wink@google.com> am d1b7def8: Merge "UICC : fix read EF Image Instance"

* commit 'd1b7def8287cda2978c06b36e31f8dd8b7cc6834':
UICC : fix read EF Image Instance
d1b7def8287cda2978c06b36e31f8dd8b7cc6834 24-Sep-2013 Wink Saville <wink@google.com> Merge "UICC : fix read EF Image Instance"
3f8a05ab9b2a1bec46f7ada2b13834361d371020 24-Sep-2013 Wink Saville <wink@google.com> am 79d07f7e: Move RIL_REQUEST_SET_INITIAL_ATTACH_APN to RILConstants.java

* commit '79d07f7e6df0b91f3042e412a3d538ebff34a680':
Move RIL_REQUEST_SET_INITIAL_ATTACH_APN to RILConstants.java
79d07f7e6df0b91f3042e412a3d538ebff34a680 23-Sep-2013 Wink Saville <wink@google.com> Move RIL_REQUEST_SET_INITIAL_ATTACH_APN to RILConstants.java

Bug: 9626411
Change-Id: I0c278d9f4c6fd7e12c495c2411ab94ac87e1f316
IL.java
148c34006cd9553fb36cf1a2a5fe01a59bf872c5 20-Sep-2013 David Braun <dabraun@google.com> am 9c9341ec: Add config setting for default sms app.

* commit '9c9341ecba5312a4a5be5f9fee3ffe1b582b65ce':
Add config setting for default sms app.
9c9341ecba5312a4a5be5f9fee3ffe1b582b65ce 20-Sep-2013 David Braun <dabraun@google.com> Add config setting for default sms app.

Different devices can have different default SMS apps.

Bug: 10818725 Allow OEM to specify or override a default SMS app (package)
Change-Id: I11c9832d2246677231e6a54cb03eb76650c85c98
msApplication.java
f66d184979d6a2c4b6a9757a300a7d17109d73d7 19-Sep-2013 Wink Saville <wink@google.com> am a316d77b: Merge "Fix potential NPE in ApnContext.isProvisioningApn" into klp-dev

* commit 'a316d77b726f6d210169c9c6079ac08312a0bd75':
Fix potential NPE in ApnContext.isProvisioningApn
a316d77b726f6d210169c9c6079ac08312a0bd75 19-Sep-2013 Wink Saville <wink@google.com> Merge "Fix potential NPE in ApnContext.isProvisioningApn" into klp-dev
4af1aac6e5faab7197d11126bdf46f8d3bf4cc4b 19-Sep-2013 David Braun <dabraun@google.com> am 33ab7bad: Ensure that a default SMS app is configured at boot

* commit '33ab7bad1f2ccb5dea26d0def6e43a4f2d1b9cb9':
Ensure that a default SMS app is configured at boot
33ab7bad1f2ccb5dea26d0def6e43a4f2d1b9cb9 19-Sep-2013 David Braun <dabraun@google.com> Ensure that a default SMS app is configured at boot

Make sure that two things are true on boot so that SMS/MMS will work
properly:
1) We have selected a default SMS/MMS app that will have write permission
to the SMS database
2) The Phone app always has permission to the database because it needs
to write to the raw tables when delivering MMS messages.

Note: If you change the default app explicitly the problems sending SMS
and MMS messages in Messaging will still happen. Preventing this requires
a larger change to prevent Mms from trying to send when it is not the
default app.

Bug: 10819150 Messaging App crashes while sending MMS
Bug: 10837862 Unable to send messages in Messaging app
Change-Id: Ie920e308b9b4067f0bbe1b6b2184c22aaf663065
honeFactory.java
9f332c9a4f464b36bac30555c5cfa6431e7211f8 19-Sep-2013 Wink Saville <wink@google.com> Fix potential NPE in ApnContext.isProvisioningApn

Bug: 10839016
Change-Id: Ifa0f974c0df69928a5d1e29c215b5bcf8c4a5fb1
ataconnection/ApnContext.java
1673c1ee9497b7d3fdbe519ee5c96aa9080c9a2f 19-Sep-2013 Jake Hamby <jhamby@google.com> am 15f6090f: Merge "Fix permission check for reading SMS on UICC." into klp-dev

* commit '15f6090f860dd50c6de051a2af62f1672108eb5e':
Fix permission check for reading SMS on UICC.
15f6090f860dd50c6de051a2af62f1672108eb5e 19-Sep-2013 Jake Hamby <jhamby@google.com> Merge "Fix permission check for reading SMS on UICC." into klp-dev
4c7516b1681059dc82f9f11867e0b3ce731e9bb8 18-Sep-2013 Wink Saville <wink@google.com> am 31ae682f: Telephony: Update CF number in EF_CFIS.

* commit '31ae682ff511ddde4073c3f94eff15da2f7fade6':
Telephony: Update CF number in EF_CFIS.
31ae682ff511ddde4073c3f94eff15da2f7fade6 18-Sep-2013 Wink Saville <wink@google.com> Telephony: Update CF number in EF_CFIS.

When call forwarding is enabled, only status is updated in EF_CFIS.
CF number is not updated. Added support to update CF number as well.

Bug: 10642929
Change-Id: Ia764b872b7837d71ffad206e37e9b261e4db7a83
sm/GSMPhone.java
sm/GsmMmiCode.java
icc/IccRecords.java
icc/SIMRecords.java
e5d7a8d946bf9496ffbe7533bffdeb83963489c3 18-Sep-2013 Jake Hamby <jhamby@google.com> Fix permission check for reading SMS on UICC.

When accessing SMS stored on UICC via TelephonyProvider, we need to
use the com.android.phone UID for the call to IccSmsInterfaceManager
to avoid a UID mismatch failure in the app ops check. Change the
permission check method call from enforceCallingPermission() to
enforceCallingOrSelfPermission() so the check doesn't fail.

Bug: 10131077
Change-Id: I0d7e0925be1fc69a95298865a1632a1fd953add0
ccSmsInterfaceManager.java
74c533d1ef7b1a456361ef0ca0fa82e5a5838467 18-Sep-2013 Wink Saville <wink@google.com> Merge "Telephony: Handle RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE" into klp-dev
b4f2aa64da4665b76bf23d43da2c584e6cce5e87 18-Sep-2013 David Braun <dabraun@google.com> am a96465da: Merge "Implement new method for handling SMS/MMS on the platform" into klp-dev

* commit 'a96465da72a526be749137c9d8aa3e0e19525690':
Implement new method for handling SMS/MMS on the platform
a96465da72a526be749137c9d8aa3e0e19525690 18-Sep-2013 David Braun <dabraun@google.com> Merge "Implement new method for handling SMS/MMS on the platform" into klp-dev
0d70750e8f09a9e643266ced3c070e3bdbce056d 17-Sep-2013 Sungmin Choi <sungmin.choi@lge.com> am d62a7cec: telephony: Increase the MAX_CONNECTIONS to 8

* commit 'd62a7cecd0451592222d73995dd53074aa6f98a5':
telephony: Increase the MAX_CONNECTIONS to 8
d62a7cecd0451592222d73995dd53074aa6f98a5 15-Sep-2013 Sungmin Choi <sungmin.choi@lge.com> telephony: Increase the MAX_CONNECTIONS to 8

The problem is that Telephony does not handle call id 2 for CDMA.
When back to back calls are made, RIL stores the previous call information
for some time as it needs to give failure reason for the last call
that failed when telephony asks for it.
So for the next call it assigns a call ID of 2.

Bug: 10355466
Change-Id: I9a4a188780bde9e66aacc7a43d54df1118b10dfb
dma/CdmaCallTracker.java
5c3b6658d82f3af57161d5a34385dd95ea0f1abb 16-Sep-2013 David Braun <dabraun@google.com> Implement new method for handling SMS/MMS on the platform

Multi project change:
The changes in this project implement the actual change in the SMS related
intent behavior (defining and using the new events).

Bug: 10449618
Change-Id: Ia707ed561d89428db78203a2ed54504d867a3e43
nboundSmsHandler.java
msApplication.java
apPushOverSms.java
fba544106298510dc3edf110ab2be92270f08c13 22-Nov-2011 Anshul Jain <anshulj@codeaurora.org> Telephony: Handle RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE

Handle RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE as a way to exit from
Emergency Callback Mode

Bug: 10749583
Change-Id: Ia572ac5a4d5ab38166453dcdf26fb0a667bba74e
dma/CDMAPhone.java
6b6e1c055a58d1f5248ffaf5c9231726f00d9a8c 14-Sep-2013 Wink Saville <wink@google.com> am ef57a331: Merge "Telephony: Handle RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE"

* commit 'ef57a331cca922b4fd8e5d1742bd583e4553db02':
Telephony: Handle RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE
1da7dc27fb9a73c20f702e08561b81cceb071eaf 22-Nov-2011 Anshul Jain <anshulj@codeaurora.org> Telephony: Handle RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE

Handle RIL_UNSOL_EXIT_EMERGENCY_CALLBACK_MODE as a way to exit from
Emergency Callback Mode

Bug: 10749583
Change-Id: Ia572ac5a4d5ab38166453dcdf26fb0a667bba74e
dma/CDMAPhone.java
23ab767b729e3b7f15a19d702f3bb9d5f53fda09 13-Sep-2013 Wink Saville <wink@google.com> am 7edea181: Merge "In Cdma Lte SST use CssIndicator for concurrent Voice & Data." into klp-dev

* commit '7edea1816641fbc6471e7cd49a60ac2aac2fde3a':
In Cdma Lte SST use CssIndicator for concurrent Voice & Data.
ed62533780677b3695304373a4dd661cec7a6a61 13-Sep-2013 Wink Saville <wink@google.com> am c4dc2a98: Merge "Add code to handle voice radio technology of LTE." into klp-dev

* commit 'c4dc2a98dc57f501c6d9b829ef1bf6d1ade613ef':
Add code to handle voice radio technology of LTE.
bdf0b91387978f2473ad812bb29c7eb2b750a11e 13-Sep-2013 Jake Hamby <jhamby@google.com> am 05b2bd6d: Merge "Fix voicemail notification for Sprint." into klp-dev

* commit '05b2bd6d8fb038e35c51e5eab36c7dd9886b1da5':
Fix voicemail notification for Sprint.
7edea1816641fbc6471e7cd49a60ac2aac2fde3a 13-Sep-2013 Wink Saville <wink@google.com> Merge "In Cdma Lte SST use CssIndicator for concurrent Voice & Data." into klp-dev
c4dc2a98dc57f501c6d9b829ef1bf6d1ade613ef 13-Sep-2013 Wink Saville <wink@google.com> Merge "Add code to handle voice radio technology of LTE." into klp-dev
05b2bd6d8fb038e35c51e5eab36c7dd9886b1da5 13-Sep-2013 Jake Hamby <jhamby@google.com> Merge "Fix voicemail notification for Sprint." into klp-dev
df53e221838a87a2d5d5175c1b8372e8515a822c 12-Sep-2013 Jake Hamby <jhamby@google.com> Fix voicemail notification for Sprint.

Sprint voicemail notification wasn't showing up because we were
looking for a CSIM application on the UICC and couldn't find it.
Added code to CDMAPhone.onUpdateIccAvailability() to load the USIM
application if we fail to get the CSIM application.

Bug: 9908333
Change-Id: I5c69c9eea6972e377b10a4057492f9ecc8233028
dma/CDMAPhone.java
8901c5df610882430d42e5c544aa254c564ed472 12-Sep-2013 Wink Saville <wink@google.com> am dcd9876d: Merge "Telephony: Fix incorrect status display on UI in airplane mode"

* commit 'dcd9876df5a6b97daf1928bd368a45750f59be24':
Telephony: Fix incorrect status display on UI in airplane mode
dcd9876df5a6b97daf1928bd368a45750f59be24 12-Sep-2013 Wink Saville <wink@google.com> Merge "Telephony: Fix incorrect status display on UI in airplane mode"
e4ab1fe53bfdd218f752d01311e6785ebe2ea295 12-Sep-2013 Wink Saville <wink@google.com> Merge "Telephony: Ignore events on a destroyed phone" into klp-dev
d141a9fff6ee0955d11efddf055ba7e8736993e0 04-Jun-2013 Sandeep Kunta <skunta@codeaurora.org> Telephony: Fix incorrect status display on UI in airplane mode

UI should display "No Service" instead of "Searching for Service"
in airplane mode.
Changes done to set ERI text to "Searching for Service" only when
radio is on.

Change-Id: Ia60900cb014c4669d05d3cf0a2d2309899440106
dma/CdmaLteServiceStateTracker.java
5e2000b856a7959609e8f15148a3584ec372f865 12-Sep-2013 Wink Saville <wink@google.com> Telephony: Ignore events on a destroyed phone

It is possible to receive responses from RIL after phone has released
it's references. Ignore events in such cases, since those events no
longer make sense, and some phone members have been de-initialized.

Make CallTrackers notify UI when ending calls in dispose, since
it has already unregistered, and won't receive the CALL_STATE_CHANGED

Change-Id: I5d8fd9ce3f74b9ae9b5b645565bd24d11be0aebc
CRs-Fixed: 228731, 228005, 415801, 350739
honeBase.java
dma/CDMAPhone.java
dma/CdmaCallTracker.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
sm/GSMPhone.java
sm/GsmCallTracker.java
sm/GsmServiceStateTracker.java
1785c21bf40489845fa70d8771858c1bfc124dd5 12-Sep-2013 Wink Saville <wink@google.com> In Cdma Lte SST use CssIndicator for concurrent Voice & Data.

This will break concurrent voice and data on mysid, but because
mysid is EOL and to keep this change simple we're not trying to
mitigate that using config variables.

Bug: 10100317
Change-Id: I7960a8d68258621de1fd9c140c3fefcdfcea8804
dma/CdmaLteServiceStateTracker.java
b54cd09892e0676d719e6df00e60c77b663f993c 12-Sep-2013 Wink Saville <wink@google.com> Add code to handle voice radio technology of LTE.

Sometimes the Voice Radio Technology is reported as LTE but Voice
over LTE (VoLte) is not currently supported and for Sprint we
should default to CDMAPhone in that case. Otherwise the could stay
as a GSMPhone and handling voice calls will fail.

Bug: 10673760
Change-Id: Ic77411b5da415c620fce5a185ca1d7542dfe3b7f
hone.java
honeBase.java
honeProxy.java
erviceStateTracker.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
sm/GsmServiceStateTracker.java
8316a9897794e4b608e7917af701fafc34c9276e 09-May-2013 Sandeep Kunta <skunta@codeaurora.org> Set RESULT tag properly when sending TR

While encoding terminal response, result tag is
always encoded with CR flag, although spec is not
clear on when to set CR flag, setting it always leads to
issues with some cards, hence set CR flag based on
CR flag in command details tag received from card.

Change-Id: I34956a018ec56767c49175add8ce71d5821f059c
at/CatService.java
150b65fc3b52beab23f0d714e4c3166f90d3985e 11-Sep-2013 Robert Greenwalt <rgreenwalt@google.com> Remove special code for fake CDMA APN

revert of https://android-review.googlesource.com/#/c/62943/2

Solved the need for sprint using bearer-specific APNs instead
as the phone type is not a reliable trigger.

bug: 9315957
Change-Id: I0e5545ab4706df2c5917c7534291644c5d8797b3
ataconnection/DcTracker.java
cfc20537a6442471fe27037e62380b29214f0f24 11-Sep-2013 Wink Saville <wink@google.com> Merge "CatService: OPEN_CHANNEL p-cmd to send event confirmation and not T.R" into klp-dev
c5a252768220b1caa01e5b62b42fd323d1f92702 21-Aug-2012 Shriram Ganesh <sganesh@codeaurora.org> CatService: OPEN_CHANNEL p-cmd to send event confirmation and not T.R

Upon handling OPEN_CHANNEL command, send User confirmation instead of
terminal response as lower layers expect confirmation information.

Bug: 10602211
Change-Id: I99ee5210ff345660559d1656e80c6ab8b0991d8e
at/CatService.java
1b0331d1901d63ac65efb200b0e19d7aa4eb2b8b 11-Jul-2013 duho.ro <duho.ro@lge.com> UICC : fix read EF Image Instance

The EFs(4Fxx) path under DF Graphics are not distinguish with
the EFs(4Fxx) path under DF Phonebook. So, getEFPath(EF_IIDF)
is not able to return correct path. Because getEFPath(EF_IMG)
is correct path, DF graphics, getEFPath(EF_IMG) is used instead of getEFPath(EF_IIDF),

EF_IMG is a linear fixed EF. The result of loading EF_IMG should be
processed as a LoadLinearFixedContext. So, it is needed to calculate the
number of EF_IMG records. If those changes are added, the changes are
duplicated with the codes of EVENT_GET_RECORD_SIZE_DONE. The codes
of EVENT_GET_RECORD_SIZE_IMG_DONE are removed and the event is treated
by the logic of the EVENT_GET_RECORD_SIZE_DONE. And then remove incorrect handler
events(EVENT_READ_IMG_DONE and EVENT_READ_ICON_DONE) are moved to the handler
events which have the procedure for loading same type EFs (EVENT_READ_RECORD_DONE
and the EVENT_READ_BINARY_DONE).

Bug : 9767739

Change-Id: I754ec5c40cff99adef11a9dfdc31b8e0446befbb
icc/IccFileHandler.java
icc/RuimFileHandler.java
8b61e10b480d3a7bae41025a97f3bd27ee5ed610 11-Sep-2013 Jake Hamby <jhamby@google.com> Fix receiving multi-part CDMA WAP messages.

Fix ArrayIndexOutOfBoundsException in CDMA WAP message handling.
Add a new flag to raw DB table to indicate 3GPP2 WAP PDU messages.
Use the new flag to return the correct value for getIndexOffset()
in InboundSmsTracker.

Previously this only worked correctly for single-segment WAP PDUs
of type WAP push.

Bug: 10595053
Change-Id: I8820da124e8fa4707cbee0398690a475d26ff702
nboundSmsHandler.java
nboundSmsTracker.java
dma/CdmaInboundSmsHandler.java
90271d9ef1377b25b78359039fb2e87f32aba25b 04-Sep-2013 Sungmin Choi <sungmin.choi@lge.com> sms: Add exception code instead of low memory status

Add exceptoin code, after receiving Duplicated SMS.

Bug: 10484923
Change-Id: Ic9465adeb8a09d11fdd2e5b35108410baf56a2fc
Signed-off-by: daehun.ju <daehun.ju@lge.com>
Signed-off-by: Sungmin Choi <sungmin.choi@lge.com>
nboundSmsHandler.java
8e416432ae310dd451f1360dfd4f70d8ef9b3903 06-Sep-2013 duho.ro <duho.ro@lge.com> UICC: get ICCID from SIM for CDMAPhone state

If the phone state is CDMAPhone and the UICC does not have a CDMA application,
getIccSerialNumber() can not read the ICCID from SIM.
This changes are changing the reference of the card application object
from RUIMRecords to SIMRecords. So, this method is able to get the ICCID
from SIMRecords, if the UICC has a SIM/USIM.

Bug: 10564873
Change-Id: Id55f794828f1f1a89905298776500df90088b17e
dma/CDMAPhone.java
a23d86f400fe029aa05592b963b2c10988545a55 05-Sep-2013 Sungmin Choi <sungmin.choi@lge.com> telephony: Fix roaming icon setting

Currently, if data roaming is true and gsm roaming is true,
roaming icon is always true.
But, in this case, roamin icon shoould depends on other condition,
i.e., same named operators or operator considered non-roaming.

Bug: 10642211
Change-Id: Ia98ffeec5dc013cf045b15c9a7c53c4a24f2eeb5
sm/GsmServiceStateTracker.java
419f297bfb0cc21566d1d1110573dd9205e8f713 21-Aug-2012 Shriram Ganesh <sganesh@codeaurora.org> CatService: OPEN_CHANNEL p-cmd to send event confirmation and not T.R

Upon handling OPEN_CHANNEL command, send User confirmation instead of
terminal response as lower layers expect confirmation information.

Bug: 10602211
Change-Id: I99ee5210ff345660559d1656e80c6ab8b0991d8e
at/CatService.java
2d973cc97744549277b1c433c092dcb15efd694b 05-Sep-2013 Vineeta Srivastava <vsrivastava@google.com> Merge "UICC : Add MCC MNC codes having 3 digits MNC" into klp-dev
91ce060652d7f9be48ee2eeb771455c9d741564b 06-Jun-2013 Sungmin Choi <sungmin.choi@lge.com> telephony: Add Explicit Call Transfer (ECT) feature

Use ECT as "4 + Send".

Bug: 9745857
Change-Id: If94d7ad33eb72dede86030c26e8a8c1b5b8125e3
allManager.java
sm/GsmCallTracker.java
79391c0b55b4dbff55c2963bf7c56af0351dd274 05-Sep-2013 Wink Saville <wink@google.com> Merge commit 'ebca826a' into manualmerge

* commit 'ebca826a':
Add provisioning apn timeout.

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

Change-Id: Ic89a22167b91e05068160a6ef0a194215913bfe7
ebca826a2b78a8542146ad1600df1cb4275a0823 05-Sep-2013 Wink Saville <wink@google.com> am e9063f69: Add provisioning apn timeout.

* commit 'e9063f6973039d66e12d0d930af03906d377969e':
Add provisioning apn timeout.
e9063f6973039d66e12d0d930af03906d377969e 05-Sep-2013 Wink Saville <wink@google.com> Add provisioning apn timeout.

Bug: 10609993
Change-Id: I2dd4fe23fa2b22ef8f4849c161c630d1a85cdb4b
ataconnection/ApnContext.java
ataconnection/DcTrackerBase.java
0530f592d89c1eceea7ee5bccb2359061a04f968 03-Sep-2013 duho.ro <duho.ro@lge.com> UICC : Add MCC MNC codes having 3 digits MNC

Old Rogers, Fido, TMUS and Malaysia cards having incorrect MNC length.

Bug: 9892341

Change-Id: I4bc24bd929e3822732e88282d0a64f59623a4c41
icc/SIMRecords.java
a0d02d50aa0fd7cf1c2d9f4d811efd2e4bfb7d4a 05-Sep-2013 Jake Hamby <jhamby@google.com> Fix receiving class 2 SMS messages.

SIMRecords class was creating the wrong type of SmsMessage object
for class 2 messages, causing a ClassCastException error. Verified
that this change fixes the bug using MD8475A call box.

Bug: 9578184
Change-Id: Ia325c6b1594d625237dc0966c05f56f586bb4baf
icc/SIMRecords.java
dd6e67fb45fa3ce0d43f8d874cd7ffaeddf0926f 04-Sep-2013 Lorenzo Colitti <lorenzo@google.com> Don't prefer APNs with no type for initial attach.

When choosing an APN for initial attach, we currently treat an
APN with no type the same as an APN that explicitly sets a type
of "ia". Such an APN will take priority over the preferred APN,
and will even take priority over APNs with the type explicitly
set to "ia".

This breaks attach on networks where there are multiple
MVNOs with the same MCC/MNC and one or more of them has an APN
with no type.

This seems to be unintentional, because the comments say that
APNs with a type of "ia" are preferred over default APNs. Fix it
by only considering an APN to be an initial attach APN if it
explicitly specifies a type of "ia".

Bug: 10614153
Change-Id: I8ed81ab3b58ae2aab2c76b644b653bb2c08da163
ataconnection/DcTrackerBase.java
7cc3a309e6833d854fc41f0e53f32f5a6cbbe08b 30-Aug-2013 Ed Tam <etam@google.com> am c55cf066: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev

* commit 'c55cf0666ebbd4c00fb8092f40dc26e77c56273e':
Telephony: SMS over IMS, DO NOT MERGE
c55cf0666ebbd4c00fb8092f40dc26e77c56273e 30-Aug-2013 Ed Tam <etam@google.com> Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev
614b3bb0238f025664c792fd8a0b69a0cc166eed 30-Aug-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "Don't show roaming icon for specific operators" into klp-dev
a08decf911ab55f06a0972a2ecb1995c46d9ac1e 30-Aug-2013 Wink Saville <wink@google.com> Merge "Add support for a provisioning apn." into klp-dev
c9b81a0c05128694c617fcdd67e73821895822fe 29-Aug-2013 Wink Saville <wink@google.com> Add support for a provisioning apn.

When there is a provisioning apn, such as lwaactivate from AT&T it is
not necessary nor desireble to try to make network connections as
they will be no TCP ACK's to SYN messages, except for a limited set
of operator white listed addresses.

This is implemented by adding two commands CMD_IS_PRVISIONING_APN
and CMD_ENABLE_MOBILE_PROVISIONING. These are used by ConnectivityService
CheckMp and to know when we are connected to a provisioning apn and to
turn actually bring up the connection when the user needs to provision.

Also, incorporate the sEnableFailFastRefCounter change from klp to make
a singleton and remove the RuntimeException.

Bug: 10328264
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
ataconnection/ApnContext.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
b48c51eb1e895ec899b53f1847ad0a5b9a45a085 29-Aug-2013 Vineeta Srivastava <vsrivastava@google.com> Merge "UICC : add support empty alpha id for BIP" into klp-dev
7ed57239eb9eff4a4afa722948db93ea288f0505 19-Jul-2013 Sungmin Choi <sungmin.choi@lge.com> Don't show roaming icon for specific operators

Bug: 9896815
Bug: 10100304
Bug: 10097969
Bug: 10101601
Change-Id: I81b988376dd61a30bc92bb9666510abbcc47788e
sm/GsmServiceStateTracker.java
25cebe4f95bfee61477d4048219a6644aa0aa03b 29-Aug-2013 Wink Saville <wink@google.com> Merge commit '43c93591' into manualmerge

* commit '43c93591':
Add support for a provisioning apn.

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

Change-Id: If78b4af0c466c6ca6939ef475726ad7a9688386a
9894b3fb2f35e21d9cfd45f233ed093589e14c26 24-Aug-2013 sy.yun <sy.yun@lge.com> fix trysetupdata when mAutoAttachOnCreation true

mAutoAttachOnCreation=true means that device can attach PS network
automatically. To do this, DCT should setup data call even PS is detached.
but when mAttached is false (PS detached) It blocks to setup data call
regardless of mAutoAttachOnCreation value. So changed to allow setup
data call when mAutoAttachOnCreation is true and mAttached is false.

Bug: 10196651
Change-Id: Ia121eb75cbbe932b94efe4c09eb3cb26f1ca1c52
ataconnection/DcTracker.java
d7e83ff0591580603e6d6adfca085140d1d53bd2 02-Jul-2013 duho.ro <duho.ro@lge.com> UICC : add support empty alpha id for BIP

"If the alpha identifier is provided by the UICC and is a null data
object (i.e. length = '00' and no value part), this is an indication
that the terminal should not give any information to the user
or ask for user confirmation;"
- 6.4.27.2 OPEN CHANNEL related to packet data service bearer, ETSI TS 102.223

Bug: 9671401
Change-Id: Iece01f3775baf2c6438776f899ed53b1f1fb942f
at/CatService.java
at/ValueParser.java
43c93591d6261be6dad375979e98b0f6ad2771fd 29-Aug-2013 Wink Saville <wink@google.com> Add support for a provisioning apn.

When there is a provisioning apn, such as lwaactivate from AT&T it is
not necessary nor desireble to try to make network connections as
they will be no TCP ACK's to SYN messages, except for a limited set
of operator white listed addresses.

This is implemented by adding two commands CMD_IS_PRVISIONING_APN
and CMD_ENABLE_MOBILE_PROVISIONING. These are used by ConnectivityService
CheckMp and to know when we are connected to a provisioning apn and to
turn actually bring up the connection when the user needs to provision.

Also, incorporate the sEnableFailFastRefCounter change from klp to make
a singleton and remove the RuntimeException.

Bug: 10328264
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
ataconnection/ApnContext.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
850665a367489cce0b83431fa0e6e543b24062e0 21-Dec-2010 Rika Brooks <rbrooks@codeaurora.org> Telephony: SMS over IMS, DO NOT MERGE

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: I87ca9841b4ace931c55e2d379fe6d7589b2dc8a5
aseCommands.java
ommandsInterface.java
ccSmsInterfaceManager.java
ccSmsInterfaceManagerProxy.java
msSMSDispatcher.java
hone.java
honeBase.java
honeProxy.java
IL.java
MSDispatcher.java
dma/CDMALTEPhone.java
dma/CDMAPhone.java
dma/CdmaSMSDispatcher.java
dma/RuimSmsInterfaceManager.java
dma/SmsMessage.java
sm/GSMPhone.java
sm/GsmSMSDispatcher.java
sm/SimSmsInterfaceManager.java
sm/SmsMessage.java
ip/SipCommandInterface.java
ip/SipPhoneBase.java
est/SimulatedCommands.java
a6855ef9a8cfcbe9ee01a437d5b35804c29fa5b5 26-Aug-2013 Wink Saville <wink@google.com> am 876763e9: Make EnableFailFastRefCounter a singleton.

* commit '876763e93ad0fa8006d290cc122f12d5e614efa2':
Make EnableFailFastRefCounter a singleton.
876763e93ad0fa8006d290cc122f12d5e614efa2 26-Aug-2013 Wink Saville <wink@google.com> Make EnableFailFastRefCounter a singleton.

Since there is only one DCT the mEnableFailFastRefCounter can be a
static/singleton and thus properly refcount the
CMD_SET_ENABLE_FAIL_FAST_MOBILE_DATA. There is still one problem
and that is if the PhoneApp crashes the singleton will be reinstantiated
and we'll have the same problem, but the frequency of this is small.
Also, the consequence of this is the DCT will be behaving "normally"
in that it will be attempting to do data-stall recovery although we
might like it not to it is the "normal" behavior.

Bug: 10304904
Change-Id: I4197c4236a402aa247f775e480e747620fd189bd
ataconnection/DcTrackerBase.java
13578cfe145396ff14fb76456dc860acfb532fad 23-Aug-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix mvnoMatches function but keep case-insensitive"
b256cf8dcb3a478bd0b47a74a5e355c6f4c03d85 23-Aug-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "fix mvno_match_data OutOfBounds Exception" into klp-dev
b4121161911b014ff2a3c75cdd94280683d0d8dc 23-Aug-2013 Wink Saville <wink@google.com> Merge "Properly notify of precise call state change after connection hangup." into klp-dev
368e873b65e60268521b3c74110a9b2abe8086ac 02-Aug-2013 Danny Baumann <dannybaumann@web.de> Properly notify of precise call state change after connection hangup.

When disconnecting connections via Connection.hangup(), previously no
precise call state notification was sent out.

Change-Id: I4439d7d8ed47e72da9d061b885ec9a0e6e1b784d
dma/CdmaCall.java
dma/CdmaCallTracker.java
dma/CdmaConnection.java
sm/GsmCall.java
sm/GsmCallTracker.java
sm/GsmConnection.java
1220a4e283def0598468376cf112d3b904026fb8 02-Aug-2013 Danny Baumann <dannybaumann@web.de> Properly notify of precise call state change after connection hangup.

When disconnecting connections via Connection.hangup(), previously no
precise call state notification was sent out.

Change-Id: I4439d7d8ed47e72da9d061b885ec9a0e6e1b784d
dma/CdmaCall.java
dma/CdmaCallTracker.java
dma/CdmaConnection.java
sm/GsmCall.java
sm/GsmCallTracker.java
sm/GsmConnection.java
59a71354e0169c7877ffd56d476ddd65ecf5a88d 19-Aug-2013 Robert Greenwalt <rgreenwalt@google.com> fix mvno_match_data OutOfBounds Exception

When the length of mvno_match_data is greater than GID from IccRecord,
it will generate StringIndexOutOfBoundsException.
Threrefore, codes are changed to use startsWith() instead of subString().

Bug: 10171336
Change-Id: I827b1d3b861d74e736875bbec1ba5bd28c6c3941
ataconnection/DcTracker.java
63fe4e2b84473bbd61030abd0a4b7c2ba34ce977 20-Aug-2013 Robert Greenwalt <rgreenwalt@google.com> Fix mvnoMatches function but keep case-insensitive

Redo previous fix in a way that's still case insensitive.

bug:10171336
Change-Id: I65e29b72ace2a41ed7a19e3bfb5d23bf3773d41c
ataconnection/DcTracker.java
7ab10e4710bdb54c6d9a5ee01cd443a42a2689f5 14-Aug-2013 Sungmin Choi <sungmin.choi@lge.com> Change set position of mAttached

When re-attach network after detaching, mAttached.get() is always false.
Although network is attached in modem side and state is connected,
phone cannot know whether connection state or not.
Because nobody notifies to phone.
So before notifyDataConnection(Phone.REASON_DATA_ATTACHED), set mAttached true

Bug: 10070685
Change-Id: Id1356e1c7e188bd484d892dc4255c3aefc81a032
ataconnection/DcTracker.java
16a01fe85457587ad5fd02ea06aa2882baf3535b 14-Aug-2013 Wink Saville <wink@google.com> Make EnableFailFastRefCounter a singleton.

Since there is only one DCT the mEnableFailFastRefCounter can be a
static/singleton and thus properly refcount the
CMD_SET_ENABLE_FAIL_FAST_MOBILE_DATA. There is still one problem
and that is if the PhoneApp crashes the singleton will be reinstantiated
and we'll have the same problem, but the frequency of this is small.
Also, the consequence of this is the DCT will be behaving "normally"
in that it will be attempting to do data-stall recovery although we
might like it not to it is the "normal" behavior.

Bug: 10304904
Change-Id: I38ff37445788ec952ca26be45b0374bc0a7ae34d
ataconnection/DcTrackerBase.java
353600dc6d6ea26b40e436e866e8c4372edaafd3 02-Aug-2013 sy.yun <sy.yun@lge.com> fix mvno_match_data OutOfBounds Exception in substring check routine.

When the length of mvno_match_data is greater than GID from IccRecord,
It will generate StringIndexOutOfBoundsException.
Therefore, codes are changed to use startsWith() insteads of subString().

Change-Id: I04c5c5039edb2cfa757bf2f5a4b9f124afb69b06
Bugs: 10171336
ataconnection/DcTracker.java
5016947ebeeb99d2f9cc2d902b46e9850b8b747b 09-Aug-2013 Wink Saville <wink@google.com> am d1eb383d: am a76fa595: Merge "Add mEnableFailFastRefCounter." into jb-mr2-dev

* commit 'd1eb383d9bd58140607f212e46db64559f408780':
Add mEnableFailFastRefCounter.
4dbcf752298487d3af0ab778bfa804462ea24271 09-Aug-2013 Wink Saville <wink@google.com> am bc42667e: am 97978662: Restart, cleanup or retry inactve connections.

* commit 'bc42667e465b7dfacfe4592390b14c5518a05e41':
Restart, cleanup or retry inactve connections.
d1eb383d9bd58140607f212e46db64559f408780 09-Aug-2013 Wink Saville <wink@google.com> am a76fa595: Merge "Add mEnableFailFastRefCounter." into jb-mr2-dev

* commit 'a76fa59574734cd1528dff2937231b78ea96e8f3':
Add mEnableFailFastRefCounter.
bc42667e465b7dfacfe4592390b14c5518a05e41 09-Aug-2013 Wink Saville <wink@google.com> am 97978662: Restart, cleanup or retry inactve connections.

* commit '979786625e7ceacf4a545a25704ef8a15338a854':
Restart, cleanup or retry inactve connections.
585e96097525e593c2ae7edb9fcf62526ab958ae 09-Aug-2013 Wink Saville <wink@google.com> am 2ae42257: DataConnection should not retry permanent errors.

* commit '2ae42257ebafdbb0470cedeab41c2f1b418b285c':
DataConnection should not retry permanent errors.
a76fa59574734cd1528dff2937231b78ea96e8f3 09-Aug-2013 Wink Saville <wink@google.com> Merge "Add mEnableFailFastRefCounter." into jb-mr2-dev
28cb5ee3ff4fe6b57039732a9268a385ad5db3d7 07-Aug-2013 William Luh <williamluh@google.com> Merge "Change the SMS event logging to "packages" aggregation, which requires the app uid."
d54f9906ce6218a0a9e7a274342082901e7d5d18 07-Aug-2013 Wink Saville <wink@google.com> Add mEnableFailFastRefCounter.

Use a reference counter to control enabling fail fast
as there are now two entities which control failing fast:
ConnectifityService.checkProvisioningUrl and
MobileDataStateTracker.captivePortalCheckComplete.

Bug: 9462512
Change-Id: I0dea0eee519f8ee7f94e79d40e82c18f30d7fe2e
ataconnection/DcTrackerBase.java
57da4aa945252ebed6b505387145f99be8ad5d72 07-Aug-2013 Wink Saville <wink@google.com> Unregistering a null receiver is now fatal.

This causes user builds to break, so only unregister
if we are actually registered.

Bug: 9657468
Change-Id: Ie801e6db37962e9de7559c8451806de1972cf430
elephonyTester.java
ataconnection/DcTesterDeactivateAll.java
ataconnection/DcTesterFailBringUpAll.java
979786625e7ceacf4a545a25704ef8a15338a854 06-Aug-2013 Wink Saville <wink@google.com> Restart, cleanup or retry inactve connections.

Instead of retrying all inactive connections, restart radio on very bad
errors, clean those that are permanent failures and retry
the others.

Bug: 10131736
Change-Id: I2527b18d6cda52c55fb94be58fbb1a7a86818ef9
ataconnection/DataConnection.java
ataconnection/DcController.java
ataconnection/DcFailCause.java
ataconnection/DcTrackerBase.java
b9f8b35a79580692c7c2c2d143389ad38aee719b 06-Aug-2013 Wink Saville <wink@google.com> Merge "Initialize RIL with the correct CDMA subscription mode setting"
16d259bfedada60d6b772ee0c640df58830527df 06-Aug-2013 Wink Saville <wink@google.com> When disposing only unbind if actually bound.

Change-Id: Icef7f050088d648fdf60f9a1ed690af46deb36e0
apPushOverSms.java
5ceae6074e0729fbbc422db2f263bf7cf453bf1a 29-Aug-2012 Naveen Kalla <nkalla@codeaurora.org> Initialize RIL with the correct CDMA subscription mode setting

Users choice of CDMA Subscription Source is stored in CDMA_SUBSCRIPTION_MODE
setting in database.
If telephony restarts after a crash, use CDMA_SUBSCRIPTION_MODE instead
of PREFERRED_CDMA_SUBSCRIPTION in PhoneFactory to prevent
mismatch with the value in the settings database chosen by the user.

Also, remove the Setting PREFERRED_CDMA_SUBSCRIPTION from the database.
With this change the special treatment for LTE on CDMA will not be needed.
The correct value can be set in the database for CDMA_SUBSCRIPTION_MODE
and that will be taken on power-up by this code.

Change-Id: I11fff596a5fe721c64f192c889672326517dc43d
honeFactory.java
dma/CdmaSubscriptionSourceManager.java
7982f3e57aaa53699ff3a00071280a88a5ac0c82 06-Aug-2013 Wink Saville <wink@google.com> Merge "Initialize RIL with the correct CDMA subscription mode setting"
d5fc65e2ca1ed72a936b497681784146449fe20b 06-Aug-2013 Ying Wang <wangying@google.com> Fix build.

Reference:
https://android-review.googlesource.com/#/c/61723/5

Change-Id: I327733be1c2ab3cda933b9f0c7c0a63332223ae8
honeFactory.java
7400cfc039e6982134ee852d01f1ff4939601f8b 06-Aug-2013 Dianne Hackborn <hackbod@google.com> Merge "Stop using implicit intents with bindService()."
ec125af4306f1be2c829c3a1d7adbf9b8cd7e659 06-Aug-2013 William Luh <williamluh@google.com> Change the SMS event logging to "packages" aggregation, which requires the app uid.

Change-Id: Ic3927b5764909b4ec8dc64fc41118f9057814656
MSDispatcher.java
dbb49dd094fbf33730830bab02eeb6250d8ae893 05-Aug-2013 Wink Saville <wink@google.com> am f6dced1a: Merge "Telephony: Fix issue in handling null alpha identifier"

* commit 'f6dced1ac15dc219bb87658a242d74abb9fb5ae2':
Telephony: Fix issue in handling null alpha identifier
f6dced1ac15dc219bb87658a242d74abb9fb5ae2 05-Aug-2013 Wink Saville <wink@google.com> Merge "Telephony: Fix issue in handling null alpha identifier"
7d3118aa708e4d02bf65514ab3feda10cd05a619 05-Aug-2013 Dianne Hackborn <hackbod@google.com> Stop using implicit intents with bindService().

The behavior of this case is not defined.

Change-Id: I6e858190d7b0c3b8976a1657de81a682cd989eee
apPushOverSms.java
2ae42257ebafdbb0470cedeab41c2f1b418b285c 21-May-2013 Wink Saville <wink@google.com> DataConnection should not retry permanent errors.

Update DcFailCause with the "no retry" info from ril.h

Bug: 9040015
Change-Id: Ib94af9996c79800322251a45349b117e1f913269
ataconnection/DataConnection.java
ataconnection/DcFailCause.java
78cc92ec740934603a9bda2de5a4745c049cfde1 02-Aug-2013 Elliott Hughes <enh@google.com> am a1915f28: Merge "If telephony wants ASCII casing, it needs to ask for it."

* commit 'a1915f289fbada7f7c716eed0078098bbb40adc1':
If telephony wants ASCII casing, it needs to ask for it.
11a8314b443c1f1fefa0636f40127f98449846d7 02-Aug-2013 Wink Saville <wink@google.com> am 4ce0e815: Merge "Create ApnSetting if none are found in database."

* commit '4ce0e815f8b0a796685fbc931cd6760c27172a0f':
Create ApnSetting if none are found in database.
a1915f289fbada7f7c716eed0078098bbb40adc1 02-Aug-2013 Elliott Hughes <enh@google.com> Merge "If telephony wants ASCII casing, it needs to ask for it."
b3537f8ffac71d6c4c263ae6e68d2722febf4622 02-Aug-2013 Elliott Hughes <enh@google.com> If telephony wants ASCII casing, it needs to ask for it.

http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html

Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: I5c2721f36861694928101c771ec6699424cf9aa3
ccTable.java
f46817da20f9628b7e55d1bb6ff0493f82dd9d85 18-Jun-2013 Alex Yakavenka <ayakav@codeaurora.org> Create ApnSetting if none are found in database.

Bug: 9315957
Change-Id: I0cf0debb703f6a4cad35300315922a5566871f85
ataconnection/DcTracker.java
1584a5054fb2a66ee05703b395172c73f784bb27 29-Aug-2012 Naveen Kalla <nkalla@codeaurora.org> Initialize RIL with the correct CDMA subscription mode setting

Users choice of CDMA Subscription Source is stored in CDMA_SUBSCRIPTION_MODE
setting in database.
If telephony restarts after a crash, use CDMA_SUBSCRIPTION_MODE instead
of PREFERRED_CDMA_SUBSCRIPTION in PhoneFactory to prevent
mismatch with the value in the settings database chosen by the user.

Also, remove the Setting PREFERRED_CDMA_SUBSCRIPTION from the database.
With this change the special treatment for LTE on CDMA will not be needed.
The correct value can be set in the database for CDMA_SUBSCRIPTION_MODE
and that will be taken on power-up by this code.

Change-Id: I11fff596a5fe721c64f192c889672326517dc43d
honeFactory.java
dma/CdmaSubscriptionSourceManager.java
e356d9a99d41a9350aee7d52ad20fa979463d42c 31-Jul-2013 Robert Greenwalt <rgreenwalt@google.com> am 06f093f7: Merge "Mobile network type is not updated when the network mode is switched."

* commit '06f093f728861837c54a96666ece5dc1853787c1':
Mobile network type is not updated when the network mode is switched.
c4161078eff3305894f1f9f1b2f00952ea0e83d8 18-Mar-2013 Kazuya Ohshiro <kazuya.x.ohshiro@sonymobile.com> Mobile network type is not updated when the network mode is switched.

Because ServiceStateTracker doesn't handle the change of ServiceState
after switching of Telephony FW, SystemProperty used for displaying
the mobile network type does not become to Unknown. To fix this issue,
when the network mode is switched, the SystemProperty should be
initialized to Unknown in the constructor of ServiceStateTracker.

Change-Id: I903ba855b9fe22530db8494a9d2615959970c5a4
erviceStateTracker.java
f219f2f4bc9de14787e1b3e3dc3cbfcb0f101a50 30-Jul-2013 Wink Saville <wink@google.com> am 793fb83c: Merge "Add support for MNC=00"

* commit '793fb83c41d26c84f4430885aafc7a8daeffffeb':
Add support for MNC=00
1b5fe200e47f40f82f0e28502a5f40bce64a82e6 27-Jul-2013 Wink Saville <wink@google.com> Add support for an initial APN

Add PhoneConstants.APN_TYPE_IA, DctConstants.APN_IA_ID and enhance
setInitialAttachApn to use the new Initial Attach apn.

Bug: 8733613
Change-Id: Ia627ac0cf5715660b6d02bb13a83d46ec1727b87
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
e64327265b40cbc52e6c07381bc0a80d7e031018 07-Oct-2011 Mattias Petersson <mattias.petersson@sonyericsson.com> Add support for MNC=00

This adds support for operators with MNC (Mobile Network Code) zero
to add customized resources. For example, it makes it possible to
add a folder called "/res/values-mnc00/" in an application. This will
cause resources in that folder to be used when MNC is zero.
(There is a total of 14 countries that have an operator with MNC
zero.)

Without this fix, the resource framework gets confused, because MNC 0
is normally used when the MNC is undefined (not set).

Bug: 7170488
Change-Id: Icfd39fd0c739216e89446252ea0e7ceba6f002c6
ccTable.java
e238e8d7cb48961817c993dc83f7aaaf84cf2d1c 26-Jul-2013 Jake Hamby <jhamby@google.com> Merge "Add prefix to SMS event tag"
bbcd0e4257ad545a6466697088fc4ddec3464547 23-Jul-2013 Wink Saville <wink@google.com> Hipri should not be enabled when we initialize.

Without this fix hipri starts at boot mobile data won't be shutdown
as refCount won't go to zero.

Bug: 9475300
Change-Id: If9587fa5360d777328fda59bbea61a2cbd9fe804
ataconnection/DcTracker.java
634a24f56f54b5d2911649288147c750b67c7ae4 23-Jul-2013 William Luh <williamluh@google.com> Add prefix to SMS event tag

Legal requires user consent for logging these in production (non-dogfood).
We will be filtering based on the specific tag prefix of exp_det_.

Change-Id: Id3d869c1b31716cee3e6ae98d3b840ef7f948e42
ventLogTags.logtags
MSDispatcher.java
e7b819f9c02355115840cab47c9ba0896a4476d3 19-Jul-2013 Wink Saville <wink@google.com> am b8127144: Merge commit \'3f4415e3\' into fix-merge-conflict

* commit 'b8127144de8d55c590ed537bdcb7a1afe5666b28':
telephony: Fix typo
b8127144de8d55c590ed537bdcb7a1afe5666b28 19-Jul-2013 Wink Saville <wink@google.com> Merge commit '3f4415e3' into fix-merge-conflict

* commit '3f4415e3':
telephony: Fix typo
3f4415e31c8c407e0397511fdc2d5906361295fa 19-Jul-2013 Wink Saville <wink@google.com> Merge "telephony: Fix typo"
9a4619dbca4b2c8836ea71eb794366bcccef5e56 09-Jul-2013 Wink Saville <wink@google.com> am 0c432e05: am 9c430a4d: Only show "Emergency calls only" if a GSM device is voice capable.

* commit '0c432e0512f69df06282741af23839db54e5d585':
Only show "Emergency calls only" if a GSM device is voice capable.
0c432e0512f69df06282741af23839db54e5d585 09-Jul-2013 Wink Saville <wink@google.com> am 9c430a4d: Only show "Emergency calls only" if a GSM device is voice capable.

* commit '9c430a4d72c8c962caefb916e82a4c82eca7068c':
Only show "Emergency calls only" if a GSM device is voice capable.
9c430a4d72c8c962caefb916e82a4c82eca7068c 09-Jul-2013 Wink Saville <wink@google.com> Only show "Emergency calls only" if a GSM device is voice capable.

This fix uses the config_voice_capable compile time switch to be
sure GsmServiceStateTracker.mEmergencyOnly is false if the device
isn't voice capable. Thus GsmServiceStateTracker.updateSpnDisplay
will not send the SPN_STRINGS_UPDATED_ACTION intent with
emergency_calls_only as the PLMN. Instead, it will aways be the
string defined by the lockscreen_carrier_default, typically
"No service".

Bug: 9422921
Change-Id: I74e89c4a29d0d8e3d5cc1726adedb0c2634cf257
sm/GsmServiceStateTracker.java
ae0ee2f04405f059a3c186ceab4ddfb789e6f641 08-Jul-2013 Jean-Baptiste Queru <jbq@google.com> am 299f0785: am 4b361fe2: am d254ff60: Merge "Telephony: remove the useless variable."

* commit '299f07852601bb735296646c9587bf72169d1476':
Telephony: remove the useless variable.
299f07852601bb735296646c9587bf72169d1476 08-Jul-2013 Jean-Baptiste Queru <jbq@google.com> am 4b361fe2: am d254ff60: Merge "Telephony: remove the useless variable."

* commit '4b361fe2f0597aae6a50012bc4fe048acd41ebbf':
Telephony: remove the useless variable.
4b361fe2f0597aae6a50012bc4fe048acd41ebbf 08-Jul-2013 Jean-Baptiste Queru <jbq@google.com> am d254ff60: Merge "Telephony: remove the useless variable."

* commit 'd254ff6031ad039e93964378d604a4950d828170':
Telephony: remove the useless variable.
13347e89869fe1d71a75dfec3d7307d62f61796e 04-Jul-2013 Wink Saville <wink@google.com> am c8865f1d: am 0c5a2697: Allow GSMPhone#getCellLocation to report LTE location information

* commit 'c8865f1dfc810e20908f45d3eef431a81544e9f6':
Allow GSMPhone#getCellLocation to report LTE location information
c8865f1dfc810e20908f45d3eef431a81544e9f6 04-Jul-2013 Wink Saville <wink@google.com> am 0c5a2697: Allow GSMPhone#getCellLocation to report LTE location information

* commit '0c5a2697697b49228bd2e23dc8d8217877a0fd7b':
Allow GSMPhone#getCellLocation to report LTE location information
0c5a2697697b49228bd2e23dc8d8217877a0fd7b 04-Jul-2013 Wink Saville <wink@google.com> Allow GSMPhone#getCellLocation to report LTE location information

Bug: 9228974
Change-Id: I7e9b190aa67968f1f2b2b567614c35c5dd5d78fa
erviceStateTracker.java
sm/GSMPhone.java
sm/GsmServiceStateTracker.java
e056c8263473f67dc78630f5535c3664fabacd23 02-Jul-2013 Wink Saville <wink@google.com> Merge commit '1f95c96e' into fix-merge-conflict

* commit '1f95c96e':
Add CMD_SET_ENABLE_FAIL_FAST_MOBILE_DATA to DcTracker.

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

Change-Id: I7c7234d1b13647a0534a77937ea51d4051043a55
1f95c96e704254857e9c2dde016b06a7d849666b 02-Jul-2013 Wink Saville <wink@google.com> am 28b99e3f: Merge "Add CMD_SET_ENABLE_FAIL_FAST_MOBILE_DATA to DcTracker." into jb-mr2-dev

* commit '28b99e3f85fa5357d536d0ae80fb70a3cd59c09a':
Add CMD_SET_ENABLE_FAIL_FAST_MOBILE_DATA to DcTracker.
28b99e3f85fa5357d536d0ae80fb70a3cd59c09a 02-Jul-2013 Wink Saville <wink@google.com> Merge "Add CMD_SET_ENABLE_FAIL_FAST_MOBILE_DATA to DcTracker." into jb-mr2-dev
6c620b6b0b1d6f1ce0a575e014a82324cbe48661 01-Jul-2013 Wink Saville <wink@google.com> am 16f8ca73: am e9070e6d: Don\'t set gsm.sim.operator.numeric to null

* commit '16f8ca73c18d2e584b6a57dc66491c1c0d40727c':
Don't set gsm.sim.operator.numeric to null
16f8ca73c18d2e584b6a57dc66491c1c0d40727c 01-Jul-2013 Wink Saville <wink@google.com> am e9070e6d: Don\'t set gsm.sim.operator.numeric to null

* commit 'e9070e6d48d1389987650fa2c3e1f90aab860684':
Don't set gsm.sim.operator.numeric to null
e9070e6d48d1389987650fa2c3e1f90aab860684 29-Jun-2013 Wink Saville <wink@google.com> Don't set gsm.sim.operator.numeric to null

Bug: 9628781
Change-Id: I80c00584535a327f9e93c8bd0980178781cae6ff
icc/RuimRecords.java
icc/SIMRecords.java
ec107cb8a36181fa26e61ab51f423ba862deb0fa 28-Jun-2013 Wink Saville <wink@google.com> Add CMD_SET_ENABLE_FAIL_FAST_MOBILE_DATA to DcTracker.

To fail fast we turn off data stall detection and do no retires.

Bug: 9279964
Change-Id: I42c326a21e05aa301e9d974ed9ac1d59472780ec
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
d084fb51297c446d4adb072089822a41820bd188 28-Jun-2013 Gao Rong <gaorong.dawn@gmail.com> Telephony: remove the useless variable.
IL.java
46f190903e93c653b90b970c1a21159bb957575b 18-Jun-2013 Wink Saville <wink@google.com> Fix NPE when exiting DcDefaultState.

Bug: 9263045
Change-Id: I62069114d5e9f2b0e90f892d2333b27fe693294d
ataconnection/DataConnection.java
017166876a51eda9ae6b3254119023604e249bc5 12-Jun-2013 Wink Saville <wink@google.com> Merge commit '6aebe10f' into fix-merge

* commit '6aebe10f':
Fail on permanent errors in DcTracker.

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

Change-Id: Icbee3d7c73fa170813e0683fb7c22dd78e08d6e8
6aebe10f9841bb3bff35d1c9912d48f742e82f91 12-Jun-2013 Wink Saville <wink@google.com> am 4a65a2c9: Fail on permanent errors in DcTracker.

* commit '4a65a2c9c5d5a46453064e7047582d9045e8addc':
Fail on permanent errors in DcTracker.
4a65a2c9c5d5a46453064e7047582d9045e8addc 11-Jun-2013 Wink Saville <wink@google.com> Fail on permanent errors in DcTracker.

This reverts the retry added when fixing bug 9240744:

https://googleplex-android-review.git.corp.google.com/#/c/315817/2


Bug: 9373372
Change-Id: I15d8dcc2c04174d54dd33f8a34813fd72764fc77
ataconnection/DcTracker.java
185370a905597ab107a8f2b0455440017e661321 04-Jun-2013 Wink Saville <wink@google.com> Merge commit 'c93dfda4' into fix-mergeconflict

* commit 'c93dfda4':
Do not retry forever in DataConnection.

Change-Id: I58bed4576638a459537d6b5a4c217e1f2fdb3826
c93dfda4916f67efd91e9a83b67128c192ca51f0 04-Jun-2013 Wink Saville <wink@google.com> am fcc57e87: Do not retry forever in DataConnection.

* commit 'fcc57e87d1620ab7dc877d65e7e85dca77132054':
Do not retry forever in DataConnection.
fcc57e87d1620ab7dc877d65e7e85dca77132054 03-Jun-2013 Wink Saville <wink@google.com> Do not retry forever in DataConnection.

When we are initially to connect we limit the the number of
retries so as to go through the list of waiting apns. But if retry
forever is enabled, as it is with Verizon devices, we can burn the
battery down quickly because we're retrying with short initial
timeouts.

In this change I also increase the timeout between apn retries from
5 seconds to 20 seconds to further reduce battery drain when retrying.
And added a retry with a longer timeout if to keep the contract with
ConnectivityService that when enabled we will continue to retry.

Bug: 9240744
Change-Id: I45b9ec5300d602d838dbdeacdbd1fca0c4d65ee3
ataconnection/DataConnection.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
203e588e3c42a81aa8a56f595119c181a63b12ca 31-May-2013 Wink Saville <wink@google.com> Handling data registration and radio technology changing.

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: Id4f29a63421af65ce153d24d646c09f7a1e8269b
erviceStateTracker.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
ataconnection/DataConnection.java
ataconnection/DcAsyncChannel.java
ataconnection/DcTracker.java
sm/GsmServiceStateTracker.java
187a39f896f88eb6c5e4306d9595546654825976 29-May-2013 Wink Saville <wink@google.com> Change DcTracker to not connect or retry if detached.

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: I363cd4580aeea68d88eff0b48ce579d2f27a13f3
ataconnection/DcTracker.java
4a9b3afeb2ec4d573eca335a3706392ecf9f281e 28-May-2013 Wink Saville <wink@google.com> Change DcTracker construction so only initialization is preformed.

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: I6d1bf350f2803aa62fa21b6a6759685456bef6eb
ataconnection/DcTracker.java
8f184cf35fa7fbc8e5ed887beaec0d090000939b 24-May-2013 Wink Saville <wink@google.com> Merge "DataConnection should not retry permanent errors."
5d5eea6ed231163c225144316b0d1913d48678a4 26-Apr-2013 Sungmin Choi <sungmin.choi@lge.com> Set initial attach apn for LTE network

When mobile register LTE network, APN provided by operators is needed.
If mobile does not have apn information, it could not register LTE network.
To deliver APN information which is used during LTE attach to modem chipset,
setLteAttachProfile() and RIL_REQUEST_SET_LTE_ATTACH_PROFILE command is added.

When Telephony DB is loaded or Telephony DB is changed, follow steps.
1. If preferred default ApnContext exists, this is delivered to modem chipset.
2. If preferred default ApnContext is null, find other ApnContext which can
handle default type.
3. If other ApnContext which can handle default type does not exist, any other
ApnContext delivered to modem chipset.

Then modem register LTE network with APN information delivered from AP.

Bug: 8733613

Change-Id: If84c62cddccf96a531dae0527ed1a6592ae76201
Signed-off-by: Seonju Oh <seonju.oh@lge.com>
Signed-off-by: Hyejin Kim <hyejin.kim@lge.com>
Signed-off-by: Sungmin Choi <sungmin.choi@lge.com>
ommandsInterface.java
IL.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
943b5090958bd8a2c0877218b1c8dbc72c4f8758 21-May-2013 Wink Saville <wink@google.com> DataConnection should not retry permanent errors.

Update DcFailCause with the "no retry" info from ril.h

Bug: 9040015
Change-Id: Ib94af9996c79800322251a45349b117e1f913269
ataconnection/DataConnection.java
ataconnection/DcFailCause.java
ee3555b687ef096490644cea009a1f4653d7df1d 21-May-2013 Wink Saville <wink@google.com> Merge "Retry even on permanent failures."
da1dd2e1bccb6141109a65d4e40253f39c405537 21-May-2013 Wink Saville <wink@google.com> Retry even on permanent failures.

The contract with ConnectivityService is that we should continue
to try to connect as long as we're ready. With this change we continue
but length the delay if there were permanent failures.

Change-Id: I83acfd2b07740d3650756aa20dad67b3c53e40d6
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
ab78c66a40cf1de4c4640601024d934dfa9c7d20 21-May-2013 Robert Greenwalt <rgreenwalt@google.com> am aba24c0e: am 6613a961: resolved conflicts for merge of d678053c to stage-aosp-master

* commit 'aba24c0e411839115840ae35caa52cd72fdf98ae':
Using a single counter for outstanding requests.
aba24c0e411839115840ae35caa52cd72fdf98ae 21-May-2013 Robert Greenwalt <rgreenwalt@google.com> am 6613a961: resolved conflicts for merge of d678053c to stage-aosp-master

* commit '6613a961473a72c218ec505e384dad6b19049aa0':
Using a single counter for outstanding requests.
6613a961473a72c218ec505e384dad6b19049aa0 21-May-2013 Robert Greenwalt <rgreenwalt@google.com> resolved conflicts for merge of d678053c to stage-aosp-master

Change-Id: I17029e11f1a17d1446a06f716ab40b5a7f723258
1db7da14111228a5079d2970d7d0ce34173000b5 20-May-2013 Wink Saville <wink@google.com> Remap NONE to UNKNOWN on GENERIC_FAILURES for SETUP_DATA_CALL.

Bug: 9040003
Change-Id: I49340b88fe8cfe2c7895c7950e7b9ba0f947b145
(cherry picked from commit 912a45a1c0740a33938ec9c081d9f5baa984d376)
ataconnection/DataConnection.java
e1a4f80a7dac4bb4439a40811d7f53c2a3a17da1 20-May-2013 Wink Saville <wink@google.com> am 748ec9f1: am 74672e8e: Fix setup of retry filters.

* commit '748ec9f1d8fdefb122216e1ff6368072c0ddf736':
Fix setup of retry filters.
748ec9f1d8fdefb122216e1ff6368072c0ddf736 20-May-2013 Wink Saville <wink@google.com> am 74672e8e: Fix setup of retry filters.

* commit '74672e8ee972f12406b72551261b4cc7e0651933':
Fix setup of retry filters.
7cabec78b4c9ad40f23d8f9fd756722d33b4a639 10-Jan-2013 Robert Greenwalt <rgreenwalt@google.com> Using a single counter for outstanding requests.

Change-Id: Ie99239fbe02f4ee1528c0dc6e1a1750cad404b2c
IL.java
74672e8ee972f12406b72551261b4cc7e0651933 18-May-2013 Wink Saville <wink@google.com> Fix setup of retry filters.

There were multiple registered filters for INTENT_RESTART_TRYSETUP_ALARM
this caused a retry not to fire and contributing to not recovering from
a RAT change error in identified by Samsung in post #22 of 8849653.

Bug: 8849653
Change-Id: I9c5cdb740d87a05dd69d72f8bc5596230b75d6f2
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
3befce9c55a0c247ad3d2168d36c5a67fe72c894 15-May-2013 Wink Saville <wink@google.com> am 14c47d88: am 9bce8bee: Merge "Fix a typo bug."

* commit '14c47d88b23fc035bed3d8625065a9157e470c36':
Fix a typo bug.
14c47d88b23fc035bed3d8625065a9157e470c36 15-May-2013 Wink Saville <wink@google.com> am 9bce8bee: Merge "Fix a typo bug."

* commit '9bce8beeeb2d55ba7f4bec67b1a174e16bdd3b53':
Fix a typo bug.
9bce8beeeb2d55ba7f4bec67b1a174e16bdd3b53 15-May-2013 Wink Saville <wink@google.com> Merge "Fix a typo bug."
64ec418c6bbf031a69f4948a115261bd1c5663ec 15-May-2013 Gao Rong <gaorong.dawn@gmail.com> Fix a typo bug.

Card state log should be correctly dispalyed as cdma_id instead of cmda_id.
icc/IccCardStatus.java
c86f2407bce6575b63caf25d23316aebd5351ac3 14-May-2013 Wink Saville <wink@google.com> am daffa125: am 24286939: Do a disconnect if ApnContext is ready but retrying or failed.

* commit 'daffa12593f4fc2fe3cb8ab527ad2e836229e414':
Do a disconnect if ApnContext is ready but retrying or failed.
daffa12593f4fc2fe3cb8ab527ad2e836229e414 14-May-2013 Wink Saville <wink@google.com> am 24286939: Do a disconnect if ApnContext is ready but retrying or failed.

* commit '2428693913ae731d4ace3414429f5e91af24ea36':
Do a disconnect if ApnContext is ready but retrying or failed.
2428693913ae731d4ace3414429f5e91af24ea36 14-May-2013 Wink Saville <wink@google.com> Do a disconnect if ApnContext is ready but retrying or failed.

This change allows enabling of a ready ApnContext to reconnect if the
ApnContext is IDLE, FAILED or RETRYING. Without this change toggling
wifi or otherwise enabling the connection would not cause the connection
to be retried. Instead, toggling airplane mode would be required.

Bug: 8849653
Change-Id: I83f44dbfd412f4b0122a2108e22f36db94c59d18
ataconnection/DcTracker.java
0ebea55f1ac175f5752f10797c4b6bf87e42afb1 11-May-2013 Wink Saville <wink@google.com> Merge commit '08c0ce75' into fix-merge-conflict

* commit '08c0ce75':
Send notifyDataConnection on changes to data connection.

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

Change-Id: I0513bea92137b27d1c070c45f231c1391c503b88
08c0ce75f8affbfffcb46fbf039795023521aea2 10-May-2013 Wink Saville <wink@google.com> am a0f04ae3: Send notifyDataConnection on changes to data connection.

* commit 'a0f04ae3f07c686ddbc4d83edf0f1b7d8d1b4a0a':
Send notifyDataConnection on changes to data connection.
a0f04ae3f07c686ddbc4d83edf0f1b7d8d1b4a0a 10-May-2013 Wink Saville <wink@google.com> Send notifyDataConnection on changes to data connection.

Previously notification was sent only when voice radio technology
changed, but it needs to be when data RAT changed. Also send it with
there is a data registration changes.

Bug: 8786016
Change-Id: I5a53e13821efde4ebd3dbe5f062e7729f321497b
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
sm/GsmServiceStateTracker.java
dae8162ec0b4b93f0d75d3b6c7ccffd0936e9caa 09-May-2013 Jake Hamby <jhamby@google.com> am 2fb61f2c: am f9c0a042: Merge "4373 & 4374 part of Severe Alerts"

* commit '2fb61f2cc25e78c9705ce5131561859382d124fb':
4373 & 4374 part of Severe Alerts
2fb61f2cc25e78c9705ce5131561859382d124fb 08-May-2013 Jake Hamby <jhamby@google.com> am f9c0a042: Merge "4373 & 4374 part of Severe Alerts"

* commit 'f9c0a042694635033704e0170d6bbc8214bd78e4':
4373 & 4374 part of Severe Alerts
030b39849e81d1b5de8ca33a718be4feea38a820 08-May-2013 Jake Hamby <jhamby@google.com> Merge "Log the correct radio states for GSM_RAT_SWITCHED."
f9c0a042694635033704e0170d6bbc8214bd78e4 08-May-2013 Jake Hamby <jhamby@google.com> Merge "4373 & 4374 part of Severe Alerts"
a71fe5191a367d376704cd642468a145ff802074 29-Apr-2013 Anju Mathapati <anjucm@codeaurora.org> 4373 & 4374 part of Severe Alerts

As per specification change 23.041 V9.6.0,
4373 & 4374 have been moved from Extreme
Alerts to Severe Alerts.

Bug: 8847901
Change-Id: I98f443dfc799da259d942f62ce66006058e5ffb1
sm/SmsCbHeader.java
2ed9b7b8bd0d962acbd72b86a4296868aba285c8 06-May-2013 Wink Saville <wink@google.com> am 6d336fec: am 9a480819: On EVENT_CONNECT in DcRetryingState do not go inactive.

* commit '6d336feccb3f412c6623c90be2144f19838eee44':
On EVENT_CONNECT in DcRetryingState do not go inactive.
9a480819c79acf31f328d254b1bb9fe6cfac2c34 03-May-2013 Wink Saville <wink@google.com> On EVENT_CONNECT in DcRetryingState do not go inactive.

Going to DcInactiveState from DcRetryingState on EVENT_CONNECT causes
us to forget we are retrying the original connection and if this is
a different connection we can disconnect completely when we shouldn't.

For example, when we're retrying the default connection and we get a
request to connect to supl or mms which are short lived connections
we'll become completely disconnected.

Bug: 8770139
Change-Id: Id271bc7f88d12e6d9fe9451b09f9c9412e6959f4
ataconnection/DataConnection.java
385051afecde7a16a08b2aebb2025c3a2bbac279 02-May-2013 Jake Hamby <jhamby@google.com> Log the correct radio states for GSM_RAT_SWITCHED.

In GsmServiceStateTracker.pollStateDone(), we were recording the
incorrect radio states when logging GSM_RAT_SWITCHED. Specifically,
we were using the new voice radio technology for "network_from" and
STATE_OUT_OF_SERVICE for "network_to".

To avoid confusion when analyzing logs from different devices,
add a new event log tag, GSM_RAT_SWITCHED_NEW, to use for logging
the correct radio states, and add comments to indicate that
GSM_RAT_SWITCHED should be considered obsolete.

Bug: 8781951
Change-Id: I858d3f5044d7fb2560a4e21b8a5b4b14b4689a61
ventLogTags.logtags
sm/GsmServiceStateTracker.java
55032f7787e2bc447249d3f2cdf4998dfb6e26cc 01-May-2013 Wink Saville <wink@google.com> am f6f1abbe: am 0f94d3ae: Add synchronized to toString.

* commit 'f6f1abbe04cf92da5412d20f194e5a023c61f42d':
Add synchronized to toString.
0f94d3aebcf0daf154bf0876164844d09067f904 30-Apr-2013 Wink Saville <wink@google.com> Add synchronized to toString.

If toString is called at the same time removeWaitingApn we can
get a ConncurrentModificationException.

Bug: 8727610
Change-Id: I95c2181a1a5abc1a28a9e4eb337b674e49847103
ataconnection/ApnContext.java
0e57bf12b5f4ea53427d7a7f1f875ec744dd1828 24-Apr-2013 Wink Saville <wink@google.com> am 26830d76: am 815af95f: Support WiFi only device at runtime.

* commit '26830d76df08a9830decdb758845ba67f5bac044':
Support WiFi only device at runtime.
3c9d82364525c955bf6501775f90026090c160e9 24-Apr-2013 Jake Hamby <jhamby@google.com> Merge "Refactor inbound (MT) SMS handling into new handler classes."
815af95fb1568fd7b1ab8e6a610189821de99c81 23-Apr-2013 Wink Saville <wink@google.com> Support WiFi only device at runtime.

Now that ConnectivityService determines if TYPE_MOBILE is supported at
runtime don't need the special code in RIL.java.

Bug: 8562845
Change-Id: I34de5c6accc718b199c13815537de1debfe3dc91
IL.java
0d4bcdf379842af4b6304809156971e926f374f0 18-Mar-2013 Jake Hamby <jhamby@google.com> Refactor inbound (MT) SMS handling into new handler classes.

Moved all MT SMS handling to separate StateMachine classes, which
save all incoming PDUs in the SmsProvider "raw" table, previously
used only for storing PDUs of concatenated messages. Then we ACK the
message, before starting the ordered broadcast as usual. If a receiver
of the broadcast sets the status to failure, we ignore it, but in the
future we could provide a mechanism to redeliver the broadcast.

New classes are (without com.android.internal.telephony prefix):
- CellBroadcastHandler
- InboundSmsHandler
- InboundSmsTracker
- SmsBroadcastUndelivered
- WakeLockStateMachine
- cdma.CdmaInboundSmsHandler
- cdma.CdmaServiceCategoryProgramHandler
- gsm.GsmCellBroadcastHandler
- gsm.GsmInboundSmsHandler

This fixes a bug in the SMS dispatcher. Previously we delivered
incoming SM's as ordered broadcasts and then sent an acknowledgment
to the SMSC after the broadcast completed. It was possible for the
ordered broadcast to take over 20 seconds to complete, causing SMS
retransmissions because we didn't ACK quickly enough. Also, a
broadcast receiver could set the result code to failure (the AOSP
MMS app never does this), causing us to negatively acknowledge the
SMS, potentially leading to many retries and a backlog on the SMSC.

The reason for saving all PDUs in the raw table before ACKing is so
InboundSmsHandler can handle the failure case of a device crash or
power failure in between ACKing the message and the delivery of the
ordered broadcast to receivers. This is handled when the Phone class
starts, creating a new thread to run SmsBroadcastUndelivered.
This Runnable scans the raw table once, finding all complete
PDUs and sending IncomingSmsTrackers to the state machine to
broadcast them again to receivers. In the worst case, a message might
be added twice to the MMS inbox, but it won't be lost.

However, due to the current MMS app implementation, which immediately
acknowledges the ordered broadcast before starting a new Service to
process the message, there is a very short window of time when a
message could potentially be lost, if the MMS app or device crashed
after the ordered broadcast returns and the message is deleted from
the raw table, but before the MMS service has added the message to
its own tables. To fix this will probably require API changes.

Another improvement from this change: SmsBroadcastUndelivered also
deletes PDUs for incomplete multipart messages that are older than
30 days. We've never garbage collected this table in the past, so
it's possible for a phone to accumulate a number of old PDUs in the
raw table if not all components arrived successfully.

The wake lock handling is also improved in this version, as we now
acquire a wakelock when the state machine leaves the Idle state,
releasing it 3 seconds after returning to the idle state, instead
of the previous 5-second timeout. If a new SMS arrives while a
broadcast is being delivered, we add it to the raw table and ACK the
new PDU immediately, then send the InboundSmsTracker as a message to
handle when the previous broadcast completes.

In order to keep track of whether a PDU is in 3GPP or 3GPP2 format,
the destination port column of the raw table is extended with three
flags: 3GPP format, 3GPP2 format, and no destination port present.
Because the destination port is a 16-bit value in both 3GPP and
3GPP2, the upper bits of the destination port can be used for flags.
This saves us from having to modify the SMS provider to update the
DB version and to add extra columns to keep track of these flags.

Bug: 7099232
Change-Id: Ibbc01ccb83320f4b6112fe3dd31355eb6f570b67
ellBroadcastHandler.java
nboundSmsHandler.java
nboundSmsTracker.java
MSDispatcher.java
msBroadcastUndelivered.java
msStorageMonitor.java
akeLockStateMachine.java
apPushOverSms.java
dma/CDMALTEPhone.java
dma/CDMAPhone.java
dma/CdmaInboundSmsHandler.java
dma/CdmaSMSDispatcher.java
dma/CdmaServiceCategoryProgramHandler.java
sm/GSMPhone.java
sm/GsmCellBroadcastHandler.java
sm/GsmInboundSmsHandler.java
sm/GsmSMSDispatcher.java
sm/UsimDataDownloadHandler.java
30961e36e424641b8cd0496888112d3ac748e306 22-Apr-2013 Wink Saville <wink@google.com> Merge "On data only devices use data registration state." into jb-mr2-dev
f1317a4b3492218ac2e449ee990948bac0295b65 20-Apr-2013 Wink Saville <wink@google.com> On data only devices use data registration state.

Some operators may report that the voice registration state is
not in service on a data only device. So use the Data registration
state for data only devices.

Bug: 8213254
Change-Id: Ieb6eef65fa5afb3d2c1a39b32a5bc5825ccc7f1c
erviceStateTracker.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
sm/GsmServiceStateTracker.java
e17fb5a149610484b4bcda31cde04abfd4e5d4ec 18-Apr-2013 Jake Hamby <jhamby@google.com> Load call forwarding flag from EF_CFF_CPHS when EF_CFIS is missing.

After loading EF_CFF_CPHS, use it to set mCallForwardingEnabled flag
if EF_CFIS record is missing or invalid.

Also fixes a few typos and updates an incorrect Javadoc comment.

Bug: 8554894
Change-Id: I3dfe3c915ad15b65781cd4e4d65cfa5c71a46ad6
icc/SIMRecords.java
121c056d398b68e2bd2d35e6f5c2730fa7fb81c9 17-Apr-2013 Wink Saville <wink@google.com> Default CellInfoListRate to off, Integer.MAX_VALUE.

For now be sure CellInfoListRate is off.

Bug: 8621996
Change-Id: I513a67d4b46b72f03e0c3360abcc0ad5222c1c13
IL.java
5fce53ac6610d7b301cb70a6433307b822c41c30 11-Apr-2013 Wink Saville <wink@google.com> Merge "Telephony: Return 'null' as per TelephonyManager need"
3c6bdec23af42aba1168303cdefc20525b0ec1d0 11-Apr-2013 Ajay Nambi <anambi@codeaurora.org> Telephony: Return 'null' as per TelephonyManager need

Return 'null' instead of "" (empty string) when Line1AlphaTag,
IccSerialNumber and Msisdn are unavailable.

Bug: 8449375
Change-Id: I5d8052922363f4b3b900bcdea490afe22fedce4f

Change-Id: Iaa77764af8f2c12c11c990c6c23152ba1dac84cb
honeBase.java
sm/GSMPhone.java
94354e82d1e0cc5fa21dec803d089dd066689174 10-Apr-2013 Wink Saville <wink@google.com> Merge "Add FW support for CellInfo RIL commands." into jb-mr2-dev
807686598ce4da5d1cb05eaaad4c71f867fe2131 22-Jul-2012 Shriram Ganesh <sganesh@codeaurora.org> Telephony: Send complete path for EF-IMG(4F20) for RUIM cards.

When retrieving the EF_IMG from an RUIM the icon load fails
because the path to the EF is incorrectly specified as "img"

Bug: 8443193
Change-Id: I76f981d5334274b34e2e1a752fd0a550458e4e86
icc/RuimFileHandler.java
c76db118626ef47a8deee6fbd9c20dff1473d896 09-Apr-2013 Wink Saville <wink@google.com> Merge "Telephony: Send complete path for EF-IMG(4F20) for RUIM cards."
5fb811ff076aa6b4a9ceca6edaf504a4c6d9ad20 09-Apr-2013 Wink Saville <wink@google.com> Add FW support for CellInfo RIL commands.

Bug: 8235566
Change-Id: I7ad7dabc4b6c38bfba4461b08e6e30d0eb9efea1
aseCommands.java
ommandsInterface.java
hone.java
honeBase.java
honeProxy.java
IL.java
erviceStateTracker.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
e3366ce305cf679bed0270db09938567d0e4d6d2 08-Apr-2013 Wink Saville <wink@google.com> Fix SignalStrength response.

Use the new SignalStrength constructor with gsmFlag.

Also, remove code in responseStrings which would cause
it to return an empty array if RILJ_LOGV was true.

Bug: 8561333
Change-Id: Ie6eb3b0335e8d7ea114ec70b3fb72e917094632e
IL.java
f50b1bea2553ccd7b528f225bb7edc1504959db7 03-Apr-2013 Wink Saville <wink@google.com> Merge "IccCardApplicatonStatus should not throw exceptions." into jb-mr2-dev
c99e7c34aaca14bb1d8f9962f79d9465ccc04575 03-Apr-2013 Wink Saville <wink@google.com> IccCardApplicatonStatus should not throw exceptions.

Change from throwing exception to logging an error and mapping
to an XXXX_UKNOWN value.

Bug: 7449696
Change-Id: Iebed1c7893d120fb02821017643ee070d634bb19
icc/IccCardApplicationStatus.java
6651da75a59ee54f154b2a82c76392a3385108bb 02-Apr-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "make new API to retrieve group identifier level1" into jb-mr2-dev
4750c8c11836338b024e159f04f0cbd13c7444b9 29-Mar-2013 Wink Saville <wink@google.com> Fix TODO in ApnContext#setDataConnectionAc.

Callers that really need to tearDown should call it directly
rather than as a side effect of setDataConnectionAc. The fixes
a "DcActiveState ERROR no such apnContext=" message caused by
an unnecssary tearDown when disconnecting.

Change-Id: I11321d098444659d99dec97b59041cefebb3285e
ataconnection/ApnContext.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
1f8e6cacec886736414f3b7d750ad1fa973ab20d 29-Mar-2013 Wink Saville <wink@google.com> Merge "Add fix and add some debugging." into jb-mr2-dev
c3b7c73fd6a494483e941adddcb3c0c23f4f0a70 28-Mar-2013 Wink Saville <wink@google.com> Add fix and add some debugging.

Bug: 8492574
Change-Id: I9cb1ab4ec3efb8186a4dd83736781835e1847720
ataconnection/DataConnection.java
c6bbea82bf74ebb492508199b6f3e172b7ce860a 28-Mar-2013 Wink Saville <wink@google.com> Map DcConstants.RETRYING to PhoneConstants.State.DISCONNECTED.

Previously RETRYING was mapped to CONNECTING this means that
ConnectivityService will not remove the route and a subsequent
change in IP addresses won't work because an old route has not
been removed.

By mapping to DISCONNECTED ConnectivityService will remove the
route. Another alternative would be to add PhoneConstants.State.RETRYING
but this is a simpler change so we'll try it first.

Bug: 8486114
Change-Id: I1c9946a1e441feda83f13730e835445624a87218
dma/CDMALTEPhone.java
dma/CDMAPhone.java
ataconnection/DcTrackerBase.java
sm/GSMPhone.java
1f2a2323572b2f3ab18234726cc1b048c670fbab 21-Mar-2013 Robert Greenwalt <rgreenwalt@google.com> Use new mechanism to get messenger to StateTracker

bug:8445208
Change-Id: Ice7dfb0b50c9481d359aed14a51372878185171c
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
f16c95f5e7e34e7e3a51a012d172902365a3682e 27-Mar-2013 Alex Yakavenka <ayakav@codeaurora.org> Merge commit '903be2fc' into fix-merge-conflict

* commit '903be2fc':
Telephony: Null check for adncache before search/update.

Change-Id: I1e498b4783e6c3381c14309019420142f3b8b15d
0e4abef0d7e978d4c3dea5199f451a1c69158d03 21-Mar-2013 Sungmin Choi <sungmin.choi@lge.com> make new API to retrieve group identifier level1

For mvno, user can add or edit mvno data field. To pre-provide
the mvno data of the edited apn when the user selects one of
the mvno types, need to support IMSI, SPN, and GID1 data.
To support GID1, make API to retrieve group identifier level1.

bug:6445254
Change-Id: I1bc280054cc7cd37e78a279866cefd62872a19fb
hone.java
honeProxy.java
honeSubInfo.java
honeSubInfoProxy.java
dma/CDMALTEPhone.java
dma/CDMAPhone.java
sm/GSMPhone.java
ip/SipPhoneBase.java
ead6ee84aa6275062b64a05dafd14a0c17da8ea3 27-Mar-2013 Wink Saville <wink@google.com> Merge "Telephony: Null check for adncache before search/update."
f8768537438ef0517f6b11f449f9cabbea2f99ba 27-Mar-2013 Lorenzo Colitti <lorenzo@google.com> Merge "Allow 0.0.0.0 and :: as default gateways" into jb-mr2-dev
652fe674a597e221274a3746118f15cf40c7dbb9 27-Mar-2013 Wink Saville <wink@google.com> Merge commit '310b322d' into fix-merge-conflict

* commit '310b322d':
Telephony: Delay SIM IO until SIM_READY

Change-Id: I50618a1fb06a7eb465f7a0d9b4b8d6fb53ad1339
f57fcc91426dfa4c3efe2f8ee64a6a39bf708a97 26-Mar-2013 Wink Saville <wink@google.com> Merge "Telephony: Delay SIM IO until SIM_READY"
64bfd98578babdd437f1a83d2d5e1fc92c76e729 21-Mar-2013 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Delay SIM IO until SIM_READY

When SIM_REFRESH with SIM_INIT is received we need to
reread EFs but only if and when app is ready.

Bug: 8445450
Change-Id: I066a1e6547cfdcba91230f5fbfa8050864327c5d
icc/IccRecords.java
icc/RuimRecords.java
icc/SIMRecords.java
ebc8af719102a64a2ae17cc2a836e23e2dbc3838 25-Mar-2013 Lorenzo Colitti <lorenzo@google.com> Allow 0.0.0.0 and :: as default gateways

On point-to-point interfaces, some RILs return the unspecified
address (0.0.0.0 or ::) as the gateway. This is correct, as
routes pointing at point-to-point interfaces don't need
gateways. Currently, telephony ignores these routes, causing
loss of connectivity (for example, when using an IPv6 APN on
Galaxy Nexus). Allow these routes to be set.

Bug: 8475171
Bug: 8276725
Change-Id: I3a770628c9717bb6e451a523417401b56ba55763
ataconnection/DataCallResponse.java
4e9ed0410d72180872d59b14cb375c1c2ed94788 26-Mar-2013 Jake Hamby <jhamby@google.com> resolved conflicts for merge of 4eede890 to jb-mr2-dev

Change-Id: I7ee1d93d832275ad04d4e6bbae68d22ae86322ac
3ab6a16ab4d9c6fd842a46ed02aee25391e1b8fa 25-Mar-2013 Jake Hamby <jhamby@google.com> Merge "Telephony: Fix IntRangeManager"
1b21c4e9ebaba1af72ae6fa18e98d6863c888aca 25-Mar-2013 Wink Saville <wink@google.com> Merge "Use Build.IS_DEBUGGABLE" into jb-mr2-dev
2cc8c148fa4cb6cba5deac6b011268b4174a0b02 25-Mar-2013 Wink Saville <wink@google.com> Use Build.IS_DEBUGGABLE

Change-Id: I8d4a2e83b8cdcf86cafb622013868f117d0701ef
honeBase.java
elephonyTester.java
ataconnection/DataConnection.java
ataconnection/DcController.java
ataconnection/DcRetryAlarmController.java
ataconnection/DcTesterDeactivateAll.java
ataconnection/DcTesterFailBringUpAll.java
b37b072231c579844c21e5120eb7c200ac872de1 25-Mar-2013 Jeff Sharkey <jsharkey@android.com> Merge "Testing property to verify roaming behavior." into jb-mr2-dev
60ced166cb63c35a0ebbee1fc356cddcb76b956f 25-Mar-2013 Jeff Sharkey <jsharkey@android.com> Testing property to verify roaming behavior.

Bug: 6777372
Change-Id: Ia698f0eca6f05a6327f6c8b36cfe14f51f01e6e3
erviceStateTracker.java
dma/CdmaServiceStateTracker.java
sm/GsmServiceStateTracker.java
b7881d6e7e4e79491376bedf151c3412dfdc4121 25-Mar-2013 Wink Saville <wink@google.com> Rename a couple variables in IccRecords.

Also add getIccId for use by PhoneBase.

Change-Id: I51eaf09bfc498f1f1edc3f697838978f56b7bd4e
honeBase.java
icc/IccRecords.java
icc/IsimUiccRecords.java
icc/RuimRecords.java
icc/SIMRecords.java
454b1dfd508844b42eb775e4ab2359be74d3672b 23-Mar-2013 Wink Saville <wink@google.com> Rename a few files and variables.

Change-Id: I4e90dbf57797b9485920f943e24fa7a4c29d070b
ebugService.java
honeBase.java
erviceStateTracker.java
dma/CDMALTEPhone.java
dma/CDMAPhone.java
dma/CdmaCallTracker.java
dma/CdmaServiceStateTracker.java
ataconnection/ApnContext.java
ataconnection/DataConnection.java
ataconnection/DataConnectionAc.java
ataconnection/DataConnectionTracker.java
ataconnection/DataConnectionTrackerBase.java
ataconnection/DcAsyncChannel.java
ataconnection/DcController.java
ataconnection/DcTracker.java
ataconnection/DcTrackerBase.java
sm/GSMPhone.java
sm/GsmServiceStateTracker.java
fce638d1cc4c30c69b5cb6b0511f93c874f34f41 22-Jul-2012 Shriram Ganesh <sganesh@codeaurora.org> Telephony: Send complete path for EF-IMG(4F20) for RUIM cards.

When retrieving the EF_IMG from an RUIM the icon load fails
because the path to the EF is incorrectly specified as "img"

Bug: 8443193
Change-Id: I76f981d5334274b34e2e1a752fd0a550458e4e86
icc/RuimFileHandler.java
4bf323c3a37e910dd6b3eb1ffabe508e0dff5b2a 30-Aug-2012 Venkat Ram Prakash Kotni <vkotni@codeaurora.org> Telephony: Return 'null' as per TelephonyManager need

Return 'null' instead of "" (empty string) when Line1AlphaTag,
IccSerialNumber and Msisdn are unavailable.

Bug: 8449375
Change-Id: I5d8052922363f4b3b900bcdea490afe22fedce4f
honeBase.java
sm/GSMPhone.java
ff4e317d24f0d23bdc0f306d53ddc51f2f1ecf6a 22-Mar-2013 Wink Saville <wink@google.com> Move retrying into DC.

This is the first step in refactoring for bug 4772191.

Bug: 4772191
Change-Id: Id54a20ab192783c63939158670faaf531a527640
ommandsInterface.java
ataCallState.java
hone.java
honeBase.java
IL.java
etryManager.java
elephonyTester.java
dma/CDMALTEPhone.java
dma/CDMAPhone.java
ataconnection/ApnContext.java
ataconnection/DataCallResponse.java
ataconnection/DataConnection.java
ataconnection/DataConnectionAc.java
ataconnection/DataConnectionBase.java
ataconnection/DataConnectionTracker.java
ataconnection/DataConnectionTrackerBase.java
ataconnection/DcController.java
ataconnection/DcFailBringUp.java
ataconnection/DcFailCause.java
ataconnection/DcRetryAlarmController.java
ataconnection/DcTesterDeactivateAll.java
ataconnection/DcTesterFailBringUpAll.java
sm/GSMPhone.java
ip/SipConnectionBase.java
ip/SipPhone.java
ip/SipPhoneBase.java
est/SimulatedCommands.java
6ca911a976a277e69800249c924c8dbc8fc5d78f 21-Mar-2013 Wink Saville <wink@google.com> Merge commit 'f606e5cc' into fix-merge-conflict

* commit 'f606e5cc':
RIL: Correct the RIL_REQUEST_DIAL api missmatch

Conflicts:
src/java/com/android/internal/telephony/RIL.java

Change-Id: Ib2b477628e14ca221acad35f4a2cf9a44170a33e
9ae284ab5fc779da9b03f8fd5020edc658c4bf4e 10-Oct-2012 Bjorn Andersson <bjorn.andersson@sonymobile.com> RIL: Correct the RIL_REQUEST_DIAL api missmatch

The uusPresent is written twice in dial() so it will always be
marked as absent.

Change-Id: Id50a4dc8a3eefdaf2284e410382428c52e9b5ef1
IL.java
2c74d79cab4eee87acf0e74c0d8bf76be8f0f4aa 16-Mar-2013 Robert Greenwalt <rgreenwalt@google.com> am f7bf2056: am 63152045: Merge "add MVNO check routine"

* commit 'f7bf205684ca101326e57921d81963da7541e3c6':
add MVNO check routine
fd5de4dae153c57e13bf8979d6f7a8aa86e3dede 07-Feb-2013 Sungmin Choi <sungmin.choi@lge.com> add MVNO check routine

modify createApnList() API as the followings:

1.1 mvno != null (already matched mvno info)
1.2 mvno == cur_mvno_info
1.2.1 result.add
2.1 mvno == null (not yet)
2.2 mvnoMatch check
2.2.1 clear prev results.
2.2.2 result add (mvno)
2.3 mvno_type is null
2.3.1 result add (normal)

match mvno as the followings:
1. if mvno_type is spn, compare spn of SIM
2. if mvno_type is imsi, compare imsi of SIM
3. if mvno_type is gid, compare gid of SIM

Bug: 8143480
Change-Id: Idf0aa1ddf139f80c7d33b1e3315493d32dbf433a
sm/GsmDataConnectionTracker.java
620c8855bcaa3fe8d492e93811b0ed6e8b4f59fc 16-Mar-2013 Robert Greenwalt <rgreenwalt@google.com> Merge commit 'b21b57c0' into manualmerge

Conflicts:
src/java/com/android/internal/telephony/uicc/SIMRecords.java

Change-Id: Ic998e70207851e7e00f56d6e8591e53834987358
c13624a4a0b63c492fa8b336ae737f831bde50eb 15-Mar-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "get group identifier level1 (Gid1)"
01fdbd3285be1a8ba2143a4bc11a0f5065bb68d0 10-May-2012 Rika Brooks <rbrooks@codeaurora.org> Telephony: Fix IntRangeManager

-Fix to populate SmsBroadcastConfigInfo list with all the possible
range lists upon enable and disable to match previous implementation.
-Fix ClientRange to be ordered by start id, then by end id.
-Fix enableRange to handle missing cases:
-enable exact same range, i.e. new [x, y], existing [x, y]
-enable range that is already enclosed in existing range i.e.
adding [3, 3] to existing range [1,3]
-enable (startId -1) == range.endId, i.e. new [3, y] existing [1, 2]
-Fix where range.endId is not updated correctly
-Fix disableRange to first update mRange then call updateRange.
-Add more unit test cases.

Bug: 8355035
Change-Id: I83308c76ed28c6f753326aeaac6bec1d88c01b39
ntRangeManager.java
5a176f73dbb2bff2ca8b8f86af86a17be6863b87 11-Mar-2013 Wink Saville <wink@google.com> Merge commit '958e7316' into fix-merge-conflict

* commit '958e7316':
Telephony: Set TP-RD to 1 in case of retry

Change-Id: I298e588b1076686e2c7c4b3714b46d2637b04079
454c5783e7695feec276325920550b2d4dcc3e16 07-Jun-2012 Rika Brooks <rbrooks@codeaurora.org> Telephony: Set TP-RD to 1 in case of retry

per TS 23.040 Section 9.2.3.6: In the case where no response or an
RP-ERROR with an appropriate cause value (see 3GPP TS 24.011 [13]) is
received in response to an SMS-SUBMIT, then the MS shall automatically
repeat the SMS-SUBMIT but must use the same TP-MR value
and set the TP-RD bit to 1 (see 9.2.3.25)

Bug: 8323645
Change-Id: I1c7ebc67f80a6eeba456ab0dc5f6331a038d7ab2
MSDispatcher.java
sm/GsmSMSDispatcher.java
6c5e8c9ef98f3ef8f87e4a5c06f730cf7d0c1536 06-Mar-2013 Wink Saville <wink@google.com> am 5779b57f: Merge "Send user confirmation instead of Terminal Response"

* commit '5779b57fe7530dfca8d814be0cbd13c7bad5d643':
Send user confirmation instead of Terminal Response
a6aedcd548ee25f4df9d86ae94eec8b2a0b61f5a 06-Mar-2013 Wink Saville <wink@google.com> Merge commit '63a6a12c' into fix-merge-conflict

* commit '63a6a12c':
Telephony: Fix for first pause DTMF digit

Change-Id: I345e0e32d8230c16c28c953de5848cd095438e34
5779b57fe7530dfca8d814be0cbd13c7bad5d643 06-Mar-2013 Wink Saville <wink@google.com> Merge "Send user confirmation instead of Terminal Response"
37d3599e3fd89987da444ba971df98516d2ea3f5 21-Dec-2010 Shruthi Krishnan <shruthink@codeaurora.org> Telephony: Fix for first pause DTMF digit

As per 3GPP requirement first pause sequence also should maintain 3 sec
delay. Added fix to wait for 3 sec time before sending DTMF digits to
RIL.

Change-Id: I6041614b544cc9c24521bee9ad505439b810ff86
sm/GsmConnection.java
14957f5b0b202fc80782944c962d282ed1866837 15-Jan-2013 Abhishek Adappa <aadappa@codeaurora.org> Send user confirmation instead of Terminal Response

On certain proactive commands like Setup Call/Open Channel,
a confirmation dialog is displayed to the user to confirm or reject the
call. If the user hits the back key to dismiss the dialog or the user
hits 'No', consider that as the user rejecting the call, instead
of sending a Terminal Response.

Bug: 8302972
Change-Id: I23d57f726018a6805ef455f6069dbab8e6dd14f0
at/CatService.java
f1b97fcff40f829cafd2fa643e8e4b788e504614 05-Mar-2013 Robert Greenwalt <rgreenwalt@google.com> Send Power-off notifications

If we update the state of the old servicestate and the new before calling done
nothing will get sent out (no change). Instead, just put the new state
in the mNewSS and call done - it'll copy it to mSS and note the diff and
notify everyone.

bug:8304092
Change-Id: I5fee4805245c547175bbd8b0e18f407edfc8c3d8
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
sm/GsmServiceStateTracker.java
2f837b8058eba0bc59e983c67efbc00cd9a80eee 07-Feb-2013 Hyejin Kim <hyejin.kim@lge.com> get group identifier level1 (Gid1)

To recognize MVNO(Mobile Virtual Network Operator), need some filters,
Service Provider Name(SPN), International Mobile Subscriber ID(IMSI),
and Group Identifier Level1(Gid1).
The GID1 elementary files on the SIM are specified in GSM 11.11 (ETS 300 977)

To get Gid1, implement it.

Bug: 8143480
Change-Id: I44f9d622240a73c42ea6418d2d55e1dae23f3b81
icc/IccConstants.java
icc/IccRecords.java
icc/SIMFileHandler.java
icc/SIMRecords.java
icc/UsimFileHandler.java
cbd0db26545a7c83896b976f21d20a30bdd6438e 28-Feb-2013 Wink Saville <wink@google.com> am a6577f4b: Merge "Telephony: Return \'null\' when SubscriberId and Line1Number are unavailable"

* commit 'a6577f4b162c9f6d8084e19a6cc5792cf52e4872':
Telephony: Return 'null' when SubscriberId and Line1Number are unavailable
a6577f4b162c9f6d8084e19a6cc5792cf52e4872 28-Feb-2013 Wink Saville <wink@google.com> Merge "Telephony: Return 'null' when SubscriberId and Line1Number are unavailable"
4b048b326272496b8bd6932173041280bc22c8dc 25-Jul-2012 Abhishek Adappa <aadappa@codeaurora.org> Telephony: Return 'null' when SubscriberId and Line1Number are unavailable

Return 'null' instead of "" (empty string) when Subscriber Id and
Line1Number are unavailable. This confirms to the definition of the
public API.

Bug: 8284793
Change-Id: Ie6395623cf413d51f6e10316aded71e2eaf5592c
sm/GSMPhone.java
e452cb2aa9236ebecb090e03a469fa68aef8d497 27-Feb-2013 Elliott Hughes <enh@google.com> Fix build.

TimeZones was renamed to the more accurate TimeZoneNames.

(cherry-pick of 96c87e2f014207dc5c55f7c8fafd1e666080d784.)

Change-Id: I52f8b3eb6e5183ba486a68820c7c3af3863ffdb5
ccTable.java
22c3bbde1128029c4d4e6fe34ee0b56f530629ac 27-Feb-2013 Elliott Hughes <enh@google.com> Merge "Fix build."
96c87e2f014207dc5c55f7c8fafd1e666080d784 27-Feb-2013 Elliott Hughes <enh@google.com> Fix build.

TimeZones was renamed to the more accurate TimeZoneNames.

Change-Id: Ia44bc852cd7f65466a97e815e3289a61ee22cb0f
ccTable.java
cfbca8ec2141b4c16d4f39d6452bac98ffd0bd03 26-Feb-2013 Wink Saville <wink@google.com> Merge commit 'b575731e' into fix-merge-conflict

* commit 'b575731e':
Update PS state when radio off or unavailable

Change-Id: I87d25d297ef455763d20b2f9b6cad920514a4f05
f1911ab88b20323cd0e4d005d7913f2df992f158 06-Sep-2012 Ye Jingjing <jingjing.ye@sonymobile.com> Update PS state when radio off or unavailable

When radio off or unavailable, CS state has been reset,
but PS state has not updated, in fact both CS and PS
state should be out of service. So SMS will try to be
sent out when sending sms, the result is "could not send"
rather than sms being queued for sending.
This fix will reset PS state to power off or out of
service when radio off or unavailable accordingly.

Bug: 8265430
Change-Id: I46e962c30021ff1273dcc559579bdedc7f432a64
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
sm/GsmServiceStateTracker.java
22d85a8e3a575a6d01d2c788587971657dfe20c6 23-Feb-2013 Wink Saville <wink@google.com> Clean up member variables.

Change-Id: Ib60f350131ade626aca682407ea0b4377b16f6c6
TResponseParser.java
all.java
allManager.java
allTracker.java
ommandException.java
onnection.java
ebugService.java
ccPhoneBookInterfaceManager.java
ccPhoneBookInterfaceManagerProxy.java
ccSmsInterfaceManagerProxy.java
ntRangeManager.java
ccTable.java
peratorInfo.java
honeBase.java
honeFactory.java
honeProxy.java
honeSubInfoProxy.java
IL.java
etryManager.java
MSDispatcher.java
erviceStateTracker.java
msMessageBase.java
msResponse.java
msStorageMonitor.java
USInfo.java
spTypeDecoder.java
at/CatCmdMessage.java
at/CatResponseMessage.java
at/CatService.java
at/CommandParams.java
at/CommandParamsFactory.java
at/IconLoader.java
at/ImageDescriptor.java
at/ResponseData.java
dma/CDMALTEPhone.java
dma/CDMAPhone.java
dma/CdmaCall.java
dma/CdmaCallTracker.java
dma/CdmaConnection.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaMmiCode.java
dma/CdmaSMSDispatcher.java
dma/CdmaServiceStateTracker.java
dma/CdmaSubscriptionSourceManager.java
dma/EriInfo.java
dma/EriManager.java
dma/RuimPhoneBookInterfaceManager.java
dma/RuimSmsInterfaceManager.java
dma/SignalToneUtil.java
dma/SmsMessage.java
ataconnection/ApnSetting.java
ataconnection/DataConnection.java
ataconnection/DataConnectionBase.java
ataconnection/DataConnectionTracker.java
ataconnection/DataConnectionTrackerBase.java
sm/GSMPhone.java
sm/GsmCall.java
sm/GsmCallTracker.java
sm/GsmConnection.java
sm/GsmMmiCode.java
sm/GsmSMSDispatcher.java
sm/GsmServiceStateTracker.java
sm/SimPhoneBookInterfaceManager.java
sm/SimSmsInterfaceManager.java
sm/SimTlv.java
sm/SmsBroadcastConfigInfo.java
sm/SmsCbHeader.java
sm/SmsMessage.java
sm/UsimDataDownloadHandler.java
ip/SipCallBase.java
ip/SipConnectionBase.java
ip/SipPhone.java
ip/SipPhoneBase.java
est/ModelInterpreter.java
est/SimulatedCommands.java
est/SimulatedGsmCallState.java
icc/AdnRecord.java
icc/AdnRecordCache.java
icc/AdnRecordLoader.java
icc/IccCardProxy.java
icc/IccFileHandler.java
icc/IccRecords.java
icc/IsimUiccRecords.java
icc/RuimRecords.java
icc/SIMRecords.java
icc/SpnOverride.java
cbaa45bbf2cab852b6c9c3a887e9f803d4e857ea 23-Feb-2013 Wink Saville <wink@google.com> Clean up

- Add @Overrides where needed.
- Update javadoc comments
- Remove extra semi-colons
- Rename DataConnection.java to DataConnectionBase.java
- Rename GsmDataConnection.java to DataConnection.java
- Add defaults to switch statements
- Remove/fix most "if (false)" statements. Fixed by using a CONSTANT
- Fix hidden variables by hoisting to base class or renaming
- Tweak some debug output

Change-Id: If38de2fdeaacafbf40cdfd7f84dc5c52030ba2a3
aseCommands.java
all.java
allForwardInfo.java
allManager.java
allTracker.java
ommandsInterface.java
onnection.java
ataCallState.java
efaultPhoneNotifier.java
riverCall.java
ccPhoneBookInterfaceManager.java
ccPhoneBookInterfaceManagerProxy.java
ccSmsInterfaceManager.java
ccSmsInterfaceManagerProxy.java
ccUtils.java
ccTable.java
peratorInfo.java
hone.java
honeBase.java
honeFactory.java
honeProxy.java
honeStateIntentReceiver.java
honeSubInfo.java
honeSubInfoProxy.java
IL.java
estrictedState.java
etryManager.java
MSDispatcher.java
erviceStateTracker.java
msMessageBase.java
msResponse.java
msUsageMonitor.java
elephonyCapabilities.java
apPushOverSms.java
at/CatCmdMessage.java
at/CatService.java
at/CommandDetails.java
at/CommandParams.java
at/CommandParamsFactory.java
at/Duration.java
at/IconLoader.java
at/Input.java
at/Item.java
at/Menu.java
at/ResultCode.java
at/ResultException.java
at/TextMessage.java
at/Tone.java
at/ToneSettings.java
at/ValueParser.java
dma/CDMALTEPhone.java
dma/CDMAPhone.java
dma/CdmaCall.java
dma/CdmaCallTracker.java
dma/CdmaCallWaitingNotification.java
dma/CdmaConnection.java
dma/CdmaInformationRecords.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaMmiCode.java
dma/CdmaSMSDispatcher.java
dma/CdmaServiceStateTracker.java
dma/CdmaSubscriptionSourceManager.java
dma/EriManager.java
dma/RuimPhoneBookInterfaceManager.java
dma/RuimSmsInterfaceManager.java
dma/SignalToneUtil.java
dma/SmsMessage.java
dma/TtyIntent.java
dma/sms/BearerData.java
ataconnection/ApnContext.java
ataconnection/ApnSetting.java
ataconnection/DataConnection.java
ataconnection/DataConnectionAc.java
ataconnection/DataConnectionBase.java
ataconnection/DataConnectionTracker.java
ataconnection/DataConnectionTrackerBase.java
ataconnection/GsmDataConnection.java
ataconnection/GsmDataConnectionTracker.java
sm/GSMPhone.java
sm/GsmCall.java
sm/GsmCallTracker.java
sm/GsmConnection.java
sm/GsmMmiCode.java
sm/GsmSMSDispatcher.java
sm/GsmServiceStateTracker.java
sm/GsmSmsAddress.java
sm/SimPhoneBookInterfaceManager.java
sm/SimSmsInterfaceManager.java
sm/SmsMessage.java
sm/SuppServiceNotification.java
sm/UsimPhoneBookManager.java
ip/SipCallBase.java
ip/SipCommandInterface.java
ip/SipConnectionBase.java
ip/SipPhone.java
ip/SipPhoneBase.java
est/ModelInterpreter.java
est/SimulatedCommands.java
est/SimulatedGsmCallState.java
icc/AdnRecord.java
icc/AdnRecordCache.java
icc/AdnRecordLoader.java
icc/CsimFileHandler.java
icc/IccCardApplicationStatus.java
icc/IccCardProxy.java
icc/IccCardStatus.java
icc/IccFileHandler.java
icc/IccIoResult.java
icc/IccRecords.java
icc/IccServiceTable.java
icc/IccUtils.java
icc/IsimFileHandler.java
icc/IsimUiccRecords.java
icc/RuimFileHandler.java
icc/RuimRecords.java
icc/SIMFileHandler.java
icc/SIMRecords.java
icc/SpnOverride.java
icc/UiccCard.java
icc/UiccCardApplication.java
icc/UiccController.java
icc/UsimFileHandler.java
icc/VoiceMailConstants.java
4918296afe1c667e9523cdfc799f558f7ebc2bfb 21-Feb-2013 Wink Saville <wink@google.com> Move DataConnection related classes to their own package.

Change-Id: I34ee9e87545e6b15ebf4d3ec101d4ed3d322f7b2
pnContext.java
pnSetting.java
ataCallState.java
ataConnection.java
ataConnectionAc.java
ataConnectionTracker.java
hone.java
honeBase.java
IL.java
erviceStateTracker.java
dma/CDMAPhone.java
dma/CdmaServiceStateTracker.java
ataconnection/ApnContext.java
ataconnection/ApnSetting.java
ataconnection/DataConnection.java
ataconnection/DataConnectionAc.java
ataconnection/DataConnectionTracker.java
ataconnection/GsmDataConnection.java
ataconnection/GsmDataConnectionTracker.java
sm/GSMPhone.java
sm/GsmDataConnection.java
sm/GsmDataConnectionTracker.java
sm/GsmServiceStateTracker.java
ip/SipPhoneBase.java
9f88c3516ba5e76d1fe55c2acd2bd5714b136b34 20-Feb-2013 Wink Saville <wink@google.com> am de707749: Merge "Telephony: Update Permanent Fail and Event Loggable Types"

* commit 'de70774912571d7e2d9de627a91df933b2d5f3c1':
Telephony: Update Permanent Fail and Event Loggable Types
de70774912571d7e2d9de627a91df933b2d5f3c1 20-Feb-2013 Wink Saville <wink@google.com> Merge "Telephony: Update Permanent Fail and Event Loggable Types"
0c5d5ba2a162f605a1381cca9fc21ac315ad77ec 05-Sep-2012 Chris Lei <chrislei@codeaurora.org> Telephony: Update Permanent Fail and Event Loggable Types

- Updating isPermanentFail() and isEventLoggable() to better
comply with "no retry" requirements in ril.h

Change-Id: I377eba7ec0203e41ae7689192a41f6b260a8775a
ataConnection.java
5aea02dbc2d1e743bd181a7db96625b5055ce633 13-Feb-2013 Wink Saville <wink@google.com> Merge "Partial fix for b8022095"
ce28277047b055d8420384f018ff4517c41ea1df 13-Feb-2013 Jake Hamby <jhamby@google.com> am 64f509b2: Merge "Fix for storing CPHS MWI messages with store type"

# By Björn Ekberg
# Via Gerrit Code Review (1) and Zoran Jovanovic (1)
* commit '64f509b256eccf899910a449857b095aa2cbc714':
Fix for storing CPHS MWI messages with store type
64f509b256eccf899910a449857b095aa2cbc714 12-Feb-2013 Jake Hamby <jhamby@google.com> Merge "Fix for storing CPHS MWI messages with store type"
e65a7cd00bf0022cfe24537371be78e4492636b8 12-Feb-2013 Wink Saville <wink@google.com> Partial fix for b8022095

With the changes to the DC the list of ApnContexts is cleared when
a DC disconnects. So the connectionId is invalid, instead send the
APN type information which fixes this retry problem.

A larger fix is coming where retries are done in DC but this will help
for now.

Bug: 8022095
Change-Id: I7364d1108c4be853a9d711eb8771d05a7640fe19
sm/GsmDataConnectionTracker.java
945e169166e9fd4bcb145d23dffb7c7b68cd6208 15-Aug-2012 Björn Ekberg <bjorn.ekberg.x@sonymobile.com> Fix for storing CPHS MWI messages with store type

CPHS MWI messages of store type were treated as discard type.
This resulted in that no CPHS MWI messages with text was ever
shown to the user.

Change-Id: I42f80a084c35a813933052d4a676e16b2c4e2d9d
sm/SmsMessage.java
8d3dfb1ac5e12b2c0a0ec50db956c8b47fcc102f 12-Feb-2013 Wink Saville <wink@google.com> Tweak LogRecord logging.

Change-Id: If948c1cdf4701c09550bd57212b9936fca6cb664
ataConnection.java
a2ccc4f16ec2f3e26b308d6f25cd4aa6a394a008 09-Feb-2013 Jake Hamby <jhamby@google.com> Add bounds checking for decoding CDMA SMS using Shift-JIS.

The test case testRandomUserData() in CdmaSmsCbTest fails since we
added support for decoding Shift-JIS messages. Change decodeShiftJis()
to call the helper method decodeCharset(), which checks the array
bounds and tries to decode as much as possible if the length extends
past the end of the PDU, instead of throwing
StringIndexOutOfBoundsException.

Bug: 8107987
Change-Id: I180e8360e391cd8276752a44a58a9c3a635dc284
dma/sms/BearerData.java
1c81e1353dc3ccc8347f65c424a993b7648b2808 08-Feb-2013 Wink Saville <wink@google.com> Merge "Move a few files from frameworks/opt/telephony to frameworks/base."
a78a6aaffa5e3e13ca617bb1f114e1c31ff7c7af 08-Feb-2013 Wink Saville <wink@google.com> Move a few files from frameworks/opt/telephony to frameworks/base.

Because ISms.aidl imports PendingIntent we couldn't easily
make opt/telephony part of the PDK. So this change moves
ISms.aidl and SmsRawData.*, which ISms.aidl also imports,
back to frameworks/base.

Change-Id: Ia64c6e771d5a292d9bfebb413a43f3745df55c85
Sms.aidl
msRawData.aidl
msRawData.java
e4dbb0bdbbfc3155171c0ca9fbbb8d1177fa2886 07-Feb-2013 Jeff Sharkey <jsharkey@android.com> Merge "Use TCP interface statistics for data stall."
a869bfaecddd0a5772cdcd84c992be315f45eb69 06-Feb-2013 Wink Saville <wink@google.com> am c95d086f: am fc354419: Merge "Telephony: Fix NPE in CdmaConnection"

# By Alex Yakavenka
# Via Alex Yakavenka (1) and others
* commit 'c95d086fdaac610430b69b4b19914cb24e49f308':
Telephony: Fix NPE in CdmaConnection
c95d086fdaac610430b69b4b19914cb24e49f308 06-Feb-2013 Wink Saville <wink@google.com> am fc354419: Merge "Telephony: Fix NPE in CdmaConnection"

# By Alex Yakavenka
# Via Alex Yakavenka (1) and Gerrit Code Review (1)
* commit 'fc354419d48b1ded8ce951670c4069780f22e273':
Telephony: Fix NPE in CdmaConnection
a914a2429cb352f1f294e15dc236b3721e81a823 06-Feb-2013 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Fix NPE in CdmaConnection

When card is removed and call gets terminated
getUiccCardApplication will return null

Change-Id: Ic861e5b5ee8515de431c33152fd11d2c45a2a353
dma/CdmaConnection.java
db9c8ee5f0c88306063fcbbbc430cb5e2e894e21 06-Feb-2013 Jeff Sharkey <jsharkey@android.com> Use TCP interface statistics for data stall.

Bug: 7903145
Change-Id: Ia90ba964a26ded119ac0394b719b567fb9971caf
ataConnectionTracker.java
7fce994eb223105829becb6c26e3af7a9739752c 05-Feb-2013 Dianne Hackborn <hackbod@google.com> Add new app ops for sending/receiving SMS messages.

There are a variety of new app ops for various kind of
SMS operations: reading, writing, sending, receiving, on
ICC card, MMS, etc. These are instrumented in the telephony
framework; the controls for access to these features are
rolled up to either sending or receiving SMS.

Change-Id: Ie18b09d77fac555aaa169eb6fdfba44dd8078976
Sms.aidl
ccSmsInterfaceManager.java
ccSmsInterfaceManagerProxy.java
MSDispatcher.java
apPushOverSms.java
dma/CdmaSMSDispatcher.java
sm/SimSmsInterfaceManager.java
6387253f9b0eb8bec049115498ec1f2bfd6d991d 05-Feb-2013 Jake Hamby <jhamby@google.com> am 9eef81ce: am 89558696: Merge "Telephony: Define enable/disable APIs for Cdma CMAS"

# By Rika Brooks
# Via Android Git Automerger (1) and others
* commit '9eef81ce80e72d68a8349fd84797276cb9cbe957':
Telephony: Define enable/disable APIs for Cdma CMAS
9eef81ce80e72d68a8349fd84797276cb9cbe957 05-Feb-2013 Jake Hamby <jhamby@google.com> am 89558696: Merge "Telephony: Define enable/disable APIs for Cdma CMAS"

# By Rika Brooks
# Via Gerrit Code Review (1) and Rika Brooks (1)
* commit '895586961de9992a4feefc57b648e01d158a382c':
Telephony: Define enable/disable APIs for Cdma CMAS
895586961de9992a4feefc57b648e01d158a382c 04-Feb-2013 Jake Hamby <jhamby@google.com> Merge "Telephony: Define enable/disable APIs for Cdma CMAS"
a63f55cf17629426d976830429a7612387532195 24-Jul-2012 Rika Brooks <rbrooks@codeaurora.org> Telephony: Define enable/disable APIs for Cdma CMAS

- Define enableCellBroadcastRange, disableCellBroadcastRange,
enableCellBroadcast, disableCellBroadcast for Cdma broadcast.
Create CdmaBroadcastRangeManager extended from existing IntRangeManager.

Change-Id: I5d70175862547475f49e08328ab3dcc5560e9096
ommandsInterface.java
Sms.aidl
IL.java
dma/CdmaSmsBroadcastConfigInfo.java
dma/RuimSmsInterfaceManager.java
ip/SipCommandInterface.java
est/SimulatedCommands.java
17382a60400f4a067d15bf3fbd98bd865b73c8e5 01-Feb-2013 Wink Saville <wink@google.com> Move SmsRawData.aidl to opt/telephony.

Change-Id: I31810a667cb2c987d4a7687a825ae6da06d8e59a
msRawData.aidl
a98defd468473ca430b298df0fc9bbe845088bc1 28-Jan-2013 Wink Saville <wink@google.com> Merge "Add protected log methods to StateMachine"
9e2a8da44a5fe14036950ad9a66b1b4c1ffdf344 28-Jan-2013 Wink Saville <wink@google.com> am 30f92450: am 69c5b8c7: Merge "Send correct screen state when radio available."

# By Bin Li
# Via Android Git Automerger (1) and others
* commit '30f92450d53443505ac1fa70138ddd55c91032bc':
Send correct screen state when radio available.
30f92450d53443505ac1fa70138ddd55c91032bc 28-Jan-2013 Wink Saville <wink@google.com> am 69c5b8c7: Merge "Send correct screen state when radio available."

# By Bin Li
# Via Bin Li (1) and Gerrit Code Review (1)
* commit '69c5b8c7c41614d0d5fc131a9f26c403a9d30de0':
Send correct screen state when radio available.
69c5b8c7c41614d0d5fc131a9f26c403a9d30de0 28-Jan-2013 Wink Saville <wink@google.com> Merge "Send correct screen state when radio available."
c51e5b85def45b8214c522152fb43c409b940a02 28-Jan-2013 Wink Saville <wink@google.com> Add protected log methods to StateMachine

This allow child classes to Override the logging and
have consistent behavior across StateMachines.

Change-Id: I7e23a44d08ca304ade2d7830fd0e307f63f1879e
ataConnection.java
sm/GsmDataConnection.java
02a6fcee7a8e19904c53ce29c647383186b8285e 26-Jan-2013 Wink Saville <wink@google.com> am 9af36163: am 5b5a06f5: Merge "Telephony: Don\'t start RilReceiver when not needed"

# By Alex Yakavenka
# Via Alex Yakavenka (1) and others
* commit '9af361639d89aa20748ce9e8e3d55c97e7f6b632':
Telephony: Don't start RilReceiver when not needed
6fd7b2c812a09d8bb4ffd7cfa48c570129cf4ca6 26-Jan-2013 Wink Saville <wink@google.com> am 7b3c1c39: am 44c9723a: Merge "Telephony: Mark SIM SMS as read after importing it"

# By Rika Brooks
# Via Android Git Automerger (1) and others
* commit '7b3c1c394ebb53ab6861dfc66f4326eccbcda133':
Telephony: Mark SIM SMS as read after importing it
9af361639d89aa20748ce9e8e3d55c97e7f6b632 25-Jan-2013 Wink Saville <wink@google.com> am 5b5a06f5: Merge "Telephony: Don\'t start RilReceiver when not needed"

# By Alex Yakavenka
# Via Alex Yakavenka (1) and Gerrit Code Review (1)
* commit '5b5a06f5d63561411d04d70900b55af23c44ef10':
Telephony: Don't start RilReceiver when not needed
5b5a06f5d63561411d04d70900b55af23c44ef10 25-Jan-2013 Wink Saville <wink@google.com> Merge "Telephony: Don't start RilReceiver when not needed"
c241cad754ecf27c96b09f1e585b8be341dfcb71 06-Jun-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Don't start RilReceiver when not needed

Basebandless targets don't need RilReceiver.

Change-Id: I510cc6f0100219af9479738fc4b48c7ab85ea666
CRs-Fixed: 367918
IL.java
98437235fc30d809992c32410f02d22cc89fac8c 19-Nov-2011 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Null check for adncache before search/update.

Sometimes adncache is uninitialized leading to exceptions.
Add checking against null before using it for searching or updating
records.

Change-Id: I5b6787ce917db921d1ee35753acf890dfaf169b7
ccPhoneBookInterfaceManager.java
7b3c1c394ebb53ab6861dfc66f4326eccbcda133 24-Jan-2013 Wink Saville <wink@google.com> am 44c9723a: Merge "Telephony: Mark SIM SMS as read after importing it"

# By Rika Brooks
# Via Gerrit Code Review (1) and Rika Brooks (1)
* commit '44c9723a49d352a8bcf3051eeb1885c80fb20e44':
Telephony: Mark SIM SMS as read after importing it
44c9723a49d352a8bcf3051eeb1885c80fb20e44 24-Jan-2013 Wink Saville <wink@google.com> Merge "Telephony: Mark SIM SMS as read after importing it"
cf57b29a755b0249da687201bcc726941d37d42b 23-Jan-2013 Bin Li <libin@marvell.com> Send correct screen state when radio available.

Change-Id: I098ffd06916d9d37272ee3c8c57a4d7e21e564c6
Signed-off-by: Bin Li <libin@marvell.com>
IL.java
4a001e3bc9735735f33fe8d05f7abd3b3a567680 24-Jan-2013 Wink Saville <wink@google.com> am 0a4672f6: am c09d9845: Merge "Fixes Binder Buffer leak after crashing com.android.smspush process"

# By Maunik Shah
# Via Android Git Automerger (1) and others
* commit '0a4672f6a60f5485dea4f8fd365afad113ef4c93':
Fixes Binder Buffer leak after crashing com.android.smspush process
5a8b17dc4ae580d78b048c5e4ce434a1bdb38f10 24-Jan-2013 Wink Saville <wink@google.com> am 581e4fbe: am 36001ade: Merge "Reset data stall watch dog after doing recovery"

# By Bin Li
# Via Android Git Automerger (1) and others
* commit '581e4fbefde83b2deaa9f2cb555d6bed8153209e':
Reset data stall watch dog after doing recovery
0a4672f6a60f5485dea4f8fd365afad113ef4c93 24-Jan-2013 Wink Saville <wink@google.com> am c09d9845: Merge "Fixes Binder Buffer leak after crashing com.android.smspush process"

# By Maunik Shah
# Via Gerrit Code Review (1) and Maunik Shah (1)
* commit 'c09d9845ab719c8224d3f2c610a612bf9489bc6e':
Fixes Binder Buffer leak after crashing com.android.smspush process
581e4fbefde83b2deaa9f2cb555d6bed8153209e 24-Jan-2013 Wink Saville <wink@google.com> am 36001ade: Merge "Reset data stall watch dog after doing recovery"

# By Bin Li
# Via Bin Li (1) and Gerrit Code Review (1)
* commit '36001adedf90a3a0077d36b869822643ae01ad1b':
Reset data stall watch dog after doing recovery
c09d9845ab719c8224d3f2c610a612bf9489bc6e 24-Jan-2013 Wink Saville <wink@google.com> Merge "Fixes Binder Buffer leak after crashing com.android.smspush process"
36001adedf90a3a0077d36b869822643ae01ad1b 24-Jan-2013 Wink Saville <wink@google.com> Merge "Reset data stall watch dog after doing recovery"
8cabd3092c961f4593e3f52796b118bbd353b99f 24-Jan-2013 Wink Saville <wink@google.com> am 5eee6bd8: am 57516407: Merge "Telephony: Correct the typo in RIL.java"

# By Jiju Kinattingal
# Via Android Git Automerger (1) and others
* commit '5eee6bd8b452dcb328d3121d6f7fa8a819a5bc7a':
Telephony: Correct the typo in RIL.java
5eee6bd8b452dcb328d3121d6f7fa8a819a5bc7a 24-Jan-2013 Wink Saville <wink@google.com> am 57516407: Merge "Telephony: Correct the typo in RIL.java"

# By Jiju Kinattingal
# Via Gerrit Code Review (1) and Jiju Kinattingal (1)
* commit '575164076e184002a8545dffa5056d38f07639c2':
Telephony: Correct the typo in RIL.java
575164076e184002a8545dffa5056d38f07639c2 23-Jan-2013 Wink Saville <wink@google.com> Merge "Telephony: Correct the typo in RIL.java"
e0c9d5eb0a21b1ddd0560cfb358288c029031969 23-Jan-2013 Wink Saville <wink@google.com> am 4fd4011e: am ef5afe19: Merge "Interprete mmi code *21*num# as registration."

* commit '4fd4011e9fd3903f76a0ddcc35798d435aa345aa':
Interprete mmi code *21*num# as registration.
4fd4011e9fd3903f76a0ddcc35798d435aa345aa 23-Jan-2013 Wink Saville <wink@google.com> am ef5afe19: Merge "Interprete mmi code *21*num# as registration."

* commit 'ef5afe19131035ef5b359096f1ef64f9a55795d9':
Interprete mmi code *21*num# as registration.
5f6b9345f8fe5545f576d29fb7ff9f3405d9dc05 23-Jan-2013 Bin Li <libin@marvell.com> Interprete mmi code *21*num# as registration.

Per 3GPP TS 22.030 6.5.2

A call forwarding request with a singel * would
be interpreted as registration if containing a
forwarded-to number, or an activation if not.

Change-Id: Iaf5754e49454819892fe054938ef8819f759d6bd
Signed-off-by: Bin Li <libin@marvell.com>
sm/GsmMmiCode.java
2d01df4311974279d0967846f850c693f72eca72 23-Jan-2013 Bin Li <libin@marvell.com> Reset data stall watch dog after doing recovery

Without resetting data stall watch dog, one data
stall will lead to radio reset if there is no
data traffic after doing recovery.

Change-Id: Icc7b1e7f160cd0c8910f7132d7c2fea0d29803e5
Signed-off-by: Bin Li <libin@marvell.com>
ataConnectionTracker.java
f1ac06f0498ec7cb7489c835bcd2eed568b5f6a6 23-Jan-2013 Wink Saville <wink@google.com> Add debug and some cleanup

Change-Id: I866676a1ec4a338dcfe089cbf0483e5e546ded85
ip/SipConnectionBase.java
ip/SipPhone.java
b08797967cd0f314d8df940ecbee13ddeb3f15c4 22-Jan-2013 Wink Saville <wink@google.com> Merge "Add some debug."
072d5d580041046968dbc335c5d4418f344d2b39 22-Nov-2012 Maunik Shah <mshah@codeaurora.org> Fixes Binder Buffer leak after crashing com.android.smspush process

After many crashes of com.android.smspush process under low memory
condition, binder buffer used to get overflow as there is a leak
in buffer.
This fix restricts the leak in binder buffer by unbinding it upon
com.android.smspush process crash.

Change-Id: I0b5cd4ef282ec9f12693337001c084ce60db4555
apPushOverSms.java
ebc3f0565ad0f9b8b7d3531afd8744843d96aadb 23-Aug-2012 Rika Brooks <rbrooks@codeaurora.org> Telephony: Mark SIM SMS as read after importing it

The GCF test case 8.2.2 checks if the status byte of the SMS is marked as read
after reading the SMS from SIM. The status byte is marked as read after the
SMS is imported from the SIM if it is not already marked.
Fix to check for null IccFilehandler which can happen if card is not present.

Extract common functions from Sim/RuimSmsInterfaceManager to their parent
class IccSmsInterfaceManager.

Change-Id: I4f226bc873786904527d7d822a67dfc14f05a327
ccSmsInterfaceManager.java
dma/RuimSmsInterfaceManager.java
sm/SimSmsInterfaceManager.java
d04a0db0a9363d0a3681d39511f0e8efd1e8b172 17-Jan-2013 Wink Saville <wink@google.com> am 2f418724: am 135bf68d: Merge "Wrong terminal response for proactive command length errors"

* commit '2f41872415627ef35399a1f502dbfab01af89d64':
Wrong terminal response for proactive command length errors
2f41872415627ef35399a1f502dbfab01af89d64 17-Jan-2013 Wink Saville <wink@google.com> am 135bf68d: Merge "Wrong terminal response for proactive command length errors"

* commit '135bf68d7638dc5d8524ba84db80e35452772aa1':
Wrong terminal response for proactive command length errors
135bf68d7638dc5d8524ba84db80e35452772aa1 17-Jan-2013 Wink Saville <wink@google.com> Merge "Wrong terminal response for proactive command length errors"
c4d170ec2abcdf94b6242f09734d34a8dd6c5e3c 17-Jan-2013 Wink Saville <wink@google.com> Add some debug.

Bug: 8022095
Change-Id: Ic3f69389b66e6a2ecfa5fe3ae1ce32732355462b
sm/GsmDataConnectionTracker.java
9edadf11a7ac700a529f49e46822e2983ed551e4 16-Jan-2013 Sanny Shang <sanny.shang@sonymobile.com> Wrong terminal response for proactive command length errors

This fix is at least reported by an internal test suite
written with the 3gpp specification as base, can not
guarantee that it exists "in the wild" however the
specification is clear.

According to 3gpp11.14, chapter 6.10.6 "Length errors",

If the total lengths of the SIMPLE-TLV data objects are not
consistent with the length given in the BER-TLV data object,
then the whole BER-TLV data object shall be rejected. The
result field in the TERMINAL RESPONSE shall have the error
condition "Command data not understood by ME".

Change-Id: I128442ea4755679b0e5524a31c01b3c690e45ab0
at/BerTlv.java
at/CommandParamsFactory.java
e48f50193e1f621e02c1193118511e6eb2cbd662 15-Jan-2013 Wink Saville <wink@google.com> am 4594790b: am 58eafee3: Merge "Telephony: Unregister from UiccController when disposed"

* commit '4594790b7cfc5edb9052622f6f93a4e8b4e50e99':
Telephony: Unregister from UiccController when disposed
4594790b7cfc5edb9052622f6f93a4e8b4e50e99 15-Jan-2013 Wink Saville <wink@google.com> am 58eafee3: Merge "Telephony: Unregister from UiccController when disposed"

* commit '58eafee3bd34563621378d49d8879538c411a7c8':
Telephony: Unregister from UiccController when disposed
c26fb77c4e637466cf0483a4995fe82e6f68b8d3 28-Sep-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Unregister from UiccController when disposed

Change-Id: I296d3f292a72d2f8181f866bd1de7637c8333c63
erviceStateTracker.java
86087b20a50303c5db59e1f80128f3cf77fb8ffb 14-Jan-2013 Jake Hamby <jhamby@google.com> am ad628b3d: am 367c5f28: Merge "Telephony: Support ShiftJIS encoding and Skip unsupported bearer data subparam"

* commit 'ad628b3df8858f9e867ce3ff3214db0983189774':
Telephony: Support ShiftJIS encoding and Skip unsupported bearer data subparam
ad628b3df8858f9e867ce3ff3214db0983189774 14-Jan-2013 Jake Hamby <jhamby@google.com> am 367c5f28: Merge "Telephony: Support ShiftJIS encoding and Skip unsupported bearer data subparam"

* commit '367c5f28da409e05f1c853893512bdf53472c41e':
Telephony: Support ShiftJIS encoding and Skip unsupported bearer data subparam
3de1a7e5535f36e86d82da12df2b17aeeafabdc6 30-Jun-2012 Rika Brooks <rbrooks@codeaurora.org> Telephony: Support ShiftJIS encoding and Skip unsupported bearer data subparam

Support Shift-JIS CHARi encoding type per 3GPP2 C.R1001 section 9.1.

3GPP2 C.S0015-B, v2.0, table 4.5-1 shows bearer data subparam ID
above 0x17 is reserved. Fix to skip reserved bearer data subparams
instead of throwing CodingException.

Change-Id: Ib83e7e72189a267421ba5fd77695b8f684ef00e2
dma/sms/BearerData.java
2f48cebb0f3169da9d9325f7b4884872280599e5 28-Nov-2012 Nizar Haouati <nizar.haouati@intel.com> telephony: Fix typo

This patch fixes the typo in CatService.

Change-Id: Iff69df0ab0309e36f0a886c483f280febe5ad84e
Author: Nizar Haouati <nizar.haouati@intel.com>
Signed-off-by: Nizar Haouati <nizar.haouati@intel.com>
Signed-off-by: Jeevaka Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 71115
at/CatService.java
aff4b040b66a3273ede04519d4ab678eecd3eb83 11-Jan-2013 Wink Saville <wink@google.com> am a4e80a44: am 392afa32: Merge "Parameters length is able to be over 127 bytes."

* commit 'a4e80a44f6239926824ea7d50f845d7b74d21710':
Parameters length is able to be over 127 bytes.
5869098e0c615369340bcd1dba2a552f77326a64 11-Jan-2013 Jake Hamby <jhamby@google.com> am a6c35afc: am eabfd15c: Merge "Telephony: Don\'t ack CB messages"

* commit 'a6c35afcc0f346f3be4f1f095351c2859a0d2099':
Telephony: Don't ack CB messages
98cd16eb902d714d6eb981528408d2a5b779e353 11-Jan-2013 Robert Greenwalt <rgreenwalt@google.com> resolved conflicts for merge of 6125afc3 to master

Change-Id: I40f57858d775b91c409532d19ea5c98ec51afb22
a4e80a44f6239926824ea7d50f845d7b74d21710 11-Jan-2013 Wink Saville <wink@google.com> am 392afa32: Merge "Parameters length is able to be over 127 bytes."

* commit '392afa3290831e856edfe16155638879c8218be6':
Parameters length is able to be over 127 bytes.
392afa3290831e856edfe16155638879c8218be6 11-Jan-2013 Wink Saville <wink@google.com> Merge "Parameters length is able to be over 127 bytes."
e72ec3f4031a24982d402bb35a7d17dc1868958d 16-Aug-2012 kyunga1.kim <kyunga1.kim@lge.com> Parameters length is able to be over 127 bytes.

When the received message has user data over 127 bytes,
occur the parse error exception because using readByte().
Therefore we use readUnsignedByte() for reading parameters length.
Signed-off-by: kyunga kim <kyunga1.kim@lge.com>
Change-Id: I195807ee59a0d9117e0d835a4b3c355635337be0
(cherry picked from commit 700e7df9a0ac480e688d37786c0c146d5d1e406d)
dma/SmsMessage.java
8750dac3bd5f9d1a6f5222f3dc9e46ee154843eb 11-Jan-2013 Jake Hamby <jhamby@google.com> am 4fd88fb1: am ac57a399: Merge "Telephony: Check SmsTracker\'s mSentIntent for null"

* commit '4fd88fb1daca0336657cf8a40d1c4e573f60f35b':
Telephony: Check SmsTracker's mSentIntent for null
922cbbe2a11ea0a3f92fcc5c22256713c853790b 11-Jan-2013 Jake Hamby <jhamby@google.com> am 2ac296a8: am 713f8792: Merge "Telephony: Fix decodeCallbackNumber for Cdma CMAS"

* commit '2ac296a87949c75cdc7768cbb25e7bcf8f9d3e5e':
Telephony: Fix decodeCallbackNumber for Cdma CMAS
a6c35afcc0f346f3be4f1f095351c2859a0d2099 10-Jan-2013 Jake Hamby <jhamby@google.com> am eabfd15c: Merge "Telephony: Don\'t ack CB messages"

* commit 'eabfd15c321499201e9d150fe16288c2d43b7787':
Telephony: Don't ack CB messages
6125afc391426c25d6321a31635cf1909aefb3bd 10-Jan-2013 Robert Greenwalt <rgreenwalt@google.com> am dc446013: Merge "Fix mRequestsLists -> mRequestList"

* commit 'dc4460132214aeb1b4767c0225b4595a7ae4a4d4':
Fix mRequestsLists -> mRequestList
eabfd15c321499201e9d150fe16288c2d43b7787 10-Jan-2013 Jake Hamby <jhamby@google.com> Merge "Telephony: Don't ack CB messages"
dc4460132214aeb1b4767c0225b4595a7ae4a4d4 09-Jan-2013 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix mRequestsLists -> mRequestList"
4fd88fb1daca0336657cf8a40d1c4e573f60f35b 09-Jan-2013 Jake Hamby <jhamby@google.com> am ac57a399: Merge "Telephony: Check SmsTracker\'s mSentIntent for null"

* commit 'ac57a399534677ebfcfef530f1529d5d7f3d3c49':
Telephony: Check SmsTracker's mSentIntent for null
ac57a399534677ebfcfef530f1529d5d7f3d3c49 09-Jan-2013 Jake Hamby <jhamby@google.com> Merge "Telephony: Check SmsTracker's mSentIntent for null"
892e1fecf3c3736c4c04cf219d01034f71307065 09-Jan-2013 Robert Greenwalt <rgreenwalt@google.com> Fix mRequestsLists -> mRequestList

first of several fixes.

Change-Id: I362fbfd446aed6714e6c89204ee095d03474c26f
IL.java
2ac296a87949c75cdc7768cbb25e7bcf8f9d3e5e 09-Jan-2013 Jake Hamby <jhamby@google.com> am 713f8792: Merge "Telephony: Fix decodeCallbackNumber for Cdma CMAS"

* commit '713f879213955e734d7b092033797c0f756fd95c':
Telephony: Fix decodeCallbackNumber for Cdma CMAS
5a5f85ce9bffeded7891fd1d480d1f56b0d91041 09-Jan-2013 Wink Saville <wink@google.com> am 08b0eb5c: am cd17a8e5: Merge "Telephony: Update call timer for phantom call"

* commit '08b0eb5c29c54164c8daf7f3eebddc2a8fb6bec7':
Telephony: Update call timer for phantom call
713f879213955e734d7b092033797c0f756fd95c 09-Jan-2013 Jake Hamby <jhamby@google.com> Merge "Telephony: Fix decodeCallbackNumber for Cdma CMAS"
1997a5ea7fc70748366e20cf8d5f27dd7600c4d2 19-Nov-2012 Fabien Hubert <fabien.hubert@intel.com> Telephony: Handling of supplimentary services in Call

When there are active calls, the candial() returns false
and if the user supplied an MMI code for supplementary
service it will not be accepted.

The codes for supplementary services such as hold, reflect
transfer etc are now handled with this patch, even when
dial cannot be done.

Change-Id: Ic90d71112ca9fd3250b82660a2929590491e41ba
Author: Fabien Hubert <fabien.hubert@intel.com>
Signed-off-by: Fabien Hubert <fabien.hubert@intel.com>
Signed-off-by: Arun Ravindran <arun.ravindran@intel.com>
Signed-off-by: Jeevaka Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 577
allManager.java
81b046d348dd3d3cba81fcb073b9cdc04fcb6b5c 27-Nov-2012 Jeevaka Badrappan <jeevaka.badrappan@intel.com> Telephony: Fix issue in handling null alpha identifier

When alpha identifier is a provided by the SIM and
is a null data object, UE should not display
anything about the Sending but UE is showing
"Sending...".

As per 3GPP 11.14, if the alpha identifier is provided
by the SIM and is a null data object(i.e.length = '00'
and no value part), this is an indication that the ME
should not give any information to the user on the fact
that the ME is sending an Send SS/Send USSD/ Send DTMF.

Instead of returning null, retrieveAlphaId returns the
default message resulting in "Sending..." shown to the
user when it is not supposed to display anything.

This patch fixes the issue by returning null when alpha
identifier is provided and is a null data object.

Change-Id: Ia7bd690b8862a5df052a84bd6e7c94f4035baca7
Author: Jeevaka Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: Jeevaka Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: Arun Ravindran <arun.ravindran@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 60370
at/ValueParser.java
08b0eb5c29c54164c8daf7f3eebddc2a8fb6bec7 08-Jan-2013 Wink Saville <wink@google.com> am cd17a8e5: Merge "Telephony: Update call timer for phantom call"

* commit 'cd17a8e56bf5fa1af49d4447e65dc69e4741e7bf':
Telephony: Update call timer for phantom call
cd17a8e56bf5fa1af49d4447e65dc69e4741e7bf 08-Jan-2013 Wink Saville <wink@google.com> Merge "Telephony: Update call timer for phantom call"
9b41acc443e068fa3c3e547e820f710c6e2297ba 01-Dec-2012 Uma Maheswari Ramalingam <umam@codeaurora.org> Telephony: Update call timer for phantom call

For phantom call, update connectTimeReal via onConnectedInOrOut().
connectTimeReal is used to calculate the call duration per
getDurationMillis().
If phantom call is in HOLDING state, update holdingStartTime via
onStartedHolding(). holdingStartTime is used to calculate hold time
per getHoldDurationMillis().

Change-Id: I716f75b7565b5e869403c48de3dd190e2b425626
dma/CdmaCallTracker.java
dma/CdmaConnection.java
sm/GsmCallTracker.java
sm/GsmConnection.java
417929d16da5a403ddd041f9e606a9885e2388c4 04-Jan-2013 Wink Saville <wink@google.com> am c00f8242: am bf358b36: Merge "Telephony: Support for LTE network modes"

* commit 'c00f8242fbb04bd2a0679dfb6284e79f14acfd39':
Telephony: Support for LTE network modes
c00f8242fbb04bd2a0679dfb6284e79f14acfd39 04-Jan-2013 Wink Saville <wink@google.com> am bf358b36: Merge "Telephony: Support for LTE network modes"

* commit 'bf358b3605c3380b7b597506d09ea129e849e1da':
Telephony: Support for LTE network modes
bf358b3605c3380b7b597506d09ea129e849e1da 04-Jan-2013 Wink Saville <wink@google.com> Merge "Telephony: Support for LTE network modes"
42dee02cee627d94b4b061e5182b07fd85a18de4 04-Jan-2013 Wink Saville <wink@google.com> am 615f8baa: am e1500d9d: Merge "Telephony: Add support for SMS-SUBMIT."

* commit '615f8baa4203f82574e3c9f9bf49ae37d7b07ed9':
Telephony: Add support for SMS-SUBMIT.
615f8baa4203f82574e3c9f9bf49ae37d7b07ed9 04-Jan-2013 Wink Saville <wink@google.com> am e1500d9d: Merge "Telephony: Add support for SMS-SUBMIT."

* commit 'e1500d9d6042ca9e6f4503e82c31bd17997d70a6':
Telephony: Add support for SMS-SUBMIT.
e1500d9d6042ca9e6f4503e82c31bd17997d70a6 04-Jan-2013 Wink Saville <wink@google.com> Merge "Telephony: Add support for SMS-SUBMIT."
2cbcc15677797f5879cf8c907876b366b034d433 27-Dec-2012 Bin Li <libin@marvell.com> Telephony: Add support for SMS-SUBMIT.

Change-Id: I2b0887ae6b28decb38576cac60f1314ff8b73e1d
Signed-off-by: Bin Li <libin@marvell.com>
sm/SmsMessage.java
3ed5b1db90314cdd57ce1a4e9727ef2cd72aa0d0 03-Jan-2013 Wink Saville <wink@google.com> am e99de8eb: am c06ff6ba: Merge "Telephony: add support for additional information"

* commit 'e99de8eba9deaef089e1dd2f838132bd6dd6d3bb':
Telephony: add support for additional information
e99de8eba9deaef089e1dd2f838132bd6dd6d3bb 03-Jan-2013 Wink Saville <wink@google.com> am c06ff6ba: Merge "Telephony: add support for additional information"

* commit 'c06ff6babf825f7215b0c17ddf4edc12a7346698':
Telephony: add support for additional information
c17767c8bd034abdfdebb880077673270c2901dc 02-Jan-2013 Wink Saville <wink@google.com> Merge commit 'eaffd605' into fix-merge-conflict

* commit 'eaffd605':
Telephony: Look for CSS indicator for voice+data

Change-Id: I612effcc253c2c9e07a3b6c82e2832dcd42bda7c
c06ff6babf825f7215b0c17ddf4edc12a7346698 03-Jan-2013 Wink Saville <wink@google.com> Merge "Telephony: add support for additional information"
1343b7ae763b3163d03bd9c4756ab4857c4658b2 10-Jul-2012 Uma Maheswari Ramalingam <umam@codeaurora.org> Telephony: Support for LTE network modes

Change-Id: I8833fe3e56c94303f05111a94433b1b9e6568d2f
Depends-On: I93c102f92ff2d10856d91108bb50fe5c0f06ad66
hone.java
dac8696ffd9adabba138a0156ac0e2a553070c23 02-Jan-2013 Wink Saville <wink@google.com> am 48a768d6: am aa54f8e0: Merge "Telephony: Add uicc debug info to DebugService"

* commit '48a768d6cff6e13d138cabe7f19d3dc1bf46ec79':
Telephony: Add uicc debug info to DebugService
eaffd6052a556b22cbc84fe54710125ff225370a 02-Jan-2013 Wink Saville <wink@google.com> am ac2f6291: Merge "Telephony: Look for CSS indicator for voice+data"

* commit 'ac2f6291229c09b4e362ec42370544d9e471226e':
Telephony: Look for CSS indicator for voice+data
48a768d6cff6e13d138cabe7f19d3dc1bf46ec79 02-Jan-2013 Wink Saville <wink@google.com> am aa54f8e0: Merge "Telephony: Add uicc debug info to DebugService"

* commit 'aa54f8e0f58fad29d358693e32baa2d1e52f9b70':
Telephony: Add uicc debug info to DebugService
ac2f6291229c09b4e362ec42370544d9e471226e 02-Jan-2013 Wink Saville <wink@google.com> Merge "Telephony: Look for CSS indicator for voice+data"
05ef3b65972826780859b9acbd1fa9580d099832 28-Dec-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Add uicc debug info to DebugService

Change-Id: I03be52f97ea84808d608c48b4e6ffa2454e2a67c
ebugService.java
IL.java
icc/IccCardProxy.java
icc/IccRecords.java
icc/IsimUiccRecords.java
icc/RuimRecords.java
icc/SIMRecords.java
icc/UiccCard.java
icc/UiccCardApplication.java
icc/UiccController.java
f481e3ec351b28a41b1cd7f870d10e34648d24ac 20-Dec-2012 Wink Saville <wink@google.com> am df89e605: am f4fa4789: Merge "telephony: Fix issue in short code ussd detection"

* commit 'df89e605a668a5eeb5d1391909456602dece16a5':
telephony: Fix issue in short code ussd detection
df89e605a668a5eeb5d1391909456602dece16a5 20-Dec-2012 Wink Saville <wink@google.com> am f4fa4789: Merge "telephony: Fix issue in short code ussd detection"

* commit 'f4fa4789ba7ac74c157da46bc597f75739f6c44d':
telephony: Fix issue in short code ussd detection
f4fa4789ba7ac74c157da46bc597f75739f6c44d 20-Dec-2012 Wink Saville <wink@google.com> Merge "telephony: Fix issue in short code ussd detection"
3bf7b83854f70011c426e5f59259781e53e505f0 19-Dec-2012 Jean-Baptiste Queru <jbq@google.com> am f441dde1: Merge from AOSP staging branch

* commit 'f441dde145451cdc7ea90fc030086db32eb4c309':
Telephony: Start DataStallAlarm only on Data CONNECTED state
CatService: Add support for GET_CHANNEL_STATUS p-cmd.
Telephony: Fix issue with fdn deletion
f441dde145451cdc7ea90fc030086db32eb4c309 19-Dec-2012 Jean-Baptiste Queru <jbq@google.com> Merge from AOSP staging branch

Change-Id: I757d7389ccc8912dff89a76e038bab9c03d7af1a
10e574acd0992d22abce257b420d333f5a49e71d 14-Aug-2012 Jeevaka Badrappan <jeevaka.badrappan@intel.com> telephony: Fix issue in short code ussd detection

According to the 3PGG TS 22.030 specification
Figure 3.5.3.2: A 1 or 2 digit "short code" is
treated as USSD if it is entered while on a call or
does not satisfy the condition (exactly 2 digits
&& starts with '1').

Following rule is already addressed in function
GsmMmiCode::newFromDialString.

If the user of the device enters one digit followed
by the #-key, phone shall initiate a USSD/SS command

Change-Id: I70795da1fb5144d1c91059f6200b74b5fd33de22
Author: Jeevaka Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Author-tracking-BZ: 28800
sm/GsmMmiCode.java
9aaa228cbb37657d12a87b5058676e449866f2ac 05-Dec-2012 Jeevaka Badrappan <jeevaka.badrappan@intel.com> Telephony: Start DataStallAlarm only on Data CONNECTED state

Telephony framework uses AlarmManager for recovery mechanism of data
stalled issue.
Framework configures the ELAPSED_REALTIME_WAKEUP alarm for every
6minutes irrespective of the data state. Due to this,quiet a few
wakeups are seen even when the device is not connected to Mobile
Data network.

Fix is to check the Data connection state before starting
this alarm.

Change-Id: I219bff9199e5ce70bbcd05c95d65731886215fe9
Author: Jeevaka Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: Jeevaka Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: Arun Ravindran <arun.ravindran@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 28494
ataConnectionTracker.java
0815970067d8c8c34b30a6ec0acd44396f2f95ac 18-Dec-2012 Wink Saville <wink@google.com> Merge "CatService: Add support for GET_CHANNEL_STATUS p-cmd."
86968438e444728053137c764cc37cf9c0a15d16 09-Aug-2012 Siddartha Pothapragada <spotha@codeaurora.org> CatService: Add support for GET_CHANNEL_STATUS p-cmd.

Change-Id: Ib0782748fdbdc94e5c13cffadb40556e3f324eff
at/AppInterface.java
at/CatCmdMessage.java
at/CommandParamsFactory.java
43198cf78f564c631ef08dddb7a183d4ba5b137d 26-Nov-2012 Jeevaka Badrappan <jeevaka.badrappan@intel.com> Telephony: Fix issue with fdn deletion

Deletion of FDN contact with name having the "=" character
fails.

If there is a contact with "=" as part of the name, then split
will result in 3strings instead of 2(key and value).

For eg: Contact name: "="

Result with current code: [string.split("=")]
string[0] = tag
string[1] = '
string[2] = '.

Expected result:
string[0] = tag (key)
string[1] = '=' (value)

If split function with 2 arguments variation is used,
this issue will be solved. Example: string.split("=", 2)

Change-Id: I6c2d6152f9b034cae9739cd96c2fe799784dc5be
Author: Jeevaka Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: Jeevaka Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: Arun Ravindran <arun.ravindran@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 10805
ccProvider.java
2d7aad7791b92186dabc779b3ab43794aceebcda 29-Nov-2012 Guillaume Lucas <guillaume.lucas@intel.com> Telephony: add support for additional information

As per ETSI 102 223 section 8.12, for some general results, it is
mandatory for the terminal to provide a specific cause value as
additional information.

This patch adds this support to the framework.

Change-Id: Ie22e60412d674e24f9ebf13d02da4b39cb2dd253
Author: Guillaume Lucas <guillaume.lucas@intel.com>
Signed-off-by: Guillaume Lucas <guillaume.lucas@intel.com>
Signed-off-by: Arun Ravindran <arun.ravindran@intel.com>
Signed-off-by: Jeevaka Badrappan <jeevaka.badrappan@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 29915
at/CatResponseMessage.java
at/CatService.java
6c02409c6ddf15bf1c11d222b6a2a1fa5245aaff 13-Dec-2012 Wink Saville <wink@google.com> am 75a5b803: am c93d3b14: am f08c4c89: Turn auto attach on/off when we attach/detach.

* commit '75a5b8030e08f6424ff4a3495c7623121f23b6a6':
Turn auto attach on/off when we attach/detach.
75a5b8030e08f6424ff4a3495c7623121f23b6a6 13-Dec-2012 Wink Saville <wink@google.com> am c93d3b14: am f08c4c89: Turn auto attach on/off when we attach/detach.

* commit 'c93d3b14259cd00a9d7f92e3e2dd4d9992fca94e':
Turn auto attach on/off when we attach/detach.
c93d3b14259cd00a9d7f92e3e2dd4d9992fca94e 13-Dec-2012 Wink Saville <wink@google.com> am f08c4c89: Turn auto attach on/off when we attach/detach.

* commit 'f08c4c89622ddcbc4ed9315fe6b399941dad4939':
Turn auto attach on/off when we attach/detach.
f08c4c89622ddcbc4ed9315fe6b399941dad4939 12-Dec-2012 Wink Saville <wink@google.com> Turn auto attach on/off when we attach/detach.

Some network operators will detach after a timeout period, isDataAllowed()
will not allow a data connection because mAutoAttachOnCreation is false
and gprsState is not STATE_IN_SERVICE. This change toggles
mAutoAttachOnCreation based on attach/detach events and data will be
allowed if gprsState == STATE_IN_SERVICE or mAutoAttachOnCreation.

Bug: 7491805
Change-Id: If41c2514ebdb9cd2fba88eef692f2c7160c04b0f
sm/GsmDataConnectionTracker.java
1d272b4f018e5d7a0f70b70d76398c20d33e234b 12-Dec-2012 Robert Greenwalt <rgreenwalt@google.com> Merge "Remove unused INITING state."
a208912485c9931d004ee0e76a45a86259447c2f 11-Dec-2012 Wink Saville <wink@google.com> am 08a4f30f: resolved conflicts for merge of 106de004 to jb-mr1-dev-plus-aosp

* commit '08a4f30f925440641561f5be7ada1992856f9979':
Set audio mode after accepting the call
08a4f30f925440641561f5be7ada1992856f9979 11-Dec-2012 Wink Saville <wink@google.com> resolved conflicts for merge of 106de004 to jb-mr1-dev-plus-aosp

Change-Id: I069420f6eb3dc40779622e929acbc368d4b7aa55
a020758235911bddc552d5d38f20375e5a1fd05d 11-Dec-2012 Alex Yakavenka <ayakav@codeaurora.org> am d0e3cf71: am 75589efa: am f2a22db8: Set audio mode after accepting the call

* commit 'd0e3cf71d7033285b2d158c719ebf7400352227c':
Set audio mode after accepting the call
d0e3cf71d7033285b2d158c719ebf7400352227c 11-Dec-2012 Alex Yakavenka <ayakav@codeaurora.org> am 75589efa: am f2a22db8: Set audio mode after accepting the call

* commit '75589efab4375a4463c1c617be227e9bbd047aad':
Set audio mode after accepting the call
75589efab4375a4463c1c617be227e9bbd047aad 11-Dec-2012 Alex Yakavenka <ayakav@codeaurora.org> am f2a22db8: Set audio mode after accepting the call

* commit 'f2a22db80d9921fae213c763f08f2800d30b5cd3':
Set audio mode after accepting the call
f2a22db80d9921fae213c763f08f2800d30b5cd3 08-Dec-2012 Alex Yakavenka <ayakav@codeaurora.org> Set audio mode after accepting the call

Set the audio mode to incall immediately after accepting the call and not wait
till call is reported as ACTIVE by RIL. This is done to speed up time taken for audio
to set up the voice path

Bug: 7612431
Change-Id: I8008edc64928016ab94aa6d770de248b5d85dc93
allManager.java
60dc9dc311361f9fb52155ea28d383d55afa90d8 11-Dec-2012 Wink Saville <wink@google.com> Merge commit '7e4b734a' into fix-merge-conflict

* commit '7e4b734a':
Telephony: Move uicc classes into uicc package

Change-Id: Iacc7f1805500bfe55299aaedbe0241ebba8e8b23
7e4b734af72aa456b4a4a4bb217c1ca2c0f15ca7 10-Dec-2012 Wink Saville <wink@google.com> am 77b3e5a8: Merge "Telephony: Move uicc classes into uicc package"

* commit '77b3e5a85a230f8b1b384b931d830220332937b5':
Telephony: Move uicc classes into uicc package
a5d65ff9d36808aec38d60ebe30f2109fcfcb8bc 08-Dec-2012 Alex Yakavenka <ayakav@codeaurora.org> Set audio mode after accepting the call

Set the audio mode to incall immediately after accepting the call and not wait
till call is reported as ACTIVE by RIL. This is done to speed up time taken for audio
to set up the voice path

Bug: 7612431
Change-Id: I8008edc64928016ab94aa6d770de248b5d85dc93
allManager.java
d720945f2be5ea5fe0faf67e67d9ea0e184eba67 01-Aug-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Move uicc classes into uicc package

Reduce constructor visibility to package where
possible

Dependent Changes:
I3b718b9aea1f21c7906c8243b4ca0db6af495a08
I80204a2f3dc57cac875abeab390bb9db7a636ff7
Ib9c19e8b157dc7ec74eb14baca5bd3b5caf08c47

Change-Id: Ib4f43374c041cb5eaf2e3883e5ea28b2eb2c9a69
dnRecord.aidl
dnRecord.java
dnRecordCache.java
dnRecordLoader.java
ommandsInterface.java
simFileHandler.java
ataConnectionTracker.java
IccPhoneBook.aidl
ccCard.java
ccCardApplicationStatus.java
ccCardProxy.java
ccCardStatus.java
ccConstants.java
ccException.java
ccFileHandler.java
ccFileNotFound.java
ccFileTypeMismatch.java
ccIoResult.java
ccPhoneBookInterfaceManager.java
ccPhoneBookInterfaceManagerProxy.java
ccProvider.java
ccRecords.java
ccRefreshResponse.java
ccServiceTable.java
ccSmsInterfaceManager.java
ccVmFixedException.java
ccVmNotSupportedException.java
hone.java
honeBase.java
honeProxy.java
honeSubInfo.java
IL.java
erviceStateTracker.java
iccCard.java
iccCardApplication.java
simFileHandler.java
apPushOverSms.java
at/CatService.java
at/CommandParamsFactory.java
at/IconLoader.java
at/RilMessageDecoder.java
at/ValueParser.java
dma/CDMALTEPhone.java
dma/CDMAPhone.java
dma/CdmaConnection.java
dma/CdmaDataConnectionTracker.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
dma/RuimFileHandler.java
dma/RuimPhoneBookInterfaceManager.java
dma/RuimRecords.java
dma/RuimSmsInterfaceManager.java
dma/SmsMessage.java
dma/sms/BearerData.java
sm/GSMPhone.java
sm/GsmConnection.java
sm/GsmDataConnectionTracker.java
sm/GsmMmiCode.java
sm/GsmSMSDispatcher.java
sm/GsmServiceStateTracker.java
sm/SIMFileHandler.java
sm/SIMRecords.java
sm/SimPhoneBookInterfaceManager.java
sm/SimSmsInterfaceManager.java
sm/SmsMessage.java
sm/SpnOverride.java
sm/UsimDataDownloadHandler.java
sm/UsimPhoneBookManager.java
sm/UsimServiceTable.java
sm/VoiceMailConstants.java
ms/IsimFileHandler.java
ms/IsimRecords.java
ms/IsimUiccRecords.java
ip/SipPhoneBase.java
icc/AdnRecord.aidl
icc/AdnRecord.java
icc/AdnRecordCache.java
icc/AdnRecordLoader.java
icc/CsimFileHandler.java
icc/IccCardApplicationStatus.java
icc/IccCardProxy.java
icc/IccCardStatus.java
icc/IccConstants.java
icc/IccException.java
icc/IccFileHandler.java
icc/IccFileNotFound.java
icc/IccFileTypeMismatch.java
icc/IccIoResult.java
icc/IccRecords.java
icc/IccRefreshResponse.java
icc/IccServiceTable.java
icc/IccUtils.java
icc/IccVmFixedException.java
icc/IccVmNotSupportedException.java
icc/IsimFileHandler.java
icc/IsimRecords.java
icc/IsimUiccRecords.java
icc/RuimFileHandler.java
icc/RuimRecords.java
icc/SIMFileHandler.java
icc/SIMRecords.java
icc/SpnOverride.java
icc/UiccCard.java
icc/UiccCardApplication.java
icc/UiccController.java
icc/UsimFileHandler.java
icc/UsimServiceTable.java
icc/VoiceMailConstants.java
5b415773990b638e2f906b5e881b52cd56ce4c36 09-Dec-2012 Wink Saville <wink@google.com> am d1591969: Merge "Use Rlog"

* commit 'd159196940a62b597a69d735ecb25a3c285d8625':
Use Rlog
ded9c0af7fa49504c047275ed34c2d3b22bf0c3a 07-Dec-2012 Wink Saville <wink@google.com> Use Rlog

Change-Id: Ie013f51215de8380b8de74161b6056b010711cfd
dnRecord.java
dnRecordCache.java
dnRecordLoader.java
pnContext.java
aseCommands.java
all.java
allManager.java
allTracker.java
ommandException.java
ommandsInterface.java
onnection.java
simFileHandler.java
ataCallState.java
ataConnectionAc.java
ataConnectionTracker.java
ebugService.java
efaultPhoneNotifier.java
riverCall.java
ccCardProxy.java
ccFileHandler.java
ccPhoneBookInterfaceManagerProxy.java
ccProvider.java
ccServiceTable.java
ccSmsInterfaceManager.java
ccUtils.java
ccTable.java
honeBase.java
honeFactory.java
honeProxy.java
honeStateIntentReceiver.java
honeSubInfo.java
IL.java
etryManager.java
MSDispatcher.java
msStorageMonitor.java
msUsageMonitor.java
elephonyCapabilities.java
iccCard.java
iccCardApplication.java
simFileHandler.java
apPushOverSms.java
at/CatLog.java
at/ComprehensionTlv.java
at/IconLoader.java
dma/CDMALTEPhone.java
dma/CDMAPhone.java
dma/CdmaCallTracker.java
dma/CdmaCallWaitingNotification.java
dma/CdmaConnection.java
dma/CdmaDataConnection.java
dma/CdmaDataConnectionTracker.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaMmiCode.java
dma/CdmaSMSDispatcher.java
dma/CdmaServiceStateTracker.java
dma/CdmaSubscriptionSourceManager.java
dma/EriManager.java
dma/RuimFileHandler.java
dma/RuimPhoneBookInterfaceManager.java
dma/RuimRecords.java
dma/RuimSmsInterfaceManager.java
dma/SignalToneUtil.java
dma/SmsMessage.java
dma/sms/BearerData.java
sm/GSMPhone.java
sm/GsmCallTracker.java
sm/GsmConnection.java
sm/GsmDataConnection.java
sm/GsmDataConnectionTracker.java
sm/GsmMmiCode.java
sm/GsmSMSDispatcher.java
sm/GsmServiceStateTracker.java
sm/SIMFileHandler.java
sm/SIMRecords.java
sm/SimPhoneBookInterfaceManager.java
sm/SimSmsInterfaceManager.java
sm/SmsMessage.java
sm/SpnOverride.java
sm/UsimDataDownloadHandler.java
sm/UsimPhoneBookManager.java
sm/VoiceMailConstants.java
ms/IsimFileHandler.java
ms/IsimUiccRecords.java
ip/SipConnectionBase.java
ip/SipPhone.java
ip/SipPhoneBase.java
ip/SipPhoneFactory.java
est/ModelInterpreter.java
est/SimulatedCommands.java
est/SimulatedGsmCallState.java
icc/UiccController.java
13cf7e43f92022a7bb71950b388805c60726589f 06-Dec-2012 Robert Greenwalt <rgreenwalt@google.com> Remove unused INITING state.

Change-Id: I56dd80988a064836f9171021f57a7bbf367090c8
ataConnectionTracker.java
dma/CDMALTEPhone.java
dma/CDMAPhone.java
sm/GSMPhone.java
sm/GsmDataConnectionTracker.java
15852c31a4c339bb618dc884a2462612f5829f1a 06-Dec-2012 Nick Kralevich <nnk@google.com> am 051b44e1: am 7f65cbad: Merge "Remove sent USSD log"

* commit '051b44e1e1c9b974b5541c74b2a24b8443940a44':
Remove sent USSD log
051b44e1e1c9b974b5541c74b2a24b8443940a44 06-Dec-2012 Nick Kralevich <nnk@google.com> am 7f65cbad: Merge "Remove sent USSD log"

* commit '7f65cbadb856891c4075d4205b464f8dc4490f08':
Remove sent USSD log
7f65cbadb856891c4075d4205b464f8dc4490f08 06-Dec-2012 Nick Kralevich <nnk@google.com> Merge "Remove sent USSD log"
72000e2c06bbee97d5ce31c4f66befab8057cb71 04-Dec-2012 Cuihtlauac ALVARADO <cuihtlauac.alvarado@orange.com> Remove sent USSD log

Content of messages sent over USSD are copied in the radio logcat only if
debug level set to verbose. There are USSD services requiring highly
sensitive information to be sent by the user, we really don't want this
information to stay in the logcat by default.

Change-Id: Ieba37be0e346a6728dc7b139105a148577e0c0ff
IL.java
2e75ed7a0a37b28a2b1e7ee78f1883ecc129e0ec 05-Dec-2012 jangeon.kim <jangeon.kim@lge.com> am cf702990: am 70c6547e: am 3e028681: simcard: With Kazakh Beeline SIM card, there isn\'t STK menu

* commit 'cf7029906ceac5d2d15138d94adfb9f9bad51b62':
simcard: With Kazakh Beeline SIM card, there isn't STK menu
cf7029906ceac5d2d15138d94adfb9f9bad51b62 05-Dec-2012 jangeon.kim <jangeon.kim@lge.com> am 70c6547e: am 3e028681: simcard: With Kazakh Beeline SIM card, there isn\'t STK menu

* commit '70c6547e8223767411a2fca0601951a5fb27ed47':
simcard: With Kazakh Beeline SIM card, there isn't STK menu
70c6547e8223767411a2fca0601951a5fb27ed47 05-Dec-2012 jangeon.kim <jangeon.kim@lge.com> am 3e028681: simcard: With Kazakh Beeline SIM card, there isn\'t STK menu

* commit '3e02868153369ab32d3ecc7b01f6e48750d6356d':
simcard: With Kazakh Beeline SIM card, there isn't STK menu
3e02868153369ab32d3ecc7b01f6e48750d6356d 28-Nov-2012 jangeon.kim <jangeon.kim@lge.com> simcard: With Kazakh Beeline SIM card, there isn't STK menu

IccFileHandler.java is modified to fix an erroneous EF_IMG file path
information. The other is CommandParamsFactory.java file, which is modified
to ignore the result of reading EF_IMG file.

This Beeline SIM card returned an error status word when the mobile device
accessed the EF_IMG file in this SIM card.
(I think this Beeline SIM card does not support EF_IMG file.)
As a result, This error result stoped processing the setup menu proactive
command, and there was no STK menu.

So, I modified the CommandParamsFactory.java file to ignore the result of
EF_IMG file read operation.
After applying this modification, The STK menu was successfully displayed.
(This issue was resolved by these modified files.)

I think there will be no critical problem even if the EF_IMG(Icon image) file
is ignored.

Bug: 7585989

Change-Id: I16e3c077779811e3d4c46cd6e003771f3e1efde2
ccFileHandler.java
at/CommandParamsFactory.java
265fa2bedf7f279b2cabab99a189096b5bd16733 04-Dec-2012 Wink Saville <wink@google.com> Merge "Remove mRefCount"
2563e7e1ec513121b980045571a245aa5390f1c5 04-Dec-2012 Wink Saville <wink@google.com> Remove mRefCount

In DataConnection we had a list of connections and ref counting, with
this change we'll only use the list of connections only.

Change-Id: I64e3aff0980de845c14ee602632aa5f3cd740366
pnContext.java
ataConnection.java
ataConnectionAc.java
sm/GsmDataConnection.java
sm/GsmDataConnectionTracker.java
deb8ccd0fbeae2b2f21f8a4ccc1139a79cccc71e 28-Nov-2012 jangeon.kim <jangeon.kim@lge.com> simcard: With Kazakh Beeline SIM card, there isn't STK menu

IccFileHandler.java is modified to fix an erroneous EF_IMG file path
information. The other is CommandParamsFactory.java file, which is modified
to ignore the result of reading EF_IMG file.

This Beeline SIM card returned an error status word when the mobile device
accessed the EF_IMG file in this SIM card.
(I think this Beeline SIM card does not support EF_IMG file.)
As a result, This error result stoped processing the setup menu proactive
command, and there was no STK menu.

So, I modified the CommandParamsFactory.java file to ignore the result of
EF_IMG file read operation.
After applying this modification, The STK menu was successfully displayed.
(This issue was resolved by these modified files.)

I think there will be no critical problem even if the EF_IMG(Icon image) file
is ignored.

Bug: 7585989

Change-Id: I16e3c077779811e3d4c46cd6e003771f3e1efde2
ccFileHandler.java
at/CommandParamsFactory.java
9eb33c38c0597e358fdf41003584e1f2a05d69f8 04-Dec-2012 Wink Saville <wink@google.com> am 4c95838a: am 7c7a5b41: am 859f7a91: Assume LTE location info is base 10 but allow 16 or 8.

* commit '4c95838add2cb8f48c9ea41e2ae37e20daea4d60':
Assume LTE location info is base 10 but allow 16 or 8.
4c95838add2cb8f48c9ea41e2ae37e20daea4d60 04-Dec-2012 Wink Saville <wink@google.com> am 7c7a5b41: am 859f7a91: Assume LTE location info is base 10 but allow 16 or 8.

* commit '7c7a5b41dfee9a5834a6da0842ad2878e262eca7':
Assume LTE location info is base 10 but allow 16 or 8.
7c7a5b41dfee9a5834a6da0842ad2878e262eca7 04-Dec-2012 Wink Saville <wink@google.com> am 859f7a91: Assume LTE location info is base 10 but allow 16 or 8.

* commit '859f7a917b27e64fc03ee614152ac37c688307a8':
Assume LTE location info is base 10 but allow 16 or 8.
859f7a917b27e64fc03ee614152ac37c688307a8 04-Dec-2012 Wink Saville <wink@google.com> Assume LTE location info is base 10 but allow 16 or 8.

Previously it was base 16 but somewhere along the line it changed
to base 10. The code is now changed to use the decode method which
assumes base 10 but also accepts base 16 (prefix 0x, 0X, #) or
base 8 (prefix 0).

Bug: 7651566
Change-Id: Icae05dcbee9c1092fce2f594a1e179bbd3e1426a
dma/CdmaLteServiceStateTracker.java
5109e89a509a890573849dfacf33d955f12a2021 30-Nov-2012 Jake Hamby <jhamby@google.com> am 7a48d5f4: am fd70b976: am e7fd4f72: Raise threshold for detecting excessive SMS usage.

* commit '7a48d5f494bd1ac8047adda1e3a691ec4ef7e89b':
Raise threshold for detecting excessive SMS usage.
7a48d5f494bd1ac8047adda1e3a691ec4ef7e89b 30-Nov-2012 Jake Hamby <jhamby@google.com> am fd70b976: am e7fd4f72: Raise threshold for detecting excessive SMS usage.

* commit 'fd70b97666c46f3a5672fd1aefa28df76296769d':
Raise threshold for detecting excessive SMS usage.
fd70b97666c46f3a5672fd1aefa28df76296769d 30-Nov-2012 Jake Hamby <jhamby@google.com> am e7fd4f72: Raise threshold for detecting excessive SMS usage.

* commit 'e7fd4f7253d22528de63bb3f0fa1f9f9ca879a86':
Raise threshold for detecting excessive SMS usage.
e7fd4f7253d22528de63bb3f0fa1f9f9ca879a86 29-Nov-2012 Jake Hamby <jhamby@google.com> Raise threshold for detecting excessive SMS usage.

Raise threshold for detecting excessive SMS usage so that the user
is warned when an app tries to send 30 or more messages in 1 minute,
rather than 30 messages in 30 minutes. This will be much less likely
to trigger for legitimate SMS usage, while still protecting against
buggy or malicious SMS apps that try to send SMS's continuously.

Bug: 7212322
Change-Id: I97078f96fdb8584cdb3ccc830000de9a534044c0
msUsageMonitor.java
99c2e1d6749cfad2a8ca94a47857d8c3bfc09454 27-Nov-2012 Wink Saville <wink@google.com> Use Rlog instead of Log.

Change-Id: I2f44193b294513e743526e5c163e7d9a45308b28
dnRecord.java
dnRecordCache.java
dnRecordLoader.java
pnContext.java
aseCommands.java
all.java
allManager.java
allTracker.java
ommandException.java
ommandsInterface.java
onnection.java
simFileHandler.java
ataCallState.java
ataConnection.java
ataConnectionAc.java
ataConnectionTracker.java
ebugService.java
efaultPhoneNotifier.java
riverCall.java
ccCardProxy.java
ccFileHandler.java
ccPhoneBookInterfaceManagerProxy.java
ccProvider.java
ccServiceTable.java
ccSmsInterfaceManager.java
ccUtils.java
ccTable.java
honeBase.java
honeFactory.java
honeProxy.java
honeStateIntentReceiver.java
honeSubInfo.java
etryManager.java
MSDispatcher.java
msStorageMonitor.java
msUsageMonitor.java
elephonyCapabilities.java
iccCard.java
iccCardApplication.java
simFileHandler.java
apPushOverSms.java
at/CatLog.java
at/ComprehensionTlv.java
at/IconLoader.java
dma/CDMALTEPhone.java
dma/CDMAPhone.java
dma/CdmaCallTracker.java
dma/CdmaCallWaitingNotification.java
dma/CdmaConnection.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaMmiCode.java
dma/CdmaSMSDispatcher.java
dma/CdmaServiceStateTracker.java
dma/CdmaSubscriptionSourceManager.java
dma/EriManager.java
dma/RuimFileHandler.java
dma/RuimPhoneBookInterfaceManager.java
dma/RuimRecords.java
dma/RuimSmsInterfaceManager.java
dma/SignalToneUtil.java
dma/SmsMessage.java
dma/sms/BearerData.java
sm/GSMPhone.java
sm/GsmCallTracker.java
sm/GsmConnection.java
sm/GsmDataConnection.java
sm/GsmDataConnectionTracker.java
sm/GsmMmiCode.java
sm/GsmSMSDispatcher.java
sm/GsmServiceStateTracker.java
sm/SIMFileHandler.java
sm/SIMRecords.java
sm/SimPhoneBookInterfaceManager.java
sm/SimSmsInterfaceManager.java
sm/SmsMessage.java
sm/SpnOverride.java
sm/UsimDataDownloadHandler.java
sm/UsimPhoneBookManager.java
sm/VoiceMailConstants.java
ms/IsimFileHandler.java
ms/IsimUiccRecords.java
ip/SipConnectionBase.java
ip/SipPhone.java
ip/SipPhoneBase.java
ip/SipPhoneFactory.java
est/ModelInterpreter.java
est/SimulatedCommands.java
est/SimulatedGsmCallState.java
icc/UiccController.java
fa4fd4721082689c4b276f67b845e7be249cb8da 16-Nov-2012 Wink Saville <wink@google.com> Add support for logging directly to RADIO LOG.

Eventually we will remove using the LOG_TAG in
system/core/liblog/logd_write.c to steer the log string
to the LOG_ID_RADIO buffer. This can't be done immediately
even if we changed all of the code in frameworks/opt/telephony
and frameworks/base/telephony because ril's and radio's are
relying on this behavior. But next year we will.

Change-Id: Ic36eaaca6f2a6302255e96a7646b687322d6997e
IL.java
f92cb4bd5519427a0db673709d94683a8baf203a 16-Nov-2012 Wink Saville <wink@google.com> Remove CdmaDCT and CdmaDC.

Change-Id: Ifa251706326dae6b1676c79fa591f056a853953d
ataConnection.java
ccRecords.java
erviceStateTracker.java
dma/CDMAPhone.java
dma/CdmaDataConnection.java
dma/CdmaDataConnectionTracker.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
dma/RuimRecords.java
sm/GSMPhone.java
sm/GsmDataConnection.java
sm/GsmDataConnectionTracker.java
sm/GsmServiceStateTracker.java
sm/SIMRecords.java
ms/IsimUiccRecords.java
2e648e5c481ac90f64d71e1643c83bc67f8c0e7f 16-Nov-2012 Wink Saville <wink@google.com> Revert "Remove CdmaDCT and CdmaDC."

This reverts commit 88f9756a023639f48e85680b8bf2cd1469a5471a

Change-Id: I9b4f140b06acfc9d5f0856f380313a097171437a
ataConnection.java
ccRecords.java
erviceStateTracker.java
dma/CDMAPhone.java
dma/CdmaDataConnection.java
dma/CdmaDataConnectionTracker.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
dma/RuimRecords.java
sm/GSMPhone.java
sm/GsmDataConnection.java
sm/GsmDataConnectionTracker.java
sm/GsmServiceStateTracker.java
sm/SIMRecords.java
ms/IsimUiccRecords.java
88f9756a023639f48e85680b8bf2cd1469a5471a 15-Nov-2012 Wink Saville <wink@google.com> Remove CdmaDCT and CdmaDC.

Change-Id: I11ead478231bdd5f0b67bc2354e161eab3d4fd87
ataConnection.java
ccRecords.java
erviceStateTracker.java
dma/CDMAPhone.java
dma/CdmaDataConnection.java
dma/CdmaDataConnectionTracker.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
dma/RuimRecords.java
sm/GSMPhone.java
sm/GsmDataConnection.java
sm/GsmDataConnectionTracker.java
sm/GsmServiceStateTracker.java
sm/SIMRecords.java
ms/IsimUiccRecords.java
26bd5cfd9604dcafe4a9b4e915c4594b5258fa0e 08-Nov-2012 Anju Mathapati <anjucm@codeaurora.org> am 4f80dc44: am c82ab021: am 6af3665b: am 2bc7f2e1: Use proper check for spn for operator name display

* commit '4f80dc446e2d01705fda4fac4ed9c557b98730aa':
Use proper check for spn for operator name display
4f80dc446e2d01705fda4fac4ed9c557b98730aa 08-Nov-2012 Anju Mathapati <anjucm@codeaurora.org> am c82ab021: am 6af3665b: am 2bc7f2e1: Use proper check for spn for operator name display

* commit 'c82ab0216264ca82a62ed4cdda387b23c0d8c1c7':
Use proper check for spn for operator name display
c82ab0216264ca82a62ed4cdda387b23c0d8c1c7 07-Nov-2012 Anju Mathapati <anjucm@codeaurora.org> am 6af3665b: am 2bc7f2e1: Use proper check for spn for operator name display

* commit '6af3665bbfeade59948947f7f503345d04cf0a94':
Use proper check for spn for operator name display
2bc7f2e1da139e183519af01f50940327ca9765e 06-Nov-2012 Anju Mathapati <anjucm@codeaurora.org> Use proper check for spn for operator name display

Change null check to null or empty string check.

bug:7389730
Change-Id: I593429b8668b49978ad38b28062b8b2031464813
sm/SIMRecords.java
069488059d9619a2b8bd070e85d6d657bddcf65a 06-Nov-2012 Christopher Tate <ctate@google.com> Use the correct new namespace for AUTO_TIME and AIRPLANE_MODE_ON settings

These moved to the global namespace; update the points of usage here in the
telephony stack so the reads no longer have to be forwarded etc.

Change-Id: I06434b78bc42ac125ec114dc68381cf906ab3085
dma/CdmaServiceStateTracker.java
sm/GsmServiceStateTracker.java
c9aeb50a136db19f788da2dac022325d4f4ce458 30-Oct-2012 Rika Brooks <rbrooks@codeaurora.org> am 2d092d1d: am edde032a: am 44be3fc4: Telephony: Distinguish GSM vs ETWS bc by message id

* commit '2d092d1d1b6fdaa33040ecf6f50dd868785f9a2c':
Telephony: Distinguish GSM vs ETWS bc by message id
2d092d1d1b6fdaa33040ecf6f50dd868785f9a2c 30-Oct-2012 Rika Brooks <rbrooks@codeaurora.org> am edde032a: am 44be3fc4: Telephony: Distinguish GSM vs ETWS bc by message id

* commit 'edde032ab1181fdce43551660bf675c8b8bb62be':
Telephony: Distinguish GSM vs ETWS bc by message id
edde032ab1181fdce43551660bf675c8b8bb62be 30-Oct-2012 Rika Brooks <rbrooks@codeaurora.org> am 44be3fc4: Telephony: Distinguish GSM vs ETWS bc by message id

* commit '44be3fc486c049bbfea331b0fc2cff0552326f4b':
Telephony: Distinguish GSM vs ETWS bc by message id
44be3fc486c049bbfea331b0fc2cff0552326f4b 06-Feb-2012 Rika Brooks <rbrooks@codeaurora.org> Telephony: Distinguish GSM vs ETWS bc by message id

Per 3GPP TS 24.012 3.1 GSM CB can be less than 88 byes.
Fix to distinguish GSM vs ETWS broadcast format by checking message id field
rather than length of pdu.

Bug: 7417676
Change-Id: I6aeedcd531a89ded7901db33d89ed45baaabbaa7
sm/SmsCbHeader.java
aa2908dd54304e252be68ba1ed82181e6ea27c5d 29-Oct-2012 Junichi Monma <monma@google.com> am 4adaff35: am 3eb13f88: am 708cb897: Allowing to change the poll state even if only PS is avairable on the network.

* commit '4adaff35f8b52aa68edd31e05052e923344b18a8':
Allowing to change the poll state even if only PS is avairable on the network.
4adaff35f8b52aa68edd31e05052e923344b18a8 29-Oct-2012 Junichi Monma <monma@google.com> am 3eb13f88: am 708cb897: Allowing to change the poll state even if only PS is avairable on the network.

* commit '3eb13f8805e784f4257dd77537fde7b7fdcbf0e3':
Allowing to change the poll state even if only PS is avairable on the network.
3eb13f8805e784f4257dd77537fde7b7fdcbf0e3 29-Oct-2012 Junichi Monma <monma@google.com> am 708cb897: Allowing to change the poll state even if only PS is avairable on the network.

* commit '708cb897813b5239e1d732d08ee2d04f577d09f1':
Allowing to change the poll state even if only PS is avairable on the network.
708cb897813b5239e1d732d08ee2d04f577d09f1 26-Oct-2012 Junichi Monma <monma@google.com> Allowing to change the poll state even if only PS is avairable on the network.

There are some MVNO operators are shipping the data only SIM. It isn't
connectable with CS, but wroks for PS. If the poll is not shown on the
system bar when network registration returns STATE_OUT_OF_SERVICE for
CS, user doesn't notice whether or not they can use PS. In addition,
PS might works while CS restriction.

Bug: 3339315
Change-Id: I6c2b508a181afed6dc9356b99ad9ef09f8c7ea4f
sm/GsmServiceStateTracker.java
19364aaa786b2311a65aeefd33f0667ee7efd870 24-Oct-2012 Wink Saville <wink@google.com> am a19f2492: am 628da84b: am a2985af1: Validate call forwarding indicator status from SIM.

* commit 'a19f2492f65afd54e9ab2f5b6c787fda7bdda711':
Validate call forwarding indicator status from SIM.
a19f2492f65afd54e9ab2f5b6c787fda7bdda711 24-Oct-2012 Wink Saville <wink@google.com> am 628da84b: am a2985af1: Validate call forwarding indicator status from SIM.

* commit '628da84bfeb1bd9de02bed2fb0cc186ac4bb0567':
Validate call forwarding indicator status from SIM.
628da84bfeb1bd9de02bed2fb0cc186ac4bb0567 24-Oct-2012 Wink Saville <wink@google.com> am a2985af1: Validate call forwarding indicator status from SIM.

* commit 'a2985af1d00f7db8cb11da3874dc74e0c7ff7088':
Validate call forwarding indicator status from SIM.
a2985af1d00f7db8cb11da3874dc74e0c7ff7088 23-Oct-2012 Wink Saville <wink@google.com> Validate call forwarding indicator status from SIM.

The expected value for the MSP is 1 to 4, if not ignore.

Bug: 7387797
Change-Id: Ib35700c927fcc06eb5fb533097cb25a0de13db77
sm/SIMRecords.java
1de1d3c6da7aa16d1a1b4a3f85484803788d2f8b 19-Oct-2012 Wink Saville <wink@google.com> Fake errors in DataConnection.

Errors can be faked for all DC's or just a particular DC,
use tools/tdi to issue the broadcast intent.


Change-Id: I4ba661e765d32931421bb62bc5e740c9652370a5
aseCommands.java
ommandsInterface.java
ataConnection.java
sm/GsmDataConnection.java
b9f33f437348b38a1c0422cd844b267894661d9f 18-Oct-2012 Wink Saville <wink@google.com> Add additional debug logging.

Change-Id: I8ea0ff57faabfdd1dedb97bfa46706fd0fb93b5b
pnContext.java
ataConnection.java
ataConnectionTracker.java
sm/GsmDataConnection.java
sm/GsmDataConnectionTracker.java
be0930109ef5f2e044cb8cde5dce10bec64383d0 17-Oct-2012 Wink Saville <wink@google.com> Remove fake data setup counter, didn't work correctly.

There will be a change for DataConnection which allows it to be
configured to return errors when bringUp is called.

Change-Id: Ie5d8209ab9f78894027a1cf7bcea7507d29d9ed4
ataConnectionTracker.java
dma/CdmaDataConnectionTracker.java
sm/GsmDataConnectionTracker.java
b3b3dd5e0d8e3d05a5d1baa683b6b275d7427247 17-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> am 99a846e1: am 20659cc7: Retry connections that are in SCANNING.

* commit '99a846e14233977d46ec1a67a000872fbc34af00':
Retry connections that are in SCANNING.
99a846e14233977d46ec1a67a000872fbc34af00 17-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> am 20659cc7: Retry connections that are in SCANNING.

* commit '20659cc78b898b553a54bb6d9d7728f326b77bd1':
Retry connections that are in SCANNING.
20659cc78b898b553a54bb6d9d7728f326b77bd1 16-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> Retry connections that are in SCANNING.

Old code would retry all connections except those in the SCANNING state
when we reattach to the network. We're seeing this from people coming out
of subways as well as emerging from their house.

bug:7353277
Change-Id: Ic1fdd745f52ef33dd94b1d85b0dcc57a00c04d62
sm/GsmDataConnectionTracker.java
5e1bc7508bd2f6cbe52ce1d7cb13194a0d265406 17-Oct-2012 Jiju Kinattingal <jijuk@codeaurora.org> Telephony: Correct the typo in RIL.java

Change-Id: Ic4bcd054f14d7e4b702b924f799e4d1619b666e0
IL.java
c2a24b8d9bc3cdcc89650494cd6011201d75bdee 16-Oct-2012 Wink Saville <wink@google.com> am 0bc0fc92: am 27814a2e: When retrying disassociate an ApnContext from a DC only when failed or idle.

* commit '0bc0fc923b4e5e811987c4c641252b2fe01fa9b1':
When retrying disassociate an ApnContext from a DC only when failed or idle.
0bc0fc923b4e5e811987c4c641252b2fe01fa9b1 16-Oct-2012 Wink Saville <wink@google.com> am 27814a2e: When retrying disassociate an ApnContext from a DC only when failed or idle.

* commit '27814a2e735c0221935d46654fb00ff3ec2c45ea':
When retrying disassociate an ApnContext from a DC only when failed or idle.
27814a2e735c0221935d46654fb00ff3ec2c45ea 16-Oct-2012 Wink Saville <wink@google.com> When retrying disassociate an ApnContext from a DC only when failed or idle.

Disassociating, is setting an ApnContext DataConnection to null. When its
null the DataConnectionTracker will not find the DataConnection when the
next RIL_UNSOL_DATA_CALL_LIST_CHANGED arrives and it sends a notification
that the connection has been disconnected. When the notification is
received by the ConnectivityService it will reset the connection and now
there will truly be no connection.

Typically, when the DataConnectionTracker sees that the default connection
is been removed, it will automatically retry the connection. But this won't
happen in this case, because there was no error to cause the retry.

Bug: 6884995
Bug: 7343098
Change-Id: Ia36316151bc5ae9a0ef9b48b1841816198862127
sm/GsmDataConnectionTracker.java
8f732e354be617e5978529d9e129c6b188777f95 13-Oct-2012 Wink Saville <wink@google.com> am 727b32f8: am f7a81331: Handle no IccRecords in updateSpnDisplay differently.

* commit '727b32f8fc527d23e8cd9f92a165198b5dff03c6':
Handle no IccRecords in updateSpnDisplay differently.
727b32f8fc527d23e8cd9f92a165198b5dff03c6 13-Oct-2012 Wink Saville <wink@google.com> am f7a81331: Handle no IccRecords in updateSpnDisplay differently.

* commit 'f7a8133113daddcc48a41e451193afd3fcb35e16':
Handle no IccRecords in updateSpnDisplay differently.
f7a8133113daddcc48a41e451193afd3fcb35e16 13-Oct-2012 Wink Saville <wink@google.com> Handle no IccRecords in updateSpnDisplay differently.

Rather than doing nothing in GsmServiceStateTracker#updateSpnDisplay
if mIccRecords is null, use a rule of 0 and an empty spn. And then keep the
remaining logic the same.

This allows "Emergency Only Calls" to be displayed in the lock and
notification screens if there is no SIM card.

Bug: 7276760
Change-Id: I0f969c8f5cad204e80c63d2e1a8e896cb7f4c02a
sm/GsmServiceStateTracker.java
a90fe2bc14a1e29c484f8022e09ee833ff08160a 10-Oct-2012 Baligh Uddin <baligh@google.com> am 674c0b56: am 175442fc: Revert "Revert "Act on no-prefered-apn-on-connect config option.""

* commit '674c0b56e52d7e223be6fa3e84aacd4b61fff153':
Revert "Revert "Act on no-prefered-apn-on-connect config option.""
674c0b56e52d7e223be6fa3e84aacd4b61fff153 10-Oct-2012 Baligh Uddin <baligh@google.com> am 175442fc: Revert "Revert "Act on no-prefered-apn-on-connect config option.""

* commit '175442fc1d7ed440e4c2a7aaffe38521446dec8c':
Revert "Revert "Act on no-prefered-apn-on-connect config option.""
175442fc1d7ed440e4c2a7aaffe38521446dec8c 10-Oct-2012 Baligh Uddin <baligh@google.com> Revert "Revert "Act on no-prefered-apn-on-connect config option.""

Revert the revert - change is good.

This reverts commit 859e774e4309c24efafb157a894c2f94f8c544f2

Change-Id: Icb71779f30f5fe1ee7ed73c88e547507cbc0c31f
sm/GsmDataConnectionTracker.java
25dbe645c6b16dee0e0bf41bbd26e9cacc66baad 10-Oct-2012 Baligh Uddin <baligh@google.com> am a35580d7: am 859e774e: Revert "Act on no-prefered-apn-on-connect config option."

* commit 'a35580d76caf1cfedbded2c640f989583b4374e3':
Revert "Act on no-prefered-apn-on-connect config option."
a35580d76caf1cfedbded2c640f989583b4374e3 10-Oct-2012 Baligh Uddin <baligh@google.com> am 859e774e: Revert "Act on no-prefered-apn-on-connect config option."

* commit '859e774e4309c24efafb157a894c2f94f8c544f2':
Revert "Act on no-prefered-apn-on-connect config option."
859e774e4309c24efafb157a894c2f94f8c544f2 10-Oct-2012 Baligh Uddin <baligh@google.com> Revert "Act on no-prefered-apn-on-connect config option."

breaking jb-mr1-release

This reverts commit 3ff47ff70406e6973226ac966d157a97fa8e9279

Change-Id: I897cc6eecaa0b4a3d248abda0431cd70742ad2df
sm/GsmDataConnectionTracker.java
4eac40beef0c2988f3a76609776e6fd665fa190f 09-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> am 4f4042f1: am 3ff47ff7: Act on no-prefered-apn-on-connect config option.

* commit '4f4042f1895f817e23ce3c821504053423232fc7':
Act on no-prefered-apn-on-connect config option.
4f4042f1895f817e23ce3c821504053423232fc7 09-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> am 3ff47ff7: Act on no-prefered-apn-on-connect config option.

* commit '3ff47ff70406e6973226ac966d157a97fa8e9279':
Act on no-prefered-apn-on-connect config option.
3ff47ff70406e6973226ac966d157a97fa8e9279 08-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> Act on no-prefered-apn-on-connect config option.

bug:7306353
Change-Id: Icf1c21cc8997821a7d50d114c8985728d9bdb02e
sm/GsmDataConnectionTracker.java
a21458b7e268f39b4995c9501d1084a580676087 07-Oct-2012 Wink Saville <wink@google.com> am e55abcae: am 682428cb: Merge "Fake sim status changed appropriately" into jb-mr1-dev

* commit 'e55abcae66ffde0739cdcc7a57783c22bae1f2df':
Fake sim status changed appropriately
e55abcae66ffde0739cdcc7a57783c22bae1f2df 07-Oct-2012 Wink Saville <wink@google.com> am 682428cb: Merge "Fake sim status changed appropriately" into jb-mr1-dev

* commit '682428cb5e85d8bcc85685808b3f0e88716712a2':
Fake sim status changed appropriately
682428cb5e85d8bcc85685808b3f0e88716712a2 07-Oct-2012 Wink Saville <wink@google.com> Merge "Fake sim status changed appropriately" into jb-mr1-dev
f860a3f42f87c9c8572623aff33349168d689477 06-Oct-2012 Wink Saville <wink@google.com> Fake sim status changed appropriately

On a VZW GN if we always do ENTER_SIM_PIN the GET_SIM_STATUS comes so
quickly that it causes the SIMRecords to return an operator.numeric of
666666 instead of 311480. To fix this we only fake sim status changed
when an error occurs on the CHANGE/ENTER SIM_PIN/PIN2. Also, faking on
RIL_REQUEST_SET_FACILITY_LOCK on errors so on a VZW GN we automatically
go to the main lock screen when the PUK is needed,

Finally, on VZN GN RIL_REQUEST_ENTER_SIM_PUK we need to always fake
RIL_RESPONSE_UNSOL_SIM_STATUS_CHANGED, otherwise we won't automatically
leave the main lock screen when we enter the correct PUK. I also do this
for RIL_REQUEST_ENTER_SIM_PUK2 for consistency.

Bug: 7255789
Change-Id: I712cc5020970317922f0c3d686c621a6abcd552c
IL.java
c69c6cc00e4031162b7ba91edf0ffb8b566e4f57 04-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> am 4e9b8c2d: am 205e3cb5: Merge "Change the dir used for the sms policy." into jb-mr1-dev

* commit '4e9b8c2d3b556a4a1b588dd2eef606c9b5ecbed3':
Change the dir used for the sms policy.
4e9b8c2d3b556a4a1b588dd2eef606c9b5ecbed3 04-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> am 205e3cb5: Merge "Change the dir used for the sms policy." into jb-mr1-dev

* commit '205e3cb53a164c6d06b61dee9c2973038ae522e2':
Change the dir used for the sms policy.
205e3cb53a164c6d06b61dee9c2973038ae522e2 04-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> Merge "Change the dir used for the sms policy." into jb-mr1-dev
58c8356d4b119d4e9c0b6fe73526f4daca1112ec 04-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> Change the dir used for the sms policy.

The dir being used didn't exist (at least on mako) so changed to /data/misc/sms
which is used for other sms-y purposes (sms short code data) and exists.

bug:7287473
Change-Id: Idd952fabc2ee40c5d25db2da79c03ad302defa72
msUsageMonitor.java
e298a991476a0b48503713bd31dca3ed82a4c4e0 04-Oct-2012 Wink Saville <wink@google.com> am 31ff8674: am be3dc4b0: Fix 7255789

* commit '31ff8674da1d7570909d893e149581ddb88285f5':
Fix 7255789
31ff8674da1d7570909d893e149581ddb88285f5 04-Oct-2012 Wink Saville <wink@google.com> am be3dc4b0: Fix 7255789

* commit 'be3dc4b04cd65e576d250cf68f310d47637167ff':
Fix 7255789
be3dc4b04cd65e576d250cf68f310d47637167ff 04-Oct-2012 Wink Saville <wink@google.com> Fix 7255789

Two problems were identified, first in IccCardProxy needs to assume a
the current app type is 3GPP because some rils are not managing the
sim status properly and return the csim as PINSTATE_UNKNOWN if the device
is gets PUK locked because the PIN was entered incorrectly 3 times. This
is fixed with the changes IccCardProxy.java and Phone.java.

The second problem is that some rils are not sending a
RIL_UNSOL_RESPONSE_SIM_STATUS_CHANGED when the PIN or PUK are changed.
This causes some devices to NOT automatically go to the lock screen
when a PUK is required. This is fixed by the change to RIL.java.

Bug: 7255789
Change-Id: I969585edf416e6b11f52470ee69d19f781bf29ca
ccCardProxy.java
hone.java
IL.java
e681dffc954ae2c2e7e48deb68ec8f21cb2aac11 03-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> am ea779b73: am d070d1c9: Merge "Fix bug in subsequent premium-sms detections." into jb-mr1-dev

* commit 'ea779b7385612a334596fd4f09c105cf0d5fa5c2':
Fix bug in subsequent premium-sms detections.
ea779b7385612a334596fd4f09c105cf0d5fa5c2 03-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> am d070d1c9: Merge "Fix bug in subsequent premium-sms detections." into jb-mr1-dev

* commit 'd070d1c9318cf1b33ab901e3741acfa81262eeb7':
Fix bug in subsequent premium-sms detections.
d070d1c9318cf1b33ab901e3741acfa81262eeb7 03-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix bug in subsequent premium-sms detections." into jb-mr1-dev
b7ca3296aeec1c103b027548e78a4eaf96b560f5 03-Oct-2012 Dianne Hackborn <hackbod@google.com> am bbab7683: am ac1e58bf: Merge "Fix issue #7274813: A few sticky broadcasts aren\'t being sent to all users" into jb-mr1-dev

* commit 'bbab768308c37fae48a4ae17a11e7d304ffae1aa':
Fix issue #7274813: A few sticky broadcasts aren't being sent to all users
bbab768308c37fae48a4ae17a11e7d304ffae1aa 03-Oct-2012 Dianne Hackborn <hackbod@google.com> am ac1e58bf: Merge "Fix issue #7274813: A few sticky broadcasts aren\'t being sent to all users" into jb-mr1-dev

* commit 'ac1e58bf04e394a9d051c6a3c3099bda0ec409e9':
Fix issue #7274813: A few sticky broadcasts aren't being sent to all users
ac1e58bf04e394a9d051c6a3c3099bda0ec409e9 03-Oct-2012 Dianne Hackborn <hackbod@google.com> Merge "Fix issue #7274813: A few sticky broadcasts aren't being sent to all users" into jb-mr1-dev
10270d2586e2d940dea23b19f6ad733f702609be 03-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> Fix bug in subsequent premium-sms detections.

bug:fix_7273572
Change-Id: Ia51989fb417f5394b9a86d0dd8109671b2ee73ab
msUsageMonitor.java
7eff443d1f090abdbbd93eef9f265c74890920bc 03-Oct-2012 Dianne Hackborn <hackbod@google.com> Fix issue #7274813: A few sticky broadcasts aren't being sent to all users

Change-Id: Ief63aa4be067618b2431c2c0fcd1d6820a348715
dma/CdmaServiceStateTracker.java
sm/GsmServiceStateTracker.java
cf4d12430566850fbbeeef77eb1d5de17aa94327 03-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> am 7fe56ac2: am 78e1a45d: Merge "fallback to res-based premium-sms detection info" into jb-mr1-dev

* commit '7fe56ac20fdee1cd270b7707bfcf60ba2d15cf85':
fallback to res-based premium-sms detection info
7fe56ac20fdee1cd270b7707bfcf60ba2d15cf85 03-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> am 78e1a45d: Merge "fallback to res-based premium-sms detection info" into jb-mr1-dev

* commit '78e1a45d183e2564139372b5a828f056db4beb23':
fallback to res-based premium-sms detection info
78e1a45d183e2564139372b5a828f056db4beb23 03-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> Merge "fallback to res-based premium-sms detection info" into jb-mr1-dev
7b9187707ed429b57ee7b6f293da1ac87f7219fd 02-Oct-2012 Jeff Sharkey <jsharkey@android.com> am b24d4a60: am 6ce6af46: Migrate telephony settings to Global.

* commit 'b24d4a60d972feea197f0d1776bc3ac1fb8dcda4':
Migrate telephony settings to Global.
b24d4a60d972feea197f0d1776bc3ac1fb8dcda4 02-Oct-2012 Jeff Sharkey <jsharkey@android.com> am 6ce6af46: Migrate telephony settings to Global.

* commit '6ce6af4664de8d12c238f00b1f566db010d52a44':
Migrate telephony settings to Global.
6ce6af4664de8d12c238f00b1f566db010d52a44 01-Oct-2012 Jeff Sharkey <jsharkey@android.com> Migrate telephony settings to Global.

Bug: 7231764
Change-Id: I2e1c23ed930bb9499c8bca53ac68c38da85085b5
honeFactory.java
dma/CdmaLteServiceStateTracker.java
81ddb888952763b5eb7a4a38fb293fc86b897968 01-Oct-2012 Robert Greenwalt <rgreenwalt@google.com> fallback to res-based premium-sms detection info

If a device doesn't yet have or will never have the gservices-based
updatable premium-sms data, we should have a reasonable fallback.
Prepopulate with an xml resource.

bug:7254595
Change-Id: I065832bfffb46faba35054a7cdf05000ed14eb4a
msUsageMonitor.java
f3f73a585e3254d67b3e78ab4817f3eff2293748 29-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> am f5aea702: Merge "Fix the premium-SMS UI." into jb-mr1-dev

* commit 'f5aea70215c993c3ddcf1455ef9405f4a729240d':
Fix the premium-SMS UI.
d1816faeedf2c7e9ca6dda6d3c7e39106fe6f415 29-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> am a7700794: Use a gservices provided file for premium-sms data

* commit 'a7700794b7fbe667e87d72d3117ae3a4d2501313':
Use a gservices provided file for premium-sms data
f5aea70215c993c3ddcf1455ef9405f4a729240d 29-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix the premium-SMS UI." into jb-mr1-dev
a7700794b7fbe667e87d72d3117ae3a4d2501313 25-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> Use a gservices provided file for premium-sms data

Allows simple full-file replacement of the data rather than trying to send
country specific data to different devices.
bug:7221402

Change-Id: Ibdac97b39b66e01e62c845fb9c6732fafd99f1c9
msUsageMonitor.java
9ebea45a36838f0547a9c30f7cd9c60b03aab3b4 19-Sep-2011 Siddartha Pothapragada <spotha@codeaurora.org> Telephony: Add 'ServiceCategory' to SMS finger print

In case of certain broadcast messages sent back to back, say if,
service category 0x0002 Administrative and service category
0x0003 Maintenance are sent in sequence,
one after the other, service category 0x0003 fails to be displayed
on the UI although modem sends it to telephony
layer. This is because telephony rejects/discards the new
incoming message - 0x0003 as its finger-print matches exactly
with the previously sent message 0x0002.

Bug: 7238888
Change-Id: Id48169924605f423ee97a0866e754462f8c4c30d
dma/SmsMessage.java
0b01e3541d611ae0b48683acdee5ea2a8f45d4c4 26-Sep-2012 Jeff Brown <jeffbrown@google.com> am 04160ae3: Merge "Update references to migrated global settings." into jb-mr1-dev

* commit '04160ae3ea77ea98d07cc55efbb6370973dd0d22':
Update references to migrated global settings.
04160ae3ea77ea98d07cc55efbb6370973dd0d22 26-Sep-2012 Jeff Brown <jeffbrown@google.com> Merge "Update references to migrated global settings." into jb-mr1-dev
b8d0e5993929ca9ecd29f406ae5f39a3e450e89b 25-Sep-2012 Jeff Brown <jeffbrown@google.com> Update references to migrated global settings.

Bug: 7231172
Change-Id: Id18cce843899452bd171d5eeff99b48ca65dfb1e
honeBase.java
dma/CdmaServiceStateTracker.java
dma/CdmaSubscriptionSourceManager.java
78df2f47241a498bbd919c4c19a44b824e5dc2d6 25-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> Fix the premium-SMS UI.

Add instructions to undo permanent selections.
bug:7205024

Change-Id: I970e41019c66ef77ed62c9cd017571e308744380
MSDispatcher.java
c90b7d250dae1931a603cc052bd90bc34c070f1b 25-Sep-2012 Wink Saville <wink@google.com> Telephony: Fix npe when making a call after ejecting card (DO NOT MERGE)

This is already in AOSP and Master, back porting to JB-MR1.

Bug: 6983013
Change-Id: Ibda258e632ecff79f22eebe093df0061ed4cdf4d
sm/GsmConnection.java
f0b6e3ed7881f0a92281684e70c6249d0898338c 25-Sep-2012 Wink Saville <wink@google.com> am 5607e47c: Merge "Telephony: Fix npe when making a call after ejecting card"

* commit '5607e47cac5ac23459539bbb6f75e2507d4e03b7':
Telephony: Fix npe when making a call after ejecting card
f4bfdd2941bdee6927a5300556a5c1d490bbff33 25-Sep-2012 John Wang <johnwang@google.com> Merge "Handle mmi dialing number ending with #." into jb-mr1-dev
9225578f29e449d30380fcf71defb1ac7e8a59db 25-Sep-2012 John Wang <johnwang@google.com> Handle mmi dialing number ending with #.

According to TS 22.030 6.5.2 "Structure of the MMI", the dialing
number should not ending with #. But it is okay to have # in the
middle of dialing number.

bug:6410387
Change-Id: I1838d7012a132f27a3a879e1d34a9c3b04844def
sm/GsmMmiCode.java
1b5c213b68a9d7ab4af0263161ba9eb91668dedf 25-Sep-2012 John Wang <johnwang@google.com> Merge "Make updateSpnDisplay cover out various scenarios." into jb-mr1-dev
60e7f68c5f73b06fd5b603c331fc24b9d329de6b 24-Sep-2012 John Wang <johnwang@google.com> Make updateSpnDisplay cover out various scenarios.

Set showPlmn and plmn to correct values in emergency mode,
out of service, and airplane mode.

bug:7134445
Change-Id: Ic95e352dbfad3c6e2b62119ce288ce69dc83b856
sm/GsmServiceStateTracker.java
a2da94751bbf8718bbaa4e181eb7d0633c1ab0f7 24-Sep-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Fix npe when making a call after ejecting card

Bug: 6983013
Change-Id: Ibda258e632ecff79f22eebe093df0061ed4cdf4d
sm/GsmConnection.java
ee7b6094d4f3d4c641e54246aec8f61349d6e9d0 22-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> Add gservices-controllable rules policy.

Allows using SIM country, network country or the most restrictive of both.
bug:7205426

Change-Id: I4f7ec6ef884d8cc3665fe60290c167740f17d9e7
MSDispatcher.java
msUsageMonitor.java
5d875796122cdd8a7004e8e3964b20b5c65a31a1 20-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> Fix string in sms_short_code confirm dialog.

Typo used the wrong string giving "allow, allow" options after toggling
the remember-my-choice checkbox.

bug:7198380
Change-Id: Ia9bf3da44a1153838c618bd8c6b722235629e853
MSDispatcher.java
167a784eb797781d89049a9fbc90aa6684fcb7e5 20-Sep-2012 Wink Saville <wink@google.com> am ed6a91f6: am 7b5e41b5: am 54cadb79: Merge "Telephony: Fix npe in IccPhoneBookInterfaceManager"

* commit 'ed6a91f6b4fb5e33406034f13d21897de70b506b':
Telephony: Fix npe in IccPhoneBookInterfaceManager
ed6a91f6b4fb5e33406034f13d21897de70b506b 20-Sep-2012 Wink Saville <wink@google.com> am 7b5e41b5: am 54cadb79: Merge "Telephony: Fix npe in IccPhoneBookInterfaceManager"

* commit '7b5e41b5aca925ef476bf670a1f65f1cb51bac83':
Telephony: Fix npe in IccPhoneBookInterfaceManager
7b5e41b5aca925ef476bf670a1f65f1cb51bac83 20-Sep-2012 Wink Saville <wink@google.com> am 54cadb79: Merge "Telephony: Fix npe in IccPhoneBookInterfaceManager"

* commit '54cadb79d3d2ef5be670d2fbd6e566f0a5f7f428':
Telephony: Fix npe in IccPhoneBookInterfaceManager
ba06d1becedde6ee94229154b2e493d6d4a3ad53 20-Sep-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Fix npe in IccPhoneBookInterfaceManager

Create new interface to get current uicc app type from
phone and use that

Bug: 7167839
Change-Id: I4787985593918c660a254c9826734cf9c963bff0
ccPhoneBookInterfaceManager.java
honeBase.java
4a6e52f2f5db93fdf339de7e92e0a23659985019 18-Sep-2012 Wink Saville <wink@google.com> am 38953327: am 5d9a7e45: am f667af23: Merge "Telephony: Add null pointer checks in UiccCardApplicaton.update"

* commit '38953327bdab42c3975528ed416a6af0d4273a7f':
Telephony: Add null pointer checks in UiccCardApplicaton.update
38953327bdab42c3975528ed416a6af0d4273a7f 18-Sep-2012 Wink Saville <wink@google.com> am 5d9a7e45: am f667af23: Merge "Telephony: Add null pointer checks in UiccCardApplicaton.update"

* commit '5d9a7e454c5c71ef15527f06278b18996d0cc191':
Telephony: Add null pointer checks in UiccCardApplicaton.update
5d9a7e454c5c71ef15527f06278b18996d0cc191 18-Sep-2012 Wink Saville <wink@google.com> am f667af23: Merge "Telephony: Add null pointer checks in UiccCardApplicaton.update"

* commit 'f667af23e53602cf0b7f1400ea0b7564764bf5ca':
Telephony: Add null pointer checks in UiccCardApplicaton.update
f48d70f5336408e7910c4868b8ede5db8354727a 17-Sep-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Add null pointer checks in UiccCardApplicaton.update

Bug: 7174617
Change-Id: Iad5ef2352ea5e6ef4ede87214036ef27cc6a95ef
iccCardApplication.java
4658a1a8c23111d5cc89feb040ce547a7b65dfb0 06-Sep-2012 Jake Hamby <jhamby@google.com> Add support for per-package policy for sending premium SMS.

The default behavior for sending a message to a premium SMS
short code (or suspected premium SMS number) is to ask the user for
confirmation. Enable the user to set a default policy ("remember this
choice" checkbox) to always/never allow the app to send SMS to
premium short codes in the future. The policy can be changed by
the Settings app in the app info screen.

Bug: 5513975
Change-Id: I82731bbc6631ac79b1b5d1d9b1f96c7100ab20cf
Sms.aidl
ccSmsInterfaceManager.java
ccSmsInterfaceManagerProxy.java
MSDispatcher.java
msUsageMonitor.java
a72f94510f726ba8692bfbf11b7c489c80da9a08 14-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> Merge "Use the same logic in isDataPossible as GSM." into jb-mr1-dev
aa810543a4084d2aa80e7f671483bc390e74c1a8 14-Sep-2012 Wink Saville <wink@google.com> am f5082fd1: am 38a7ed0d: am 4a844050: Merge "Telephony: Request for sim_status even if there is no UNSL_SIM_STATUS_CHANGED"

* commit 'f5082fd198921c62a17ce10f9fb503af944949a9':
Telephony: Request for sim_status even if there is no UNSL_SIM_STATUS_CHANGED
f5082fd198921c62a17ce10f9fb503af944949a9 14-Sep-2012 Wink Saville <wink@google.com> am 38a7ed0d: am 4a844050: Merge "Telephony: Request for sim_status even if there is no UNSL_SIM_STATUS_CHANGED"

* commit '38a7ed0d3d355373ae7709e8292c636e48882124':
Telephony: Request for sim_status even if there is no UNSL_SIM_STATUS_CHANGED
38a7ed0d3d355373ae7709e8292c636e48882124 14-Sep-2012 Wink Saville <wink@google.com> am 4a844050: Merge "Telephony: Request for sim_status even if there is no UNSL_SIM_STATUS_CHANGED"

* commit '4a8440506c9e31a3d65ba64664af3b2ad18b2fa1':
Telephony: Request for sim_status even if there is no UNSL_SIM_STATUS_CHANGED
22e3d13998dd36f78d14b3c5b8508ad6be689629 14-Sep-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Request for sim_status even if there is no UNSL_SIM_STATUS_CHANGED

Some radios/rils lose initial UNSOL_SIM_STATUS_CHANGED indication
(because Telephony wasn't connected to rild when the event happened).
Query for sim_status on power_on.

Bug: 7116148
Change-Id: I448f1b939837a61b7b060068ea1062947a5f6138
icc/UiccController.java
71592446731992ac8bd61fe5804455d1b17335b9 14-Sep-2012 Geremy Condra <gcondra@google.com> Merge "Add event logging for SMS" into jb-mr1-dev
2029d86b5aebd03f7acbd249a4e2e4f65ec37d47 08-Sep-2012 Geremy Condra <gcondra@google.com> Add event logging for SMS

This allows us to gather metrics about unwanted SMS use on
dogfood devices.

Change-Id: I00820b12219dde918d6d7adee3ccf03c576424c9
ventLogTags.logtags
MSDispatcher.java
f022afffe951c56fd2c1fda40b0e276fd21edb20 13-Sep-2012 John Wang <johnwang@google.com> am 29b5d8e4: resolved conflicts for merge of f5cbd762 to jb-dev-plus-aosp

* commit '29b5d8e48cd4c6563d49cb227b5a9e03c5791d0b':
resolved conflicts for merge of f5cbd762 to jb-dev-plus-aosp
abd59738ceb9d21b8bf159d4625ea9b0ade873ee 13-Sep-2012 Robert Greenwalt <rgreenwalt@google.com> Use the same logic in isDataPossible as GSM.

Could not reproduce the problem, but this does seem like a potential problem.
bug:5870919

Change-Id: Iabee1ef20b56ec00dae8acbce32a876d51125a66
dma/CdmaDataConnectionTracker.java
29b5d8e48cd4c6563d49cb227b5a9e03c5791d0b 13-Sep-2012 John Wang <johnwang@google.com> resolved conflicts for merge of f5cbd762 to jb-dev-plus-aosp

Change-Id: I2ee98d03fb1e6e3f5c2325d59d54621fa97eb6ff
sm/GsmServiceStateTracker.java
b840987a39e7149c1364739696977089cd53814d 13-Sep-2012 Wink Saville <wink@google.com> Use Settings.Global instead of Settings.Secure in a few places.

There are more but the PDP_WATCHDOG_POLL_INTERVAL_MS is causing
excessive logging so changing it and others in the DCT as well as
in GsmSST.

The uses in PhoneFactory, SmsUsageMonitor, PhoneBase,
CdmaLteServiceStateTracker, CdmaSubscriptionSourceManager and
CdmaServiceStateTracker need to be looked at also, will fix
those next.

Change-Id: I8c29e7ce5ad6aecc824d3c0d71fa6cfca0eac777
ataConnectionTracker.java
sm/GsmServiceStateTracker.java
e08bcc948be9f8cb966da0814d7cf17109cfdb95 08-Sep-2012 Wink Saville <wink@google.com> am f8a1f90c: am 511d4b68: am 713a658e: Merge "Telephony: Log parameters for facility lock operations."

* commit 'f8a1f90c98b7252ca8fdc9df9166c6d62eb16e68':
Telephony: Log parameters for facility lock operations.
511d4b684ccaa6a2b572c331e4bc5c76a919e4a7 08-Sep-2012 Wink Saville <wink@google.com> am 713a658e: Merge "Telephony: Log parameters for facility lock operations."

* commit '713a658e9d60a94c96b98d94424a61c708525c04':
Telephony: Log parameters for facility lock operations.
88e9c9700fbb6119c2564fb7173821c84b360d07 29-Aug-2012 Abhishek Adappa <aadappa@codeaurora.org> Telephony: Log parameters for facility lock operations.

Change-Id: Ib834928ffd76a0f0e4fa0552cc27a09ccb4cd987
IL.java
565013a713156a0ddcc46dc3a0077e4c268ce272 08-Sep-2012 Wink Saville <wink@google.com> Merge commit '599f207f' into fix-merge-conflict

* commit '599f207f':
Telephony: Remove CdmaLteUicc objects

Change-Id: I5d63ea7edbcb1e7fe4010bcb3e5c9d6c961827d6
db1b0c54ffa990afeac24cc54d8b1992f1aa3a85 08-Sep-2012 Wink Saville <wink@google.com> am 1d40e34c: Merge "Telephony: Remove CdmaLteUicc objects"

* commit '1d40e34c74e2874114855db681aafba5676ae25c':
Telephony: Remove CdmaLteUicc objects
1d40e34c74e2874114855db681aafba5676ae25c 08-Sep-2012 Wink Saville <wink@google.com> Merge "Telephony: Remove CdmaLteUicc objects"
e287feac673ff68565b766e0e463d105fa9cef9d 10-Jul-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Remove CdmaLteUicc objects

-Pass IccCard object to GsmMmiCode
-Create IccCardProxy
-Make IccCard an interface and pass instance of IccCardProxy to
external applications (PhoneApp). IccCardProxy will use internal
UiccCard to map Icc requests to current active application on
UiccCard to maintain backwards compatibility for external
applications
-Add documentation to UiccController

The primary advantage of UiccController is that we can work with
multiple uicc applications at the same time. And that is a
requirement for modes like Cdma/Lte. The existing code supports
Cdma/Lte only partially and with guessing on modem side. However,
some things modem can guess, while others - it can't.

For instance, when a user tries to edit the fdn list the current
code will pass ef_id for fdn (0x6F3B). But the modem will have no
clue which fdn list the user wants to edit (csim or usim, both
have path 7FFF), and it's impossible for modem to guess correctly
all the time. All the modem can do is try to be consistent and
hope another device is doing same things. Imagine you bring your
card from another Cdma/Lte device to your new Cdma/Lte device:
if this modem uses different fdn file, it won't work as all
existing entries won't be there.

Another example is when the modem's guess is wrong for files like
csim/ef_li (7FFF 6F3A) versus usim/ef_adn (7FFF 6F3A). They have
same ef_ids so Android really should pass aid of the app it wants
to access. Without aids there is no way modem can know for sure
which file Android wants to read! However, in the current code
even Android doesn't know which aid it wants to read file from
since CdmaLteRecords has only 1 aid.

All of these problems cause more and more hacks, both in the modem
and in Android side. UiccController cleans up current code and
provides framework to work with multiple Uicc applications at the
same time.

Change-Id: I60216887b14140bdf833a8ed579ba16cad932bdc
simFileHandler.java
ccCard.java
ccCardApplication.java
ccCardApplicationStatus.java
ccCardProxy.java
ccCardStatus.java
ccConstants.java
ccFileHandler.java
ccPhoneBookInterfaceManager.java
ccRecords.java
honeBase.java
honeFactory.java
honeProxy.java
IL.java
erviceStateTracker.java
iccCard.java
iccCardApplication.java
simFileHandler.java
at/CatService.java
dma/CDMALTEPhone.java
dma/CDMAPhone.java
dma/CdmaConnection.java
dma/CdmaDataConnectionTracker.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaLteUiccFileHandler.java
dma/CdmaLteUiccRecords.java
dma/CdmaServiceStateTracker.java
dma/RuimFileHandler.java
dma/RuimRecords.java
sm/GSMPhone.java
sm/GsmConnection.java
sm/GsmDataConnectionTracker.java
sm/GsmMmiCode.java
sm/GsmServiceStateTracker.java
sm/SIMFileHandler.java
sm/SIMRecords.java
ms/IsimFileHandler.java
ms/IsimUiccRecords.java
icc/README
icc/UiccController.java
2f81ec63398ad4b0af33e5233411a4a1e3680bd7 06-Sep-2012 Wink Saville <wink@google.com> am 3d5e9bd1: am 8566fabf: am e9260aec: Merge "Omitting Big Endian caused corrupt characters"

* commit '3d5e9bd1a4ea294ebb85e87ef5a8aed687ba9ade':
Omitting Big Endian caused corrupt characters
8566fabf80997b1effde2fdaad3ff06223a5f326 06-Sep-2012 Wink Saville <wink@google.com> am e9260aec: Merge "Omitting Big Endian caused corrupt characters"

* commit 'e9260aec3d196e9c9b94962289f177ae39283eb4':
Omitting Big Endian caused corrupt characters
e9260aec3d196e9c9b94962289f177ae39283eb4 06-Sep-2012 Wink Saville <wink@google.com> Merge "Omitting Big Endian caused corrupt characters"
9f1860d5596f79d74fa4ecf78c0dd1d8253fc5f9 18-Jul-2012 Pierre Fröjd <pierre.frojd.x@sonyericsson.com> Omitting Big Endian caused corrupt characters

When sending a terminal reponse to SIM containing unicode
characters, big endian must be explicitly stated to
avoid corrupt characters.

Change-Id: Iac4dcadfd860b5de15ad2a65c4ccdf3fae9292d4
at/ResponseData.java
dec905e7465287f21b191889da07f331890f43c9 05-Sep-2012 Wink Saville <wink@google.com> am b66683d8: am 5af6cdd6: am 7ac8d802: Merge "Telephony: Fixed problem with short operator name"

* commit 'b66683d899c3e58f84d8369ced23e3c4f6e5fd99':
Telephony: Fixed problem with short operator name
5af6cdd62a9c88371ef5defafa7fd49780cf8ef3 05-Sep-2012 Wink Saville <wink@google.com> am 7ac8d802: Merge "Telephony: Fixed problem with short operator name"

* commit '7ac8d8026b997141d106762574478eb9daaf3f38':
Telephony: Fixed problem with short operator name
7ac8d8026b997141d106762574478eb9daaf3f38 05-Sep-2012 Wink Saville <wink@google.com> Merge "Telephony: Fixed problem with short operator name"
b142fa0d4ec00ebb7df1b6657f56a57f0fbfd7fa 05-Sep-2012 Wink Saville <wink@google.com> am ad10642b: am 380be4a4: am 6fe2a8a4: Merge "Handle the case when TP-PI reserved bits are set"

* commit 'ad10642b1f79079148211dade13dce276f9dd93f':
Handle the case when TP-PI reserved bits are set
380be4a4fa0290f4b86309b22778839fab8c1b5e 05-Sep-2012 Wink Saville <wink@google.com> am 6fe2a8a4: Merge "Handle the case when TP-PI reserved bits are set"

* commit '6fe2a8a4ab453dd72daf24798ef1bc460840b136':
Handle the case when TP-PI reserved bits are set
56c949ded0e352444806dd04bbca1895a2c75a9b 04-Sep-2012 Huanze Lan <huanze.lan@sonyericsson.com> Handle the case when TP-PI reserved bits are set

Discard settings according to 3GPP TS 23.040,
9.2.3.27 TP-Parameter-Indicator (TP-PI).

Usually operators will set this byte to 0 to indicate
there is no more data, but a few operators sets a
reserved bit to 1 to indicate there is no more data instead,
so we need to handle this case also.

Change-Id: I58abc2473c79b65795be186182927c603b35305e
sm/SmsMessage.java
9386a53046f7cb9137b958c8d255306248c881cd 18-Jul-2012 Johan Redestig <johan.redestig@sonymobile.com> Telephony: Fixed problem with short operator name

This patch solves the problem with erroneous service
provider name that is visible in status row. The name
of the service provider is one character short. This
happen when loading the service provider name from
EF_SPN_CPHS or EF_SPN_SHORT_CPHS.

Change-Id: I54df69b9d46bc90028581d16df72f1fd4757c913
sm/SIMRecords.java
08a57a4c23056b2abbf6c86c1e3fa6fee8d20e67 01-Sep-2012 Jake Hamby <jhamby@google.com> am 5b7a88ea: Merge "Fix CDMA decoding of multipart UTF-16 SMS messages."

* commit '5b7a88ea46ba6d02369ca6ec030df7f2df31b644':
Fix CDMA decoding of multipart UTF-16 SMS messages.
b2deb7e4c88a4000d66c3a8f711084515b9e0f57 31-Aug-2012 Jake Hamby <jhamby@google.com> Fix CDMA decoding of multipart UTF-16 SMS messages.

Recent changes to support CMAS over CDMA introduced a bug causing
an exception to be thrown when decoding multipart UTF-16 encoded
messages. This change fixes the exception by correctly subtracting
the header size from the number of bytes to decode. It also adds
more robust error handling to try to decode the maximum length
possible instead of throwing an exception if the length is still
larger than the user data length after subtracting the header.

This also fixes a bug in the encoder, which was padding the
UTF-16 user data to 16-bit alignment, which is incorrect (should
be padded to an 8-bit boundary). The code happened to work because
we always generated a UDH that was an even number of bytes
(including length) so the padding was a no-op. The decoder works
correctly.

Bug: 6939151
Change-Id: I4000fa2f4703b39e5ed7e5bd8490828303ef8979
dma/sms/BearerData.java
ac1701bae6a076fe92b05875aa94b6bef45838c1 31-Aug-2012 Jake Hamby <jhamby@google.com> am 115632cc: Fix CDMA decoding of multipart UTF-16 SMS messages.

* commit '115632cc56f813bd21543f8532c763d7d2968046':
Fix CDMA decoding of multipart UTF-16 SMS messages.
115632cc56f813bd21543f8532c763d7d2968046 31-Aug-2012 Jake Hamby <jhamby@google.com> Fix CDMA decoding of multipart UTF-16 SMS messages.

Recent changes to support CMAS over CDMA introduced a bug causing
an exception to be thrown when decoding multipart UTF-16 encoded
messages. This change fixes the exception by correctly subtracting
the header size from the number of bytes to decode. It also adds
more robust error handling to try to decode the maximum length
possible instead of throwing an exception if the length is still
larger than the user data length after subtracting the header.

This also fixes a bug in the encoder, which was padding the
UTF-16 user data to 16-bit alignment, which is incorrect (should
be padded to an 8-bit boundary). The code happened to work because
we always generated a UDH that was an even number of bytes
(including length) so the padding was a no-op. The decoder works
correctly.

Bug: 6939151
Change-Id: I4000fa2f4703b39e5ed7e5bd8490828303ef8979
dma/sms/BearerData.java
7f7d82aac56022880f613772ed4a90738075c843 31-Aug-2012 Wink Saville <wink@google.com> am 50b1206d: am cc0e5450: Merge "WspTypeDecoder: fixed decoding of content parameters"

* commit '50b1206d5ab38003c0d63b7e6a3589bf00c6ceb5':
WspTypeDecoder: fixed decoding of content parameters
50b1206d5ab38003c0d63b7e6a3589bf00c6ceb5 31-Aug-2012 Wink Saville <wink@google.com> am cc0e5450: Merge "WspTypeDecoder: fixed decoding of content parameters"

* commit 'cc0e54506132e42f5e0ca2cfee0c399ba49ba149':
WspTypeDecoder: fixed decoding of content parameters
cbbf6deee30d702e398939f4bb464f5e821f5e6c 30-Aug-2012 Dianne Hackborn <hackbod@google.com> Update to send sticky broadcasts to all users.

Change-Id: I66312f142348282b90fb63f8f20361446d56fb03
ccCard.java
honeProxy.java
dma/CDMAPhone.java
0fcf2097e7e217319b625d5dfc24aded06c02227 30-Aug-2012 Johan Redestig <johan.redestig@sonymobile.com> WspTypeDecoder: fixed decoding of content parameters

The removed condition prevented any parameter to have
0 as integer value.

Change-Id: Iaa8e106e49a51322c07f647f2f66bb7bd6055c89
spTypeDecoder.java
25a229f871862521d0b15d9d042b36bd382a4a64 28-Aug-2012 Wink Saville <wink@google.com> am 15e83e03: am 935f0c7a: Merge "Pull up Stats polling and Data Stall Alarm handling to DCT"

* commit '15e83e031027a1b161c4ee4f046e3cc1bdf0f92b':
Pull up Stats polling and Data Stall Alarm handling to DCT
15e83e031027a1b161c4ee4f046e3cc1bdf0f92b 28-Aug-2012 Wink Saville <wink@google.com> am 935f0c7a: Merge "Pull up Stats polling and Data Stall Alarm handling to DCT"

* commit '935f0c7abbf49e71478c79ca32eae972fcca574d':
Pull up Stats polling and Data Stall Alarm handling to DCT
935f0c7abbf49e71478c79ca32eae972fcca574d 28-Aug-2012 Wink Saville <wink@google.com> Merge "Pull up Stats polling and Data Stall Alarm handling to DCT"
8739ce83da5d9e8887f7ec414614af3682c12c7a 28-Aug-2012 Wink Saville <wink@google.com> am 162971e5: am 820e9643: Merge "Plug a fd leak."

* commit '162971e54aa22f23b193ae5eb44ba12092fc0303':
Plug a fd leak.
162971e54aa22f23b193ae5eb44ba12092fc0303 28-Aug-2012 Wink Saville <wink@google.com> am 820e9643: Merge "Plug a fd leak."

* commit '820e964351b4d58c69ce40b64928911eb07efeeb':
Plug a fd leak.
820e964351b4d58c69ce40b64928911eb07efeeb 28-Aug-2012 Wink Saville <wink@google.com> Merge "Plug a fd leak."
cebb2cc576c652dd642d7f419532ec04e0f59d7d 31-Jul-2012 Naveen Kalla <nkalla@codeaurora.org> Pull up Stats polling and Data Stall Alarm handling to DCT

Code in GsmDataConnectionTracker and CdmaDataConnectionTracker is
very similar for maintaining data activity statistics and detecting
data stalls. So it can be moved up to the parent class.

Change-Id: I3ec63f6bbfe369e0006d3aa6d6b92abf451657f4
ataConnectionTracker.java
dma/CdmaDataConnectionTracker.java
sm/GsmDataConnectionTracker.java
dd8b840a59aafaac5325985fb35fb1db3f7dd9d8 25-Aug-2012 Wink Saville <wink@google.com> am 4b24797a: am fb4c7e43: Merge "Telephony: Send disconnect when disposing DCTs"

* commit '4b24797a3bf90b95fd46a3acf4ec6bcc4f32530b':
Telephony: Send disconnect when disposing DCTs
4b24797a3bf90b95fd46a3acf4ec6bcc4f32530b 25-Aug-2012 Wink Saville <wink@google.com> am fb4c7e43: Merge "Telephony: Send disconnect when disposing DCTs"

* commit 'fb4c7e43721fe51e2f749c70f36c0f6be18e8580':
Telephony: Send disconnect when disposing DCTs
fb4c7e43721fe51e2f749c70f36c0f6be18e8580 25-Aug-2012 Wink Saville <wink@google.com> Merge "Telephony: Send disconnect when disposing DCTs"
eca324b92d4cd136f728c14dbb92a1d55674645e 24-Aug-2012 Wink Saville <wink@google.com> am ffcb548f: Empty DC\'s apnList when the DC is free.

* commit 'ffcb548fa2fdcc170ef4bbbe50f0348959cac8f1':
Empty DC's apnList when the DC is free.
ffcb548fa2fdcc170ef4bbbe50f0348959cac8f1 23-Aug-2012 Wink Saville <wink@google.com> Empty DC's apnList when the DC is free.

Not doing this causes DC.apnList's to have multiple entries in the
apnlist which causes DC's to look like its connected to both IMS and
INTERNET. And when selecting CDMA only mode on a Xoom we will not bring
up the connection thus no data connectivity.

A "cherry-pick" from frameworks/base/ b44b13a3f5967a7ce80f7124dc7b9c486f49c275

Bug: 6939338
Change-Id: I49881adb2710d7fe5d88c3aef748618bda7d65f1
sm/GsmDataConnectionTracker.java
0ef38e23406aeed28e95dbc4e5022822508349e7 20-Aug-2012 Jake Hamby <jhamby@google.com> am 6df4d0f3: am 026b1a18: Merge "Telephony: Fix MT SMS with invalid TOA field causing crash issue"

* commit '6df4d0f3d49769e733045b3efcda9060aaae1bfe':
Telephony: Fix MT SMS with invalid TOA field causing crash issue
2ab323871c8a16e039df1ff916da57df7bd34763 20-Aug-2012 Jake Hamby <jhamby@google.com> am 4eedbd9a: am f0414167: Merge "Telephony: Fix LTE CB Sms for dual-mode devices"

* commit '4eedbd9a3fa0bafb4be05522113a5f6498923b4e':
Telephony: Fix LTE CB Sms for dual-mode devices
6df4d0f3d49769e733045b3efcda9060aaae1bfe 20-Aug-2012 Jake Hamby <jhamby@google.com> am 026b1a18: Merge "Telephony: Fix MT SMS with invalid TOA field causing crash issue"

* commit '026b1a184c918c9e0ddd028073084e443e5ae0fc':
Telephony: Fix MT SMS with invalid TOA field causing crash issue
4eedbd9a3fa0bafb4be05522113a5f6498923b4e 20-Aug-2012 Jake Hamby <jhamby@google.com> am f0414167: Merge "Telephony: Fix LTE CB Sms for dual-mode devices"

* commit 'f0414167059ea8ac7daae752e0ce7bd858df7f92':
Telephony: Fix LTE CB Sms for dual-mode devices
026b1a184c918c9e0ddd028073084e443e5ae0fc 20-Aug-2012 Jake Hamby <jhamby@google.com> Merge "Telephony: Fix MT SMS with invalid TOA field causing crash issue"
f0414167059ea8ac7daae752e0ce7bd858df7f92 20-Aug-2012 Jake Hamby <jhamby@google.com> Merge "Telephony: Fix LTE CB Sms for dual-mode devices"
0fd49b6b31960a768702d202a066b1088ec489a1 15-Aug-2012 Alex Yakavenka <ayakaven@codeaurora.org> Telephony: Fix LTE CB Sms for dual-mode devices

Ignore 3gpp location information when it is not available.
This is required to support dual-mode devices such as CDMA/LTE devices
that require support for both 3GPP and 3GPP2 format messages.

Change-Id: Ie5d6372ef7e8da6893800e05a83ba840b7fd31f6
sm/GsmSMSDispatcher.java
5ad6947b2d955a4e972d556090922d77aa6a2641 09-Aug-2011 Rekha Kumar <rekhak@codeaurora.org> Telephony: Fix MT SMS with invalid TOA field causing crash issue

Throw FormatException when type of number is incorrect and handle it

Change-Id: I305ea1c9e4fee29c84caefec7d7564d46228851d
sm/GsmSmsAddress.java
sm/SmsMessage.java
4a558a7b6494361fb0b3ac5ebb4f40f8e778ac5f 16-Aug-2012 Wink Saville <wink@google.com> am 3a7fdcb7: am 640ac806: Merge "Telephony: Ignore SipPhone"

* commit '3a7fdcb7918fd4e68814952b545c89fb971e5356':
Telephony: Ignore SipPhone
3a7fdcb7918fd4e68814952b545c89fb971e5356 16-Aug-2012 Wink Saville <wink@google.com> am 640ac806: Merge "Telephony: Ignore SipPhone"

* commit '640ac8068f3941dcf79c0496285758d4b8180847':
Telephony: Ignore SipPhone
073ffbd395b7c3942c75a0880cafd1ddb84b4b07 15-Aug-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Ignore SipPhone

UiccController's code isn't ready to handle having multiple
different PhoneBase objects working at the same time

Bug: 6975696
Change-Id: I8f83174cc7db478743445c09fb8f03c66cf1e41e
icc/UiccController.java
208f334f85a5e5182a98aefb56066443a2de5261 15-Aug-2012 Wink Saville <wink@google.com> Merge commit 'd9d3f48c' into fix-merge-conflict



* commit 'd9d3f48c':
Telephony: Unregister broadcast receiver

Change-Id: I57a974e92592efa8a662f083dd1bfc613c1a945a
81a055a7b9e3049413a503fa61c09f3f43648d78 15-Aug-2012 Wink Saville <wink@google.com> am aa8bd6e9: am 91cccaaf: Merge "Telephony: Always create IccCard"

* commit 'aa8bd6e9add9bf3604e2faf1f36faefcbbda7b76':
Telephony: Always create IccCard
d9d3f48c49050e54b5fbbcd660a1cda940559a70 15-Aug-2012 Wink Saville <wink@google.com> am 4a306f66: Merge "Telephony: Unregister broadcast receiver"

* commit '4a306f66962aabf843ce883a8f96450389db5f7a':
Telephony: Unregister broadcast receiver
aa8bd6e9add9bf3604e2faf1f36faefcbbda7b76 15-Aug-2012 Wink Saville <wink@google.com> am 91cccaaf: Merge "Telephony: Always create IccCard"

* commit '91cccaaf575d6faf4e57bcb8a7e78538f28c75cd':
Telephony: Always create IccCard
4a306f66962aabf843ce883a8f96450389db5f7a 15-Aug-2012 Wink Saville <wink@google.com> Merge "Telephony: Unregister broadcast receiver"
91cccaaf575d6faf4e57bcb8a7e78538f28c75cd 15-Aug-2012 Wink Saville <wink@google.com> Merge "Telephony: Always create IccCard"
a5fc984c8b0696c187e14bfa75962b6e46c40d02 15-Aug-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Unregister broadcast receiver

Telephony code registers a BroadcastReceiver but does not
unregister it. This is causing Broadcast Register Receivers list
to grow large enough to cause situation with excessive JNI refs.

Change-Id: I8d2531849fd2b1282aaf5c20516b043b3bf0a2fa
sm/GsmServiceStateTracker.java
dbb088ab146d2fcb435e75e4ca70f2ff7d00d2c7 15-Aug-2012 Alex Yakavenka <ayakaven@codeaurora.org> Telephony: Fix decodeCallbackNumber for Cdma CMAS

Fix exception in decodeCallbackNumber for Cdma CMAS by
verifying expected param size.

Change-Id: I687a0ad424b6c1d73c0320b3a776cadf7e8ba180
dma/sms/BearerData.java
bb8277c9c32f77d71dcc393b9baa19a3ffbeb0a6 15-Aug-2012 Alex Yakavenka <ayakaven@codeaurora.org> Telephony: Don't ack CB messages

SmsDispatcher receives its own broadcast to ack messages.
CB message needs to be excluded from the acking code since
it should not be acked.

Change-Id: I3f1496bb0c81a8edcc4173661e2ca75b03a9c6fb
MSDispatcher.java
f92aefb45aa708772779a1ea10622b38f965fab5 13-Aug-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Always create IccCard

There is some bug in master branch which is not in AOSP code
that prevents KeyGuard from showing up unless IccCard broadcasts
its status

Force creation of IccCard (even if it really is absent) so that
it broadcasts its state and KeyGuard gets displayed

Fix NullPointerException in case card was removed by checking
return value of phone.getIccCard()

bug: 6983013
Change-Id: I95de1cc8a70a9e3d66d3e5d6059e82626057c5d4
ccCard.java
sm/GsmConnection.java
icc/UiccController.java
e0e2ceb1ae025e6dd2adda75c32dba93c6dfeea4 13-Aug-2012 Wink Saville <wink@google.com> Merge commit '616b281b' into merge-conflict-TelephonySignal-Strength-cleanup

* commit '616b281b':
Telephony: Signal Strength cleanup

Change-Id: I3c211a06c480169d90fb5bc2c1774bd509d91f87
616b281b5a644d599bcc6b4bd75545b600eff45e 13-Aug-2012 Wink Saville <wink@google.com> am 15e350db: Merge "Telephony: Signal Strength cleanup"

* commit '15e350dbdedb12c36c4432375e8c58a633b1e492':
Telephony: Signal Strength cleanup
15e350dbdedb12c36c4432375e8c58a633b1e492 13-Aug-2012 Wink Saville <wink@google.com> Merge "Telephony: Signal Strength cleanup"
59a96dd369b5c275b5e40105d71ed4c76d46f8b1 11-Aug-2012 Wink Saville <wink@google.com> am 193becaf: Merge commit \'33f24931ad25942ed8abb142df2edc2c1811350e\' into fix-merge-conflict

* commit '193becaf222c8b426f46afad87391ae3e70415c8':
Telephony: Fix npe due to mIccCard not being created
193becaf222c8b426f46afad87391ae3e70415c8 11-Aug-2012 Wink Saville <wink@google.com> Merge commit '33f24931ad25942ed8abb142df2edc2c1811350e' into fix-merge-conflict

* commit '33f24931ad25942ed8abb142df2edc2c1811350e':
Telephony: Fix npe due to mIccCard not being created
54007c8258ed3ea20c1a00c9385cf11129218efb 11-Aug-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Fix npe due to mIccCard not being created

Change-Id: I668bfb97ea7f047182fdcb92ebfec7cc4e73d2f5
sm/GsmServiceStateTracker.java
049ab0421f32e6effc5d1277b69bd382cebadb18 09-Aug-2012 Wink Saville <wink@google.com> Merge commit 'e0e2ebb5' into fix-merge-conflict

* commit 'e0e2ebb5':
Telephony: Dynamically instantiate IccCard

Change-Id: I37d65c140033f110bc4990f68adf9489737c9c38
e0e2ebb5a50e580cbe6957dcafb3495a2d0a27f2 27-Jul-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Dynamically instantiate IccCard

Instantiate when get_sim_status request returns

Change-Id: I9c9333d23f1e0b23256731b245577d1a25721647
ataConnectionTracker.java
ccCard.java
ccPhoneBookInterfaceManager.java
ccRecords.java
honeBase.java
erviceStateTracker.java
dma/CDMALTEPhone.java
dma/CDMAPhone.java
dma/CdmaDataConnectionTracker.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
dma/RuimPhoneBookInterfaceManager.java
dma/RuimRecords.java
sm/GSMPhone.java
sm/GsmDataConnectionTracker.java
sm/GsmMmiCode.java
sm/GsmServiceStateTracker.java
sm/SIMRecords.java
sm/SimPhoneBookInterfaceManager.java
ip/SipPhoneBase.java
icc/UiccController.java
a13eb8b86f22b0efcfb888e2491b007d3424dddd 08-Nov-2011 Rekha Kumar <rekhak@codeaurora.org> Telephony: Check SmsTracker's mSentIntent for null

When SmsManager's sendMultipartTextMessage is invoked with null sentIntents,
the SmsTracker object is initialized with mSentIntent as null.
This causes NullPointerException.

Change-Id: I545c4a23676ba67f6a5523f15564993f001e48ca
MSDispatcher.java
bb36adde615d3d85fa0fc23935197c6bc6a799ed 27-Jul-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Dynamically instantiate IccCard

Instantiate when get_sim_status request returns

Change-Id: I9c9333d23f1e0b23256731b245577d1a25721647
ataConnectionTracker.java
ccCard.java
ccPhoneBookInterfaceManager.java
ccRecords.java
honeBase.java
erviceStateTracker.java
dma/CDMALTEPhone.java
dma/CDMAPhone.java
dma/CdmaDataConnectionTracker.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
dma/RuimPhoneBookInterfaceManager.java
dma/RuimRecords.java
sm/GSMPhone.java
sm/GsmDataConnectionTracker.java
sm/GsmMmiCode.java
sm/GsmServiceStateTracker.java
sm/SIMRecords.java
sm/SimPhoneBookInterfaceManager.java
ip/SipPhoneBase.java
icc/UiccController.java
b754042d27e77f6e800b2e9a16d9b3ee9f91f154 04-Aug-2012 Wink Saville <wink@google.com> Merge "Fix a logging NPE problem" into jb-mr1-dev
b89bb0f88d5e1042a5fa56b6b1dd4baeec07f58f 04-Aug-2012 Wink Saville <wink@google.com> am f7c060b9: am 99dec9eb: Merge "Telephony: Move AdnRecord.aidl into opt/telephony"

* commit 'f7c060b9ded0613109c1cec05c537c4e846fecd4':
Telephony: Move AdnRecord.aidl into opt/telephony
28af7786dc807b6647221bfd2c0edd4fdbffef3c 04-Aug-2012 Wink Saville <wink@google.com> am 073517d3: am d016bfd4: Merge "fixes buffer overflow for data"

* commit '073517d3e1529f2a6007de5c6fbed5412dcfe59e':
fixes buffer overflow for data
06e85d3327fcdd6b2a8e7b83c9f84f0ae348a12e 04-Aug-2012 Wink Saville <wink@google.com> am 8342d163: am f8f82e08: Merge "Add DORMANT state to GSM data link activity"

* commit '8342d1630c433559835563eded2dacdbf35d9db4':
Add DORMANT state to GSM data link activity
f7c060b9ded0613109c1cec05c537c4e846fecd4 04-Aug-2012 Wink Saville <wink@google.com> am 99dec9eb: Merge "Telephony: Move AdnRecord.aidl into opt/telephony"

* commit '99dec9ebdfb31432e7fdac5c42b7e7e21f29e287':
Telephony: Move AdnRecord.aidl into opt/telephony
073517d3e1529f2a6007de5c6fbed5412dcfe59e 04-Aug-2012 Wink Saville <wink@google.com> am d016bfd4: Merge "fixes buffer overflow for data"

* commit 'd016bfd42fcfc230d0104fd16fa807bfd7ceb7e6':
fixes buffer overflow for data
8342d1630c433559835563eded2dacdbf35d9db4 04-Aug-2012 Wink Saville <wink@google.com> am f8f82e08: Merge "Add DORMANT state to GSM data link activity"

* commit 'f8f82e088e109049cb888a75af0686afd118ea85':
Add DORMANT state to GSM data link activity
99dec9ebdfb31432e7fdac5c42b7e7e21f29e287 04-Aug-2012 Wink Saville <wink@google.com> Merge "Telephony: Move AdnRecord.aidl into opt/telephony"
d016bfd42fcfc230d0104fd16fa807bfd7ceb7e6 04-Aug-2012 Wink Saville <wink@google.com> Merge "fixes buffer overflow for data"
f8f82e088e109049cb888a75af0686afd118ea85 04-Aug-2012 Wink Saville <wink@google.com> Merge "Add DORMANT state to GSM data link activity"
cd4ae4aa265885ea754df9c9909d232563454187 03-Aug-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Move AdnRecord.aidl into opt/telephony

Change-Id: I827343c758dd2aac9014c4f98b247e3784606516
dnRecord.aidl
11b9bd95ff8d436ffb5e01998870102f5a412cf9 04-Aug-2012 Robert Greenwalt <rgreenwalt@google.com> Fix a logging NPE problem

Manually ported from jb-dev due to telephony relocation.

bug:6864064
Change-Id: Ic461256654f99e8c6c13251777972cc3e799e179
dma/CdmaServiceStateTracker.java
b3a03455be44a2a0ffbeb757b193d860c1878599 19-Jul-2012 Naveen Kalla <nkalla@codeaurora.org> Add DORMANT state to GSM data link activity

GsmDataConnectionTracker sets its activity flag to DORMANT and notifies
LinkActivity when RIL indicates that all its data calls are in
dormant state (i.e. active is set to 1 in UNSOL_DATA_CALL_LIST_CHANGED
message for all data calls)

This indication is needed so that the Android public API getDataActivity()
can return DATA_ACTIVITY_DORMANT when Android applications invoke this
API while the phone is on a WCDMA data call.

Change-Id: I81b9db36375fea4f9fb946ddd5ddf0e1d16cbbab
ataConnectionTracker.java
dma/CdmaDataConnectionTracker.java
sm/GSMPhone.java
sm/GsmDataConnectionTracker.java
c1e1c4722539812750c2d22dd9cf5f8df0ed7da0 03-Aug-2012 Madan Ankapura <mankapur@sta.samsung.com> fixes buffer overflow for data

Change-Id: Ia1fc89b2fe0fc84ca540fef2783b95f8f9952d6f
Signed-off-by: Madan Ankapura <mankapur@sta.samsung.com>
dma/CdmaLteUiccRecords.java
5b81adc82a53b3064f4baa3acfeabef31586588a 10-Jul-2012 Uma Maheswari Ramalingam <umam@codeaurora.org> Telephony: Signal Strength cleanup

Make signal strength parsing common for all modes

Change-Id: I41bce658c536dc30558224c8ca76d6d70afb78ee
honeBase.java
IL.java
erviceStateTracker.java
dma/CDMAPhone.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
sm/GSMPhone.java
sm/GsmServiceStateTracker.java
c62df086696fc7cb42c51e086ea2aab076cff24b 01-Aug-2012 Ajay Nambi <anambi@codeaurora.org> Telephony: Send disconnect when disposing DCTs

Send disconnect when disposing DCTs. This is invoked multiple times
during Inter-RAT (IRAT) handovers and sending disconnect to lower layers
keeps things in-sync and avoid race conditions as seen in field tests.

Change-Id: I7c0c32a0448934981f0ebbeb9ee2702b87f9b5d9
dma/CdmaDataConnectionTracker.java
sm/GsmDataConnectionTracker.java
3965c152887e506f5b5df486185820510290363e 28-Jul-2012 Ajay Nambi <anambi@codeaurora.org> Telephony: Look for CSS indicator for voice+data

For non-LTE, use the CSS field of VOICE_REGISTRATION_STATE to determine
if the modem supports simultaneous voice+data.

Change-Id: I546c939f325a6e3b09d563e32d45412910401422
dma/CdmaLteServiceStateTracker.java
a6b55dcb21ebc8e781d3031ff2de74e23427abb1 26-Jul-2012 Jake Hamby <jhamby@google.com> am 324dd8d1: am b8a13d30: Implement CMAS service category program results.

* commit '324dd8d12e3c3df713e981119d8e88c6afefa962':
Implement CMAS service category program results.
067196df27214e8203369b013023887919a10aff 26-Jul-2012 Jake Hamby <jhamby@google.com> am 522ff6be: am 34661b1e: Fix detection of CDMA cell broadcast messages.

* commit '522ff6be0e89476101687c6865f98d925448c8ac':
Fix detection of CDMA cell broadcast messages.
64159c6230faabfee86bbb9597a04d202034882b 26-Jul-2012 Wink Saville <wink@google.com> am f71db0a5: am 08bf1a57: am 801aa9f3: Merge "Fix PhoneApp crash while decoding operatorNumeric to find mcc"

* commit 'f71db0a58eeec26998288ed65b0516ca1043c66a':
Fix PhoneApp crash while decoding operatorNumeric to find mcc
a2aa7a99068ce4cb7d7a72450aa05d10884ad307 26-Jul-2012 Wink Saville <wink@google.com> am 89ab794f: am 9fdeecb4: Fix build

* commit '89ab794fbe239de1cc63a02132572677133bcc18':
Fix build
d4ed2bdefb663ee7cb78c25edba4f8a70fe31c29 26-Jul-2012 John Wang <johnwang@google.com> am eca0fe06: am 1e5f46c0: Don\'t send terminal response without cmd details.

* commit 'eca0fe063adf22665ab5a83fc4e5ab11610641d0':
Don't send terminal response without cmd details.
b8a13d300b245e0080aa01275e232f54d5d0e09c 25-Jul-2012 Jake Hamby <jhamby@google.com> Implement CMAS service category program results.

Correctly handle CDMA Service Category Program Data requests,
and send the SCPT response to the message center. Parcel SCPD
operations as an ArrayList instead of an array (current version
will throw ClassCastException when the array is cast).

Bug: 6853691
Change-Id: I949ea68891c78306059248832e59a593ab606e11
MSDispatcher.java
dma/CdmaSMSDispatcher.java
dma/SmsMessage.java
dma/sms/BearerData.java
3c93767bab0040818e0f530c0d0102654a87e0c0 25-Jul-2012 Wink Saville <wink@google.com> Merge "Revise CellInfo API's"
34661b1e9381d56b168777e3f18f6f9f2ad305c1 23-Jul-2012 Jake Hamby <jhamby@google.com> Fix detection of CDMA cell broadcast messages.

The bIsServicePresent field of an incoming CDMA SMS RIL message
is not a reliable way to distinguish broadcast from point-to-point
messages on some RILs. Change CDMA SmsMessage.getMessageType() to
return MESSAGE_TYPE_BROADCAST when the service category is not 0,
and MESSAGE_TYPE_POINT_TO_POINT when the service category is 0.

Bug: 6853691
Change-Id: I0d44a8ce0bb295da5125271db90652570d655bc1
dma/SmsMessage.java
08bf1a57eb310c99b9994ef23b944441ae33aa2b 25-Jul-2012 Wink Saville <wink@google.com> am 801aa9f3: Merge "Fix PhoneApp crash while decoding operatorNumeric to find mcc"

* commit '801aa9f327730327132aafbae7e0c55bb6e7ea71':
Fix PhoneApp crash while decoding operatorNumeric to find mcc
9fdeecb4aa06552efcc535f21718cae45cc604e2 25-Jul-2012 Wink Saville <wink@google.com> Fix build

mCurrentCmd should have been mCurrntCmd.

Change-Id: Ibd8faf0f6fec2285045f6f498730ff7882217cb1
at/CatService.java
1e5f46c0477703b0eef40278cfa101d20b53091a 25-Jul-2012 John Wang <johnwang@google.com> Don't send terminal response without cmd details.

bug:6481578
Change-Id: I1ccd8b4599cff8df6806e39d53f86e265647bae7
at/CatService.java
7c491bb3d140e2579c2c01edca94305701664db5 25-Jul-2012 Rekha Kumar <rekhak@codeaurora.org> Fix PhoneApp crash while decoding operatorNumeric to find mcc

Handle StringIndexOutOfBoundsException when mcc is found using
substring operation.

Bug: 6872958
Change-Id: I9e89a791e6efb3f9daacc33ac3aef05d9218af41
sm/GsmServiceStateTracker.java
ef1d4bff9bbf7d967dbcace73f08910e14e367d0 17-Jul-2012 Wink Saville <wink@google.com> Revise CellInfo API's

Change-Id: I35bc22caf4a6a2255f2ce122690823f8d602b359
efaultPhoneNotifier.java
hone.java
honeBase.java
honeNotifier.java
honeProxy.java
IL.java
erviceStateTracker.java
dma/CDMAPhone.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaServiceStateTracker.java
sm/GSMPhone.java
sm/GsmServiceStateTracker.java
ip/SipPhoneBase.java
a63bf4237dfc3c9b81f7d5eff57c5500b8b8215d 18-Jul-2012 Johan Redestig <johan.redestig@sonymobile.com> Plug a fd leak.

Change-Id: Ia7189e67e8a03eceaa81e13cac98f20a82a44276
sm/VoiceMailConstants.java
62b20cd5b7ce5d7809ff1fe2b5796b2e605165e5 18-Jul-2012 Robert Greenwalt <rgreenwalt@google.com> Fix our interpretation of apn setting's bearer.

Between ICS and JB we changed it to use TelephonyManager's network type
enumeration. This changes it back to represent the RIL's radio
technology. The only diff between the two is 13 and 14 are swapped,
so the change was causing problems with LTE and eHRPD.

bug:6830908
Change-Id: I25f3e30b08ebcdf99bb70a41e01e3fbf38bf2de7
sm/GsmDataConnectionTracker.java
c38bb60d867c5d61d90b7179a9ed2b2d1848124f 12-Jul-2012 Wink Saville <wink@google.com> Create telephony-common - DO NOT MERGE

telephony-common was created by moving some of
frameworks/base/telephony
to:
frameworks/opt/telephony

Change-Id: I32cbb5eec1fa239c1587e055c8f7ef4fc48fb62c
TParseEx.java
TResponseParser.java
dnRecord.java
dnRecordCache.java
dnRecordLoader.java
pnContext.java
pnSetting.java
aseCommands.java
all.java
allForwardInfo.java
allManager.java
allStateException.java
allTracker.java
ommandException.java
ommandsInterface.java
onnection.java
ataCallState.java
ataConnection.java
ataConnectionAc.java
ataConnectionTracker.java
ebugService.java
efaultPhoneNotifier.java
riverCall.java
ventLogTags.logtags
IccPhoneBook.aidl
Sms.aidl
ccCard.java
ccCardApplication.java
ccCardStatus.java
ccConstants.java
ccException.java
ccFileHandler.java
ccFileNotFound.java
ccFileTypeMismatch.java
ccIoResult.java
ccPhoneBookInterfaceManager.java
ccPhoneBookInterfaceManagerProxy.java
ccProvider.java
ccRecords.java
ccRefreshResponse.java
ccServiceTable.java
ccSmsInterfaceManager.java
ccSmsInterfaceManagerProxy.java
ccUtils.java
ccVmFixedException.java
ccVmNotSupportedException.java
ntRangeManager.java
ccTable.java
miCode.java
peratorInfo.java
hone.java
honeBase.java
honeFactory.java
honeNotifier.java
honeProxy.java
honeStateIntentReceiver.java
honeSubInfo.java
honeSubInfoProxy.java
IL.java
estrictedState.java
etryManager.java
MSDispatcher.java
erviceStateTracker.java
msAddress.java
msHeader.java
msMessageBase.java
msRawData.java
msResponse.java
msStorageMonitor.java
msUsageMonitor.java
elephonyCapabilities.java
USInfo.java
apPushManagerParams.java
apPushOverSms.java
spTypeDecoder.java
at/AppInterface.java
at/BerTlv.java
at/CatCmdMessage.java
at/CatException.java
at/CatLog.java
at/CatResponseMessage.java
at/CatService.java
at/CommandDetails.java
at/CommandParams.java
at/CommandParamsFactory.java
at/ComprehensionTlv.java
at/ComprehensionTlvTag.java
at/Duration.java
at/FontSize.java
at/IconLoader.java
at/ImageDescriptor.java
at/Input.java
at/Item.java
at/LaunchBrowserMode.java
at/Menu.java
at/PresentationType.java
at/ResponseData.java
at/ResultCode.java
at/ResultException.java
at/RilMessageDecoder.java
at/TextAlignment.java
at/TextAttribute.java
at/TextColor.java
at/TextMessage.java
at/Tone.java
at/ToneSettings.java
at/ValueParser.java
at/package.html
dma/CDMALTEPhone.java
dma/CDMAPhone.java
dma/CallFailCause.java
dma/CdmaCall.java
dma/CdmaCallTracker.java
dma/CdmaCallWaitingNotification.java
dma/CdmaConnection.java
dma/CdmaDataConnection.java
dma/CdmaDataConnectionTracker.java
dma/CdmaInformationRecords.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaLteUiccFileHandler.java
dma/CdmaLteUiccRecords.java
dma/CdmaMmiCode.java
dma/CdmaSMSDispatcher.java
dma/CdmaServiceStateTracker.java
dma/CdmaSubscriptionSourceManager.java
dma/EriInfo.java
dma/EriManager.java
dma/RuimFileHandler.java
dma/RuimPhoneBookInterfaceManager.java
dma/RuimRecords.java
dma/RuimSmsInterfaceManager.java
dma/SignalToneUtil.java
dma/SmsMessage.java
dma/TtyIntent.java
dma/package.html
dma/sms/BearerData.java
dma/sms/CdmaSmsAddress.java
dma/sms/CdmaSmsSubaddress.java
dma/sms/SmsEnvelope.java
dma/sms/UserData.java
dma/sms/package.html
sm/CallFailCause.java
sm/GSMPhone.java
sm/GsmCall.java
sm/GsmCallTracker.java
sm/GsmConnection.java
sm/GsmDataConnection.java
sm/GsmDataConnectionTracker.java
sm/GsmMmiCode.java
sm/GsmSMSDispatcher.java
sm/GsmServiceStateTracker.java
sm/GsmSmsAddress.java
sm/GsmSmsCbMessage.java
sm/SIMFileHandler.java
sm/SIMRecords.java
sm/SimPhoneBookInterfaceManager.java
sm/SimSmsInterfaceManager.java
sm/SimTlv.java
sm/SmsBroadcastConfigInfo.java
sm/SmsCbConstants.java
sm/SmsCbHeader.java
sm/SmsMessage.java
sm/SpnOverride.java
sm/SuppServiceNotification.java
sm/UsimDataDownloadHandler.java
sm/UsimPhoneBookManager.java
sm/UsimServiceTable.java
sm/VoiceMailConstants.java
sm/package.html
ms/IsimRecords.java
ms/IsimUiccRecords.java
ackage.html
ip/SipCallBase.java
ip/SipCommandInterface.java
ip/SipConnectionBase.java
ip/SipPhone.java
ip/SipPhoneBase.java
ip/SipPhoneFactory.java
est/ModelInterpreter.java
est/SimulatedCommands.java
est/SimulatedGsmCallState.java
est/SimulatedRadioControl.java
est/package.html
icc/UiccController.java
0825495a331bb44df395a0cdb79fab85e68db5d5 12-Jul-2012 Wink Saville <wink@google.com> Create telephony-common

telephony-common was created by moving some of
frameworks/base/telephony
to:
frameworks/opt/telephony

Change-Id: I32cbb5eec1fa239c1587e055c8f7ef4fc48fb62c
TParseEx.java
TResponseParser.java
dnRecord.java
dnRecordCache.java
dnRecordLoader.java
pnContext.java
pnSetting.java
aseCommands.java
all.java
allForwardInfo.java
allManager.java
allStateException.java
allTracker.java
ommandException.java
ommandsInterface.java
onnection.java
ataCallState.java
ataConnection.java
ataConnectionAc.java
ataConnectionTracker.java
ebugService.java
efaultPhoneNotifier.java
riverCall.java
ventLogTags.logtags
IccPhoneBook.aidl
Sms.aidl
ccCard.java
ccCardApplication.java
ccCardStatus.java
ccConstants.java
ccException.java
ccFileHandler.java
ccFileNotFound.java
ccFileTypeMismatch.java
ccIoResult.java
ccPhoneBookInterfaceManager.java
ccPhoneBookInterfaceManagerProxy.java
ccProvider.java
ccRecords.java
ccRefreshResponse.java
ccServiceTable.java
ccSmsInterfaceManager.java
ccSmsInterfaceManagerProxy.java
ccUtils.java
ccVmFixedException.java
ccVmNotSupportedException.java
ntRangeManager.java
ccTable.java
miCode.java
peratorInfo.java
hone.java
honeBase.java
honeFactory.java
honeNotifier.java
honeProxy.java
honeStateIntentReceiver.java
honeSubInfo.java
honeSubInfoProxy.java
IL.java
estrictedState.java
etryManager.java
MSDispatcher.java
erviceStateTracker.java
msAddress.java
msHeader.java
msMessageBase.java
msRawData.java
msResponse.java
msStorageMonitor.java
msUsageMonitor.java
elephonyCapabilities.java
USInfo.java
apPushManagerParams.java
apPushOverSms.java
spTypeDecoder.java
at/AppInterface.java
at/BerTlv.java
at/CatCmdMessage.java
at/CatException.java
at/CatLog.java
at/CatResponseMessage.java
at/CatService.java
at/CommandDetails.java
at/CommandParams.java
at/CommandParamsFactory.java
at/ComprehensionTlv.java
at/ComprehensionTlvTag.java
at/Duration.java
at/FontSize.java
at/IconLoader.java
at/ImageDescriptor.java
at/Input.java
at/Item.java
at/LaunchBrowserMode.java
at/Menu.java
at/PresentationType.java
at/ResponseData.java
at/ResultCode.java
at/ResultException.java
at/RilMessageDecoder.java
at/TextAlignment.java
at/TextAttribute.java
at/TextColor.java
at/TextMessage.java
at/Tone.java
at/ToneSettings.java
at/ValueParser.java
at/package.html
dma/CDMALTEPhone.java
dma/CDMAPhone.java
dma/CallFailCause.java
dma/CdmaCall.java
dma/CdmaCallTracker.java
dma/CdmaCallWaitingNotification.java
dma/CdmaConnection.java
dma/CdmaDataConnection.java
dma/CdmaDataConnectionTracker.java
dma/CdmaInformationRecords.java
dma/CdmaLteServiceStateTracker.java
dma/CdmaLteUiccFileHandler.java
dma/CdmaLteUiccRecords.java
dma/CdmaMmiCode.java
dma/CdmaSMSDispatcher.java
dma/CdmaServiceStateTracker.java
dma/CdmaSubscriptionSourceManager.java
dma/EriInfo.java
dma/EriManager.java
dma/RuimFileHandler.java
dma/RuimPhoneBookInterfaceManager.java
dma/RuimRecords.java
dma/RuimSmsInterfaceManager.java
dma/SignalToneUtil.java
dma/SmsMessage.java
dma/TtyIntent.java
dma/package.html
dma/sms/BearerData.java
dma/sms/CdmaSmsAddress.java
dma/sms/CdmaSmsSubaddress.java
dma/sms/SmsEnvelope.java
dma/sms/UserData.java
dma/sms/package.html
sm/CallFailCause.java
sm/GSMPhone.java
sm/GsmCall.java
sm/GsmCallTracker.java
sm/GsmConnection.java
sm/GsmDataConnection.java
sm/GsmDataConnectionTracker.java
sm/GsmMmiCode.java
sm/GsmSMSDispatcher.java
sm/GsmServiceStateTracker.java
sm/GsmSmsAddress.java
sm/GsmSmsCbMessage.java
sm/SIMFileHandler.java
sm/SIMRecords.java
sm/SimPhoneBookInterfaceManager.java
sm/SimSmsInterfaceManager.java
sm/SimTlv.java
sm/SmsBroadcastConfigInfo.java
sm/SmsCbConstants.java
sm/SmsCbHeader.java
sm/SmsMessage.java
sm/SpnOverride.java
sm/SuppServiceNotification.java
sm/UsimDataDownloadHandler.java
sm/UsimPhoneBookManager.java
sm/UsimServiceTable.java
sm/VoiceMailConstants.java
sm/package.html
ms/IsimRecords.java
ms/IsimUiccRecords.java
ackage.html
ip/SipCallBase.java
ip/SipCommandInterface.java
ip/SipConnectionBase.java
ip/SipPhone.java
ip/SipPhoneBase.java
ip/SipPhoneFactory.java
est/ModelInterpreter.java
est/SimulatedCommands.java
est/SimulatedGsmCallState.java
est/SimulatedRadioControl.java
est/package.html
icc/UiccController.java