Revert "telephony: Add state check for LteOnCdma to isGsm and isCdma"

- Fix issue : carrier signal and LTE , cdma acting like a bitch This reverts commit 5723440.
ResurrectionRemix · Feb 2, 2017 · fecfcc9 · fecfcc9
1 parent 49a197b
commit fecfcc9
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
@@ -21,8 +21,6 @@
 import android.os.Parcelable;
 import android.telephony.Rlog;
 
-import com.android.internal.telephony.PhoneConstants;
-
 /**
  * Contains phone state and service related information.
  *
@@ -1178,11 +1176,12 @@ 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
-                || (isLte(radioTechnology) && !isLteOnCdma(radioTechnology));
+                || radioTechnology == RIL_RADIO_TECHNOLOGY_LTE_CA;
 
     }
 
@@ -1194,8 +1193,7 @@ 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
-                || isLteOnCdma(radioTechnology);
+                || radioTechnology == RIL_RADIO_TECHNOLOGY_EHRPD;
     }
 
     /** @hide */
@@ -1204,12 +1202,6 @@ 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;