commit f6254ba7f0e48515bca3c08bbb71f916448bf0d1
author Lorenzo Colitti <lorenzo@google.com> Fri Dec 31 00:55:05 2010 -0800
committer Lorenzo Colitti <lorenzo@google.com> Fri Dec 31 00:55:05 2010 -0800
tree 04a15809a3fa1551776303e0fe7615f6f1a8db43
parent 0cd0136d440cf6ad9d5fab430269116786e671ec

Fix setupDataCall breakage.

Change I1a1adc61 added a new parameter to setupDataCall,
but updated the callers incorrectly (specifying the
arguments in the wrong order). Fix the order.

Change-Id: I0e762de29ac05d387371a7cfe33a33ad16219221

telephony/java/com/android/internal/telephony/RILConstants.java

diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java
index 49a633e..9b21de8 100644
--- a/telephony/java/com/android/internal/telephony/RILConstants.java
+++ b/telephony/java/com/android/internal/telephony/RILConstants.java
@@ -91,8 +91,8 @@
     /* 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;

telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java

diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java
index bba450a..1b2c918 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 @@
                 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

telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java

diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java
index cad360c..b947020 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 @@
                 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