History log of /frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
d17f611fd1d45ef9daee5a0032dbd158add584f1 25-Apr-2017 Malcolm Chen <refuhoo@google.com> Move intents ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED,
ACTION_DEFAULT_SUBSCRIPTION_CHANGED and EXTRA_SUBSCRIPTION_INDEX
from Intent class to SubscriptionManager class.

Bug: 37497166
Test: Manual
Change-Id: Ifeedf974328cd3d839d7f66bf41a91c479d66316
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
2fbf974ff8207eccc54c2dbde8c1962c4d468541 03-Apr-2017 Sanket Padawe <sanketpadawe@google.com> Add new extra as per CDD for ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED.

Bug: 36572866
Test: manual
Change-Id: Ie41a6401a19118533cd857e2b72546ec26dc17df
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
421d485ae09dedc9efe3cd04f0ff3bb50c9cf592 14-Feb-2017 Christopher Tate <ctate@google.com> Send telephony *_SUBSCRIPTION_CHANGED broadcasts to manifest receivers

Bug 35318995

Change-Id: If989ee246e8d3597adcbdbb773a7a3337cb9d0a5
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
c33ff760c71844625193dbeb44e7c126c828b5ec 04-Jun-2016 fionaxu <fionaxu@google.com> Merge "cold sim clean up" into nyc-mr1-dev
am: e274482c43

* commit 'e274482c43261f29bf9690491f064e2ce2cb8996':
cold sim clean up

Change-Id: Idbe0f8fbdefe6ff4c76a06d98b033ad9af9d7ede
4c31e4c0d2db31fe84081aa6f1e2bcc08b31f9d3 24-May-2016 fionaxu <fionaxu@google.com> cold sim clean up

- add new api to control provisioning notification visibility through
network agent
- rework on the interaction between carrier app and framework
- code cleanup
- unit test support
- hook pco value into datacallcomplete, enabling test by set sysprop for
pco values

Bug: 28567303
Change-Id: Id6b9b2aff4c4f128103593aab0bcef1c3a365141
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
b955acd6b799e84eff1fc873060c52d487705680 01-Jun-2016 Jack Yu <jackyu@google.com> Merge "Fixed that data call is not torn down when data roaming is disabled." into nyc-dev am: 048e4a733c
am: 6ab6544fed

* commit '6ab6544fed86686fb7ac260984745d2d9d132d8a':
Fixed that data call is not torn down when data roaming is disabled.

Change-Id: Ie5126192077246c03fbea89b8a790a38bf16ad4d
f629e7f1a1e36215d9bbed40df310a54b772f9e9 31-May-2016 Jack Yu <jackyu@google.com> Fixed that data call is not torn down when data roaming is disabled.

Fixed the incorrect content observer initialization and its event
handler.

bug: 28923982
Change-Id: I730cb1c737acc2285eb6de4aab97a463db7f4301
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
9c819ed064c3abd543aaf2c38bc9a5252a523d42 22-Apr-2016 Jack Yu <jackyu@google.com> Fixed that data call setup failed after default data SIM switches
am: 0979b71e48

* commit '0979b71e48405cab10bdf1d1b4170cfce72838a7':
Fixed that data call setup failed after default data SIM switches

Change-Id: I91ae8f6437a457c3bfa786af3be639bdff8e480f
0979b71e48405cab10bdf1d1b4170cfce72838a7 21-Apr-2016 Jack Yu <jackyu@google.com> Fixed that data call setup failed after default data SIM switches

Need to reset the auto attach flag when DDS occurs.

bug: 28181225
Change-Id: Ib4405b94ac3085e48cb029451cc44f4eee6408c2
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
2eb76ee3dff2062ee1a53ac2747e9deed5918615 20-Apr-2016 fionaxu <fionaxu@google.com> Merge "Cold Sim fix for DataConnection and DCT" into nyc-dev
am: aa4b4df0d1

* commit 'aa4b4df0d128b8705c38c5f54dde798721f4cc56':
Cold Sim fix for DataConnection and DCT

Change-Id: I99303a3b9fffa96e07e8af09e45edbf16f902da1
a02b6fd88953d783c32e6d7f84b7eddbc0d1faf1 08-Apr-2016 fionaxu <fionaxu@google.com> Cold Sim fix for DataConnection and DCT

