remove activation button from preferred NW setting
- platform today only supports hands-free activation, otasp activation
automatically starts at background (non-interactive call),
no user interaction is required.
- activation button will trigger deprecated ActivationActivity inside
SuW which we plan to remove for a long time.
- the activation button itself is buggy, it only shows from the cdma
menu if it is running on tablets and cdma-only device which is
inconsist with logics from elsewhere.
Bug: 33784603
Test: manual testing
Change-Id: I281ffc475f53c8ea7b1cd4a2cfc573ad66b5b88d
diff --git a/res/xml/cdma_options.xml b/res/xml/cdma_options.xml
index 78e3630..c86787b 100644
--- a/res/xml/cdma_options.xml
+++ b/res/xml/cdma_options.xml
@@ -43,14 +43,6 @@
</PreferenceScreen>
<PreferenceScreen
- android:key="cdma_activate_device_key"
- android:title="@string/cdma_activate_device">
- <intent android:action="com.android.phone.PERFORM_VOICELESS_CDMA_PROVISIONING">
- <extra android:name="autoStart" android:value="true" />
- </intent>
- </PreferenceScreen>
-
- <PreferenceScreen
android:key="carrier_settings_key"
android:title="@string/carrier_settings_title">
<intent android:action="android.intent.action.MAIN"
diff --git a/src/com/android/phone/CdmaOptions.java b/src/com/android/phone/CdmaOptions.java
index eabbdd2..a02d3df 100644
--- a/src/com/android/phone/CdmaOptions.java
+++ b/src/com/android/phone/CdmaOptions.java
@@ -31,7 +31,6 @@
import android.text.TextUtils;
import com.android.internal.telephony.Phone;
-import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.TelephonyProperties;
/**
@@ -46,7 +45,6 @@
private static final String BUTTON_CDMA_SYSTEM_SELECT_KEY = "cdma_system_select_key";
private static final String BUTTON_CDMA_SUBSCRIPTION_KEY = "cdma_subscription_key";
- private static final String BUTTON_CDMA_ACTIVATE_DEVICE_KEY = "cdma_activate_device_key";
private static final String BUTTON_CARRIER_SETTINGS_KEY = "carrier_settings_key";
private static final String BUTTON_APN_EXPAND_KEY = "button_apn_key_cdma";
@@ -108,16 +106,6 @@
.findPreference(BUTTON_CDMA_SUBSCRIPTION_KEY));
}
- final boolean voiceCapable = mPrefActivity.getResources().getBoolean(
- com.android.internal.R.bool.config_voice_capable);
- final boolean isLTE = mPhone.getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE;
- if (voiceCapable || isLTE) {
- // This option should not be available on voice-capable devices (i.e. regular phones)
- // and is replaced by the LTE data service item on LTE devices
- mPrefScreen.removePreference(
- mPrefScreen.findPreference(BUTTON_CDMA_ACTIVATE_DEVICE_KEY));
- }
-
// Read platform settings for carrier settings
final boolean isCarrierSettingsEnabled = carrierConfig.getBoolean(
CarrierConfigManager.KEY_CARRIER_SETTINGS_ENABLE_BOOL);
diff --git a/src/com/android/phone/OtaUtils.java b/src/com/android/phone/OtaUtils.java
index a37ce80..b1b0049 100644
--- a/src/com/android/phone/OtaUtils.java
+++ b/src/com/android/phone/OtaUtils.java
@@ -87,6 +87,10 @@
"com.android.phone.PERFORM_CDMA_PROVISIONING";
// Intent action to launch activation on a non-voice capable device
+ /**
+ * @deprecated platform no longer supports voiceless cdma provisioning,
+ * only hands free activation.
+ */
public static final String ACTION_PERFORM_VOICELESS_CDMA_PROVISIONING =
"com.android.phone.PERFORM_VOICELESS_CDMA_PROVISIONING";