summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth Shelnutt <shelnutt2@gmail.com>2014-05-20 11:52:55 -0400
committerSeth Shelnutt <shelnutt2@gmail.com>2014-06-15 23:16:35 -0400
commit38e6c43b552a8a7c92a86be8844daf74df96b945 (patch)
tree7cd999838d8531704824728de8e81414aeefc053
parentee70d19452f4e9b78042a74e555b45b46cfaec6b (diff)
LgeLteRIL: VSS add check for null apn
Change-Id: Id2315755ea49eb2257ab357fd63d79cbacadedc9
-rw-r--r--ril/telephony/java/com/android/internal/telephony/LgeLteRIL.java37
1 files changed, 19 insertions, 18 deletions
diff --git a/ril/telephony/java/com/android/internal/telephony/LgeLteRIL.java b/ril/telephony/java/com/android/internal/telephony/LgeLteRIL.java
index 8f56838..54a1cf3 100644
--- a/ril/telephony/java/com/android/internal/telephony/LgeLteRIL.java
+++ b/ril/telephony/java/com/android/internal/telephony/LgeLteRIL.java
@@ -618,23 +618,24 @@ public class LgeLteRIL extends RIL implements CommandsInterface {
setupDataCall(String radioTechnology, String profile, String apn,
String user, String password, String authType, String protocol,
Message result) {
-
- RILRequest rrSPT = RILRequest.obtain(
- 0x16f, null); //121 - RIL_REQUEST_VSS_UPDATE_PROFILE
- rrSPT.mParcel.writeInt(1); // pdnId
- rrSPT.mParcel.writeInt(apn.length()); // apnLength
- rrSPT.mParcel.writeString(apn); // apn
- rrSPT.mParcel.writeInt(0); // ipType
- rrSPT.mParcel.writeInt(0); // inactivityTime
- rrSPT.mParcel.writeInt(1); // enable
- rrSPT.mParcel.writeInt(0); // authType
- rrSPT.mParcel.writeInt(0); // esmInfo
- rrSPT.mParcel.writeString(""); // username
- rrSPT.mParcel.writeString(""); // password
- send(rrSPT);
-
-
- super.setupDataCall(radioTechnology, profile, apn, user, password,
- authType, protocol, result);
+ // Only update VSS if we have an actual APN
+ if(apn != null && !apn.isEmpty()) {
+ RILRequest rrSPT = RILRequest.obtain(
+ 0x16f, null); //121 - RIL_REQUEST_VSS_UPDATE_PROFILE
+
+ rrSPT.mParcel.writeInt(1); // pdnId
+ rrSPT.mParcel.writeInt(apn.length()); // apnLength
+ rrSPT.mParcel.writeString(apn); // apn
+ rrSPT.mParcel.writeInt(0); // ipType
+ rrSPT.mParcel.writeInt(0); // inactivityTime
+ rrSPT.mParcel.writeInt(1); // enable
+ rrSPT.mParcel.writeInt(0); // authType
+ rrSPT.mParcel.writeInt(0); // esmInfo
+ rrSPT.mParcel.writeString(""); // username
+ rrSPT.mParcel.writeString(""); // password
+ send(rrSPT);
+ }
+ super.setupDataCall(radioTechnology, profile, apn, user, password,
+ authType, protocol, result);
}
}