Bug: 25203607
Change-Id: I3bbef77edf57eaa8d7da24d687cc9b5ab0ef111b
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
8597332d611116fb7055d1e84149937f3cc822ec 22-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> Merge changes from topic \'DCT_refactor_nyc\' into nyc-dev
am: 7c6359fc07

* commit '7c6359fc07840f8ed59161a7caf51634115a5d7e':
Remove DctController
Create TelephonyNetworkFactory.
Make PhoneSwitcher class.
Create the new SubscriptionMonitor
7a477263108748903cf5a4151a4e8b739f12264a 16-Dec-2015 Robert Greenwalt <rgreenwalt@google.com> Create the new SubscriptionMonitor

Add some unit tests too.

Change-Id: I9e40be14d61f8f43d6bd37915f0c2ab5b3bf8289
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
c823b11be1844c5ef7c5a660a97e60ae6b899229 13-Feb-2016 Chen Xu <fionaxu@google.com> Merge "Subscription related Unit test with code cleanup" into mm-wireless-dev am: 3d141ae13b
am: 2cc7f47624

* commit '2cc7f4762438942b0c6b098fa9bd248c29fbd471':
Subscription related Unit test with code cleanup
2cc7f4762438942b0c6b098fa9bd248c29fbd471 13-Feb-2016 Chen Xu <fionaxu@google.com> Merge "Subscription related Unit test with code cleanup" into mm-wireless-dev
am: 3d141ae13b

* commit '3d141ae13bb5b109f831c16bfd886cfef649958e':
Subscription related Unit test with code cleanup
655bae990bdd7e4584491def4d30692e6173779c 11-Feb-2016 fionaxu <fionaxu@google.com> Subscription related Unit test with code cleanup

bug: 25691379

Change-Id: Ib31b34b3d1116cf714717f5742095de7aa4c0a13
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
9d9fbd051bf607147fe1064d6016c118b2b28dc5 09-Feb-2016 Robert Greenwalt <rgreenwalt@google.com> Merge "Fix getActiveSubscriptionInfoForIccId iccId comparison"
am: af300d9c18

* commit 'af300d9c18ddf6d780d8708f3a4f2af2864b0437':
Fix getActiveSubscriptionInfoForIccId iccId comparison
3176d2b5ad62bc72437c4880d7929a5d0670ade4 27-Jan-2016 Jonas Claeson <jonas.claeson@sonymobile.com> Fix getActiveSubscriptionInfoForIccId iccId comparison

The function compared references instead of strings.

Introduced by:

commit c22e8507402956a747469208bd1aa43dbd683e21
Author: Svet Ganov <svetoslavganov@google.com>
Date: Wed Apr 22 13:09:14 2015 -0700

Change-Id: Ib5bb464f708ff548588c2af30e14ea559cf45333
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
e1eef7656d072baac2a2baee08363dc2b8f960dc 05-Feb-2016 Nathan Harold <nharold@google.com> Obfuscate the ICCID in addSubInfoRecord()

Bug: 26989987
Change-Id: I18b1e556eb6c37442c870155299f5f30a2a2c603
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
960c250fc2afee078852df1f37a887cec848ec5d 25-Jan-2016 Shishir Agrawal <shishir@google.com> Unhiding MSIM APIs.

1. Unhide MSIM APIs in TelephonyManager that already have non-MSIM equivalent
APIs public.
2. Make MSIM API naming consistent (overloaded, no suffix).
3. Unhide APIs in SubscriptionManager that are necessary for MSIM.

Bug: 26772894
Change-Id: I9e623100358d65f1ab853c33599cb78f100f7e3a
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
38ca51d0f643405df51e78fce6c546424e9f410d 25-Jan-2016 Shishir Agrawal <shishir@google.com> DO NOT MERGE : Unhiding MSIM APIs.

1. Unhide MSIM APIs in TelephonyManager that already have non-MSIM equivalent
APIs public.
2. Make MSIM API naming consistent (overloaded, no suffix).
3. Unhide APIs in SubscriptionManager that are necessary for MSIM.

