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

am 4d9261fa: Merge "Use dataConnectionNotInUse to decide if a DC is free." into honeycomb-LTE

Browse Source 
* commit '4d9261fad3e3bdfa056f377c10f2af0a6db62542':
  Use dataConnectionNotInUse to decide if a DC is free.
This commit is contained in:
Wink Saville
2011-06-21 19:37:46 -07:00
committed by Android Git Automerger
parent 66c37f5df2 4d9261fad3
commit 446a436cf3
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -846,9 +846,16 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
return result; return result;
} }
private boolean dataConnectionNotInUse(DataConnectionAc dcac) {
for (ApnContext apnContext : mApnContexts.values()) {
if (apnContext.getDataConnectionAc() == dcac) return false;
}
return true;
}
private GsmDataConnection findFreeDataConnection() { private GsmDataConnection findFreeDataConnection() {
for (DataConnectionAc dcac : mDataConnectionAsyncChannels.values()) { for (DataConnectionAc dcac : mDataConnectionAsyncChannels.values()) {
if (dcac.isInactiveSync()) { if (dcac.isInactiveSync() && dataConnectionNotInUse(dcac)) {
log("findFreeDataConnection: found free GsmDataConnection"); log("findFreeDataConnection: found free GsmDataConnection");
return (GsmDataConnection) dcac.dataConnection; return (GsmDataConnection) dcac.dataConnection;
} }