Merge "Start using CarrierConfig for 4G/LTE icon"
diff --git a/Android.mk b/Android.mk
index 0466a1f..b54b376 100644
--- a/Android.mk
+++ b/Android.mk
@@ -34,7 +34,6 @@
androidx.legacy_legacy-preference-v14 \
LOCAL_JAVA_LIBRARIES := \
- bouncycastle \
telephony-common \
ims-common
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4058cee..179ea3c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2718,6 +2718,10 @@
<string name="sim_change_succeeded">SIM PIN changed successfully</string>
<!-- SIM card lock settings screen, toast after not entering correct SIM PIN [CHAR LIMIT=40] -->
<string name="sim_lock_failed">Can\u2019t change SIM card lock state.\nPossibly incorrect PIN.</string>
+ <!-- SIM card lock settings screen, toast after disabling PIN failed from modem -->
+ <string name="sim_pin_disable_failed">Can\'t disable PIN.</string>
+ <!-- SIM card lock settings screen, toast after enabling PIN failed from modem -->
+ <string name="sim_pin_enable_failed">Can\'t enable PIN.</string>
<!-- SIM card lock settings screen, SIM PIN dialog button labels: [CHAR LIMIT=40] -->
<string name="sim_enter_ok">OK</string>
<!-- SIM card lock settings screen, SIM PIN dialog button labels: [CHAR LIMIT=40] -->
diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index 437f42e..2cb4904 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -46,6 +46,7 @@
import androidx.preference.SwitchPreference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.internal.telephony.CommandException;
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneFactory;
import com.android.internal.telephony.TelephonyIntents;
@@ -123,7 +124,7 @@
AsyncResult ar = (AsyncResult) msg.obj;
switch (msg.what) {
case MSG_ENABLE_ICC_PIN_COMPLETE:
- iccLockChanged(ar.exception == null, msg.arg1);
+ iccLockChanged(ar.exception == null, msg.arg1, ar.exception);
break;
case MSG_CHANGE_ICC_PIN_COMPLETE:
iccPinChanged(ar.exception == null, msg.arg1);
@@ -453,12 +454,25 @@
mPinToggle.setEnabled(false);
}
- private void iccLockChanged(boolean success, int attemptsRemaining) {
+ private void iccLockChanged(boolean success, int attemptsRemaining, Throwable exception) {
if (success) {
mPinToggle.setChecked(mToState);
} else {
- Toast.makeText(getContext(), getPinPasswordErrorMessage(attemptsRemaining),
- Toast.LENGTH_LONG).show();
+ if (exception instanceof CommandException) {
+ CommandException.Error err = ((CommandException)(exception)).getCommandError();
+ if (err == CommandException.Error.PASSWORD_INCORRECT) {
+ Toast.makeText(getContext(), getPinPasswordErrorMessage(attemptsRemaining),
+ Toast.LENGTH_LONG).show();
+ } else {
+ if (mToState) {
+ Toast.makeText(getContext(), mRes.getString
+ (R.string.sim_pin_enable_failed), Toast.LENGTH_LONG).show();
+ } else {
+ Toast.makeText(getContext(), mRes.getString
+ (R.string.sim_pin_disable_failed), Toast.LENGTH_LONG).show();
+ }
+ }
+ }
}
mPinToggle.setEnabled(true);
resetDialogState();
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index ee20c58..5101fe8 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -36,6 +36,7 @@
import android.net.TrafficStats;
import android.net.Uri;
import android.os.AsyncResult;
+import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
@@ -1358,25 +1359,26 @@
imsVolteProvisionedSwitch.setOnCheckedChangeListener(null);
imsVolteProvisionedSwitch.setChecked(isImsVolteProvisioned());
imsVolteProvisionedSwitch.setOnCheckedChangeListener(mImsVolteCheckedChangeListener);
- imsVolteProvisionedSwitch.setEnabled(
- mImsManager.isVolteEnabledByPlatform(phone.getContext()));
+ imsVolteProvisionedSwitch.setEnabled(!Build.IS_USER
+ && mImsManager.isVolteEnabledByPlatform(phone.getContext()));
imsVtProvisionedSwitch.setOnCheckedChangeListener(null);
imsVtProvisionedSwitch.setChecked(isImsVtProvisioned());
imsVtProvisionedSwitch.setOnCheckedChangeListener(mImsVtCheckedChangeListener);
- imsVtProvisionedSwitch.setEnabled(
- mImsManager.isVtEnabledByPlatform(phone.getContext()));
+ imsVtProvisionedSwitch.setEnabled(!Build.IS_USER
+ && mImsManager.isVtEnabledByPlatform(phone.getContext()));
imsWfcProvisionedSwitch.setOnCheckedChangeListener(null);
imsWfcProvisionedSwitch.setChecked(isImsWfcProvisioned());
imsWfcProvisionedSwitch.setOnCheckedChangeListener(mImsWfcCheckedChangeListener);
- imsWfcProvisionedSwitch.setEnabled(
- mImsManager.isWfcEnabledByPlatform(phone.getContext()));
+ imsWfcProvisionedSwitch.setEnabled(!Build.IS_USER
+ && mImsManager.isWfcEnabledByPlatform(phone.getContext()));
eabProvisionedSwitch.setOnCheckedChangeListener(null);
eabProvisionedSwitch.setChecked(isEabProvisioned());
eabProvisionedSwitch.setOnCheckedChangeListener(mEabCheckedChangeListener);
- eabProvisionedSwitch.setEnabled(isEabEnabledByPlatform(phone.getContext()));
+ eabProvisionedSwitch.setEnabled(!Build.IS_USER
+ && isEabEnabledByPlatform(phone.getContext()));
}
OnClickListener mDnsCheckButtonHandler = new OnClickListener() {
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
index f9ecd8e..c445edf 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
@@ -18,6 +18,7 @@
import android.content.Context;
import android.graphics.drawable.Drawable;
+import android.util.Log;
import android.util.Pair;
import androidx.preference.PreferenceFragment;
@@ -36,6 +37,7 @@
*/
public class BluetoothDetailsHeaderController extends BluetoothDetailsController {
private static final String KEY_DEVICE_HEADER = "bluetooth_device_header";
+ private static final String TAG = "BluetoothDetailsHeaderController";
private EntityHeaderController mHeaderController;
private LocalBluetoothManager mLocalManager;
@@ -63,12 +65,16 @@
.getBtClassDrawableWithDescription(mContext, mCachedDevice,
mContext.getResources().getFraction(R.fraction.bt_battery_scale_fraction, 1, 1));
String summaryText = mCachedDevice.getConnectionSummary();
- // If both the hearing aids are connected, two battery status should be shown.
- final String pairDeviceSummary = mDeviceManager
- .getHearingAidPairDeviceSummary(mCachedDevice);
- if (pairDeviceSummary != null) {
+
+ if (mCachedDevice.isHearingAidDevice()) {
+ // For Hearing Aid device, display the other battery status.
+ final String pairDeviceSummary = mDeviceManager
+ .getHearingAidPairDeviceSummary(mCachedDevice);
+ Log.d(TAG, "setHeaderProperties: HearingAid: summaryText=" + summaryText
+ + ", pairDeviceSummary=" + pairDeviceSummary);
mHeaderController.setSecondSummary(pairDeviceSummary);
}
+
mHeaderController.setLabel(mCachedDevice.getName());
mHeaderController.setIcon(pair.first);
mHeaderController.setIconContentDescription(pair.second);
diff --git a/src/com/android/settings/core/FeatureFlags.java b/src/com/android/settings/core/FeatureFlags.java
index e77c27b..db941a6 100644
--- a/src/com/android/settings/core/FeatureFlags.java
+++ b/src/com/android/settings/core/FeatureFlags.java
@@ -26,4 +26,5 @@
public static final String BLUETOOTH_WHILE_DRIVING = "settings_bluetooth_while_driving";
public static final String DATA_USAGE_SETTINGS_V2 = "settings_data_usage_v2";
public static final String AUDIO_SWITCHER_SETTINGS = "settings_audio_switcher";
+ public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid";
}
diff --git a/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java b/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java
new file mode 100644
index 0000000..731dc6f
--- /dev/null
+++ b/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.development.featureflags;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.text.TextUtils;
+import android.util.FeatureFlagUtils;
+import android.util.Log;
+
+import com.android.settings.core.FeatureFlags;
+
+import java.util.HashSet;
+
+import androidx.annotation.VisibleForTesting;
+
+/**
+ * Helper class to get feature persistent flag information.
+ */
+public class FeatureFlagPersistent {
+ private static final HashSet<String> PERSISTENT_FLAGS;
+ static {
+ PERSISTENT_FLAGS = new HashSet<>();
+ PERSISTENT_FLAGS.add(FeatureFlags.HEARING_AID_SETTINGS);
+ }
+
+ public static boolean isEnabled(Context context, String feature) {
+ String value = SystemProperties.get(FeatureFlagUtils.PERSIST_PREFIX + feature);
+ if (!TextUtils.isEmpty(value)) {
+ return Boolean.parseBoolean(value);
+ } else {
+ return FeatureFlagUtils.isEnabled(context, feature);
+ }
+ }
+
+ public static void setEnabled(Context context, String feature, boolean enabled) {
+ SystemProperties.set(FeatureFlagUtils.PERSIST_PREFIX + feature, enabled ? "true" : "false");
+ FeatureFlagUtils.setEnabled(context, feature, enabled);
+ }
+
+ public static boolean isPersistent(String feature) {
+ return PERSISTENT_FLAGS.contains(feature);
+ }
+
+ /**
+ * Returns all persistent flags in their raw form.
+ */
+ @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+ static HashSet<String> getAllPersistentFlags() {
+ return PERSISTENT_FLAGS;
+ }
+}
+
diff --git a/src/com/android/settings/development/featureflags/FeatureFlagPreference.java b/src/com/android/settings/development/featureflags/FeatureFlagPreference.java
index a837709..ebf35de 100644
--- a/src/com/android/settings/development/featureflags/FeatureFlagPreference.java
+++ b/src/com/android/settings/development/featureflags/FeatureFlagPreference.java
@@ -18,25 +18,38 @@
import android.content.Context;
import android.util.FeatureFlagUtils;
+import android.util.Log;
import androidx.preference.SwitchPreference;
public class FeatureFlagPreference extends SwitchPreference {
private final String mKey;
+ private final boolean mIsPersistent;
public FeatureFlagPreference(Context context, String key) {
super(context);
mKey = key;
setKey(key);
setTitle(key);
- setCheckedInternal(FeatureFlagUtils.isEnabled(context, mKey));
+ mIsPersistent = FeatureFlagPersistent.isPersistent(key);
+ boolean isFeatureEnabled;
+ if (mIsPersistent) {
+ isFeatureEnabled = FeatureFlagPersistent.isEnabled(context, key);
+ } else {
+ isFeatureEnabled = FeatureFlagUtils.isEnabled(context, key);
+ }
+ setCheckedInternal(isFeatureEnabled);
}
@Override
public void setChecked(boolean isChecked) {
setCheckedInternal(isChecked);
- FeatureFlagUtils.setEnabled(getContext(), mKey, isChecked);
+ if (mIsPersistent) {
+ FeatureFlagPersistent.setEnabled(getContext(), mKey, isChecked);
+ } else {
+ FeatureFlagUtils.setEnabled(getContext(), mKey, isChecked);
+ }
}
private void setCheckedInternal(boolean isChecked) {
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
index b17defd..48ec0e3 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
@@ -85,9 +85,13 @@
FeatureFactory.getFactory(this).getMetricsFeatureProvider().action(this,
MetricsEvent.ACTION_STORAGE_MIGRATE_LATER);
- final Intent intent = new Intent(this, StorageWizardReady.class);
- intent.putExtra(EXTRA_MIGRATE_SKIP, true);
- startActivity(intent);
+ if (mDisk != null) {
+ final Intent intent = new Intent(this, StorageWizardReady.class);
+ intent.putExtra(EXTRA_MIGRATE_SKIP, true);
+ startActivity(intent);
+ } else {
+ finishAffinity();
+ }
}
@Override
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java
index 4d295e5..7833eff 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java
@@ -20,6 +20,7 @@
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -96,7 +97,7 @@
verify(mHeaderController).setIcon(any(Drawable.class));
verify(mHeaderController).setIconContentDescription(any(String.class));
verify(mHeaderController).setSummary(any(String.class));
- verify(mHeaderController).setSecondSummary(any(String.class));
+ verify(mHeaderController, never()).setSecondSummary(any(String.class));
verify(mHeaderController).done(mActivity, true);
}
@@ -119,4 +120,12 @@
inOrder.verify(mHeaderController)
.setSummary(mContext.getString(R.string.bluetooth_connecting));
}
+
+ @Test
+ public void testSecondSummary_isHearingAidDevice_showSecondSummary() {
+ when(mCachedDevice.isHearingAidDevice()).thenReturn(true);
+ showScreen(mController);
+
+ verify(mHeaderController).setSecondSummary(any(String.class));
+ }
}
diff --git a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPersistentTest.java b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPersistentTest.java
new file mode 100644
index 0000000..c9f452d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPersistentTest.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.development.featureflags;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.android.settings.development.featureflags.FeatureFlagPersistent;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.provider.Settings;
+import android.util.FeatureFlagUtils;
+import android.util.Log;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class FeatureFlagPersistentTest {
+
+ private static final String TEST_FEATURE_NAME = "test_feature";
+
+ private static final String PERSISTENT_FALSE_NAME = "false_persistent";
+ private static final String PERSISTENT_TRUE_NAME = "true_persistent";
+ private static final String VOLATILE_FALSE_NAME = "volatile_false_volatile";
+ private static final String VOLATILE_TRUE_NAME = "volatile_true_volatile";
+
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+
+ FeatureFlagPersistent.getAllPersistentFlags().add(TEST_FEATURE_NAME);
+ FeatureFlagUtils.getAllFeatureFlags().put(TEST_FEATURE_NAME, "false");
+
+ FeatureFlagUtils.getAllFeatureFlags().put(VOLATILE_FALSE_NAME, "false");
+ FeatureFlagUtils.getAllFeatureFlags().put(VOLATILE_TRUE_NAME, "true");
+
+ FeatureFlagPersistent.getAllPersistentFlags().add(PERSISTENT_FALSE_NAME);
+ FeatureFlagUtils.getAllFeatureFlags().put(PERSISTENT_FALSE_NAME, "false");
+
+ FeatureFlagPersistent.getAllPersistentFlags().add(PERSISTENT_TRUE_NAME);
+ FeatureFlagUtils.getAllFeatureFlags().put(PERSISTENT_TRUE_NAME, "true");
+ }
+
+ @After
+ public void tearDown() {
+ cleanup(PERSISTENT_FALSE_NAME);
+ cleanup(PERSISTENT_TRUE_NAME);
+ cleanup(VOLATILE_FALSE_NAME);
+ cleanup(VOLATILE_TRUE_NAME);
+ cleanup(TEST_FEATURE_NAME);
+ }
+
+ private void cleanup(String flagName) {
+ Settings.Global.putString(mContext.getContentResolver(), flagName, "");
+ SystemProperties.set(FeatureFlagUtils.FFLAG_PREFIX + flagName, "");
+ SystemProperties.set(FeatureFlagUtils.FFLAG_OVERRIDE_PREFIX + flagName, "");
+ SystemProperties.set(FeatureFlagUtils.PERSIST_PREFIX + flagName, "");
+ }
+
+ /**
+ * Test to verify a non-persistent flag is indeed not persistent.
+ */
+ @Test
+ public void isPersistent_notPersistent_shouldReturnFalse() {
+ assertThat(FeatureFlagPersistent.isPersistent(VOLATILE_FALSE_NAME)).isFalse();
+ }
+
+ /**
+ * Test to verify a persistent flag is indeed persistent.
+ */
+ @Test
+ public void isPersistent_persistent_shouldReturnTrue() {
+ assertThat(FeatureFlagPersistent.isPersistent(PERSISTENT_TRUE_NAME)).isTrue();
+ }
+
+ /**
+ * Test to verify a persistent flag that is enabled should return true.
+ */
+ @Test
+ public void isEnabled_enabled_shouldReturnTrue() {
+ assertThat(FeatureFlagPersistent.isEnabled(mContext, PERSISTENT_TRUE_NAME)).isTrue();
+ }
+
+ /**
+ * Test to verify a persistent flag that is disabled should return false.
+ */
+ @Test
+ public void isEnabled_disabled_shouldReturnFalse() {
+ assertThat(FeatureFlagPersistent.isEnabled(mContext, PERSISTENT_FALSE_NAME)).isFalse();
+ }
+
+ /**
+ * Test to verify a persistent flag that has an enabled in system property should return true.
+ */
+ @Test
+ public void isEnabled_sysPropEnabled_shouldReturnTrue() {
+ SystemProperties.set(FeatureFlagUtils.PERSIST_PREFIX + TEST_FEATURE_NAME, "true");
+ FeatureFlagUtils.setEnabled(mContext, TEST_FEATURE_NAME, false);
+
+ assertThat(FeatureFlagPersistent.isEnabled(mContext, TEST_FEATURE_NAME)).isTrue();
+ }
+
+ /**
+ * Test to verify a persistent flag that is disabled in system property should return false.
+ */
+ @Test
+ public void isEnabled_sysPropDisabled_shouldReturnFalse() {
+ SystemProperties.set(FeatureFlagUtils.PERSIST_PREFIX + TEST_FEATURE_NAME, "false");
+ FeatureFlagUtils.setEnabled(mContext, TEST_FEATURE_NAME, true);
+
+ assertThat(FeatureFlagPersistent.isEnabled(mContext, TEST_FEATURE_NAME)).isFalse();
+ }
+
+ /**
+ * Test to verify setting persistent flag to enable works.
+ */
+ @Test
+ public void setEnabled_sysPropTrue_shouldSetValues() {
+ SystemProperties.set(FeatureFlagUtils.PERSIST_PREFIX + TEST_FEATURE_NAME, "");
+
+ FeatureFlagPersistent.setEnabled(mContext, TEST_FEATURE_NAME, true);
+
+ assertThat(SystemProperties.get(FeatureFlagUtils.PERSIST_PREFIX + TEST_FEATURE_NAME)).isEqualTo("true");
+ assertThat(FeatureFlagUtils.isEnabled(mContext, TEST_FEATURE_NAME)).isTrue();
+ }
+
+ /**
+ * Test to verify setting persistent flag to disable works.
+ */
+ @Test
+ public void setEnabled_sysPropFalse_shouldSetValues() {
+ SystemProperties.set(FeatureFlagUtils.PERSIST_PREFIX + TEST_FEATURE_NAME, "");
+
+ FeatureFlagPersistent.setEnabled(mContext, TEST_FEATURE_NAME, false);
+
+ assertThat(SystemProperties.get(FeatureFlagUtils.PERSIST_PREFIX + TEST_FEATURE_NAME)).isEqualTo("false");
+ assertThat(FeatureFlagUtils.isEnabled(mContext, TEST_FEATURE_NAME)).isFalse();
+ }
+}
+