Bug: 26772894
Change-Id: I9e623100358d65f1ab853c33599cb78f100f7e3a
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.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/SubscriptionController.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/SubscriptionController.java
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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
edd4a385f41a7fb765c0cbbc19b0fa6c0b2a1281 16-Oct-2015 Sanket Padawe <sanketpadawe@google.com> Hide IccId from SubscriptionController logs.

Bug: 24941148
Change-Id: I53a36b390eb74fba8e6086f8b1102ace435592b5
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
7a384469c0c167b9002cae1728bc0315422d3242 30-Jul-2015 Ian Pedowitz <ijpedowitz@google.com> Merge "Revert "Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm."" into mnc-dev
1da27cad8b73ffdf0ab2db330b627ca68891c893 30-Jul-2015 Svetoslav Ganov <svetoslavganov@google.com> Revert "Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm."

This reverts commit b872941b01c651df631b4b4700f3493b2f517f7b.

Change-Id: Idcc5c7817ab405cec136884528238b51ef762273
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
08d40bc30eb992961fa4ec56a76a28c6e201d8c9 21-Jul-2015 Etan Cohen <etancohen@google.com> Do not update RAF for invalid sub IDs.

Bug: 22076899
Change-Id: I44c6744d6464d13a0803a6480ee72f07bda7c087
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
73159fe819030161412702eec8ad4ada29667c7d 16-Jul-2015 Sanket Padawe <sanketpadawe@google.com> Merge "Add new API for acessing DB associated with Subscription." into mnc-dev
cfa612cdd84e44eb59ece6460d9db63ac72bee92 14-Jul-2015 Sanket Padawe <sanketpadawe@google.com> Add new API for acessing DB associated with Subscription.

Bug: 22360525
Change-Id: Ia51f38bab5327f77de4997cb4695959a5573048f
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
b872941b01c651df631b4b4700f3493b2f517f7b 11-Jul-2015 Amit Mahajan <amitmahajan@google.com> Removing OrSelf check when checking for PRIVILEGED_PHONE_STATE perm.

Self check is done as part of READ_PHONE_STATE and AppOps checks.

Bug: 22376654
Change-Id: I437f9bf324950cb70bae5be76699824da5897a6f
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
787894d7a314ccd915d094bbc3f47fe7052efd62 01-Jul-2015 Robert Greenwalt <rgreenwalt@google.com> Add/Fix Permission check on SubscriptionManager.

Things that are modifying should check the modify permission.

bug: 19259681
Change-Id: I93968bccedc673171ddf0d27ffe664a698b8fcb4
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
4e286c0da881ea725221aa6d5d4feec891e338f0 29-Jun-2015 Amit Mahajan <amitmahajan@google.com> Change the order of permission checks for READ_PHONE_STATE.

This is needed for 2 reasons:
1. If called as self, OP_READ_PHONE_STATE check should not be done.
2. If caller does not have permission, exception should be thrown
for READ_PHONE_STATE.

Bug: 22128902
Change-Id: Ibd4de0c5ba314700b6b3d7a59f502d2a21b7d86f
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
505e101bf4452237808e2398c9b660d711ca81aa 24-Jun-2015 Etan Cohen <etancohen@google.com> Modify telephony permissions to use either READ_PHONE_STATE or READ_PRIVILEDGED_PHONE_STATE

Bug: 22001264
Change-Id: Ieb06e5cbcc366c25c174ec18281e55c1d73f2d80
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
4255481b2c36b884cfc97e44ce4479f312610136 23-Jun-2015 Robert Greenwalt <rgreenwalt@google.com> Say a phone is disconnected if we can't find it.

isDataDisconnected(subId) was returning false if it couldn't
find a phone servicing the given subscription. That seems
wrong and led to ServiceStateTracker thinking it was connected
if there was no SIM inserted. That in turn led to very slow
AirplaneMode engagement.

bug: 21427496
Change-Id: I762e5dae6bc4263e846245ddd49097e8bc204e12
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
b8a1662bc51a75f662b12b25363aabed528c54c9 09-Jun-2015 Junda Liu <junda@google.com> Avoid logging phone number and add comment.

