summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2011-05-16 16:35:10 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-16 16:35:10 -0700
commita77f4c530b173dc0b4968fea3d9c9e21fae6e082 (patch)
tree7461b6ed4b4797565dcebc8e13a0ca9b75dcb980 /telephony
parent0b171e4c3fad8668cb1d7d79687d6bcb6202fd4d (diff)
parent360f553311ab697995d24c2a42e45659a5436efa (diff)
downloadframeworks_base-a77f4c530b173dc0b4968fea3d9c9e21fae6e082.zip
frameworks_base-a77f4c530b173dc0b4968fea3d9c9e21fae6e082.tar.gz
frameworks_base-a77f4c530b173dc0b4968fea3d9c9e21fae6e082.tar.bz2
am 360f5533: am 7b0339a8: Merge "No data icon switch seen between LTE to EHRPD Handover" into honeycomb-LTE
* commit '360f553311ab697995d24c2a42e45659a5436efa': No data icon switch seen between LTE to EHRPD Handover
Diffstat (limited to 'telephony')
-rw-r--r--telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java10
1 files changed, 1 insertions, 9 deletions
diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
index 32c5d75..d79f0a1 100644
--- a/telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
+++ b/telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
@@ -290,13 +290,6 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
newSS.setStateOutOfService();
mLteSS.setStateOutOfService();
- // TODO: 4G Tech Handoff
- // if (has4gHandoff) {
- // Message msg = phone.mDataConnectionTracker.obtainMessage(
- // DataConnectionTracker.EVENT_4G_TECHNOLOGY_CHANGE);
- // phone.mDataConnectionTracker.sendMessage(msg);
- // }
-
if ((hasMultiApnSupport)
&& (phone.mDataConnectionTracker instanceof CdmaDataConnectionTracker)) {
if (DBG) log("GsmDataConnectionTracker Created");
@@ -390,8 +383,7 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
mDetachedRegistrants.notifyRegistrants();
}
- if ((hasCdmaDataConnectionChanged || hasNetworkTypeChanged)
- && (phone.mDataConnectionTracker instanceof CdmaDataConnectionTracker)) {
+ if ((hasCdmaDataConnectionChanged || hasNetworkTypeChanged)) {
phone.notifyDataConnection();
}