diff options
| author | Sooraj Sasindran <ssasin@codeaurora.org> | 2015-09-21 14:52:52 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2015-10-06 03:21:20 -0600 |
| commit | 2407f2d8843eff1445ea18e38228e9782210cc81 (patch) | |
| tree | 305af6c491ecf2fdda71a3cf9fd5b065077b2525 /src/com/android/settings/sim | |
| parent | 3d755752aced43b991c75c15a2812a7e7674601c (diff) | |
| download | packages_apps_Settings-2407f2d8843eff1445ea18e38228e9782210cc81.zip packages_apps_Settings-2407f2d8843eff1445ea18e38228e9782210cc81.tar.gz packages_apps_Settings-2407f2d8843eff1445ea18e38228e9782210cc81.tar.bz2 | |
MSIM: Display SIM info even if APM is on
If device is in APM, then display the sim info and disable
button to activate/deactivate sim.
CRs-Fixed: 910841
Change-Id: Id4726f9f45eab2b813d7d4a448d9edae4a1bfe2e
Diffstat (limited to 'src/com/android/settings/sim')
| -rw-r--r-- | src/com/android/settings/sim/SimSettings.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java index 8639f6c..f39f349 100644 --- a/src/com/android/settings/sim/SimSettings.java +++ b/src/com/android/settings/sim/SimSettings.java @@ -475,6 +475,14 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable update(); // now use other config screen to active/deactive sim card\ mSwitch.setVisibility(mSwitchVisibility); + + // Disable manual provisioning option to user when + // device is in Airplane mode. + if (isAirplaneModeOn()) { + mSwitch.setEnabled(false); + } else { + mSwitch.setEnabled(true); + } } @Override @@ -511,7 +519,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable // Preference screen has a valid SIM and slot index/SubId. private boolean isCurrentSubValid() { boolean isSubValid = false; - if (!isAirplaneModeOn() && hasCard()) { + if (hasCard()) { List<SubscriptionInfo> sirList = mSubscriptionManager.getActiveSubscriptionInfoList(); if (sirList != null ) { |