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

am 2b48ca07: Merge "Fix 2 functions getting connections up by apnType" into honeycomb-LTE

Browse Source 
* commit '2b48ca07efd7f499ff01a3eeb17a4f5c40106dbe':
  Fix 2 functions getting connections up by apnType
This commit is contained in:
Robert Greenwalt
2011-05-06 16:25:39 -07:00
committed by Android Git Automerger
parent 04f2ad1ce1 2b48ca07ef
commit 56e8e0bc80
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
telephony/java/com/android/internal/telephony/DataConnectionTracker.java
View File

@@ -671,8 +671,10 @@ public abstract class DataConnectionTracker extends Handler {
protected LinkProperties getLinkProperties(String apnType) { protected LinkProperties getLinkProperties(String apnType) {
int id = apnTypeToId(apnType); int id = apnTypeToId(apnType);
if (isApnIdEnabled(id)) { if (isApnIdEnabled(id)) {
DataConnectionAc dcac = mDataConnectionAsyncChannels.get(id); // TODO - remove this cdma-only hack and support multiple DCs.
DataConnectionAc dcac = mDataConnectionAsyncChannels.get(0);
return dcac.getLinkPropertiesSync(); return dcac.getLinkPropertiesSync();
} else { } else {
return new LinkProperties(); return new LinkProperties();
@@ -682,7 +684,8 @@ public abstract class DataConnectionTracker extends Handler {
protected LinkCapabilities getLinkCapabilities(String apnType) { protected LinkCapabilities getLinkCapabilities(String apnType) {
int id = apnTypeToId(apnType); int id = apnTypeToId(apnType);
if (isApnIdEnabled(id)) { if (isApnIdEnabled(id)) {
DataConnectionAc dcac = mDataConnectionAsyncChannels.get(id); // TODO - remove this cdma-only hack and support multiple DCs.
DataConnectionAc dcac = mDataConnectionAsyncChannels.get(0);
return dcac.getLinkCapabilitiesSync(); return dcac.getLinkCapabilitiesSync();
} else { } else {
return new LinkCapabilities(); return new LinkCapabilities();