Merge "Add mapping between RAT and Network Mode" into lmp-mr1-dev

1 files changed, 16 insertions, 0 deletions

diff --git a/telephony/java/android/telephony/RadioAccessFamily.java b/telephony/java/android/telephony/RadioAccessFamily.java
index dd4c45d0f9c9..734fc68511d1 100644
--- a/telephony/java/android/telephony/RadioAccessFamily.java
+++ b/telephony/java/android/telephony/RadioAccessFamily.java
@@ -19,6 +19,8 @@ package android.telephony;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import com.android.internal.telephony.RILConstants;
+
 /**
  * Object to indicate the phone radio type and access technology.
  *
@@ -107,6 +109,7 @@ public class RadioAccessFamily implements Parcelable {
      * @param outParcel The Parcel in which the object should be written.
      * @param flags Additional flags about how the object should be written.
      */
+    @Override
     public void writeToParcel(Parcel outParcel, int flags) {
         outParcel.writeInt(mPhoneId);
         outParcel.writeInt(mRadioAccessFamily);
@@ -131,5 +134,18 @@ public class RadioAccessFamily implements Parcelable {
             return new RadioAccessFamily[size];
         }
     };
+
+    public static int getRafFromNetworkType(int type) {
+        // TODO map from RILConstants.NETWORK_TYPE_* to RAF_*
+        switch (type) {
+            case RILConstants.NETWORK_MODE_WCDMA_PREF:
+            case RILConstants.NETWORK_MODE_GSM_UMTS:
+                return RAF_UMTS | RAF_GSM;
+            case RILConstants.NETWORK_MODE_GSM_ONLY:
+                return RAF_GSM;
+            default:
+                return RAF_UNKNOWN;
+        }
+    }
 }