Bug: b/21706074
Change-Id: I92aa149296a6df7e4e1d5f8f12b0617227c8489c
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
45540cd5c71494df8421c7602b27082c98cc8cb7 02-Jun-2015 Amit Mahajan <amitmahajan@google.com> Changing getSimState to use slot idx instead of sub id.

Bug: 20736251
Change-Id: I43ec6450358f833f878ed4eee993ea79d5220c65
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
fa0cc99e942ce9fb5ec45013c51e140be0d4039d 07-May-2015 Sanket Padawe <sanketpadawe@google.com> Fix displayName value for subInfoRecord.

Bug: 20542760
Change-Id: I3abe3184cc327676ef25ed45c3959342fbcb0207
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
319d801550166fc7a9bdbb501a8a226d321b926e 04-May-2015 Prerepa Viswanadham <dham@google.com> Fix build

Change-Id: I94b54466ef75d6562a69e440aa611ef576ab61e8
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
a55882e08163283ff3fe0763df9ffa97b4b69f01 04-May-2015 Prerepa Viswanadham <dham@google.com> Merge commit '52c1beb' into alee_merge
58ad34367efdf5e8c19874a1d7848fa383403c38 04-May-2015 Prerepa Viswanadham <dham@google.com> Merge commit '8c162d4' into alee_merge

Change-Id: Ib8b923319368c74eb6c23ef3c34a7f6770da4c89
2462a6d1434f52f31ec407cd40d1917f020c6d1d 27-Apr-2015 Cheuksan Wang <edwang@google.com> remove permission check from isActiveSubId()

This check added READ_PHONE_STATE permission to calls that didn't
require it before.

Bug: 20629608
Change-Id: Ie506b99ee4e0b36b42f930928cebcf9c0289e150
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
325ae99b500488dd22f08bff67007151ad233b18 16-Apr-2015 Stuart Scott <stuartscott@google.com> Only reassign modems if default data sub is valid.

bug:20255880
Change-Id: I20912d5203613fddd9d7c28708d97f8d10ee8abd
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
639eb9aaa82f38bd30ee78a752f3c54cf9a13c49 01-Apr-2015 Sanket Padawe <sanketpadawe@google.com> Set only plmn to carrierText if both plmn & spn are same in setPlmnSpn

Bug: 19710990
Change-Id: I308fa7b29c71f10644942fd0f147d19cba8fa2e1
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
32dfb14dd5469ea4e65c08a9e3be4ff97a136c6b 09-Feb-2015 Sandeep Gutta <sangutta@codeaurora.org> MSIM: Send correct modemId/RAF during SET request

- During SET_RADIO_CAP_REQUEST request, send appropriate modemId
which received as part of GET_RADIO_CAP request
- Update the phone RAF/ModemId local cache when UNSOL_RADIO_CAP
success event received, this is to make sure the local cache
is in sync with the current config @ modem layer.
- During SET_RADIO_CAP_REQUEST request, send the exact RAF value
as is which received as part of GET_RADIO_CAP request.

bug:19296282
Change-Id: I86f3983eb86032352b84902ad7eef752f3ecfe0a
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
c22e8507402956a747469208bd1aa43dbd683e21 22-Apr-2015 Svet Ganov <svetoslavganov@google.com> Clear caller indetitiy and use controller op package after security checks.

The SubscriptionController is calling into local managers from its
context. Hence, we have to clear the IPC binder identity and then
use the app ops package name for the controller when calling into
other APIs. This avoid two situations: first, the subscription
controller calls into other APIs with the caller identity but the
controller op package name; second, the controller calls into
other APIs with its own identity but the ap op package of the
caller. This avoid crashes when we have nested APIs each of which
performs its own app op checks. Fun.

Change-Id: I0bd02d9ab1bea4de6bd96584a514cdc6406193af
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
b8eadaa4e0496f89667e4357ca714033dac1f2a6 19-Apr-2015 Svet Ganov <svetoslavganov@google.com> Add OP_READ_PHONE_STATE app op continued - telephony

Change-Id: Iee4064b12bff5e2e3fbfd807bc8bc5601a40424c
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
e0e635f49707265e50e559face05332d835d2c06 19-Apr-2015 Svet Ganov <svetoslavganov@google.com> Fix crash due to recent app op changes

