• Home
  • History
  • Annotate
  • only in /frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/
History log of /frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/
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)
iccCardApplication.java
iccProfile.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)
iccCarrierPrivilegeRules.java
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
iccCard.java
iccProfile.java
iccSlot.java
uicc/EuiccCard.java
d01c6d858bd8865a2c56663ce443e33890cde9f6 26-May-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Fix issue no SIM broadcast under pass through mode." into pi-dev
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
uicc/EuiccCard.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
iccSlot.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
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
iccSlot.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
iccProfile.java
af9e9c88dc6ff6def10520c26566c52511fd0a90 27-Apr-2018 Gil O'Neil <goneil@google.com> Merge "Exposed method as public for testing that reloads UiccProfile rules" 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
iccCarrierPrivilegeRules.java
b84e50571d0cae3f8e21a1e761634406dce06411 22-Apr-2018 Chen Xu <fionaxu@google.com> Merge "DO NOT MERGE CarrierIdentifier listen for simrecordsOverride event" 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
ccRecords.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
iccSlot.java
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
iccController.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
iccProfile.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
iccSlot.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
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
iccController.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
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
uicc/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
uicc/EuiccCard.java
uicc/apdu/ApduSender.java
uicc/apdu/RequestBuilder.java
uicc/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
iccProfile.java
bd7db2a4dd79b84cbf6d6ec2fb394d4894e2581c 11-Apr-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Add status word codes for EAP-AKA" 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
ccIoResult.java
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
iccSlot.java
e0cbaff40048a1da597a9b8ad815d9a412446126 09-Apr-2018 Jordan Liu <jminjie@google.com> Merge "Do not check the carrier config for BrandOverride" into pi-dev
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
iccProfile.java
991bb4335ef0f2a26c069515ecdc9ac4760d89bf 03-Apr-2018 Chen Xu <fionaxu@google.com> Merge "A test api to override carrier information" into pi-dev
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
arrierTestOverride.java
ccRecords.java
IMRecords.java
c7107f09c3c280422701bb708f4ebdb71b7f29b4 29-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "UiccProfile should handle responses after disposed" into pi-dev
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)
iccProfile.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
iccSlot.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
iccProfile.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
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
IMRecords.java
iccProfile.java
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)
iccController.java
iccProfile.java
iccSlot.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
iccController.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)
ccCardProxy.java
19f59aaad59a79933d8a614fe641332f27636e75 14-Mar-2018 Qingxi Li <qingxi@google.com> Merge "Add API to check extended APDU Supported" 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
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
iccController.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
iccCard.java
iccController.java
iccProfile.java
iccSlot.java
1b913aa987eaf137443fa270deb2d0f3519c3236 09-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "New unit tests for UiccProfile.updateExternalState()." into pi-dev
e98fe84bfd55086bb8561465d5c5c82c763c9518 07-Mar-2018 Amit Mahajan <amitmahajan@google.com> New unit tests for UiccProfile.updateExternalState().

Test: unit tests
Bug: 72513243
Change-Id: I23432138e1c3f8db74b91cab9759594217385fdf
iccProfile.java
d8ed98b719569a05ca73623022f1fc9920f03cf5 09-Mar-2018 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Reset carrier config on SIM_REFRESH of type RESET." 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
iccController.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
iccSlot.java
6875b23d90a1f0ab15f528e878712cb8d1ff4b39 28-Feb-2018 Qingxi Li <qingxi@google.com> Add parser for Extended APDU in ATR

Bug: 68999147
Test: Included
Change-Id: I69d4c100441fe5251f89aa47bb49b78f9efdd498
nswerToReset.java
486dc86cf8bfe701232d5b43fef610fbf1a686bc 01-Mar-2018 Jiuyu Sun <jiuyu@google.com> Merge "Fix issues on EuiccCard constructor."
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
iccController.java
uicc/EuiccCard.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
nstallCarrierAppTrampolineActivity.java
nstallCarrierAppUtils.java
76c436b86b836c9b67b71462bdbe757d0f067944 23-Feb-2018 Gil O'Neil <goneil@google.com> Merge "Utilize CARRIER_APP_WHITELIST to check if carrier app is installed"
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
iccCarrierPrivilegeRules.java
iccProfile.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
eef2607f1d32a5835932bebe2c487e851ac437a2 23-Feb-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Avoid logging exception stack trace unnecessarily."
1f9a13b16c3f2269b908945c8933fb2e07cebf47 23-Feb-2018 Amit Mahajan <amitmahajan@google.com> Avoid logging exception stack trace unnecessarily.

Test: none
Bug: 72944241
Change-Id: I99e88a8e4fbb68027434d5228d3844709218b8a4
iccController.java
ef3a98e359b92f2bcd92f4569cd19414df4e5dab 22-Feb-2018 Jiuyu Sun <jiuyu@google.com> Merge "Add device capabilities."
266f0afbe2af40613d33d1364fd06a01ea6eee4c 22-Feb-2018 Jeff Davidson <jpd@google.com> Merge "Factor out telephony permission checks into a helper class."
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
uicc/EuiccCard.java
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
iccCarrierPrivilegeRules.java
iccProfile.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
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"
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
iccProfile.java
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
arrierAppInstallReceiver.java
nstallCarrierAppTrampolineActivity.java
nstallCarrierAppUtils.java
howInstallAppNotificationReceiver.java
iccProfile.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
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
uicc/EuiccCard.java
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
uicc/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
iccController.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
uicc/EuiccCard.java
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
iccSlot.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
iccSlot.java
8285290c64164781e5658c406cbe8454112015eb 07-Feb-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Parse ATR in the UiccSlot"
28dcffcfdf04b4f5fa16f78219278987febc68e3 06-Feb-2018 yinxu <yinxu@google.com> Parse ATR in the UiccSlot

