From 59ceeae4ec2284ad0b90b0101f2c491be72cec33 Mon Sep 17 00:00:00 2001
From: Robert Greenwalt <robdroid@android.com>
Date: Mon, 28 Sep 2009 21:04:22 -0700
Subject: [PATCH] Fix the reporting of ActiveApnTypes on CDMA

Previous fix limiting what was reported active was too strict, leading to
DISCONNECTED messages not being accepted (apn list was empty).

bug: 2151520
---
 .../internal/telephony/cdma/CdmaDataConnectionTracker.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
index 93b48a9465ad8..9407603308a3a 100644
--- a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
+++ b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
@@ -246,7 +246,7 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
     @Override
     protected boolean isApnTypeActive(String type) {
         return (isApnTypeAvailable(type) &&
-                (state == State.CONNECTED || state == State.INITING));
+                (state != State.IDLE));
     }
 
     @Override
@@ -260,7 +260,7 @@ public final class CdmaDataConnectionTracker extends DataConnectionTracker {
     }
 
     protected String[] getActiveApnTypes() {
-        if (state == State.CONNECTED || state == State.INITING) {
+        if (state != State.IDLE) {
             return mSupportedApnTypes.clone();
         }
         return new String[0];