commit 2b48ca07efd7f499ff01a3eeb17a4f5c40106dbe
author Robert Greenwalt <rgreenwalt@google.com> Fri May 06 16:21:06 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 06 16:21:06 2011 -0700
tree b47556590262a6b5e1ebdd1fc35e5f31889e7503
parent 2499da83cb3db5f1d87a52e3e390139c98ff4210
parent 06ce569b76d06a730eb228f99aeba62b28e27211

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

telephony/java/com/android/internal/telephony/DataConnectionTracker.java

diff --git a/telephony/java/com/android/internal/telephony/DataConnectionTracker.java b/telephony/java/com/android/internal/telephony/DataConnectionTracker.java
index 244f35e..43f3b95 100644
--- a/telephony/java/com/android/internal/telephony/DataConnectionTracker.java
+++ b/telephony/java/com/android/internal/telephony/DataConnectionTracker.java
@@ -671,8 +671,10 @@
 
     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 @@
     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();