aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2014-03-13 06:54:55 -0700
committerWink Saville <wink@google.com>2014-03-13 14:05:39 +0000
commitc187f0e9bfb897405d6c41f669fc2aadacb0ee1e (patch)
treea19a78b142c5f323943ad48d79da1d6a23d1455d
parent82d87aeb1a7694d6ba782fb80bb2ede4f242993a (diff)
downloadtelephony-c187f0e9bfb897405d6c41f669fc2aadacb0ee1e.tar.gz
This is a start and two tests succeed: Tested expired AT&T SIM and waiting 15min for alarm to fire. Tested a provisioned Verizon SIM and works normally. I've NOT tested AT&T where I've properly completed the provisioning. I've NOT tested T-Mobile SIM either provisioned or not-provisioned. I've NOT tested provisioning over WiFi. I've NOT tested that WiFi <-> Mobile works I've NOT tested voice calls, SMS, MMS ... The current bug is below, but it is poorly named either it should be renamed or a new bug created. Bug: 13190133 Change-Id: I0a09f642614cd27a8655e9dae764b8999ce485b8
-rw-r--r--src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java21
1 files changed, 5 insertions, 16 deletions
diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java b/src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
index a8050a6f9f..40eba1198b 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
@@ -849,10 +849,6 @@ public abstract class DcTrackerBase extends Handler {
break;
}
case DctConstants.CMD_ENABLE_MOBILE_PROVISIONING: {
- // TODO: Right now we know when it ends "successfully" when
- // provisioning apn gets dropped, what happens if the user never
- // succeed, I assume there is a timeout and the network will drop
- // it after a period of time.
Bundle bundle = msg.getData();
if (bundle != null) {
try {
@@ -867,18 +863,11 @@ public abstract class DcTrackerBase extends Handler {
mIsProvisioning = false;
mProvisioningUrl = null;
} else {
- ApnContext apnContext = mApnContexts.get(PhoneConstants.APN_TYPE_DEFAULT);
- if (apnContext.isProvisioningApn() && apnContext.getState() == State.CONNECTED){
- log("CMD_ENABLE_MOBILE_PROVISIONING: mIsProvisioning=true url="
- + mProvisioningUrl);
- mIsProvisioning = true;
- startProvisioningApnAlarm();
- completeConnection(mApnContexts.get(PhoneConstants.APN_TYPE_DEFAULT));
- } else {
- log("CMD_ENABLE_MOBILE_PROVISIONING: No longer connected");
- mIsProvisioning = false;
- mProvisioningUrl = null;
- }
+ loge("CMD_ENABLE_MOBILE_PROVISIONING: provisioningUrl=" + mProvisioningUrl);
+ mIsProvisioning = true;
+ startProvisioningApnAlarm();
+ onSetInternalDataEnabled(true);
+ enableApnType("default");
}
break;
}