From 887f2e401edb84867b8ee4026306269abb0f909b Mon Sep 17 00:00:00 2001
From: Wink Saville <wink@google.com>
Date: Fri, 10 Sep 2010 10:50:31 -0700
Subject: [PATCH] Fix bug 2972138 Lost cell data connection and didn't get it
 back, DO NOT MERGE.

The problem was ConnectvityService was not notified if a permanent error
occurs on the default apn.

bug: 2972138
Change-Id: I7be17061695ae2ba3571d70f24dcc4fe96d9ede9
---
 .../internal/telephony/gsm/GsmDataConnectionTracker.java    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
index f6d4491db35a7..e7d57bc220379 100644
--- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
+++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
@@ -1157,10 +1157,8 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
             // No try for permanent failure
             if (cause.isPermanentFail()) {
                 notifyNoData(cause);
-                if (!mRequestedApnType.equals(Phone.APN_TYPE_DEFAULT)) {
-                    phone.notifyDataConnection(Phone.REASON_APN_FAILED);
-                    onEnableApn(apnTypeToId(mRequestedApnType), DISABLED);
-                }
+                phone.notifyDataConnection(Phone.REASON_APN_FAILED);
+                onEnableApn(apnTypeToId(mRequestedApnType), DISABLED);
                 return;
             }