Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6254ba7 authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

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
parent 0cd0136d

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -91,8 +91,8 @@ public interface RILConstants { 
    /* Setup a packet data connection. See ril.h RIL_REQUEST_SETUP_DATA_CALL */

    /* Setup a packet data connection. See ril.h RIL_REQUEST_SETUP_DATA_CALL */

    int SETUP_DATA_TECH_CDMA      = 0;

    int SETUP_DATA_TECH_CDMA      = 0;

    int SETUP_DATA_TECH_GSM       = 1;

    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_PAP       = 1;

    int SETUP_DATA_AUTH_CHAP      = 2;

    int SETUP_DATA_AUTH_CHAP      = 2;

    int SETUP_DATA_AUTH_PAP_CHAP  = 3;

    int SETUP_DATA_AUTH_PAP_CHAP  = 3;

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -93,8 +93,8 @@ public class CdmaDataConnection extends DataConnection { 
                Integer.toString(RILConstants.SETUP_DATA_TECH_CDMA),

                Integer.toString(RILConstants.SETUP_DATA_TECH_CDMA),

                Integer.toString(dataProfile),

                Integer.toString(dataProfile),

                null, null, null,

                null, null, null,

                RILConstants.SETUP_DATA_PROTOCOL_IP,

                Integer.toString(RILConstants.SETUP_DATA_AUTH_PAP_CHAP),

                Integer.toString(RILConstants.SETUP_DATA_AUTH_PAP_CHAP), msg);

                RILConstants.SETUP_DATA_PROTOCOL_IP, msg);

    }

    }





    @Override

    @Override

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -114,8 +114,8 @@ public class GsmDataConnection extends DataConnection { 
                Integer.toString(RILConstants.SETUP_DATA_TECH_GSM),

                Integer.toString(RILConstants.SETUP_DATA_TECH_GSM),

                Integer.toString(RILConstants.DATA_PROFILE_DEFAULT),

                Integer.toString(RILConstants.DATA_PROFILE_DEFAULT),

                apn.apn, apn.user, apn.password,

                apn.apn, apn.user, apn.password,

                RILConstants.SETUP_DATA_PROTOCOL_IP,

                Integer.toString(authType),

                Integer.toString(authType), msg);

                RILConstants.SETUP_DATA_PROTOCOL_IP, msg);

    }

    }





    @Override

    @Override