Change-Id: Ied887fe9dd7287f14a4a6eeee8ebeecbc7aff38f
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
6cd5ae363cc32559c682c6bc3daafdfa68311c07 26-Mar-2015 Cheuksan Wang <edwang@google.com> Fail SmsManager requests if SubId is not active.

If subId is not active, expected subIds can be assigned to the messages being
processed due to SmsManager calls. The change will fail any SmsManager calls
if SubId is not active.

Bug: 18629526
Change-Id: I8da1b1e2c477f32dcbaff417fc4e14ba2a225414
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
656905eedf13bbeaa7748c85970d814871c0eb35 27-Feb-2015 Sanket Padawe <sanketpadawe@google.com> Notify subscriptionInfoChanged in setPlmnSpn even without sim.

Bug: 19476978
Change-Id: I3f87c60f3de2f9e317061466d6c57bca0efc821d
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
e9876ff49bded7a139ee80471408f9fa965c0e89 24-Feb-2015 Sanket Padawe <sanketpadawe@google.com> Set carrierName of subInfo to null while creating/updating subInfo.

Bug: 19476304
Change-Id: Ia16465584cf31858bbf1ae36cfdbf21184de10d7
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
c029b573426b57995925fc7701969ad371899f0b 05-Feb-2015 Ye Wen <ywen@google.com> Fix mistake of calling wrong method to return sim country iso

b/19240047

Change-Id: If155f682ec06e377b4c5e6b05494631112812146
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.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/SubscriptionController.java
dfe728162d1ecd9f6c76989fba58e05ca943fbe8 29-Jan-2015 Sanket Padawe <sanketpadawe@google.com> Merge "Suppress logging to avoid showing phone number." into lmp-mr1-dev
65f78dfd8122c8f76d685abb9968bc3f973e5725 29-Jan-2015 Sanket Padawe <sanketpadawe@google.com> Suppress logging to avoid showing phone number.

Bug: 19193581
Change-Id: If8e35b6c8386a0e92cd1e89172b6dd1f0c220bc1
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
20baf0330a05f7507cce251e9c16cb0c47542d0f 29-Jan-2015 Junda Liu <junda@google.com> Merge "Check line1number override and use it instead for subscription." into lmp-mr1-dev
11bf4f45a64ce8bebd8edca04a8a401e2a40ae61 29-Jan-2015 Robert Greenwalt <rgreenwalt@google.com> Fix dump to not require extra permissions.

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

bug:19134027
Change-Id: I0f6bf3029f6230c759b94e04235d32c7a06ccea3
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
516a9df88657fcf1edd1588b26e00e963fe9ce51 28-Jan-2015 Junda Liu <junda@google.com> Check line1number override and use it instead for subscription.

Bug: b/19143556
Change-Id: I7bceea2ed39a075e66db2a5487296d4d33e2a941
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
05eb62a0ccc74ecfbc8d61d334f247ff6996dc78 20-Jan-2015 Stuart Scott <stuartscott@google.com> Revert "Make SubscriptionController thread safe and some cleanup."

This reverts commit f34c3ae44f20f7454cda82628e8d23bff3198130.

bug:19029410
Change-Id: Iff8e99429565f8b43d4cbf5c8457e25691ba626c
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
19517065ec69bafc5cfc91c8386a7583441ecf6d 15-Jan-2015 Amit Mahajan <amitmahajan@google.com> Change to update carrier text after subId is updated.

Bug: 18752574
Change-Id: I9cb8b7d26fca1654bd2323bd5555a1cfc4e9877d
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
f34c3ae44f20f7454cda82628e8d23bff3198130 13-Jan-2015 Wink Saville <wink@google.com> Make SubscriptionController thread safe and some cleanup.

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

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

Reduce logging in SubscriptionController.

Bug: 18716459
Change-Id: I679a7f184359ae8182c61308694354138a808b43
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
84b5d1652f6791d859d880bd73ada8ad698cae8e 09-Jan-2015 Amit Mahajan <amitmahajan@google.com> Change to not call setLine1Number() when display number is updated in
SubscriptionController.

