diff options
author | John Wang <johnwang@google.com> | 2010-09-14 10:28:33 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-14 10:28:33 -0700 |
commit | e7b92d7b53343119173558302ecfb3986ae0fbd6 (patch) | |
tree | a86a58d1cbcb5976cbf670ed0ed6ef59c809c48f /telephony | |
parent | 901b7b9b17d20dc8085fb5fd3bab0f0804f3906b (diff) | |
parent | bc0e400d78ccba89af9a1472dcbf1853a73f7d0d (diff) | |
download | frameworks_base-e7b92d7b53343119173558302ecfb3986ae0fbd6.zip frameworks_base-e7b92d7b53343119173558302ecfb3986ae0fbd6.tar.gz frameworks_base-e7b92d7b53343119173558302ecfb3986ae0fbd6.tar.bz2 |
Merge "Return immutable copies of private callList." into gingerbread
Diffstat (limited to 'telephony')
-rw-r--r-- | telephony/java/com/android/internal/telephony/CallManager.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/telephony/java/com/android/internal/telephony/CallManager.java b/telephony/java/com/android/internal/telephony/CallManager.java index 4bf3282..d522bde 100644 --- a/telephony/java/com/android/internal/telephony/CallManager.java +++ b/telephony/java/com/android/internal/telephony/CallManager.java @@ -1144,22 +1144,22 @@ public final class CallManager { /** * @return list of all ringing calls */ - public ArrayList<Call> getRingingCalls() { - return mRingingCalls; + public List<Call> getRingingCalls() { + return Collections.unmodifiableList(mRingingCalls); } /** * @return list of all foreground calls */ - public ArrayList<Call> getForegroundCalls() { - return mForegroundCalls; + public List<Call> getForegroundCalls() { + return Collections.unmodifiableList(mForegroundCalls); } /** * @return list of all background calls */ - public ArrayList<Call> getBackgroundCalls() { - return mBackgroundCalls; + public List<Call> getBackgroundCalls() { + return Collections.unmodifiableList(mBackgroundCalls); } /** @@ -1269,7 +1269,7 @@ public final class CallManager { /** * @return the connections of active foreground call - * return null if there is no active foreground call + * return empty list if there is no active foreground call */ public List<Connection> getFgCallConnections() { Call fgCall = getActiveFgCall(); |