From dcbba67afc08d0ac9af53e95d5997af11f869853 Mon Sep 17 00:00:00 2001
From: Ramesh Sudini <ramesh.sudini@motorola.com>
Date: Mon, 25 Apr 2011 12:58:05 -0500
Subject: [PATCH] Telephony: Fix merge issue "Set enabled state before
 notification is sent out."

The original change-id was I6e84920b8d082fd6da838bccb5333051362bc4bc

Change-Id: I758641f8b29346a868e1b6b454ccd3f2341dffb8
---
 .../internal/telephony/gsm/GsmDataConnectionTracker.java       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
index fc1d536c20f2d..223c8adc644db 100644
--- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
+++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
@@ -1596,13 +1596,12 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
         apnContext.setState(State.IDLE);
         apnContext.setApnSetting(null);
 
-        mPhone.notifyDataConnection(apnContext.getReason(), apnContext.getApnType());
-
         // Check if APN disabled.
         if (apnContext.getPendingAction() == ApnContext.PENDING_ACTION_APN_DISABLE) {
            apnContext.setEnabled(false);
            apnContext.setPendingAction(ApnContext.PENDING_ACTION_NONE);
         }
+        mPhone.notifyDataConnection(apnContext.getReason(), apnContext.getApnType());
 
         // if all data connection are gone, check whether Airplane mode request was
         // pending.