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

am b1a3f0ca: Fix no data issue after system server crash

Browse Source 
* commit 'b1a3f0ca4b23b882fc1a5e83eaa412c0ed76696f':
  Fix no data issue after system server crash
This commit is contained in:
Kazuhiro Ondo
2011-09-09 15:00:51 -07:00
committed by Android Git Automerger
parent 90cfe5c366 b1a3f0ca4b
commit 30928eb603
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,7 +122,6 @@ 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) {
@@ -1571,7 +1570,7 @@ 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 (mPhone.mCM.getRadioState().isOn()) {
if (DBG) log("onRecordsLoaded: notifying data availability"); if (DBG) log("onRecordsLoaded: notifying data availability");
notifyDataAvailability(Phone.REASON_SIM_LOADED); notifyDataAvailability(Phone.REASON_SIM_LOADED);
} }
@@ -1703,7 +1702,6 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
@Override @Override
protected void onRadioAvailable() { protected void onRadioAvailable() {
if (DBG) log("onRadioAvailable"); if (DBG) log("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
@@ -1731,7 +1729,6 @@ 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