Merge "Fix bug in airplane mode."

1 files changed, 5 insertions, 1 deletions

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.");