Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Get rid of setupDataCallWithProtocol."

Browse Source
This commit is contained in:
Lorenzo Colitti
2010-12-29 17:23:33 -08:00
committed by Android (Google) Code Review
parent dee9981c2a 4eb4045072
commit 49b06be874
7 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
telephony/java/com/android/internal/telephony/CommandsInterface.java
View File

@@ -1327,11 +1327,15 @@ public interface CommandsInterface {
* the password for APN, or NULL
* @param authType
* the PAP / CHAP auth type. Values is one of SETUP_DATA_AUTH_*
* @param protocol
* one of the PDP_type values in TS 27.007 section 10.1.1.
* For example, "IP", "IPV6", "IPV4V6", or "PPP".
* @param result
* Callback message
*/
public void setupDataCall(String radioTechnology, String profile, String apn,
String user, String password, String authType, Message result);
public void setupDataCall(String radioTechnology, String profile,
String apn, String user, String password, String authType,
String protocol, Message result);
/**
* Deactivate packet data connection

20
telephony/java/com/android/internal/telephony/RIL.java
View File

@@ -1269,22 +1269,10 @@ public final class RIL extends BaseCommands implements CommandsInterface {
return 1;
}
/**
* The preferred new alternative to setupDefaultPDP that is
* CDMA-compatible.
*
*/
public void
setupDataCall(String radioTechnology, String profile, String apn,
String user, String password, String authType, Message result) {
setupDataCallWithProtocol(radioTechnology, profile, apn, user, password,
authType, "IP", result);
}
public void
setupDataCallWithProtocol(String radioTechnology, String profile,
String apn, String user, String password, String authType,
String protocolType, Message result) {
String user, String password, String authType, String protocol,
Message result) {
RILRequest rr
= RILRequest.obtain(RIL_REQUEST_SETUP_DATA_CALL, result);
@@ -1296,12 +1284,12 @@ public final class RIL extends BaseCommands implements CommandsInterface {
rr.mp.writeString(user);
rr.mp.writeString(password);
rr.mp.writeString(authType);
rr.mp.writeString(protocolType);
rr.mp.writeString(protocol);
if (RILJ_LOGD) riljLog(rr.serialString() + "> "
+ requestToString(rr.mRequest) + " " + radioTechnology + " "
+ profile + " " + apn + " " + user + " "
+ password + " " + authType + " " + protocolType);
+ password + " " + authType + " " + protocol);
send(rr);
}

5
telephony/java/com/android/internal/telephony/RILConstants.java
View File

@@ -92,10 +92,15 @@ public interface RILConstants {
int SETUP_DATA_TECH_CDMA = 0;
int SETUP_DATA_TECH_GSM = 1;
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;
String SETUP_DATA_PROTOCOL_IP = "IP";
String SETUP_DATA_PROTOCOL_IPV6 = "IPV6";
String SETUP_DATA_PROTOCOL_IPV4V6 = "IPV4V6";
/* Deactivate data call reasons */
int DEACTIVATE_REASON_NONE = 0;
int DEACTIVATE_REASON_RADIO_OFF = 1;

9
telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java
View File

@@ -89,9 +89,12 @@ public class CdmaDataConnection extends DataConnection {
// msg.obj will be returned in AsyncResult.userObj;
Message msg = obtainMessage(EVENT_SETUP_DATA_CONNECTION_DONE, cp);
msg.obj = cp;
phone.mCM.setupDataCall(Integer.toString(RILConstants.SETUP_DATA_TECH_CDMA),
Integer.toString(dataProfile), null, null,
null, Integer.toString(RILConstants.SETUP_DATA_AUTH_PAP_CHAP), msg);
phone.mCM.setupDataCall(
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);
}
@Override

9
telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java
View File

@@ -110,9 +110,12 @@ public class GsmDataConnection extends DataConnection {
authType = (apn.user != null) ? RILConstants.SETUP_DATA_AUTH_PAP_CHAP :
RILConstants.SETUP_DATA_AUTH_NONE;
}
phone.mCM.setupDataCall(Integer.toString(RILConstants.SETUP_DATA_TECH_GSM),
Integer.toString(RILConstants.DATA_PROFILE_DEFAULT), apn.apn, apn.user,
apn.password, Integer.toString(authType), msg);
phone.mCM.setupDataCall(
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);
}
@Override

2
telephony/java/com/android/internal/telephony/sip/SipCommandInterface.java
View File

@@ -186,7 +186,7 @@ class SipCommandInterface extends BaseCommands implements CommandsInterface {
public void setupDataCall(String radioTechnology, String profile,
String apn, String user, String password, String authType,
Message result) {
String protcol, Message result) {
}
public void deactivateDataCall(int cid, int reason, Message result) {

5
telephony/java/com/android/internal/telephony/test/SimulatedCommands.java
View File

@@ -954,8 +954,9 @@ public final class SimulatedCommands extends BaseCommands
unimplemented(response);
}
public void setupDataCall(String radioTechnology, String profile, String apn, String user,
String password, String authType, Message result) {
public void setupDataCall(String radioTechnology, String profile,
String apn, String user, String password, String authType,
String protocol, Message result) {
unimplemented(result);
}