Merge "Fix bug in airplane mode."

2010-03-18 11:09:11 -07:00
parent 4ce4febe72 61f1ce0ec0
commit 2fbc10f355
1 changed files with 5 additions and 1 deletions
--- 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.");