Merge "Hide Linux terminal if VM isn't supported" into main
diff --git a/src/com/android/settings/development/linuxterminal/LinuxTerminalPreferenceController.java b/src/com/android/settings/development/linuxterminal/LinuxTerminalPreferenceController.java
index b78972a..3bd9587 100644
--- a/src/com/android/settings/development/linuxterminal/LinuxTerminalPreferenceController.java
+++ b/src/com/android/settings/development/linuxterminal/LinuxTerminalPreferenceController.java
@@ -46,7 +46,7 @@
static final long MEMORY_MIN_BYTES = DataUnit.GIGABYTES.toBytes(4); // 4_000_000_000
@VisibleForTesting
- static final long STORAGE_MIN_BYTES = DataUnit.GIGABYTES.toBytes(128); // 128_000_000_000
+ static final long STORAGE_MIN_BYTES = DataUnit.GIGABYTES.toBytes(64); // 64_000_000_000
private static final String LINUX_TERMINAL_KEY = "linux_terminal";
diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java
index 1ae6b40..16440b2 100644
--- a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java
+++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java
@@ -100,8 +100,7 @@
mDialog.setText(ID_PRL_VERSION_VALUE, getCdmaPrlVersion());
- if ((mSubscriptionInfo != null && isCdmaLteEnabled()) ||
- (mSubscriptionInfo == null && isSimPresent(mSlotId))) {
+ if (isCdmaLteEnabled()) {
// Show IMEI for LTE device
mDialog.setText(ID_IMEI_VALUE, mTelephonyManager.getImei(mSlotId));
mDialog.setText(ID_IMEI_SV_VALUE,
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java
index 89cc6d9..f68f67e 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java
@@ -143,36 +143,6 @@
}
@Test
- public void populateImeiInfo_cdmaSimPresent_shouldSetImeiInfoAndSetAllCdmaSetting() {
- ReflectionHelpers.setField(mController, "mSubscriptionInfo", null);
- when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_CDMA);
- when(mTelephonyManager.getSimState(anyInt())).thenReturn(
- TelephonyManager.SIM_STATE_PRESENT);
-
- mController.populateImeiInfo();
-
- verify(mDialog).setText(ID_MEID_NUMBER_VALUE, MEID_NUMBER);
- verify(mDialog).setText(ID_MIN_NUMBER_VALUE, "");
- verify(mDialog).setText(ID_PRL_VERSION_VALUE, "");
- verify(mDialog).setText(eq(ID_IMEI_VALUE), any());
- verify(mDialog).setText(eq(ID_IMEI_SV_VALUE), any());
- }
-
- @Test
- public void populateImeiInfo_cdmaSimABSENT_shouldSetImeiInfoAndSetAllCdmaSetting() {
- ReflectionHelpers.setField(mController, "mSubscriptionInfo", null);
- when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_CDMA);
- when(mTelephonyManager.getSimState(anyInt())).thenReturn(TelephonyManager.SIM_STATE_ABSENT);
-
- mController.populateImeiInfo();
-
- verify(mDialog).setText(ID_MEID_NUMBER_VALUE, MEID_NUMBER);
- verify(mDialog).setText(ID_MIN_NUMBER_VALUE, "");
- verify(mDialog).setText(ID_PRL_VERSION_VALUE, "");
- verify(mDialog).removeViewFromScreen(ID_GSM_SETTINGS);
- }
-
- @Test
public void populateImeiInfo_gsmSimDisabled_shouldSetImeiAndRemoveCdmaSettings() {
ReflectionHelpers.setField(mController, "mSubscriptionInfo", null);
when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_GSM);
diff --git a/tests/unit/src/com/android/settings/development/mediadrm/ForceSwSecureCryptoFallbackPreferenceControllerTest.java b/tests/unit/src/com/android/settings/development/mediadrm/ForceSwSecureCryptoFallbackPreferenceControllerTest.java
index 5eb76f1..5482b41 100644
--- a/tests/unit/src/com/android/settings/development/mediadrm/ForceSwSecureCryptoFallbackPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/development/mediadrm/ForceSwSecureCryptoFallbackPreferenceControllerTest.java
@@ -69,7 +69,11 @@
@Test
@EnableFlags(Flags.FLAG_FORCE_L3_ENABLED)
public void updateState_flagEnabled_checkPreference() {
- mController.updateState(mPreference);
+ try (MediaDrm drm = new MediaDrm(WIDEVINE_UUID)) {
+ mController.updateState(mPreference);
+ } catch (UnsupportedSchemeException ex) {
+ assumeNoException(ex);
+ }
assertThat(mPreference.isEnabled()).isTrue();
assertThat(mPreference.isChecked()).isFalse();
assertThat(WidevineProperties.forcel3_enabled().orElse(false)).isFalse();