From 14a996fdb68ae6e0f2e398c968eb1409a956f441 Mon Sep 17 00:00:00 2001 From: Ricardo Cerqueira Date: Thu, 28 Jul 2016 12:29:40 +0100 Subject: SimSettings: Make provisioning optional even if qti-telephony is present Current code assumes the manual provisioning options should come up if the qti-telephony blob is present. Don't make that assumption. Change-Id: I5e4f28b628e3fe3fe9e506631e92c85103e87ccf --- res/values/config.xml | 4 ++++ src/com/android/settings/sim/SimSettings.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/res/values/config.xml b/res/values/config.xml index f463615..a2ad7d0 100755 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -133,4 +133,8 @@ 3 = right side --> 0 + + + true diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java index 88ed36f..b97ee03 100644 --- a/src/com/android/settings/sim/SimSettings.java +++ b/src/com/android/settings/sim/SimSettings.java @@ -512,7 +512,8 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable // Disable manual provisioning option to user when // device is in Airplane mode. Hide it if the extphone framework // is not present, as the operation relies on said framework. - if (mExtTelephony == null) { + if (mExtTelephony == null || + !mContext.getResources().getBoolean(R.bool.config_enableManualSubProvisioning)) { mSwitch.setVisibility(View.GONE); } else { mSwitch.setVisibility(View.VISIBLE); -- cgit v1.1