Merge change 21581 into eclair

* changes:
  Fix CDMA to startup/shutdown based on apn en/disab

2 files changed, 9 insertions, 8 deletions

diff --git a/core/java/android/net/MobileDataStateTracker.java b/core/java/android/net/MobileDataStateTracker.java
index 6b00900..da1115d 100644
--- a/core/java/android/net/MobileDataStateTracker.java
+++ b/core/java/android/net/MobileDataStateTracker.java
@@ -49,7 +49,6 @@ public class MobileDataStateTracker extends NetworkStateTracker {
 
     private String mApnType;
     private boolean mEnabled;
-    private boolean mTeardownRequested;
 
     /**
      * Create a new MobileDataStateTracker
@@ -66,7 +65,6 @@ public class MobileDataStateTracker extends NetworkStateTracker {
                 TelephonyManager.getDefault().getNetworkTypeName());
         mApnType = apnType;
         mPhoneService = null;
-        mTeardownRequested = false;
         if(netType == ConnectivityManager.TYPE_MOBILE) {
             mEnabled = true;
         } else {
@@ -81,7 +79,9 @@ public class MobileDataStateTracker extends NetworkStateTracker {
                 "net.eth0.dns3",
                 "net.eth0.dns4",
                 "net.gprs.dns1",
-                "net.gprs.dns2"};
+                "net.gprs.dns2",
+                "net.ppp0.dns1",
+                "net.ppp0.dns2"};
 
     }
 
@@ -160,9 +160,9 @@ public class MobileDataStateTracker extends NetworkStateTracker {
 
                     switch (state) {
                     case DISCONNECTED:
-                        if(mTeardownRequested) {
+                        if(isTeardownRequested()) {
                             mEnabled = false;
-                            mTeardownRequested = false;
+                            setTeardownRequested(false);
                         }
 
                         setDetailedState(DetailedState.DISCONNECTED, reason, apnName);
@@ -277,7 +277,7 @@ public class MobileDataStateTracker extends NetworkStateTracker {
      */
     @Override
     public boolean teardown() {
-        mTeardownRequested = true;
+        setTeardownRequested(true);
         return (setEnableApn(mApnType, false) != Phone.APN_REQUEST_FAILED);
     }
 
@@ -286,7 +286,7 @@ public class MobileDataStateTracker extends NetworkStateTracker {
      */
     public boolean reconnect() {
         mEnabled = true;
-        mTeardownRequested = false;
+        setTeardownRequested(false);
         mEnabled = (setEnableApn(mApnType, true) !=
                 Phone.APN_REQUEST_FAILED);
         return mEnabled;
diff --git a/core/java/android/widget/ListView.java b/core/java/android/widget/ListView.java
index 02a137d..993b7cb 100644
--- a/core/java/android/widget/ListView.java
+++ b/core/java/android/widget/ListView.java
@@ -1428,7 +1428,8 @@ public class ListView extends AbsListView {
                 throw new IllegalStateException("The content of the adapter has changed but "
                         + "ListView did not receive a notification. Make sure the content of "
                         + "your adapter is not modified from a background thread, but only "
-                        + "from the UI thread.");
+                        + "from the UI thread. [in ListView(" + getId() + ", " + getClass() 
+                        + ") with Adapter(" + mAdapter.getClass() + ")]");
             }
 
             setSelectedPositionInt(mNextSelectedPosition);