diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-05-06 16:21:06 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-06 16:21:06 -0700 |
| commit | 2b48ca07efd7f499ff01a3eeb17a4f5c40106dbe (patch) | |
| tree | b47556590262a6b5e1ebdd1fc35e5f31889e7503 | |
| parent | 2499da83cb3db5f1d87a52e3e390139c98ff4210 (diff) | |
| parent | 06ce569b76d06a730eb228f99aeba62b28e27211 (diff) | |
| download | frameworks_base-2b48ca07efd7f499ff01a3eeb17a4f5c40106dbe.zip frameworks_base-2b48ca07efd7f499ff01a3eeb17a4f5c40106dbe.tar.gz frameworks_base-2b48ca07efd7f499ff01a3eeb17a4f5c40106dbe.tar.bz2 | |
Merge "Fix 2 functions getting connections up by apnType" into honeycomb-LTE
| -rw-r--r-- | telephony/java/com/android/internal/telephony/DataConnectionTracker.java | 7 |
1 files 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 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 @@ 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(); |