PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Align with the visibility logic from Dialer

Browse Source 
Copy most visiblity logic from the Dialer app
We should check whether RTT is supported or not by querying Telecom.

Also, the rtt configuration won't be initialized properly before
user goes into the RTT page.
Prior to this cl, we set a wrong default value when we're showing
the subtext of RTT, this is not correct.
Currently, we simple show nothing in subtext if RTT haven't initilized
properly.

Test: Work with testing team to verify the behavior.
Fix: 188110773
Change-Id: I47c1983d15e22ef5a1fb3027334117a38a479558
This commit is contained in:
Tsung-Mao Fang
2021-06-24 15:17:05 +08:00
parent 14a31ce9d6
commit 770f064d36
3 changed files with 158 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
tests/robotests/src/com/android/settings/accessibility/RTTSettingPreferenceControllerTest.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2020 The Android Open Source Project
* Copyright (C) 2021 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.
@@ -25,22 +25,15 @@ import static org.robolectric.Shadows.shadowOf;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ResolveInfo;
import android.os.PersistableBundle;
import android.telecom.TelecomManager;
import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.ResolveInfoBuilder;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.shadows.ShadowPackageManager;
@@ -51,72 +44,40 @@ public class RTTSettingPreferenceControllerTest {
private ShadowPackageManager mShadowPackageManager;
private RTTSettingPreferenceController mController;
private TelephonyManager mTelephonyManagerFromSubId;
@Mock
private PersistableBundle mPersistableBundle;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
final Context context = spy(ApplicationProvider.getApplicationContext());
final int subId = SubscriptionManager.getDefaultVoiceSubscriptionId();
final String rttSettingsPackageName =
context.getString(R.string.config_rtt_setting_package_name);
final CarrierConfigManager configManager = spy(new CarrierConfigManager(context));
final TelephonyManager telephonyManager = spy(new TelephonyManager(context));
final TelecomManager telecomManager = spy(new TelecomManager(context));
mTelephonyManagerFromSubId = spy(new TelephonyManager(context, subId));
doReturn(telephonyManager).when(context).getSystemService(TelephonyManager.class);
doReturn(mTelephonyManagerFromSubId).when(telephonyManager).createForSubscriptionId(subId);
doReturn(telecomManager).when(context).getSystemService(TelecomManager.class);
doReturn(configManager).when(context).getSystemService(CarrierConfigManager.class);
doReturn(mPersistableBundle).when(configManager).getConfigForSubId(subId);
doReturn(rttSettingsPackageName).when(telecomManager).getDefaultDialerPackage();
mShadowPackageManager = shadowOf(context.getPackageManager());
mController = spy(new RTTSettingPreferenceController(context, "rtt_setting"));
mController.mRTTIntent = new Intent("com.android.test.action.example");
}
@Test
public void getStatus_carrierAndRttSupported_settingsIntent_available() {
doReturn(true).when(mTelephonyManagerFromSubId).isRttSupported();
doReturn(true).when(mPersistableBundle).getBoolean(
CarrierConfigManager.KEY_IGNORE_RTT_MODE_SETTING_BOOL);
setupTestIntent();
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
public void getStatus_rttSupported_settingsIntent_unsupported() {
doReturn(true).when(mTelephonyManagerFromSubId).isRttSupported();
doReturn(false).when(mPersistableBundle).getBoolean(
CarrierConfigManager.KEY_IGNORE_RTT_MODE_SETTING_BOOL);
setupTestIntent();
public void getAvailabilityStatus_resolvedIsEmpty_shouldReturnUNSUPPORTED_ON_DEVICE() {
doReturn(true).when(mController).isRttSettingSupported();
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
}
@Test
public void getStatus_settingsIntent_unsupported() {
doReturn(false).when(mTelephonyManagerFromSubId).isRttSupported();
public void getAvailabilityStatus_intentIsHandledButRttSettingNotSupported_returnAVAILABLE() {
setupTestIntent();
doReturn(false).when(mController).isRttSettingSupported();
assertThat(mController.getAvailabilityStatus()).isEqualTo(
BasePreferenceController.UNSUPPORTED_ON_DEVICE);
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
}
@Test
public void getStatus_unsupported() {
doReturn(false).when(mTelephonyManagerFromSubId).isRttSupported();
public void getAvailabilityStatus_intentCanBeHandledAndRttSettingSupported_returnAVAILABLE() {
setupTestIntent();
doReturn(true).when(mController).isRttSettingSupported();
assertThat(mController.getAvailabilityStatus()).isEqualTo(
BasePreferenceController.UNSUPPORTED_ON_DEVICE);
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.AVAILABLE);
}
private void setupTestIntent() {