diff options
author | John Wang <johnwang@google.com> | 2010-09-14 10:31:45 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-14 10:31:45 -0700 |
commit | e92fdd261eed516a8821675ceca971d1c90d772b (patch) | |
tree | 9857865cb8784d9d242c60adc43a0f82ce930fee /telephony | |
parent | 720d5985f5d31912c97b7e549230d241e58c1298 (diff) | |
parent | e7b92d7b53343119173558302ecfb3986ae0fbd6 (diff) | |
download | frameworks_base-e92fdd261eed516a8821675ceca971d1c90d772b.zip frameworks_base-e92fdd261eed516a8821675ceca971d1c90d772b.tar.gz frameworks_base-e92fdd261eed516a8821675ceca971d1c90d772b.tar.bz2 |
am e7b92d7b: Merge "Return immutable copies of private callList." into gingerbread
Merge commit 'e7b92d7b53343119173558302ecfb3986ae0fbd6' into gingerbread-plus-aosp
* commit 'e7b92d7b53343119173558302ecfb3986ae0fbd6':
Return immutable copies of private callList.
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(); |