am 30928eb6: am b1a3f0ca: Fix no data issue after system server crash (0042330e) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -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