Bug:72526416
Test: Unit Test
Change-Id: I2a9827d6fdd0c9956f2e684fd5d8885e49fef0c1
nswerToReset.java
iccSlot.java
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
iccProfile.java
iccSlot.java
uicc/EuiccCard.java
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
uicc/EuiccCard.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)
iccCarrierPrivilegeRules.java
58c06dd64319705d9a7ddb6fee5f1d63b9c50f9e 03-Feb-2018 Ying Xu <yinxu@google.com> Merge "Send NOT_READY when there is no apps or no supported apps"
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
iccProfile.java
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
ccCardProxy.java
iccSlot.java
4ce44fdede0fc78cf53c3803085b0bb980d5ff81 31-Jan-2018 nharold <nharold@google.com> Merge "Remove obsolete getIsimChallengeResponse"
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
simRecords.java
simUiccRecords.java
77bd44b5b922be6ab95c690fbd5f5c6ed0486e49 30-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Send broadcast for ABSENT/UNKNOWN states."
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
iccProfile.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
iccProfile.java
iccSlot.java
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
iccProfile.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
iccController.java
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
uicc/EuiccCard.java
22e47743295adf2cf3b24be1beecb3bb953a86b8 25-Jan-2018 Jun Yin <junyin@google.com> Merge "EuiccCard #3 (disableProfile)"
6acff248942168ae81ddf43fd09c09f7edacd79d 25-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Disable IccCardProxy and enable new code in UiccProfile."
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
uicc/EuiccCard.java
5ca8c9861932a8ba41ae411b8811bc56497dfbee 25-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "EuiccCard #2 (getAllProfiles)"
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
ccCardProxy.java
iccCard.java
iccController.java
iccProfile.java
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
uicc/EuiccCard.java
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
iccController.java
b1871192051ed151656eb9e19941ba67a07888b6 24-Jan-2018 Jun Yin <junyin@google.com> Merge "EuiccCard #1"
27818a0882e0eada83579ec4a3fa2b483f15c49d 24-Jan-2018 Nicolas Geoffray <ngeoffray@google.com> Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""
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
iccController.java
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
iccController.java
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
iccController.java
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
iccController.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
uicc/EuiccCard.java
uicc/EuiccCardErrorException.java
uicc/EuiccCardException.java
uicc/EuiccSpecVersion.java
uicc/Tags.java
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
ccSlotStatus.java
iccController.java
iccSlot.java
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"
3ff1f2150f175b1b81c209459df4d1b111da93a4 16-Jan-2018 Amit Mahajan <amitmahajan@google.com> Make LOADED an external sim state.

Test: Basic telephony sanity
Bug: 64131518
Change-Id: Ie651e903f462f97fa37d9f8c53a956988042b13c
ccCardProxy.java
iccProfile.java
e8b6e7887154aa5aa5f4548acf53eeb61cb1c918 05-Jan-2018 yinxu <yinxu@google.com> Add CARD_ID in SubscriptionInfo database

Test: Basic telephony sanity
Bug: 64131518
Change-Id: I5771ab704830d060141e8346f698c6aa532083a8
iccCard.java
52a415304e4c96c1d98dba37e7f12154fa8d816c 17-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Change to broadcast SIM_STATE_CHANGED only from SubscriptionInfoUpdater."
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)
arrierTestOverride.java
ccRecords.java
IMRecords.java
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
ccCardProxy.java
iccProfile.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
uicc/apdu/ApduException.java
uicc/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
uicc/apdu/RequestBuilder.java
uicc/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
uicc/apdu/ApduCommand.java
uicc/apdu/CloseLogicalChannelInvocation.java
uicc/apdu/OpenLogicalChannelInvocation.java
uicc/apdu/TransmitApduLogicalChannelInvocation.java
uicc/async/AsyncMessageInvocation.java
da79e5d5b5fea477c80de49ffd1c3ed5409d76a4 16-Jan-2018 Ying Xu <yinxu@google.com> Merge "Modify the SIM state "Ready" and "Loaded""
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
ccRecords.java
simUiccRecords.java
uimRecords.java
IMRecords.java
iccCardApplication.java
iccProfile.java
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
ccRecords.java
064f8206fdca5a6c9ad5b64afab3332f8ada4b7d 12-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "EuiccSpecVersion"
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
ccCardProxy.java
ccRecords.java
simUiccRecords.java
uimRecords.java
IMRecords.java
iccCardApplication.java
iccProfile.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
uicc/EuiccSpecVersion.java
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
ccCardStatus.java
iccController.java
iccSlot.java
iccStateChangedLauncher.java
f5fa7002b961e4dbcbfc74e0a318fe12666a4b6f 05-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Make UiccProfile#getOperatorBrandOverride work as before"
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
iccProfile.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
ccCardProxy.java
iccProfile.java
1076d8a77d3790e80a3d753d074810848b128169 03-Jan-2018 Ying Xu <yinxu@google.com> Merge "Add the UiccProfile into UiccCard"
33f8fe37e2928753860ae4281f3d260b1fce061b 03-Jan-2018 Treehugger Robot <treehugger-gerrit@google.com> Merge "Clean up Icc Refresh handling"
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
ccRecords.java
uimRecords.java
IMRecords.java
iccCard.java
iccCardApplication.java
iccCarrierPrivilegeRules.java
iccPkcs15.java
iccProfile.java
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
ccRecords.java
simUiccRecords.java
uimRecords.java
IMRecords.java
iccController.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
ccCardProxy.java
iccProfile.java
iccSlot.java
19a3b32b3f08afc95c60fbf626758dcc6baa078f 03-Jan-2018 Amit Mahajan <amitmahajan@google.com> Merge "Add UiccCard to UiccSlot, and UiccSlot to UiccController."
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
ccCardStatus.java
ccSlotStatus.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
ccCardProxy.java
iccCard.java
iccController.java
iccSlot.java
iccStateChangedLauncher.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
uicc/async/AsyncResultCallback.java
uicc/async/AsyncResultHelper.java
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."
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
ccCardProxy.java
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
iccSlot.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
ccCardProxy.java
ccRecords.java
simUiccRecords.java
uimRecords.java
IMRecords.java
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."
49470fb09d68948c358b8e3cbb99916465da765b 20-Nov-2017 Amit Mahajan <amitmahajan@google.com> Remove unused code.

Test: none
Bug: 64131518
Change-Id: I06663e6aa415cb15e35399596433e1d9d5ba7c3f
ccCardProxy.java
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"
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
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
iccProfile.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
IMRecords.java
pnOverride.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
ccRecords.java
simUiccRecords.java
uimRecords.java
IMRecords.java
0dab91b3b0cd7f1d0be0b318ab23728f51dcdede 09-Nov-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Add new class UiccProfile"
4352c3f35a4ea84dad8e8684011852f34e43aae5 07-Nov-2017 yinxu <yinxu@google.com> Add new class UiccProfile

