diff options
author | twyen <twyen@google.com> | 2017-11-29 20:55:14 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-11-29 20:55:14 +0000 |
commit | 254649f0adb22f412a66dc1e708fb0fe49caceaa (patch) | |
tree | 87061813e836d2d612f0d53f402442cb47afe2df /java | |
parent | 002c66cda2a66ffdcde73442efb212e8341cb445 (diff) | |
parent | 0e029e7f6d270eda757ccd5981ea4c18489fbdd5 (diff) |
Merge "Fix resource not found when placing call outside dialer"
am: 0e029e7f6d
Change-Id: I26a5a05e9288ddb952dad3eae973f7d31644be72
Diffstat (limited to 'java')
-rw-r--r-- | java/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/java/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java b/java/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java index 3c9d9268f..e41a75b22 100644 --- a/java/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java +++ b/java/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java @@ -115,7 +115,9 @@ public class SelectPhoneAccountDialogFragment extends DialogFragment { final Bundle args = new Bundle(); args.putInt(ARG_TITLE_RES_ID, titleResId); args.putBoolean(ARG_CAN_SET_DEFAULT, canSetDefault); - args.putInt(ARG_SET_DEFAULT_RES_ID, setDefaultResId); + if (setDefaultResId != 0) { + args.putInt(ARG_SET_DEFAULT_RES_ID, setDefaultResId); + } args.putParcelableArrayList(ARG_ACCOUNT_HANDLES, accountHandlesCopy); args.putParcelable(ARG_LISTENER, listener); args.putString(ARG_CALL_ID, callId); |