Bug: 18957504
Change-Id: I83637b377d4a3af9eae1aee454da19be8a00496d
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
9cd10f29b23f1df574a1ef13379908ddfc933d5e 08-Jan-2015 Wink Saville <wink@google.com> Make getDefaultSubId smarter and handle data only devices.

Bug: 18919382
Change-Id: I9409d550cd4c3ef7bba64ca69ae0205ec3be3fec
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
3972955a3b3730c4e1632949dcaecc6fcc0c0567 08-Jan-2015 Jason Monk <jmonk@google.com> Merge "Have ServiceStateTrackers update Plmn/Spn directly" into lmp-mr1-dev
0192d7f3f201bce2b513749982577c8ddebe3ea2 10-Dec-2014 Jason Monk <jmonk@google.com> Have ServiceStateTrackers update Plmn/Spn directly

It seems that somehow the info from the ServiceState trackers is
getting out of sync with the Subscription database. To avoid this
update the info directly rather than going through a sticky broadcast.

Bug: 18752574
Change-Id: I66a3cb30df6478b7313230252ff2560946297d47
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
fecec7d7a925364ee265068f35e399e03faeee8e 11-Dec-2014 Wink Saville <wink@google.com> Fix NPE in SubscriptionController if getActiveSubscriptionInfoList is empty.

Bug: 18683935
Change-Id: I34a185a1585449bf8c7e9fe56672f2578753cc4d
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
8002387711e57456dbb4353eb894714592f303fb 11-Dec-2014 Wink Saville <wink@google.com> Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.

Rename isValidSubId to isValidSubscriptionId.

Bug: 18668873
Change-Id: Ie937d20b1bc6d3d63b658abe48e0aa65d830181f
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
8b25624ba664619f1935e5ddb401556cf4c3d5d1 09-Dec-2014 Etan Cohen <etancohen@google.com> Fix reference to incorrect extra name for SPN

Bug: 18223317
Change-Id: I7f8c11dede44861cc4386a11eaef039e0e429bbd
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
9dd8bcd98376fc644d372f96ad93dc6dadd73058 05-Dec-2014 Stuart Scott <stuartscott@google.com> Merge "Default data should connect on user's preferred network type" into lmp-mr1-dev
7e7d2b34010bf24a70bbf40303c7a4606c438ada 04-Dec-2014 Stuart Scott <stuartscott@google.com> Default data should connect on user's preferred network type

bug:18416275
bug:18415493

Change-Id: I14bce5520af67f038f43920a4454275c5a7e8a9f
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
de060226160826546f0f78e3b437998ad194ed6d 05-Dec-2014 Jason Monk <jmonk@google.com> Only register SPN receiver when we need to

Avoid crashing fugu by not registering this receiver when the uri
where we would store the data is not valid.

Bug: 18634568
Change-Id: I882eaa0dc6a312b4df7d5e39056ab5f8df844162
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
3ec379cf2c240fe7f7cc36e2fe7502f769f309a0 05-Dec-2014 Wink Saville <wink@google.com> Merge "getActiveSubscriptionInfoList used wrong slection operator." into lmp-mr1-dev
2236bf11125220d9b396a607bcd1bba45c1fe2c3 04-Dec-2014 Wink Saville <wink@google.com> getActiveSubscriptionInfoList used wrong slection operator.

The call to getSubInfo should use ">=0" to find "active" subscriptions.
Previously INVALID_SIM_SLOT_INDEX was -1000 and now its -1 so the
"!=" would return older inactive subscriptons (i.e. -1000 for
SIM_SLOT_INDEX) as well as the truly active subscriptions.

Bug: 18599334
Change-Id: Ied1af25773df34725508a2ab1a5954e6a3ffb20a
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
916a4a24ae001831f15bafad1d5105f049f22031 04-Dec-2014 Jason Monk <jmonk@google.com> Merge "SubscriptionController store SPN brdcst in carrier" into lmp-mr1-dev
cd9e0d22c9a50903efc9965beb7e022f727ce63a 04-Dec-2014 Jason Monk <jmonk@google.com> SubscriptionController store SPN brdcst in carrier

Save the current PLMN/SPN in the carrier name of the SubscriptionInfo.

