summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQi Wang <wangqi@google.com>2016-02-22 05:40:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-02-22 05:40:51 +0000
commit581a228372d0c84a70bbb5c2215f00dd290e5194 (patch)
tree0598f298535fd5b07d7142e7c8cb1e28e21fb261
parent8a95000248c75c2d4534cf6e18c42b30da54f9e5 (diff)
parent628de9b7d21628d442902a154e02e44372b8997c (diff)
Merge "Fix crash when rotating in multi-window mode." into nyc-dev
-rw-r--r--src/com/android/dialer/interactions/PhoneNumberInteraction.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/com/android/dialer/interactions/PhoneNumberInteraction.java b/src/com/android/dialer/interactions/PhoneNumberInteraction.java
index 24728450c..0c3ae510a 100644
--- a/src/com/android/dialer/interactions/PhoneNumberInteraction.java
+++ b/src/com/android/dialer/interactions/PhoneNumberInteraction.java
@@ -191,6 +191,7 @@ public class PhoneNumberInteraction implements OnLoadCompleteListener<Cursor> {
private static final String ARG_PHONE_LIST = "phoneList";
private static final String ARG_INTERACTION_TYPE = "interactionType";
private static final String ARG_CALL_INITIATION_TYPE = "callInitiation";
+ private static final String ARG_IS_VIDEO_CALL = "is_video_call";
private int mInteractionType;
private ListAdapter mPhonesAdapter;
@@ -200,19 +201,18 @@ public class PhoneNumberInteraction implements OnLoadCompleteListener<Cursor> {
public static void show(FragmentManager fragmentManager, ArrayList<PhoneItem> phoneList,
int interactionType, boolean isVideoCall, int callInitiationType) {
- PhoneDisambiguationDialogFragment fragment = new PhoneDisambiguationDialogFragment(
- isVideoCall);
+ PhoneDisambiguationDialogFragment fragment = new PhoneDisambiguationDialogFragment();
Bundle bundle = new Bundle();
bundle.putParcelableArrayList(ARG_PHONE_LIST, phoneList);
bundle.putInt(ARG_INTERACTION_TYPE, interactionType);
bundle.putInt(ARG_CALL_INITIATION_TYPE, callInitiationType);
+ bundle.putBoolean(ARG_IS_VIDEO_CALL, isVideoCall);
fragment.setArguments(bundle);
fragment.show(fragmentManager, TAG);
}
- public PhoneDisambiguationDialogFragment(boolean isVideoCall) {
+ public PhoneDisambiguationDialogFragment() {
super();
- mIsVideoCall = isVideoCall;
}
@Override
@@ -221,6 +221,7 @@ public class PhoneNumberInteraction implements OnLoadCompleteListener<Cursor> {
mPhoneList = getArguments().getParcelableArrayList(ARG_PHONE_LIST);
mInteractionType = getArguments().getInt(ARG_INTERACTION_TYPE);
mCallInitiationType = getArguments().getInt(ARG_CALL_INITIATION_TYPE);
+ mIsVideoCall = getArguments().getBoolean(ARG_IS_VIDEO_CALL);
mPhonesAdapter = new PhoneItemAdapter(activity, mPhoneList, mInteractionType);
final LayoutInflater inflater = activity.getLayoutInflater();