Bug: 64131518
Test: Basic telephony sanity
Change-Id: I501f14ba309e047d415e1f9faa59d36b3d9672ee
iccProfile.java
d6e73967a59d48a75d3d394511b73bc3656f50ed 08-Nov-2017 Jordan Liu <jminjie@google.com> Merge "Use CarrierConfigManager as fallback to override brand"
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
iccCard.java
964fa68759ed3bbfeead77215e3791065b0c60de 03-Nov-2017 Chen Xu <fionaxu@google.com> Merge "new IccRecord APIs to get plmn and registerForSpnUpdate"
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
IMRecords.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
arrierTestOverride.java
ccRecords.java
IMRecords.java
fec5f08b2ec3428077ca7556e4950259cfd0794a 27-Oct-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "MSIM: Fix to update display name in subinfo record"
5f84fc9311a64d369b57a78ccb0d823703c25367 26-Oct-2017 nharold <nharold@google.com> Merge "Trim Empty PLMNs from the list of parsed PLMNs"
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
IMRecords.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
IMRecords.java
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
lmnActRecord.java
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"
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
iccCardApplication.java
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"
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
iccCarrierPrivilegeRules.java
673d2662761d32d2304f9634d0b3622037ac8fd8 06-Sep-2017 Cassie <xih@google.com> Merge "Make access rule format compatible with GP."
am: d8cd250167

Change-Id: I0e0b151355604081ead7ef94ac1c7b6c1b7d0a32
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)
iccCarrierPrivilegeRules.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
dnRecord.java
IMRecords.java
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
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
b2e7c842392afaf32785fc5cb5cf8c7e0aae2c92 24-Aug-2017 Sanket Padawe <sanketpadawe@google.com> Merge "Reset EF_AD (mMncLength) on sim refresh event."
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
iccCarrierPrivilegeRules.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
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
ccFileHandler.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
ccCardProxy.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
ccCardProxy.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
ccRecords.java
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
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
ccCardProxy.java
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
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."
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"
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
IMRecords.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
IMRecords.java
94e25b3ffeeb9a93a8fa24ae327a574dbadcd10d 10-Aug-2017 Shuo Qian <shuoq@google.com> Merge "Provide a machanism to override MVNO parameters below CarrierConfig"
am: d46c8e7c88

Change-Id: Ib60b60826452d1a67a02ff7f16427c7f2d970efe
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)
IMRecords.java
d46c8e7c886fc9de3501e6fa739b263cdcba676c 10-Aug-2017 Shuo Qian <shuoq@google.com> Merge "Provide a machanism to override MVNO parameters below CarrierConfig"
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
78eee16577eb4f4462d7f87cd6503412bcd8bfdb 10-Aug-2017 Amit Mahajan <amitmahajan@google.com> Merge "The method of parseEfSpdi does not match TS24008."
am: 84aab18843

Change-Id: I5466054ce05f8be4ba30d466ea73d6da5d42b4f6
84aab188438af33fa6e6e7719d504de40576050f 10-Aug-2017 Amit Mahajan <amitmahajan@google.com> Merge "The method of parseEfSpdi does not match TS24008."
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
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
39b496f0c6d418e3ea2e7b0428740f9f800a505e 12-Jul-2017 Jack Yu <jackyu@google.com> Fixed debug messages and typos

Test: Build
Merged-In: I13f87a72f1a54fed7b8b69332379e5e11e61c25b
Change-Id: I13f87a72f1a54fed7b8b69332379e5e11e61c25b
ccCardProxy.java
iccCard.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)
arrierTestOverride.java
ccRecords.java
uimRecords.java
IMRecords.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
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
ccCardProxy.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
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."
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
iccController.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
ccRecords.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
ccCardProxy.java
iccCard.java
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)
ccCardProxy.java
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."
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
ccCardProxy.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)
ccCardStatus.java
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
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
iccController.java
b54bc0f38f6356a3d7b9ade541d15654d610bbc0 21-Jun-2017 sqian <shuoq@google.com> Merge "Fix MVNO override feature" into oc-dr1-dev
am: bbdd40dd8c

Change-Id: If8cc27d8fd423c50f9c41b33be00b67f37bc2e3f
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
IMRecords.java
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
IMRecords.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()"
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
iccCard.java
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
ccCardStatus.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
iccCard.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
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
simUiccRecords.java
uimRecords.java
IMRecords.java
iccCard.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
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
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
ccCardProxy.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
arrierTestOverride.java
ccRecords.java
uimRecords.java
IMRecords.java
cbc5162efce58ee600bc45fc8a650fb7b5054e38 24-Jan-2017 Nathan Harold <nharold@google.com> Move SMS_RECORD_LENGTH to SmsManager

Bug: 33414487
Change-Id: Ia57198d92330c35518a3054d63e4312c2328a733
ccConstants.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
ccUtils.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
2286c7e03cecdcc375686196f79ec94d61051804 17-Apr-2017 Meng Wang <mewan@google.com> Fix dump: dump mSpnOverride value

Bug: 37422095
Test: make
Change-Id: Ia349cebb2530e6fe4eda71c86d7942a9e2fffec2
IMRecords.java
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
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/)
ccCardProxy.java
c1b980a10c516bc73372425cdd48d91d6f1f4cb0 12-Apr-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Supress SIM_STATE_UNKNOWN when not PERSOSUBSTATE_SIM_NETWORK"
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
iccCard.java
iccCarrierPrivilegeRules.java
iccPkcs15.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"
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
ccCardProxy.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
iccCard.java
iccCarrierPrivilegeRules.java
iccPkcs15.java
54c11ae1a5062891b442a01915646d3b0b450a5f 03-Apr-2017 Jeff Davidson <jpd@google.com> Merge "Squashed merge of master-sim into master."
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
a5b403d00d532fd639a4fa2e83bb51e276ac3f2c 03-Apr-2017 Ajay Nambi <anambi@codeaurora.org> Merge "Uicc: Fix NullPointerException issue after turn on airplane mode"
am: 625a17656e

