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

diff --git a/res/values/config.xml b/res/values/config.xml
index f463615..a2ad7d0 100755 (executable)
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -133,4 +133,8 @@
          3 = right side
     -->
     <integer name="config_fingerprintSensorLocation">0</integer>
+
+    <!-- Does the device allow for manual subscription provisioning? Only works for multi-sim devices,
+         and currently depends on QC's proprietary telephony stack -->
+    <bool name="config_enableManualSubProvisioning">true</bool>
 </resources>

diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index 88ed36f..b97ee03 100644 (file)
--- 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);