Skip to content

telephony: Add state check for LteOnCdma to isGsm and isCdma #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Jcfunk wants to merge 1 commit into from
Closed

telephony: Add state check for LteOnCdma to isGsm and isCdma #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions telephony/java/android/telephony/ServiceState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import android.os.Parcelable;
import android.telephony.Rlog;

import com.android.internal.telephony.PhoneConstants;

/**
* Contains phone state and service related information.
*
Expand Down Expand Up @@ -1176,12 +1178,11 @@ public static boolean isGsm(int radioTechnology) {
|| radioTechnology == RIL_RADIO_TECHNOLOGY_HSDPA
|| radioTechnology == RIL_RADIO_TECHNOLOGY_HSUPA
|| radioTechnology == RIL_RADIO_TECHNOLOGY_HSPA
|| radioTechnology == RIL_RADIO_TECHNOLOGY_LTE
|| radioTechnology == RIL_RADIO_TECHNOLOGY_HSPAP
|| radioTechnology == RIL_RADIO_TECHNOLOGY_GSM
|| radioTechnology == RIL_RADIO_TECHNOLOGY_TD_SCDMA
|| radioTechnology == RIL_RADIO_TECHNOLOGY_IWLAN
|| radioTechnology == RIL_RADIO_TECHNOLOGY_LTE_CA;
|| (isLte(radioTechnology) && !isLteOnCdma(radioTechnology));

}

Expand All @@ -1193,7 +1194,8 @@ public static boolean isCdma(int radioTechnology) {
|| radioTechnology == RIL_RADIO_TECHNOLOGY_EVDO_0
|| radioTechnology == RIL_RADIO_TECHNOLOGY_EVDO_A
|| radioTechnology == RIL_RADIO_TECHNOLOGY_EVDO_B
|| radioTechnology == RIL_RADIO_TECHNOLOGY_EHRPD;
|| radioTechnology == RIL_RADIO_TECHNOLOGY_EHRPD
|| isLteOnCdma(radioTechnology);
}

/** @hide */
Expand All @@ -1202,6 +1204,12 @@ public static boolean isLte(int radioTechnology) {
radioTechnology == RIL_RADIO_TECHNOLOGY_LTE_CA;
}

/** @hide */
private static boolean isLteOnCdma(int radioTechnology) {
return isLte(radioTechnology)
&& TelephonyManager.getLteOnCdmaModeStatic() == PhoneConstants.LTE_ON_CDMA_TRUE;
}

/** @hide */
public static boolean bearerBitmapHasCdma(int radioTechnologyBitmap) {
return (RIL_RADIO_CDMA_TECHNOLOGY_BITMASK & radioTechnologyBitmap) != 0;
Expand Down