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

[Settings] Replace ImsDirectQuery

Browse Source 
This is a code refactor to replace
1. Legacy ImsQuery into ImsExecutorQuery
2. ImsDirectQuery into ImsQuery
3. SystemTty into Tty

Bug: 140542283
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gLteSliceHelperTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=VideoCallingPreferenceControllerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingPreferenceControllerTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSliceHelperTest
Change-Id: I239021c60fff47de307ac7e21641bee56e205861
This commit is contained in:
Bonian Chen
2020-01-28 10:54:44 +08:00
parent 613371047b
commit c820dc191c
11 changed files with 53 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/network/ims/VolteQueryImsState.java
View File

@@ -17,8 +17,11 @@
package com.android.settings.network.ims;
import android.content.Context;
import android.telecom.TelecomManager;
import android.telephony.SubscriptionManager;
import androidx.annotation.VisibleForTesting;
import com.android.ims.ImsManager;
import com.android.settings.network.SubscriptionUtil;
@@ -34,7 +37,7 @@ public class VolteQueryImsState extends ImsQueryController {
/**
* Constructor
*
* @param context {@code Context}
* @param context {@link Context}
* @param subId subscription's id
*/
public VolteQueryImsState(Context context, int subId) {
@@ -52,8 +55,14 @@ public class VolteQueryImsState extends ImsQueryController {
return false;
}
return ((!isSystemTtyEnabled(mContext).directQuery())
|| (isTtyOnVolteEnabled(mSubId).directQuery()));
return ((!isTtyEnabled(mContext))
|| (isTtyOnVolteEnabled(mSubId).query()));
}
@VisibleForTesting
boolean isTtyEnabled(Context context) {
final TelecomManager telecomManager = context.getSystemService(TelecomManager.class);
return (telecomManager.getCurrentTtyMode() != TelecomManager.TTY_MODE_OFF);
}
/**