Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not merge: Fix 3G connectivity bug 3513741." into honeycomb-LTE

Browse Source
This commit is contained in:
Wink Saville
2011-03-14 13:43:05 -07:00
committed by Android (Google) Code Review
parent 08d79acc46 9d7d5b4435
commit d6398ad3ce
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/com/android/internal/telephony/ServiceStateTracker.java
View File

@@ -320,7 +320,7 @@ public abstract class ServiceStateTracker extends Handler {
Registrant r = new Registrant(h, what, obj);
mDetachedRegistrants.add(r);
if (getCurrentDataConnectionState() == ServiceState.STATE_OUT_OF_SERVICE) {
if (getCurrentDataConnectionState() != ServiceState.STATE_IN_SERVICE) {
r.notifyRegistrant();
}
}

2
telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
View File

@@ -387,12 +387,10 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker {
}
if (hasCdmaDataConnectionAttached) {
cdmaDataConnectionAttachedRegistrants.notifyRegistrants();
mAttachedRegistrants.notifyRegistrants();
}
if (hasCdmaDataConnectionDetached) {
cdmaDataConnectionDetachedRegistrants.notifyRegistrants();
mDetachedRegistrants.notifyRegistrants();
}

8
telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
View File

@@ -16,8 +16,6 @@
package com.android.internal.telephony.cdma;
import static com.android.internal.telephony.TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC;
import com.android.internal.telephony.CommandException;
import com.android.internal.telephony.CommandsInterface;
import com.android.internal.telephony.DataConnectionTracker;
@@ -102,8 +100,6 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
protected int cdmaDataConnectionState = ServiceState.STATE_OUT_OF_SERVICE;
protected int newCdmaDataConnectionState = ServiceState.STATE_OUT_OF_SERVICE;
protected int mRegistrationState = -1;
protected RegistrantList cdmaDataConnectionAttachedRegistrants = new RegistrantList();
protected RegistrantList cdmaDataConnectionDetachedRegistrants = new RegistrantList();
protected RegistrantList cdmaForSubscriptionInfoReadyRegistrants = new RegistrantList();
/**
@@ -1098,11 +1094,11 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
}
if (hasCdmaDataConnectionAttached) {
cdmaDataConnectionAttachedRegistrants.notifyRegistrants();
mAttachedRegistrants.notifyRegistrants();
}
if (hasCdmaDataConnectionDetached) {
cdmaDataConnectionDetachedRegistrants.notifyRegistrants();
mDetachedRegistrants.notifyRegistrants();
}
if (hasCdmaDataConnectionChanged || hasNetworkTypeChanged) {