Change-Id: I93f592863affc52afb64ef934ad7567cf9a10c12
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
iccCarrierPrivilegeRules.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
dnRecordCache.java
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
iccCarrierPrivilegeRules.java
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
918d0cdfa287218038aaff6fa15b125f5ca5bb7e 22-Mar-2017 Jack Yu <jackyu@google.com> Merge "Invalid call forwarding indicator status check"
am: fa3049fdfa

Change-Id: Ibd45fa7b81db530deac2782833f2172f87df5b4b
fa3049fdfac244c12bd3d8d6f53a16155e2b3b1d 22-Mar-2017 Jack Yu <jackyu@google.com> Merge "Invalid call forwarding indicator status check"
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
ccCardProxy.java
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
ccCardProxy.java
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"
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."
444c570f0beab900e6c45f4270ab52c46a4c2d7f 24-Jan-2017 Nathan Harold <nharold@google.com> Move SMS_RECORD_LENGTH to SmsManager

Bug: 33414487
Change-Id: Ia57198d92330c35518a3054d63e4312c2328a733
ccConstants.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
ccUtils.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
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
ccRecords.java
IMRecords.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
IMRecords.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"
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
ccRecords.java
IMRecords.java
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
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
ccCardProxy.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)
IMRecords.java
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
9c374cb3850abf30b382d83a7ed8cdb709cd5cde 03-Feb-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "Disable Logspam in PlmnActRecord"
7234fdc7598466b831f024074002802e53901bd5 03-Feb-2017 Nathan Harold <nharold@google.com> Disable Logspam in PlmnActRecord

Bug: 34950968
Test: sim load
Change-Id: Id403eb06985a1eda60b2324cb696adde3d7c64bb
lmnActRecord.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
IMRecords.java
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
IMRecords.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
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
iccController.java
iccStateChangedLauncher.java
17ca88e667afa77a57f242cbc041059260fce626 09-Dec-2016 Polina Bondarenko <pbond@google.com> Revert "Telephony: notify deviceProvisioningPackage"

This reverts commit ec340144db9085e0815a513220b152326fd4fee7.

Change-Id: I0ebfe74416f25361234ba5adf00ec4acefd96f10
iccController.java
iccStateChangedLauncher.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
iccController.java
iccStateChangedLauncher.java
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
ccConstants.java
ccFileHandler.java
ccRecords.java
ccUtils.java
lmnActRecord.java
IMRecords.java
simFileHandler.java
4a1959c22e94e69040b6cab21fa08ca2e1df0c9b 03-Nov-2016 Nathan Harold <nharold@google.com> Add meaningful error strings to IccIoResult

Bug: 32641276
Test: none
Change-Id: I8c3e9068f7ece1fb90b73da556add060c9484f28
ccIoResult.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)
ccConstants.java
ccRecords.java
IMFileHandler.java
IMRecords.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
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
ccConstants.java
ccFileHandler.java
ccRecords.java
ccUtils.java
lmnActRecord.java
IMRecords.java
simFileHandler.java
633765fea496acd1c3891b1020f622b0dcf29439 03-Nov-2016 Nathan Harold <nharold@google.com> Add meaningful error strings to IccIoResult

Bug: 32641276
Test: none
Change-Id: I8c3e9068f7ece1fb90b73da556add060c9484f28
ccIoResult.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
ccConstants.java
ccRecords.java
IMFileHandler.java
IMRecords.java
800a988b95a4b9bc2bca2562108e54cd8bd21ee1 11-Nov-2016 Sudheer Shanka <sudheersai@google.com> Update usage of ActivityManagerNative.

Bug: 30977067
Test: N/A
Change-Id: I5a3934355e0a4bc47490c16b0dac3979c55d8d16
ccCardProxy.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
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
IMRecords.java
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
IMRecords.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
IMRecords.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
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
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
ccRecords.java
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
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
5e040f4db9d136fd7f509dd78edb380265fd0119 09-Aug-2016 fionaxu <fionaxu@google.com> pii part2: redact non-null pii with SHA-1 Hash

Bug: 30073833
Change-Id: Id4d7b59623b39660218f35d2c202518a994bae4c
ccRecords.java
IMRecords.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
dnRecord.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
IMRecords.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
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
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
IMRecords.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
simFileHandler.java
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
IMRecords.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
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
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
ccRecords.java
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
ccCardProxy.java
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
077cb44ab716b4d8be7aafa7abdb26b431b7978b 07-Jul-2016 fionaxu <fionaxu@google.com> Merge \"hide personal private information from log\" into nyc-mr1-dev
am: 6a012a4902

Change-Id: I7b99c7922eb6a2fe3f89b1d6f9c3970271260c5a
a1cdb9b9a81cc4b637b6b76cc267166719936862 06-Jul-2016 fionaxu <fionaxu@google.com> hide personal private information from log

Bug: 29943985
Change-Id: Icf3a7d5b6517ac027ad92f07bd626bd69399dcc4
IMRecords.java
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
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
IMRecords.java
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
uimRecords.java
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
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
iccController.java
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
42813c4c238eeb51727451aae6e8a6f7f956a583 01-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Add receiver to override carrier name after carrierconfig is loaded.

Bug: 27718118
Change-Id: Ie62dd3dc52f0977a2b05ae8f0ba4898c80174658
IMRecords.java
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
aebb070ebfc2c858a5185b299654c6a85e33088c 24-May-2016 Junda Liu <junda@google.com> Add restricted card status.

Bug: b/28564314
Change-Id: I502f7ddbbe03fc8528226ec2e4e33d0d8a73ad98
ccCardProxy.java
ccCardStatus.java
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
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
iccCarrierPrivilegeRules.java
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
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
IMRecords.java
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
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
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
iccPkcs15.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
976973b877baebd7a9447128602cc025eb047796 10-Mar-2016 Junda Liu <junda@google.com> support authType for sim challenge.

Bug: b/27360179
Change-Id: I0196dc98c7f295baafd1dfb205245365647c1c74
iccCardApplication.java
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
simUiccRecords.java
a2df69ceec27f7f35d7e8a840218f30b01dd4f21 25-Mar-2016 Amit Mahajan <amitmahajan@google.com> Changes to decode and store hex digits in ICC ID.

