Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add NR to ServiceState#isLte and rename to isPsOnlyTech" am: ad189b5e60 am: 400ee161ad

Browse Source 
Change-Id: I8d68833469bf09d843344be2cdce426f7575f4d3
This commit is contained in:
Automerger Merge Worker
2020-01-17 21:41:06 +00:00
parent 44dbd82667 400ee161ad
commit 5972b964e9
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
telephony/java/android/telephony/ServiceState.java
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;
}
@@ -1718,9 +1718,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 */