From 61f1ce0ec0692f4184edef3334a26973ba65edd7 Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Wed, 17 Mar 2010 19:26:58 -0700 Subject: [PATCH] Fix bug in airplane mode. If the phone comes up in airplane mode you and you turn it off, you can currently end with both mobile and wifi turned on. bug:2524413 Change-Id: I7a841c955be9038109d0b220070406a3fbd3e8e9 --- core/java/android/net/MobileDataStateTracker.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/java/android/net/MobileDataStateTracker.java b/core/java/android/net/MobileDataStateTracker.java index 22e432563cf3..98f32b36e99e 100644 --- a/core/java/android/net/MobileDataStateTracker.java +++ b/core/java/android/net/MobileDataStateTracker.java @@ -369,7 +369,11 @@ public class MobileDataStateTracker extends NetworkStateTracker { } // else fall through case Phone.APN_TYPE_NOT_AVAILABLE: - mEnabled = false; + // Default is always available, but may be off due to + // AirplaneMode or E-Call or whatever.. + if (mApnType != Phone.APN_TYPE_DEFAULT) { + mEnabled = false; + } break; default: Log.e(TAG, "Error in reconnect - unexpected response."); -- 2.11.0