Bug: 25410213
Change-Id: I521976d4fe1aa815da2c6f7eb8e6bc1e7b912eab
ccRecords.java
ccUtils.java
uimRecords.java
IMRecords.java
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
df3c262824b7e791027d2ec24c4f5d3040d21286 21-Mar-2016 fionaxu <fionaxu@google.com> Handled Pkcs15 load file failure

Bug: 27556007
Change-Id: Ib05a4cecf843ca6f18c211ee93dcae97d68937d4
iccPkcs15.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.
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
IMRecords.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
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
4145d45a5e3076a88e27a3af35c2827a25c413b9 02-Mar-2016 fionaxu <fionaxu@google.com> First Unit test on UiccCardApplication

bug: 25691379

Change-Id: I897a2485ec45285146a122f2717fe7daab334d54
iccCardApplication.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
dnRecordCache.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)
iccCarrierPrivilegeRules.java
iccPkcs15.java
5d8aaa5120e880684086511276eca30d59849f40 26-Feb-2016 fionaxu <fionaxu@google.com> Merge "Fix UiccCard Test Failure" into nyc-dev
am: 4552b1f4f3

* commit '4552b1f4f3d7d2f6a19e19cbbc5dcbdacf64cf39':
Fix UiccCard Test Failure
f21d2289021a94fc74023e2b5987d236df354fe1 26-Feb-2016 fionaxu <fionaxu@google.com> Fix UiccCard Test Failure

BUG=25691379
Change-Id: Ib68920f2369217220282b8338f141b24fb24c334
iccCard.java
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
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
iccCard.java
iccCarrierPrivilegeRules.java
dd6b98fbe79c46648c28602d017a42b780786735 17-Feb-2016 Bill Yi <byi@google.com> Merge commit '4a34069a9eed8557eb905b8bcb6a46f5524d5b20' into HEAD
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
153077e0b2d9ff6f115a0739dac1d64931bffb91 10-Feb-2016 Amit Mahajan <amitmahajan@google.com> Update voicemail number related unit test.

Bug: 25691379
Change-Id: Ia80a455c99a21f50348d9ca3ef2b3e69179c93e7
simUiccRecords.java
uimRecords.java
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
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
dnRecord.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
ccFileHandler.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
iccCard.java
iccCarrierPrivilegeRules.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
ccCardProxy.java
ccRecords.java
simUiccRecords.java
uimRecords.java
IMRecords.java
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
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
IMRecords.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
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
IMRecords.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
IMRecords.java
1a87ab3d7170d618f048c4f5af8c7504a587aaa5 10-Dec-2015 Jack Yu <jackyu@google.com> Merge from master

Change-Id: Ifbd86600111d2c444031ff608fab62fb2ee4b236
dnRecord.java
dnRecordCache.java
dnRecordLoader.java
ccFileHandler.java
ccRecords.java
IMRecords.java
iccCard.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
ccRecords.java
IMRecords.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
ccCardProxy.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
iccCard.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
iccCard.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)
dnRecordLoader.java
ccFileHandler.java
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.
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
ccRecords.java
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.
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.
eadee84166d397b6425cfd56f89fa1569f6a93f5 22-Oct-2015 Amit Mahajan <amitmahajan@google.com> Save call forwarding flag in SharedPreference.

Bug: 22822731
Change-Id: I801738685b65fc0ee0410c1ad4925d15694c81f4
ccRecords.java
IMRecords.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.
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.
497d54c0f337bd71165122d2e2c54ec826f4fb17 16-Oct-2015 Sanket Padawe <sanketpadawe@google.com> Mask IccId which gets printed in bug reports & radio logs.

Bug: 24941148
Change-Id: Ic26c657529def04cdd34cfd9d78a35ae3ef52d15
ccRecords.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.
314030298ab01ddbaacd34b709776337f5bea6d6 13-Oct-2015 Wei Liu <luciferleo@google.com> Use wear style dialog for ICC hotswap restart dialog.

b/24719054

Change-Id: If341828ef3de7f6afb955f2e5be3c6901f21c169
iccCard.java
35bd762108c6d3e07b487b05717bc55bd6b6ed24 02-Oct-2015 Jack Yu <jackyu@google.com> Merge "Fixed that bad ADN record loading caused all other good records dropped."
9492190f797698c86a63ea021237bd674cc785d0 25-Sep-2015 Jack Yu <jackyu@google.com> Merge "Fixed the race condition that ICC records unavailable when initializing phonebook."
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
dnRecordCache.java
dnRecordLoader.java
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
dnRecord.java
dnRecordLoader.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
dnRecord.java
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.
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
simUiccRecords.java
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
e268ec4827cc05a745c954f04bfdf16d7bcbf153 25-Aug-2015 Anthony Lee <anthonylee@google.com> am 228824f6: Don\'t print PII

* commit '228824f603b310707829fdd92bf8e16d8f421b58':
Don't print PII
228824f603b310707829fdd92bf8e16d8f421b58 25-Aug-2015 Anthony Lee <anthonylee@google.com> Don't print PII

Bug: 22907228
Change-Id: I8a9926f5374ad4dc15c993dcfcc039852acdfb0f
ccRecords.java
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.
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
IMRecords.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.
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
uimRecords.java
IMRecords.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.
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
iccCarrierPrivilegeRules.java
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.
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
iccCard.java
7c1debea31b77032057ad3382b064f94f4a3402c 29-Jun-2015 Jack Yu <jackyu@google.com> Added FDN handling in AdnRecordLoader class.

bug: 21851547
Change-Id: Ibfc12a872a7643013ff207641f2254af3d24b3cd
ccFileHandler.java
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.
5eb9201854b41d890128b0ec51a1b882c8021690 12-Jun-2015 Junda Liu <junda@google.com> Merge "Reduce logging for uicc carrier privilege component." into mnc-dev
c3ac6ac3d62e0e1637ff8fddf945953dca60eeba 12-Jun-2015 Junda Liu <junda@google.com> Reduce logging for uicc carrier privilege component.

Bug: b/21556527
Change-Id: I39090a6279b9baa99d9e471f43861f92429842f9
iccCarrierPrivilegeRules.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
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
dnRecordLoader.java
ccFileHandler.java
8dc41c421f6c305faf53b6468414f7bfa32d6230 11-Jun-2015 Jeff Davidson <jpd@google.com> Merge "Include DISABLED_UNTIL_USED components in carrier privilege check." into mnc-dev
f9f73e5f5125df262b8c2bec21de5600dc4d1801 09-Jun-2015 Etan Cohen <etancohen@google.com> Hide CSIM IMSI information (mask by VDBG)

