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

am 012b86d4: DataConnection was cleaned up too early if it\'s already disconnecting

Browse Source 
* commit '012b86d4294182497c4c72a318e0f4cbe5075a44':
  DataConnection was cleaned up too early if it's already disconnecting
This commit is contained in:
Kazuhiro Ondo
2011-06-30 18:00:06 -07:00
committed by Android Git Automerger
parent 672c468c45 012b86d429
commit c0c07d4ff6
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
View File

@@ -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();