Telephony: 4G+ icon display on status bar.

- Display 4G+ icon upon LTE_CA data RAT.

Change-Id: I9a78edc910051ea484fd27f3671a69519614f4d4
CRs-Fixed: 873290

1 files changed, 24 insertions, 20 deletions

diff --git a/telephony/java/android/telephony/RadioAccessFamily.java b/telephony/java/android/telephony/RadioAccessFamily.java
index a2888bf..c079eae 100755
--- a/telephony/java/android/telephony/RadioAccessFamily.java
+++ b/telephony/java/android/telephony/RadioAccessFamily.java
@@ -47,6 +47,7 @@ public class RadioAccessFamily implements Parcelable {
     public static final int RAF_HSPAP = (1 << ServiceState.RIL_RADIO_TECHNOLOGY_HSPAP);
     public static final int RAF_GSM = (1 << ServiceState.RIL_RADIO_TECHNOLOGY_GSM);
     public static final int RAF_TD_SCDMA = (1 << ServiceState.RIL_RADIO_TECHNOLOGY_TD_SCDMA);
+    public static final int RAF_LTE_CA = (1 << ServiceState.RIL_RADIO_TECHNOLOGY_LTE_CA);
 
     // Grouping of RAFs
     private static final int GSM = RAF_GSM | RAF_GPRS | RAF_EDGE;
@@ -54,6 +55,7 @@ public class RadioAccessFamily implements Parcelable {
     private static final int CDMA = RAF_IS95A | RAF_IS95B | RAF_1xRTT;
     private static final int EVDO = RAF_EVDO_0 | RAF_EVDO_A | RAF_EVDO_B | RAF_EHRPD;
     private static final int WCDMA = HS | RAF_UMTS;
+    private static final int LTE = RAF_LTE | RAF_LTE_CA;
 
     /* Phone ID of phone */
     private int mPhoneId;
@@ -162,19 +164,19 @@ public class RadioAccessFamily implements Parcelable {
                 raf = CDMA | EVDO;
                 break;
             case RILConstants.NETWORK_MODE_LTE_CDMA_EVDO:
-                raf = RAF_LTE | CDMA | EVDO;
+                raf = LTE | CDMA | EVDO;
                 break;
             case RILConstants.NETWORK_MODE_LTE_GSM_WCDMA:
-                raf = RAF_LTE | GSM | WCDMA;
+                raf = LTE | GSM | WCDMA;
                 break;
             case RILConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
-                raf = RAF_LTE | CDMA | EVDO | GSM | WCDMA;
+                raf = LTE | CDMA | EVDO | GSM | WCDMA;
                 break;
             case RILConstants.NETWORK_MODE_LTE_ONLY:
-                raf = RAF_LTE;
+                raf = LTE;
                 break;
             case RILConstants.NETWORK_MODE_LTE_WCDMA:
-                raf = RAF_LTE | WCDMA;
+                raf = LTE | WCDMA;
                 break;
             case RILConstants.NETWORK_MODE_CDMA_NO_EVDO:
                 raf = CDMA;
@@ -192,28 +194,28 @@ public class RadioAccessFamily implements Parcelable {
                 raf = RAF_TD_SCDMA | WCDMA;
                 break;
             case RILConstants.NETWORK_MODE_TD_SCDMA_LTE:
-                raf = RAF_TD_SCDMA | RAF_LTE;
+                raf = RAF_TD_SCDMA | LTE;
                 break;
             case RILConstants.NETWORK_MODE_TD_SCDMA_GSM:
                 raf = RAF_TD_SCDMA | GSM;
                 break;
             case RILConstants.NETWORK_MODE_TD_SCDMA_GSM_LTE:
-                raf = RAF_TD_SCDMA | GSM | RAF_LTE;
+                raf = RAF_TD_SCDMA | GSM | LTE;
                 break;
             case RILConstants.NETWORK_MODE_TD_SCDMA_GSM_WCDMA:
                 raf = RAF_TD_SCDMA | GSM | WCDMA;
                 break;
             case RILConstants.NETWORK_MODE_TD_SCDMA_WCDMA_LTE:
-                raf = RAF_TD_SCDMA | WCDMA | RAF_LTE;
+                raf = RAF_TD_SCDMA | WCDMA | LTE;
                 break;
             case RILConstants.NETWORK_MODE_TD_SCDMA_GSM_WCDMA_LTE:
-                raf = RAF_TD_SCDMA | GSM | WCDMA | RAF_LTE;
+                raf = RAF_TD_SCDMA | GSM | WCDMA | LTE;
                 break;
             case RILConstants.NETWORK_MODE_TD_SCDMA_GSM_WCDMA_CDMA_EVDO:
                 raf = RAF_TD_SCDMA | GSM | WCDMA | CDMA | EVDO;
                 break;
             case RILConstants.NETWORK_MODE_TD_SCDMA_LTE_CDMA_EVDO_GSM_WCDMA:
-                raf = RAF_TD_SCDMA | RAF_LTE | CDMA | EVDO | GSM | WCDMA;
+                raf = RAF_TD_SCDMA | LTE | CDMA | EVDO | GSM | WCDMA;
                 break;
             default:
                 raf = RAF_UNKNOWN;
@@ -232,6 +234,7 @@ public class RadioAccessFamily implements Parcelable {
         raf = ((WCDMA & raf) > 0) ? (WCDMA | raf) : raf;
         raf = ((CDMA & raf) > 0) ? (CDMA | raf) : raf;
         raf = ((EVDO & raf) > 0) ? (EVDO | raf) : raf;
+        raf = ((LTE & raf) > 0) ? (LTE | raf) : raf;
 
         return raf;
     }
@@ -254,19 +257,19 @@ public class RadioAccessFamily implements Parcelable {
             case (CDMA | EVDO):
                 type = RILConstants.NETWORK_MODE_CDMA;
                 break;
-            case (RAF_LTE | CDMA | EVDO):
+            case (LTE | CDMA | EVDO):
                 type = RILConstants.NETWORK_MODE_LTE_CDMA_EVDO;
                 break;
-            case (RAF_LTE | GSM | WCDMA):
+            case (LTE | GSM | WCDMA):
                 type = RILConstants.NETWORK_MODE_LTE_GSM_WCDMA;
                 break;
-            case (RAF_LTE | CDMA | EVDO | GSM | WCDMA):
+            case (LTE | CDMA | EVDO | GSM | WCDMA):
                 type = RILConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA;
                 break;
-            case RAF_LTE:
+            case LTE:
                 type = RILConstants.NETWORK_MODE_LTE_ONLY;
                 break;
-            case (RAF_LTE | WCDMA):
+            case (LTE | WCDMA):
                 type = RILConstants.NETWORK_MODE_LTE_WCDMA;
                 break;
             case CDMA:
@@ -284,28 +287,28 @@ public class RadioAccessFamily implements Parcelable {
             case (RAF_TD_SCDMA | WCDMA):
                 type = RILConstants.NETWORK_MODE_TD_SCDMA_WCDMA;
                 break;
-            case (RAF_TD_SCDMA | RAF_LTE):
+            case (RAF_TD_SCDMA | LTE):
                 type = RILConstants.NETWORK_MODE_TD_SCDMA_LTE;
                 break;
             case (RAF_TD_SCDMA | GSM):
                 type = RILConstants.NETWORK_MODE_TD_SCDMA_GSM;
                 break;
-            case (RAF_TD_SCDMA | GSM | RAF_LTE):
+            case (RAF_TD_SCDMA | GSM | LTE):
                 type = RILConstants.NETWORK_MODE_TD_SCDMA_GSM_LTE;
                 break;
             case (RAF_TD_SCDMA | GSM | WCDMA):
                 type = RILConstants.NETWORK_MODE_TD_SCDMA_GSM_WCDMA;
                 break;
-            case (RAF_TD_SCDMA | WCDMA | RAF_LTE):
+            case (RAF_TD_SCDMA | WCDMA | LTE):
                 type = RILConstants.NETWORK_MODE_TD_SCDMA_WCDMA_LTE;
                 break;
-            case (RAF_TD_SCDMA | GSM | WCDMA | RAF_LTE):
+            case (RAF_TD_SCDMA | GSM | WCDMA | LTE):
                 type = RILConstants.NETWORK_MODE_TD_SCDMA_GSM_WCDMA_LTE;
                 break;
             case (RAF_TD_SCDMA| GSM | WCDMA | CDMA | EVDO):
                 type = RILConstants.NETWORK_MODE_TD_SCDMA_GSM_WCDMA_CDMA_EVDO;
                 break;
-            case (RAF_TD_SCDMA| RAF_LTE | CDMA | EVDO | GSM | WCDMA):
+            case (RAF_TD_SCDMA| LTE | CDMA | EVDO | GSM | WCDMA):
                 type = RILConstants.NETWORK_MODE_TD_SCDMA_LTE_CDMA_EVDO_GSM_WCDMA;
                 break;
             default:
@@ -339,6 +342,7 @@ public class RadioAccessFamily implements Parcelable {
             case "CDMA":    return CDMA;
             case "EVDO":    return EVDO;
             case "WCDMA":   return WCDMA;
+            case "LTE_CA":  return RAF_LTE_CA;
             default:        return RAF_UNKNOWN;
         }
     }