Bug: 21518434
Change-Id: Icfc26ad0f5540afb55272ffc66bdaad38ae1b092
uimRecords.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
iccCarrierPrivilegeRules.java
5a68da341137763920f682b8d239c9229b934a05 02-Jun-2015 Amit Mahajan <amitmahajan@google.com> Merge "Change to not log IMSI." into mnc-dev
a1421a82e8d4f711ba13a86d40889868ead492d4 30-May-2015 Amit Mahajan <amitmahajan@google.com> Change to not log IMSI.

Bug: 21518434
Change-Id: Ief0ed018106aaa9783acd1da1e5c4533ed2a6718
ccRecords.java
simUiccRecords.java
uimRecords.java
IMRecords.java
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
ccRecords.java
uimRecords.java
IMRecords.java
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
iccCarrierPrivilegeRules.java
7234bd8664dbec97858f3f635eaa01c77d2f2881 14-May-2015 Junda Liu <junda@google.com> Add EF_GID2 support to uicc and phone.

Bug: b/21078450
Change-Id: I6beaa969a95c1ad7f77868a8c56a287474da7af5
ccConstants.java
ccRecords.java
IMFileHandler.java
IMRecords.java
simFileHandler.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
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
ccCardProxy.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
IMRecords.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
ccConstants.java
IMRecords.java
simFileHandler.java
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
iccController.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
iccCard.java
iccController.java
64e02b05d7334a9d5704ee2b9f4710a310d9937e 18-Feb-2015 Ian Pedowitz <ijpedowitz@google.com> Revert "Revert "Remove special handling for length field.""

This reverts commit dddce02ea69219173eedd8d624654fd40f016a36.
iccCarrierPrivilegeRules.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
iccCarrierPrivilegeRules.java
4084e10843c7e643c13773b36be85fe59ea49992 16-Feb-2015 Sanket Padawe <sanketpadawe@google.com> Reverting change which uses spnoverride to set ONS.

Bug: 19386079
Change-Id: I1417d55415be88a90c350fbe2533889630117503
pnOverride.java
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
uimRecords.java
29b438847b8cd2ea874c505d878dcadcba632522 03-Feb-2015 Sanket Padawe <sanketpadawe@google.com> Remove phone number being displayed from logs

Bug: 19251204
Change-Id: I5391fa2033ddb8cb41e11cb23aa16485369cd13e
ccRecords.java
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
ccCardProxy.java
ccRecords.java
uimRecords.java
IMRecords.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
uimRecords.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
ccCardProxy.java
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
ccCardProxy.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
ccCardProxy.java
uimRecords.java
iccCard.java
iccCardApplication.java
iccController.java
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
pnOverride.java
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
uimRecords.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
ccCardProxy.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
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
iccController.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
ccCardProxy.java
b7fa93b50e3381d8685c3e1956c41106d431f6ce 04-Dec-2014 Amit Mahajan <amitmahajan@google.com> Merge "UICC : discard language setting of SIM" into lmp-mr1-dev
4fae501dc021c215c1f291a244466610bc3f7120 04-Dec-2014 Wink Saville <wink@google.com> Add debug and check validity of mCardIndex.

Change-Id: Ic5a2baaacaf1810416b898dcb6171ef15e422f7f
ccCardProxy.java
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
uimRecords.java
IMRecords.java
cda4eded9861bea93e2467bdd65fc7ba8b41dfc9 25-Nov-2014 Junda Liu <junda@google.com> Remove special handling for length field.

Bug: b/18012893
Change-Id: I99a678c2ffce1bf31c79b1fdb2dc846193b972b3
iccCarrierPrivilegeRules.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
4b09dff383ae7dfca595aeeea886a594a1947340 22-Nov-2014 Wink Saville <wink@google.com> Additional changes to SubscriptionManager API as per API council.

bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
ccCardProxy.java
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
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
IMRecords.java
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
ccRecords.java
simUiccRecords.java
uimRecords.java
IMRecords.java
iccCard.java
iccController.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
iccCarrierPrivilegeRules.java
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
iccCarrierPrivilegeRules.java
d578d868402f67bac20f441aa89cd1edbf574173 07-Nov-2014 Junda Liu <junda@google.com> Merge "Support SHA256 and avoid unnecessary signature parsing." into lmp-mr1-dev
c05061bdcff84d8211d51a5080c57f442e4edf74 30-Oct-2014 Junda Liu <junda@google.com> Support SHA256 and avoid unnecessary signature parsing.

Bug: b/17372964
Change-Id: I6567db63288986d100614e73c5e9af6ab9d5c756
iccCarrierPrivilegeRules.java
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
iccCard.java
iccCarrierPrivilegeRules.java
iccController.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
IMRecords.java
b237a11044ed842d2865ff8c8716befb06b6ca25 25-Oct-2014 Wink Saville <wink@google.com> Change subId to int from long

Change-Id: Idae6335e63e7b1e4e714bc17e71b1a4705e38474
ccCardProxy.java
iccCardApplication.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
ccRecords.java
simUiccRecords.java
uimRecords.java
IMRecords.java
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
simFileHandler.java
ccConstants.java
ccRecords.java
uimFileHandler.java
uimRecords.java
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.
5d8e4457b03d166aa249989916b66a85df898516 11-Sep-2014 Steven Liu <stevenliu@motorola.com> dispose uicc card if modem is not available.

Bug: 17786992
Change-Id: Idd36a2afe696789340e0b6cba1d30eeadc378036
ccCardProxy.java
iccController.java
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.
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.
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
IMRecords.java
b30d3481987401d1f3ede9317b0d6f80ebbd0e57 30-Sep-2014 Junda Liu <junda@google.com> Merge "Fixes: SIM records loaded not firing on refresh reset." into lmp-dev
33b32317a7ac74e331b1e66479ad9f9fa60b449b 30-Sep-2014 Amit Mahajan <amitmahajan@google.com> Merge "Update mRecordsRequested on sending request instead of onLocked." 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
ccCardProxy.java
iccCard.java
ab55739495b38cf403e7c4514e00f4661034c838 29-Sep-2014 Amit Mahajan <amitmahajan@google.com> Update mRecordsRequested on sending request instead of onLocked.

