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

Merge "Telephony: Data availability indication upon records loaded." into honeycomb-LTE

Browse Source
This commit is contained in:
Wink Saville
2011-04-28 13:51:31 -07:00
committed by Android (Google) Code Review
parent 05fcd239ab 662b016d6e
commit a68a61dfe3
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
View File

@@ -115,6 +115,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
static final Uri PREFERAPN_URI = Uri.parse("content://telephony/carriers/preferapn"); static final Uri PREFERAPN_URI = Uri.parse("content://telephony/carriers/preferapn");
static final String APN_ID = "apn_id"; static final String APN_ID = "apn_id";
private boolean canSetPreferApn = false; private boolean canSetPreferApn = false;
private boolean mRadioAvailable = false;
@Override @Override
protected void onActionIntentReconnectAlarm(Intent intent) { protected void onActionIntentReconnectAlarm(Intent intent) {
@@ -1325,6 +1326,10 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
private void onRecordsLoaded() { private void onRecordsLoaded() {
if (DBG) log("onRecordsLoaded: createAllApnList"); if (DBG) log("onRecordsLoaded: createAllApnList");
createAllApnList(); createAllApnList();
if (mRadioAvailable) {
if (DBG) log("onRecordsLoaded, notifying data availability");
notifyDataAvailability(null);
}
setupDataOnReadyApns(Phone.REASON_SIM_LOADED); setupDataOnReadyApns(Phone.REASON_SIM_LOADED);
} }
@@ -1436,6 +1441,8 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
@Override @Override
protected void onRadioAvailable() { protected void onRadioAvailable() {
mRadioAvailable = true;
if (mPhone.getSimulatedRadioControl() != null) { if (mPhone.getSimulatedRadioControl() != null) {
// Assume data is connected on the simulator // Assume data is connected on the simulator
// FIXME this can be improved // FIXME this can be improved
@@ -1463,6 +1470,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
dc.resetRetryCount(); dc.resetRetryCount();
} }
mReregisterOnReconnectFailure = false; mReregisterOnReconnectFailure = false;
mRadioAvailable = false;
if (mPhone.getSimulatedRadioControl() != null) { if (mPhone.getSimulatedRadioControl() != null) {
// Assume data is connected on the simulator // Assume data is connected on the simulator
@@ -1472,6 +1480,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
if (DBG) log("Radio is off and clean up all connection"); if (DBG) log("Radio is off and clean up all connection");
cleanUpAllConnections(false, Phone.REASON_RADIO_TURNED_OFF); cleanUpAllConnections(false, Phone.REASON_RADIO_TURNED_OFF);
} }
notifyDataAvailability(null);
} }
@Override @Override