diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2010-09-01 19:41:50 -0700 |
|---|---|---|
| committer | Lorenzo Colitti <lorenzo@google.com> | 2010-09-07 19:46:23 -0700 |
| commit | b60c9ba33582e798e40b102ba3180d5cd1102ca3 (patch) | |
| tree | 187ec93a13d285d23e4b100ab520a7dc3b71b64b | |
| parent | b062f02d54b97dd45c810a6bb4544c94ff4ed0f1 (diff) | |
| download | frameworks_base-b60c9ba33582e798e40b102ba3180d5cd1102ca3.zip frameworks_base-b60c9ba33582e798e40b102ba3180d5cd1102ca3.tar.gz frameworks_base-b60c9ba33582e798e40b102ba3180d5cd1102ca3.tar.bz2 | |
Framework changes for IPv6 / IPv4v6 data calls.
Change-Id: I172fbcf3fcc4af3822aa16afac7015e675ccd007
| -rw-r--r-- | telephony/java/com/android/internal/telephony/RIL.java | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/telephony/java/com/android/internal/telephony/RIL.java b/telephony/java/com/android/internal/telephony/RIL.java index 1a0dd89..8c2280b 100644 --- a/telephony/java/com/android/internal/telephony/RIL.java +++ b/telephony/java/com/android/internal/telephony/RIL.java @@ -1298,10 +1298,18 @@ public final class RIL extends BaseCommands implements CommandsInterface { 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) { RILRequest rr = RILRequest.obtain(RIL_REQUEST_SETUP_DATA_CALL, result); - rr.mp.writeInt(6); + rr.mp.writeInt(7); rr.mp.writeString(radioTechnology); rr.mp.writeString(profile); @@ -1309,11 +1317,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); if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest) + " " + radioTechnology + " " + profile + " " + apn + " " + user + " " - + password + " " + authType); + + password + " " + authType + " " + protocolType); send(rr); } @@ -2901,7 +2910,11 @@ public final class RIL extends BaseCommands implements CommandsInterface { dataCall.active = p.readInt(); dataCall.type = p.readString(); dataCall.apn = p.readString(); - dataCall.address = p.readString(); + String address = p.readString(); + if (address != null) { + address = address.split(" ")[0]; + } + dataCall.address = address; response.add(dataCall); } |