DataConnection was cleaned up too early if it's already disconnecting
Fix one logic failure introduced in patch for bug 4901019. Bug: 4970726 Change-Id: Ifc4071b1cbf0c19fbd8356d7dcc16f9df39d4b54
This commit is contained in:
committed by
Wink Saville
parent
a2267451dd
commit
012b86d429
@@ -788,6 +788,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
|
|||||||
Message msg = obtainMessage(EVENT_DISCONNECT_DONE, apnContext);
|
Message msg = obtainMessage(EVENT_DISCONNECT_DONE, apnContext);
|
||||||
apnContext.getDataConnection().tearDown(apnContext.getReason(), msg);
|
apnContext.getDataConnection().tearDown(apnContext.getReason(), msg);
|
||||||
apnContext.setState(State.DISCONNECTING);
|
apnContext.setState(State.DISCONNECTING);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
// apn is connected but no reference to dcac.
|
// apn is connected but no reference to dcac.
|
||||||
// Should not be happen, but reset the state in case.
|
// Should not be happen, but reset the state in case.
|
||||||
@@ -796,7 +797,6 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
|
|||||||
apnContext.getApnType());
|
apnContext.getApnType());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
// force clean up the data connection.
|
// force clean up the data connection.
|
||||||
if (dcac != null) dcac.resetSync();
|
if (dcac != null) dcac.resetSync();
|
||||||
|
|||||||
Reference in New Issue
Block a user