Add NR to ServiceState#isLte and rename to isPsOnlyTech

Test: atest ServiceStateTest
Bug: 129670729
Change-Id: Id058d90bc6c4f35c85bc719740bee41865390eb7
This commit is contained in:
Sarah Chin
2020-01-07 17:45:05 -08:00
parent ee209e1194
commit 96169ca5ff

View File

@@ -16,8 +16,6 @@
package android.telephony;
import com.android.telephony.Rlog;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
@@ -36,6 +34,8 @@ import android.telephony.NetworkRegistrationInfo.Domain;
import android.telephony.NetworkRegistrationInfo.NRState;
import android.text.TextUtils;
import com.android.telephony.Rlog;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
@@ -584,8 +584,8 @@ public class ServiceState implements Parcelable {
*/
@DuplexMode
public int getDuplexMode() {
// only support LTE duplex mode
if (!isLte(getRilDataRadioTechnology())) {
// support LTE/NR duplex mode
if (!isPsOnlyTech(getRilDataRadioTechnology())) {
return DUPLEX_MODE_UNKNOWN;
}
@@ -1717,9 +1717,10 @@ public class ServiceState implements Parcelable {
}
/** @hide */
public static boolean isLte(int radioTechnology) {
return radioTechnology == RIL_RADIO_TECHNOLOGY_LTE ||
radioTechnology == RIL_RADIO_TECHNOLOGY_LTE_CA;
public static boolean isPsOnlyTech(int radioTechnology) {
return radioTechnology == RIL_RADIO_TECHNOLOGY_LTE
|| radioTechnology == RIL_RADIO_TECHNOLOGY_LTE_CA
|| radioTechnology == RIL_RADIO_TECHNOLOGY_NR;
}
/** @hide */