From afa79585e0e517d9fdfe6065bc5084cab9bb2300 Mon Sep 17 00:00:00 2001
From: Wink Saville <wink@google.com>
Date: Mon, 18 Apr 2011 16:03:03 -0700
Subject: [PATCH] Remove getCurrentDataConnectionList.

This should not be exposed externally and is used only by
RadioInfo.java a hidden application used for debugging.
I'll another mechanism which will probably use an
asynchronous interface with the DataConnectionTracker.

Change-Id: Ic21cc8d45bd3172c2ceeab154eca6118d94580e9
---
 .../android/internal/telephony/DataConnectionTracker.java | 8 --------
 telephony/java/com/android/internal/telephony/Phone.java  | 7 -------
 .../java/com/android/internal/telephony/PhoneProxy.java   | 4 ----
 .../com/android/internal/telephony/cdma/CDMAPhone.java    | 4 ----
 .../java/com/android/internal/telephony/gsm/GSMPhone.java | 4 ----
 5 files changed, 27 deletions(-)

diff --git a/telephony/java/com/android/internal/telephony/DataConnectionTracker.java b/telephony/java/com/android/internal/telephony/DataConnectionTracker.java
index 3280c442e65f3..01ac95fdf8f0d 100644
--- a/telephony/java/com/android/internal/telephony/DataConnectionTracker.java
+++ b/telephony/java/com/android/internal/telephony/DataConnectionTracker.java
@@ -365,14 +365,6 @@ public abstract class DataConnectionTracker extends Handler {
         return mActivity;
     }
 
-    /**
-     * @return the data connections
-     */
-    public ArrayList<DataConnection> getAllDataConnections() {
-        /** TODO: change return type to Collection? */
-        return new ArrayList<DataConnection>(mDataConnections.values());
-    }
-
     public boolean isApnTypeActive(String type) {
         // TODO: support simultaneous with List instead
         if (Phone.APN_TYPE_DUN.equals(type)) {
diff --git a/telephony/java/com/android/internal/telephony/Phone.java b/telephony/java/com/android/internal/telephony/Phone.java
index 56be570813de2..b99f39b9ccddb 100644
--- a/telephony/java/com/android/internal/telephony/Phone.java
+++ b/telephony/java/com/android/internal/telephony/Phone.java
@@ -1249,13 +1249,6 @@ public interface Phone {
      */
     void getDataCallList(Message response);
 
-    /**
-     * Get current mutiple data connection status
-     *
-     * @return list of data connections
-     */
-    List<DataConnection> getCurrentDataConnectionList();
-
     /**
      * Update the ServiceState CellLocation for current network registration.
      */
diff --git a/telephony/java/com/android/internal/telephony/PhoneProxy.java b/telephony/java/com/android/internal/telephony/PhoneProxy.java
index 5e506b35f63ac..a3fc25d3f410f 100644
--- a/telephony/java/com/android/internal/telephony/PhoneProxy.java
+++ b/telephony/java/com/android/internal/telephony/PhoneProxy.java
@@ -593,10 +593,6 @@ public class PhoneProxy extends Handler implements Phone {
         mActivePhone.getDataCallList(response);
     }
 
-    public List<DataConnection> getCurrentDataConnectionList() {
-        return mActivePhone.getCurrentDataConnectionList();
-    }
-
     public void updateServiceLocation() {
         mActivePhone.updateServiceLocation();
     }
diff --git a/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java b/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java
index b077a5eeb7743..152ffd5c30ce4 100755
--- a/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java
+++ b/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java
@@ -727,10 +727,6 @@ public class CDMAPhone extends PhoneBase {
         return mDataConnectionTracker.getDataOnRoamingEnabled();
     }
 
-    public List<DataConnection> getCurrentDataConnectionList () {
-        return mDataConnectionTracker.getAllDataConnections();
-    }
-
     public void setVoiceMailNumber(String alphaTag,
                                    String voiceMailNumber,
                                    Message onComplete) {
diff --git a/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java b/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java
index ff3e3cc424fe0..b137ca777281b 100644
--- a/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java
+++ b/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java
@@ -1069,10 +1069,6 @@ public class GSMPhone extends PhoneBase {
         mCM.getDataCallList(response);
     }
 
-    public List<DataConnection> getCurrentDataConnectionList () {
-        return mDataConnectionTracker.getAllDataConnections();
-    }
-
     public void updateServiceLocation() {
         mSST.enableSingleLocationUpdate();
     }