From 06ce569b76d06a730eb228f99aeba62b28e27211 Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Fri, 6 May 2011 16:01:46 -0700 Subject: [PATCH] Fix 2 functions getting connections up by apnType A bad impl that only effected non-default connections on CDMA. bug:4392820 Change-Id: If178dba90c4525289098fc88b80cf918e35f4d32 --- .../android/internal/telephony/DataConnectionTracker.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/telephony/java/com/android/internal/telephony/DataConnectionTracker.java b/telephony/java/com/android/internal/telephony/DataConnectionTracker.java index ad39b272ac64c..419711ff8397f 100644 --- a/telephony/java/com/android/internal/telephony/DataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/DataConnectionTracker.java @@ -668,8 +668,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(); @@ -679,7 +681,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();