History log of /frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
5e040f4db9d136fd7f509dd78edb380265fd0119 09-Aug-2016 fionaxu <fionaxu@google.com> pii part2: redact non-null pii with SHA-1 Hash

Bug: 30073833
Change-Id: Id4d7b59623b39660218f35d2c202518a994bae4c
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.java
77a1f167b962ceaf7972d246f4c23e17772d1c69 26-Jul-2016 fionaxu <fionaxu@google.com> scrub pii in imsphoneconnection + code cleanup

bug: 30368127
Change-Id: I14e8e6de97543786cc7dd327fe4a79f8968ecf04
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.java
a1cdb9b9a81cc4b637b6b76cc267166719936862 06-Jul-2016 fionaxu <fionaxu@google.com> hide personal private information from log

Bug: 29943985
Change-Id: Icf3a7d5b6517ac027ad92f07bd626bd69399dcc4
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.java
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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.java
42813c4c238eeb51727451aae6e8a6f7f956a583 01-Jun-2016 Sanket Padawe <sanketpadawe@google.com> Add receiver to override carrier name after carrierconfig is loaded.

Bug: 27718118
Change-Id: Ie62dd3dc52f0977a2b05ae8f0ba4898c80174658
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.java
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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.java
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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.java
4f0cbdf141f851c8bbe9d4ec4f73e808236003f7 16-Apr-2015 Zoran Jovanovic <zoran.jovanovic@sonymobile.com> Make FSM for loading SPN more robust

Let FSM for loading SPN continue if the loaded
data is null or empty.

Change-Id: Ie0a138edb62a02761108b9dbf117d9199ef8354b
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.java
1a87ab3d7170d618f048c4f5af8c7504a587aaa5 10-Dec-2015 Jack Yu <jackyu@google.com> Merge from master

Change-Id: Ifbd86600111d2c444031ff608fab62fb2ee4b236
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.java
eadee84166d397b6425cfd56f89fa1569f6a93f5 22-Oct-2015 Amit Mahajan <amitmahajan@google.com> Save call forwarding flag in SharedPreference.

Bug: 22822731
Change-Id: I801738685b65fc0ee0410c1ad4925d15694c81f4
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.java
200014f52acfbff467ab92910247f81e369da7e6 20-Aug-2015 Amit Mahajan <amitmahajan@google.com> Discard mnc length value received in EF_AD if invalid.

Graceful handling instead of crashing for an error case.

Bug: 23095679
Change-Id: Iad6ff8e9530f0f96fd60d2674b4589098ce9d9e9
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.java
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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.java
7234bd8664dbec97858f3f635eaa01c77d2f2881 14-May-2015 Junda Liu <junda@google.com> Add EF_GID2 support to uicc and phone.

Bug: b/21078450
Change-Id: I6beaa969a95c1ad7f77868a8c56a287474da7af5
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.java
b66ae5f6334393d39becc860840ab42a90c9a926 11-Jan-2013 Preeti Ahuja <preetia@codeaurora.org> Use EF_EXT5 as extension for EF_MSISDN on USIM

For USIM applications, use EF_EXT5 as the extension for EF_MSISDN
as per TS 31.102 Section 4.2.37

Change-Id: I8d339eb0accaf16dc61311f973326083018aac61
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.java
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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.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.
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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.java
ab55739495b38cf403e7c4514e00f4661034c838 29-Sep-2014 Amit Mahajan <amitmahajan@google.com> Update mRecordsRequested on sending request instead of onLocked.

Bug: 17668819
Change-Id: Ib982149c665258dba8fbb4b58a35449b40529913
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.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
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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.java
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
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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.java
62d026a3882d133aa81995f8dfd2c1d25b1b0649 03-Sep-2014 Shishir Agrawal <shishir@google.com> NPE fix Check parent app for null in SIMRecords.

Bug: 17354388
Change-Id: I2b2255b1c8fd9c7a8572d54060c1836030198a90
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.java
6bc4098827f3070a44b5e51508b455d7c7be9c07 01-Sep-2014 Wink Saville <wink@google.com> ksd to lmp-sprout-dev

Change-Id: I94eb65c62231b5831570bb0cbbbd9c916bee0a37
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.java
68515b655255005f653aec29e9f152412514982a 18-Aug-2014 Shishir Agrawal <shishir@google.com> Fix possible NPE in SIMRecords and IccSmsInterfaceManager.

Bug: 17108041

Change-Id: I2df5cb777d27b669f6b3ae7ad9d853a951270fcd
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.java
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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.java
a8467dd0c524787104b1ccdddc5e8af10ba729ed 13-Jun-2014 Wink Saville <wink@google.com> Merge kwd to master

Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.java
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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.java
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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.java
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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.java
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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.java
a0d02d50aa0fd7cf1c2d9f4d811efd2e4bfb7d4a 05-Sep-2013 Jake Hamby <jhamby@google.com> Fix receiving class 2 SMS messages.

SIMRecords class was creating the wrong type of SmsMessage object
for class 2 messages, causing a ClassCastException error. Verified
that this change fixes the bug using MD8475A call box.

Bug: 9578184
Change-Id: Ia325c6b1594d625237dc0966c05f56f586bb4baf
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.java
e9070e6d48d1389987650fa2c3e1f90aab860684 29-Jun-2013 Wink Saville <wink@google.com> Don't set gsm.sim.operator.numeric to null

Bug: 9628781
Change-Id: I80c00584535a327f9e93c8bd0980178781cae6ff
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.java
22d85a8e3a575a6d01d2c788587971657dfe20c6 23-Feb-2013 Wink Saville <wink@google.com> Clean up member variables.

Change-Id: Ib60f350131ade626aca682407ea0b4377b16f6c6
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/SIMRecords.java