diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-05-06 16:25:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-06 16:25:39 -0700 |
| commit | 56e8e0bc8008d2bd60f04fc78ff036236a44f598 (patch) | |
| tree | f65d7fdcdce9311a0f767e3cba5b195e1a4b000d /telephony | |
| parent | 04f2ad1ce1378e115940ecc7ab49ed3b929795dc (diff) | |
| parent | 2b48ca07efd7f499ff01a3eeb17a4f5c40106dbe (diff) | |
| download | frameworks_base-56e8e0bc8008d2bd60f04fc78ff036236a44f598.zip frameworks_base-56e8e0bc8008d2bd60f04fc78ff036236a44f598.tar.gz frameworks_base-56e8e0bc8008d2bd60f04fc78ff036236a44f598.tar.bz2 | |
am 2b48ca07: Merge "Fix 2 functions getting connections up by apnType" into honeycomb-LTE
* commit '2b48ca07efd7f499ff01a3eeb17a4f5c40106dbe':
Fix 2 functions getting connections up by apnType
Diffstat (limited to 'telephony')
| -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(); |