Bug: 17668819
Change-Id: Ib982149c665258dba8fbb4b58a35449b40529913
IMRecords.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.
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
ccRecords.java
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
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
ccCardProxy.java
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.
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
ccConstants.java
IMRecords.java
simFileHandler.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.
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
IMRecords.java
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.
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
simUiccRecords.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
IMRecords.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.
a78b89580413cda352dbba21c4b0227dbb0211d3 06-Sep-2014 Derek Tan <derektan@google.com> Make public the getIccId function.

Bug: 17255752

Change-Id: Id1ffc49e0b2c9674b1631bbd5662be8889d97ed7
iccCard.java
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.
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
iccCard.java
ec3a0c19932bb09778fa06566c50ba101643b310 04-Sep-2014 Tom Taylor <tomtaylor@google.com> resolved conflicts for merge of 91e062f3 to lmp-sprout-dev

Change-Id: Ief6e0af92faa8556ff93f184d058730aae84909f
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
ccCardProxy.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.
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.
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
ccRecords.java
uimRecords.java
IMRecords.java
62d026a3882d133aa81995f8dfd2c1d25b1b0649 03-Sep-2014 Shishir Agrawal <shishir@google.com> NPE fix Check parent app for null in SIMRecords.

Bug: 17354388
Change-Id: I2b2255b1c8fd9c7a8572d54060c1836030198a90
IMRecords.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
ccCardProxy.java
iccCard.java
iccCarrierPrivilegeRules.java
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
pnOverride.java
6bc4098827f3070a44b5e51508b455d7c7be9c07 01-Sep-2014 Wink Saville <wink@google.com> ksd to lmp-sprout-dev

Change-Id: I94eb65c62231b5831570bb0cbbbd9c916bee0a37
ccCardProxy.java
ccRecords.java
uimRecords.java
IMRecords.java
pnOverride.java
iccCard.java
iccCardApplication.java
934a24a6aa2b7a981e872fa350648904ed80280a 28-Aug-2014 Diego Pontoriero <diegs@google.com> Generalize getCarrierPackageNamesForBroadcastIntent utility method to work for all intent types.

Bug: 17163860
Change-Id: I4b013db09a521fbc41401e11cd60a0c7b0172b64
iccCard.java
iccCarrierPrivilegeRules.java
ba891ddf2edcaa23c1f1d8a5a17cb508b8593d74 19-Aug-2014 Shishir Agrawal <shishir@google.com> Merge "Fix possible NPE in SIMRecords and IccSmsInterfaceManager." into lmp-dev
8777445caf72f1803f40698665c37c626269deb8 19-Aug-2014 Shishir Agrawal <shishir@google.com> Merge "UiccCarrierPrivilegeRules: Set state error on incorrect response from UICC." into lmp-dev
68515b655255005f653aec29e9f152412514982a 18-Aug-2014 Shishir Agrawal <shishir@google.com> Fix possible NPE in SIMRecords and IccSmsInterfaceManager.

Bug: 17108041

Change-Id: I2df5cb777d27b669f6b3ae7ad9d853a951270fcd
IMRecords.java
c862ea7172855fa77cece249e90cbe9a7056e4d5 15-Aug-2014 Vinit Deshpande <vinitd@google.com> Merge "Enable EAP-SIM end-to-end" into lmp-dev
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
ccRecords.java
279ace857d85b3409515983e0f62d127351594d8 14-Aug-2014 Shishir Agrawal <shishir@google.com> UiccCarrierPrivilegeRules: Set state error on incorrect response from UICC.

Bug: 17033027

Change-Id: I9f6c32525172a47b217246b187b18ed77233221b
iccCarrierPrivilegeRules.java
8071f9cde13df71af0c4c8b3810d24740279da9a 12-Aug-2014 Junda Liu <junda@google.com> Merge "Skip unknown tags in parsing." into lmp-dev
32bbe4213fc554ebf00553cd9935d17fe7530aa1 07-Aug-2014 Junda Liu <junda@google.com> Skip unknown tags in parsing.

Bug: b/16650010

Change-Id: I3b52d6201e4eb20096c2724103fd1463e0d9b908
iccCarrierPrivilegeRules.java
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
IMRecords.java
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
iccCarrierPrivilegeRules.java
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
iccCard.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
uimRecords.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
ccRecords.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
iccCard.java
iccCarrierPrivilegeRules.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
uimRecords.java
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
iccCard.java
iccCarrierPrivilegeRules.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
ccRecords.java
uimRecords.java
IMRecords.java
iccCard.java
iccCardApplication.java
ce083ae9d277bea9fbc1c143766adf1013f4a50e 02-Jul-2014 Amit Mahajan <amitmahajan@google.com> Changes to add new parameter for Sim Authenticate

Change-Id: I393c18f878fe3e5efcd81543a9a38a4c353b6e03
ccRecords.java
iccCardApplication.java
e5b5f10d2d09f62c265381cab0816edfbdf566f0 17-Jul-2014 Junda Liu <junda@google.com> Add urls for spec and update AID to be spec compliant.

Change-Id: I79580c8e510a8424b64436d8e6c57a8a3cc7fb1d
iccCarrierPrivilegeRules.java
004868eb3f91b06ef7e86b511bbb7b354036834a 11-Jul-2014 Junda Liu <junda@google.com> Fix UICC rule parsing.

Change-Id: I2fb81efba9fb749a23ee6fe59a24118782f502fc
iccCarrierPrivilegeRules.java
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
iccCard.java
iccCarrierPrivilegeRules.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)
iccCard.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
iccCard.java
iccCarrierPrivilegeRules.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
ccRecords.java
simUiccRecords.java
775f100b20a5c978bc07f621a4087f79b1f73e3f 25-Jun-2014 Wink Saville <wink@google.com> Fix NPE caused by null mUiccApplication.

