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

This commit is contained in:
Robert Greenwalt
2011-05-06 16:21:06 -07:00
committed by Android (Google) Code Review

View File

@@ -671,8 +671,10 @@ public abstract class DataConnectionTracker extends Handler {
protected LinkProperties getLinkProperties(String apnType) {
int id = apnTypeToId(apnType);
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();
} else {
return new LinkProperties();
@@ -682,7 +684,8 @@ public abstract class DataConnectionTracker extends Handler {
protected LinkCapabilities getLinkCapabilities(String apnType) {
int id = apnTypeToId(apnType);
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();
} else {
return new LinkCapabilities();