commit 9096a427ced8b020730cfce136a276ff00724485
author John Wang <johnwang@google.com> Fri Sep 03 14:17:20 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 03 14:17:20 2010 -0700
tree c77caeb6ee3c927ca337c075fef24f7eb66f53ea
parent 2856ccfbf25d2508e64b9ac4fb77f186968ec4b3
parent 419126a6969be5384742b2fbf5f8507d0513c8db

am 419126a6: am dc243482: Merge "Add API to get all foreground calls." into gingerbread

Merge commit '419126a6969be5384742b2fbf5f8507d0513c8db'

* commit '419126a6969be5384742b2fbf5f8507d0513c8db':
  Add API to get all foreground calls.

telephony/java/com/android/internal/telephony/CallManager.java

diff --git a/telephony/java/com/android/internal/telephony/CallManager.java b/telephony/java/com/android/internal/telephony/CallManager.java
index 12df44e..c1232e8 100644
--- a/telephony/java/com/android/internal/telephony/CallManager.java
+++ b/telephony/java/com/android/internal/telephony/CallManager.java
@@ -1108,14 +1108,21 @@
      */
 
     /**
-     * @return list of ringing calls
+     * @return list of all ringing calls
      */
     public ArrayList<Call> getRingingCalls() {
         return mRingingCalls;
     }
 
     /**
-     * @return list of background calls
+     * @return list of all foreground calls
+     */
+    public ArrayList<Call> getForegroundCalls() {
+        return mForegroundCalls;
+    }
+
+    /**
+     * @return list of all background calls
      */
     public ArrayList<Call> getBackgroundCalls() {
         return mBackgroundCalls;