diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java
index 49a633e9fb4e1..9b21de8f9b972 100644
--- a/telephony/java/com/android/internal/telephony/RILConstants.java
+++ b/telephony/java/com/android/internal/telephony/RILConstants.java
@@ -91,8 +91,8 @@ public interface RILConstants {
     /* Setup a packet data connection. See ril.h RIL_REQUEST_SETUP_DATA_CALL */
     int SETUP_DATA_TECH_CDMA      = 0;
     int SETUP_DATA_TECH_GSM       = 1;
-    int SETUP_DATA_AUTH_NONE      = 0;
 
+    int SETUP_DATA_AUTH_NONE      = 0;
     int SETUP_DATA_AUTH_PAP       = 1;
     int SETUP_DATA_AUTH_CHAP      = 2;
     int SETUP_DATA_AUTH_PAP_CHAP  = 3;
diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java
index bba450ab14b22..1b2c9183daef2 100644
--- a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java
+++ b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java
@@ -93,8 +93,8 @@ public class CdmaDataConnection extends DataConnection {
                 Integer.toString(RILConstants.SETUP_DATA_TECH_CDMA),
                 Integer.toString(dataProfile),
                 null, null, null,
-                RILConstants.SETUP_DATA_PROTOCOL_IP,
-                Integer.toString(RILConstants.SETUP_DATA_AUTH_PAP_CHAP), msg);
+                Integer.toString(RILConstants.SETUP_DATA_AUTH_PAP_CHAP),
+                RILConstants.SETUP_DATA_PROTOCOL_IP, msg);
     }
 
     @Override
diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java
index cad360c2d2918..b94702060387e 100644
--- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java
+++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java
@@ -114,8 +114,8 @@ public class GsmDataConnection extends DataConnection {
                 Integer.toString(RILConstants.SETUP_DATA_TECH_GSM),
                 Integer.toString(RILConstants.DATA_PROFILE_DEFAULT),
                 apn.apn, apn.user, apn.password,
-                RILConstants.SETUP_DATA_PROTOCOL_IP,
-                Integer.toString(authType), msg);
+                Integer.toString(authType),
+                RILConstants.SETUP_DATA_PROTOCOL_IP, msg);
     }
 
     @Override