Bug: 18223317
Change-Id: I75ceba8ca8e1d9eb356292296b84a9cdac2e54e2
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
4608e158b3907fb980cac72d20909919a8031f96 04-Dec-2014 Sanket Padawe <sanketpadawe@google.com> Fixed IMEI crash in HH without SIM

Added null pointer check in SubscriptionController

Bug: 18292087
Change-Id: I1289143388466b66a74de5070bcecc17d22fd799
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
bf96bc5d20e42a1c011413c3b1dee8ef5b524b43 04-Dec-2014 Wink Saville <wink@google.com> Merge "Add debug and check validity of mCardIndex." into lmp-mr1-dev
4fae501dc021c215c1f291a244466610bc3f7120 04-Dec-2014 Wink Saville <wink@google.com> Add debug and check validity of mCardIndex.

Change-Id: Ic5a2baaacaf1810416b898dcb6171ef15e422f7f
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
4e7f34de0e226703fadd1f30f9976bb426c5166b 11-Nov-2014 Stuart Scott <stuartscott@google.com> SubscriptionController uses RAT families to control default data

bug: 18417009

Change-Id: I0c016db0c5adce6e28fc3ffb713d4a4c4d270b51
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
4b09dff383ae7dfca595aeeea886a594a1947340 22-Nov-2014 Wink Saville <wink@google.com> Additional changes to SubscriptionManager API as per API council.

bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
947781d8871fdd94e0eb44f9d7afee0881388d5d 11-Nov-2014 Stuart Scott <stuartscott@google.com> Updating Subscription Info Icon

bug: 18356155

Change-Id: If78d47c68864ff83b879a17d28fa81cab5d2e652
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
299dad50409e907993fa96c7401d4f10c58018b1 11-Nov-2014 Wink Saville <wink@google.com> Update SubscriptionManager API as per API council.

bug: 17575308
Change-Id: Ib39a60e4f75981a466e9d606ec627756efad018d
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
657d4db8bc4c9c892c5d31fee5e2b5084b86fbee 28-Oct-2014 Stuart Scott <stuartscott@google.com> SubscriptionController gives SubInfoRecord the blank bitmap icon.

bug: 17575308
Change-Id: I5cf2f8e59091f752b2258ccf560db8b03108fcff
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
24e3fd66bf996b3b2c63088aa2b0c201871dd4a5 07-Nov-2014 Sanket Padawe <sanketpadawe@google.com> Set default sim name and carrier name for subInfoRecord.

Changes for setting display name and carrier name inside subinforecord
object when its created and updated.

Bug: 17732079
Bug: 18247211
Change-Id: I5db976d5ed540ce46d4dd236195a7e60d96ae381
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
24d498b7139781fc88cfbe4c6ad1500c8b3212b5 05-Nov-2014 Sanket Padawe <sanketpadawe@google.com> Changes related to setting default color for sim in multisim.

Changes for setting default sim color when the subinforecord
is added into the database.

Change-Id: I5717da94bfb6bb260864a46c3898d347be96d6af
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
5f208fd8c2c2ef5036dabffafc72b73b9eb3fc16 30-Oct-2014 Stuart Scott <stuartscott@google.com> Clean up public API of SubInfoRecord.

bug: 17575308

Change-Id: Id69135474a7b90d6731d27f191e95c3fa61e0d0f
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
50297d8a0fbc6f7d799af3931fa378453476ea9f 28-Oct-2014 Sanket Padawe <sanketpadawe@google.com> Remove checks to support new sim color selection.

Remove checks to support new sim color selection in multi-sim settings UI.

Change-Id: I26da0a79f5b1edf829fc5d46af2c0c23962226b8
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
b237a11044ed842d2865ff8c8716befb06b6ca25 25-Oct-2014 Wink Saville <wink@google.com> Change subId to int from long

Change-Id: Idae6335e63e7b1e4e714bc17e71b1a4705e38474
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
6137cc7b1a52486465055445e24328487e19553f 24-Oct-2014 Sanket Padawe <sanketpadawe@google.com> Default sim name set to carrier name in sim settings

Default sim name in SIM settings UI should be carrier name untill user
specifies a name for SIM.

Bug: 17732079
Change-Id: I302ad00095fd06b393dbe358b135f031390a3678
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
1e7aeace971d8b6d5e5b8cf2038cfce820bb7772 23-Oct-2014 Legler Wu <legler.wu@mediatek.com> [DS] Change the copyright

