summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorKazuhiro Ondo <kazuhiro.ondo@motorola.com>2011-09-13 14:25:23 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-09-13 14:25:23 -0700
commit0042330e3b19426447cae0456c57f3ba14c189b6 (patch)
tree3a57131d64b3faf8ee86bbf6a2619b3c3b308fd3 /telephony
parent7e2bf434f51d8f5d48c3137b1e6b6535389ebcc3 (diff)
parent30928eb60395ac7c02ac45fd00a0d781ce364856 (diff)
downloadframeworks_base-0042330e3b19426447cae0456c57f3ba14c189b6.zip
frameworks_base-0042330e3b19426447cae0456c57f3ba14c189b6.tar.gz
frameworks_base-0042330e3b19426447cae0456c57f3ba14c189b6.tar.bz2
am 30928eb6: am b1a3f0ca: Fix no data issue after system server crash
* commit '30928eb60395ac7c02ac45fd00a0d781ce364856': Fix no data issue after system server crash
Diffstat (limited to 'telephony')
-rw-r--r--telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
index 4e43fcd..e32270e 100644
--- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
+++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
@@ -115,7 +115,6 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
static final Uri PREFERAPN_URI = Uri.parse("content://telephony/carriers/preferapn");
static final String APN_ID = "apn_id";
private boolean canSetPreferApn = false;
- private boolean mRadioAvailable = false;
@Override
protected void onActionIntentReconnectAlarm(Intent intent) {
@@ -1572,7 +1571,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
private void onRecordsLoaded() {
if (DBG) log("onRecordsLoaded: createAllApnList");
createAllApnList();
- if (mRadioAvailable) {
+ if (mPhone.mCM.getRadioState().isOn()) {
if (DBG) log("onRecordsLoaded: notifying data availability");
notifyDataAvailability(Phone.REASON_SIM_LOADED);
}
@@ -1706,7 +1705,6 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
@Override
protected void onRadioAvailable() {
if (DBG) log("onRadioAvailable");
- mRadioAvailable = true;
if (mPhone.getSimulatedRadioControl() != null) {
// Assume data is connected on the simulator
// FIXME this can be improved
@@ -1734,7 +1732,6 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
dc.resetRetryCount();
}
mReregisterOnReconnectFailure = false;
- mRadioAvailable = false;
if (mPhone.getSimulatedRadioControl() != null) {
// Assume data is connected on the simulator