From f57276154aaa587524374db8e0d7228383611bf3 Mon Sep 17 00:00:00 2001
From: Ramesh Sudini <ramesh.sudini@motorola.com>
Date: Tue, 8 Mar 2011 15:51:52 -0600
Subject: [PATCH] Do not merge: Telephony: Corrections to LTE and eHRPD
 constant values.

LTE and EHRPD values are not consistent with ril.h

Change-Id: I76d1ff408a37960873f537772637ff3ae3ac056f
---
 telephony/java/android/telephony/ServiceState.java | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
index 5dcb8202ade4f..ba058373627a6 100644
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -92,9 +92,11 @@ public class ServiceState implements Parcelable {
     /** @hide */
     public static final int RADIO_TECHNOLOGY_EVDO_B = 12;
     /** @hide */
-    public static final int RADIO_TECHNOLOGY_LTE = 13;
+    public static final int RADIO_TECHNOLOGY_EHRPD = 13;
     /** @hide */
-    public static final int RADIO_TECHNOLOGY_EHRPD = 14;
+    public static final int RADIO_TECHNOLOGY_LTE = 14;
+    /** @hide */
+    public static final int RADIO_TECHNOLOGY_HSPAP = 15;
 
     /**
      * Available registration states for GSM, UMTS and CDMA.
@@ -429,10 +431,13 @@ public class ServiceState implements Parcelable {
             radioTechnology = "EvDo rev. B";
             break;
         case 13:
-            radioTechnology = "LTE";
+            radioTechnology = "eHRPD";
             break;
         case 14:
-            radioTechnology = "eHRPD";
+            radioTechnology = "LTE";
+            break;
+        case 15:
+            radioTechnology = "HSPAP";
             break;
         default:
             Log.w(LOG_TAG, "mRadioTechnology variable out of range.");