From dc38c541669ceaa1c1bc1efc45772f3869f1ccda Mon Sep 17 00:00:00 2001
From: twyen <twyen@google.com>
Date: Tue, 28 Nov 2017 11:46:43 -0800
Subject: Fix resource not found when placing call outside dialer

newInstance() defaults setDefaultResId to 0 and if it is written into the args the real default ID will not be used.

Bug: 69804734
Test: SelectPhoneAccountDialogFragmentTest
PiperOrigin-RevId: 177194281
Change-Id: Ic2b50fa741d812fd464d5e81199b040ef4c07195
---
 .../contacts/common/widget/SelectPhoneAccountDialogFragment.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'java/com/android/contacts')

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);
-- 
cgit v1.2.3