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

Fix the Real Time Text option was shown in accessibility settings under active Fi.

Browse Source 
Root cause:
Only using and querying the dialer intent can't be represented for supporting RTT.

Next action:
Add one checker for carrier config.

Bug: 159242323
Test: manual test for AT&T, Google Fi, chunghwa sim
& make RunSettingsRoboTests ROBOTEST_FILTER=RTTSettingPreferenceControllerTest

Change-Id: I8e85b9fdfc658ea6855a4041691efdbfd07c62d6
This commit is contained in:
Peter_Liang
2020-08-20 21:52:11 +08:00
parent fd1f4cba36
commit d43fcdaf49
2 changed files with 101 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/com/android/settings/accessibility/RTTSettingPreferenceController.java
View File

@@ -20,8 +20,12 @@ import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.os.PersistableBundle;
import android.provider.Settings;
import android.telecom.TelecomManager;
import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
@@ -37,7 +41,6 @@ import java.util.List;
public class RTTSettingPreferenceController extends BasePreferenceController {
private static final String DIALER_RTT_CONFIGURATION = "dialer_rtt_configuration";
private final Context mContext;
private final PackageManager mPackageManager;
private final TelecomManager mTelecomManager;
@@ -81,8 +84,41 @@ public class RTTSettingPreferenceController extends BasePreferenceController {
return mModes[option];
}
@VisibleForTesting
boolean isDialerSupportRTTSetting() {
return TextUtils.equals(mTelecomManager.getDefaultDialerPackage(), mDialerPackage);
private boolean isDialerSupportRTTSetting() {
final TelephonyManager telephonyManager = createTelephonyManagerFromSubId();
final boolean isCarrierAndRttSupported = telephonyManager.isRttSupported()
&& getBooleanCarrierConfig(CarrierConfigManager.KEY_IGNORE_RTT_MODE_SETTING_BOOL);
return isCarrierAndRttSupported
&& TextUtils.equals(mTelecomManager.getDefaultDialerPackage(), mDialerPackage);
}
/**
* Gets the boolean config from carrier config manager.
*
* @param key config key defined in CarrierConfigManager.
* @return boolean value of corresponding key.
*/
private boolean getBooleanCarrierConfig(String key) {
final CarrierConfigManager configManager =
mContext.getSystemService(CarrierConfigManager.class);
if (configManager == null) {
// Return static default defined in CarrierConfigManager.
return CarrierConfigManager.getDefaultConfig().getBoolean(key);
}
// If an invalid subId is used, this bundle will contain default values.
final int subId = SubscriptionManager.getDefaultVoiceSubscriptionId();
final PersistableBundle bundle = configManager.getConfigForSubId(subId);
return bundle != null
? bundle.getBoolean(key)
: CarrierConfigManager.getDefaultConfig().getBoolean(key);
}
private TelephonyManager createTelephonyManagerFromSubId() {
final TelephonyManager telephonyManager = mContext.getSystemService(TelephonyManager.class);
final int subId = SubscriptionManager.getDefaultVoiceSubscriptionId();
return telephonyManager.createForSubscriptionId(subId);
}
}