Change the copyright as Android.

Review: https://partner-android-review.git.corp.google.com/#/c/185242

Change-Id: Iad9632917d14ddb429aeb08d7335aef3fe0663d8
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
d786f9a4184a8d6f116fc9aece46adf18e52a14d 21-Oct-2014 Nick Kralevich <nnk@google.com> require DUMP permission on dump()

Bug: 17983781
Change-Id: Ib8e9904da80d638abdcc74a5e183ce3d44e1e33b
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
f17dec635141a16b68ab4980c118d49ec5ae11c0 16-Oct-2014 Wink Saville <wink@google.com> Fix an NPE in SubscriptionController.dump

Bug: 17945275
Change-Id: I076112ede5fd224284c23078b321fd282d0dffe0
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
976586d02baafa601eb816467cd9321eaa3c66dc 08-Oct-2014 Wink Saville <wink@google.com> Add SubscriptionController dump.

Unable to reproduce 17678050 so add a dump method and
ScLocalLogs to hopefully capture what's happening.

Bug: 17678050
Change-Id: I91d99c98cff9b6fd484d4972b5461098bba23ba2
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
281281bfbb7a9def377de26b3ad160188da4da7d 19-Sep-2014 duho.ro <duho.ro@lge.com> Telephony: default subId updating on single slot device

The default sub Id should be updated on single slot device when card
hot-swapped.

Bug: 17400805

Change-Id: If42d4a218e508e65f3e97f2fcd974f622f8011b1
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
b66469cd64077d31fc67087708638a985d9cb449 10-Sep-2014 Etan Cohen <etancohen@google.com> Reduce log spam - moving some subscription messages to verbose from debug logging.

Change-Id: I1a8d541cd9547d049559c26744b7d61690304840
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
2c1d340751338c77050e36f4bf77635eeba794a2 10-Sep-2014 Junda Liu <junda@google.com> Merge "Update telemgr calls with subId to new APIs with ForSubscriber suffix." into lmp-dev
6a5ef38e6ae3d3a3ad90ae180388fe85de0495a2 08-Sep-2014 Wink Saville <wink@google.com> Change suffix UsingSubId to ForSubscriber.

Bug: 17255752
Change-Id: Ifd522888b5aaae111f642d1e35bd1bb939e539d4
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
96d961419690d3b78fbebe037889f5e922650251 06-Sep-2014 Junda Liu <junda@google.com> Update telemgr calls with subId to new APIs with ForSubscriber suffix.

Bug: b/17255752
Change-Id: Ib4447f280a76424751a3d5c25a8ba400a1f789ee
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
ba2ee8969eb4a6c7292dc257beb1a125b34b30b6 05-Sep-2014 Wink Saville <wink@google.com> More cleanup prior to unhiding

Rename public SubInfoRecord instance variables

Change-Id: I25a56d779c63a3f483d7a43c5c123404bf489fa3
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
fb87258e809cc6e386faafd8ad1ea5585760a36d 03-Sep-2014 Wink Saville <wink@google.com> Rename getActivatedXxx to getActiveXxx

Change-Id: Iba6d2805a69d3385c93b7ed3c6267b5b8b252a28
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.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
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
374fb1f013fcddac3421720a7f2123e8f025c52a 19-Aug-2014 Hyejin Kim <hyejin.kim@lge.com> Consider default subId during initialization of subscription controller

Bug: 16445210, 16966396
Change-Id: I1d9cdc1d070af532ae25d10d8f7d5240bb272623
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.java
76b5625831e12343d195ebb509a6804774ca2c0f 18-Jun-2014 Wink Saville <wink@google.com> Empty triangle displayed for radio signal but calls & data work

Don't assume getSubId always returns an array and add a FIXME comment.
And explicitly set phoneId and subId in the intent so as not to relay
on a phones subId being valid.

Also cleanup some debug.

Bug: 15669560
Change-Id: I645ddb35b964b08dcb46f881c9d02b932d128950
/frameworks/opt/telephony/src/java/com/android/internal/telephony/SubscriptionController.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/SubscriptionController.java