summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorQi Wang <wangqi@google.com>2016-02-22 05:44:25 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-02-22 05:44:25 +0000
commit3ae96377da4c3602da7352b87446c636a6163c6d (patch)
tree544f50c5e5ec1dfd81e8f067356e70a6fb68c486 /src
parent1143e19b381fe8e9d4b509dfceacecb6ce47e4b0 (diff)
parent581a228372d0c84a70bbb5c2215f00dd290e5194 (diff)
Merge "Fix crash when rotating in multi-window mode." into nyc-dev
am: 581a228372 * commit '581a228372d0c84a70bbb5c2215f00dd290e5194': Fix crash when rotating in multi-window mode.
Diffstat (limited to 'src')
-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();