Bug: 15712558
Change-Id: Ieb35fa69d8002286e54e6f5d8e73e057300ae94c
ccCardProxy.java
a8467dd0c524787104b1ccdddc5e8af10ba729ed 13-Jun-2014 Wink Saville <wink@google.com> Merge kwd to master

Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
ccCardApplicationStatus.java
ccCardProxy.java
ccConstants.java
ccFileHandler.java
ccRecords.java
simFileHandler.java
simRecords.java
simUiccRecords.java
uimRecords.java
IMRecords.java
iccCard.java
iccCardApplication.java
iccController.java
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.
9a33dbffcbdd0cc14b893edec1b385ecdbf07c46 26-Apr-2014 Wink Saville <wink@google.com> am 044a35cf: am d1ae7c94: Merge "Handle ICC IO error"

* commit '044a35cfda5f45980ed188527119c6fdc423a667':
Handle ICC IO error
044a35cfda5f45980ed188527119c6fdc423a667 26-Apr-2014 Wink Saville <wink@google.com> am d1ae7c94: Merge "Handle ICC IO error"

* commit 'd1ae7c941a4ea5f45aeca4171d75c1283a78039d':
Handle ICC IO error
d1ae7c941a4ea5f45aeca4171d75c1283a78039d 26-Apr-2014 Wink Saville <wink@google.com> Merge "Handle ICC IO error"
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
ccCardProxy.java
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."
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"
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
uimRecords.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
uimRecords.java
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
IMRecords.java
iccCardApplication.java
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
iccCard.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
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
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
uimRecords.java
IMRecords.java
81f99786f2d3754f641efa204ac8c289330e3ef1 13-Feb-2014 Derek Tan <derektan@google.com> Merge "Expose sendEnvelope." into master-nova
dcca0fbaf728212d182e08fe2239d9d4a5f96516 04-Feb-2014 Derek Tan <derektan@google.com> Expose sendEnvelope.

Change-Id: Ic8226a6302ee6a9ff07f46d68c59007dd3599803
iccCard.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
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
IMRecords.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
iccCard.java
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"
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
iccController.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
ccConstants.java
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
ccCardProxy.java
iccCardApplication.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
ccFileHandler.java
uimFileHandler.java
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
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
ccRecords.java
IMRecords.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
ccFileHandler.java
uimFileHandler.java
2d973cc97744549277b1c433c092dcb15efd694b 05-Sep-2013 Vineeta Srivastava <vsrivastava@google.com> Merge "UICC : Add MCC MNC codes having 3 digits MNC" into klp-dev
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
IMRecords.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
IMRecords.java
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
uimRecords.java
IMRecords.java
14c47d88b23fc035bed3d8625065a9157e470c36 15-May-2013 Wink Saville <wink@google.com> am 9bce8bee: Merge "Fix a typo bug."

* commit '9bce8beeeb2d55ba7f4bec67b1a174e16bdd3b53':
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.
ccCardStatus.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
IMRecords.java
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
uimFileHandler.java
c76db118626ef47a8deee6fbd9c20dff1473d896 09-Apr-2013 Wink Saville <wink@google.com> Merge "Telephony: Send complete path for EF-IMG(4F20) for RUIM cards."
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
ccCardApplicationStatus.java
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
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
ccRecords.java
uimRecords.java
IMRecords.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
ccRecords.java
simUiccRecords.java
uimRecords.java
IMRecords.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
uimFileHandler.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
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
ccConstants.java
ccRecords.java
IMFileHandler.java
IMRecords.java
simFileHandler.java
22d85a8e3a575a6d01d2c788587971657dfe20c6 23-Feb-2013 Wink Saville <wink@google.com> Clean up member variables.

Change-Id: Ib60f350131ade626aca682407ea0b4377b16f6c6
dnRecord.java
dnRecordCache.java
dnRecordLoader.java
ccCardProxy.java
ccFileHandler.java
ccRecords.java
simUiccRecords.java
uimRecords.java
IMRecords.java
pnOverride.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
dnRecord.java
dnRecordCache.java
dnRecordLoader.java
simFileHandler.java
ccCardApplicationStatus.java
ccCardProxy.java
ccCardStatus.java
ccFileHandler.java
ccIoResult.java
ccRecords.java
ccServiceTable.java
ccUtils.java
simFileHandler.java
simUiccRecords.java
uimFileHandler.java
uimRecords.java
IMFileHandler.java
IMRecords.java
pnOverride.java
iccCard.java
iccCardApplication.java
iccController.java
simFileHandler.java
oiceMailConstants.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
05ef3b65972826780859b9acbd1fa9580d099832 28-Dec-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Add uicc debug info to DebugService

Change-Id: I03be52f97ea84808d608c48b4e6ffa2454e2a67c
ccCardProxy.java
ccRecords.java
simUiccRecords.java
uimRecords.java
IMRecords.java
iccCard.java
iccCardApplication.java
iccController.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
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
simFileHandler.java
ccCardApplicationStatus.java
ccCardProxy.java
ccCardStatus.java
ccConstants.java
ccException.java
ccFileHandler.java
ccFileNotFound.java
ccFileTypeMismatch.java
ccIoResult.java
ccRecords.java
ccRefreshResponse.java
ccServiceTable.java
ccUtils.java
ccVmFixedException.java
ccVmNotSupportedException.java
simFileHandler.java
simRecords.java
simUiccRecords.java
uimFileHandler.java
uimRecords.java
IMFileHandler.java
IMRecords.java
pnOverride.java
iccCard.java
iccCardApplication.java
iccController.java
simFileHandler.java
simServiceTable.java
oiceMailConstants.java
ded9c0af7fa49504c047275ed34c2d3b22bf0c3a 07-Dec-2012 Wink Saville <wink@google.com> Use Rlog

Change-Id: Ie013f51215de8380b8de74161b6056b010711cfd
iccController.java
99c2e1d6749cfad2a8ca94a47857d8c3bfc09454 27-Nov-2012 Wink Saville <wink@google.com> Use Rlog instead of Log.

Change-Id: I2f44193b294513e743526e5c163e7d9a45308b28
iccController.java
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
iccController.java
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
EADME
iccController.java
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
iccController.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
iccController.java
bb36adde615d3d85fa0fc23935197c6bc6a799ed 27-Jul-2012 Alex Yakavenka <ayakav@codeaurora.org> Telephony: Dynamically instantiate IccCard

Instantiate when get_sim_status request returns

Change-Id: I9c9333d23f1e0b23256731b245577d1a25721647
iccController.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
iccController.java