summaryrefslogtreecommitdiff
path: root/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java
diff options
context:
space:
mode:
Diffstat (limited to 'InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java')
-rw-r--r--InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java b/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java
index ec706d074..b505e29f4 100644
--- a/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java
+++ b/InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java
@@ -34,7 +34,7 @@ public class ConferenceManagerPresenter
private static final int MAX_CALLERS_IN_CONFERENCE = 5;
- private Integer[] mCallerIds;
+ private String[] mCallerIds;
private Context mContext;
@Override
@@ -82,9 +82,9 @@ public class ConferenceManagerPresenter
final Call currentCall = callList.getActiveOrBackgroundCall();
if (currentCall != null) {
// getChildCallIds() always returns a valid Set
- mCallerIds = currentCall.getChildCallIds().toArray(new Integer[0]);
+ mCallerIds = currentCall.getChildCallIds().toArray(new String[0]);
} else {
- mCallerIds = new Integer[0];
+ mCallerIds = new String[0];
}
Log.d(this, "Number of calls is " + String.valueOf(mCallerIds.length));