commit 9e1e1360d3f8910e9f0c7d6f16ea0e4f12bcf8cc
author Robert Greenwalt <rgreenwalt@google.com> Fri Apr 08 16:44:32 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 08 16:44:32 2011 -0700
tree 5ceda7e3381907c8b218db1d8c31885226d66ea0
parent dcd2ef9acc34c70e7a3c698d7e01e8af0af00f20
parent de78352c6c048e009fbeefb40a2b06a8573f7b7e

am de78352c: am ac9c73ae: Merge "Fix notification of disconnected networks." into honeycomb-LTE

* commit 'de78352c6c048e009fbeefb40a2b06a8573f7b7e':
  Fix notification of disconnected networks.

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

diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
index 53cbad5..ecc29e6 100644
--- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
+++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
@@ -1569,13 +1569,16 @@
         if(DBG) log("EVENT_DISCONNECT_DONE connId=" + connId);
         if (ar.userObj instanceof ApnContext) {
             apnContext = (ApnContext) ar.userObj;
+        } else {
+            loge("Invalid ar in onDisconnectDone");
+            return;
         }
 
-        mPhone.notifyDataConnection(apnContext.getReason(), apnContext.getApnType());
-
         apnContext.setState(State.IDLE);
         apnContext.setApnSetting(null);
 
+        mPhone.notifyDataConnection(apnContext.getReason(), apnContext.getApnType());
+
         // if all data connection are gone, check whether Airplane mode request was
         // pending.
         if (!isConnected()) {