From 25193d330e7daaed1d4678609326c4f84bf3d584 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Tue, 1 Mar 2011 15:01:30 -0800 Subject: Fix issue #3411615: Crash when getting dialog layout inflator. Well, I'm not sure it is right for onCreateDialog() to return a null dialog, but if it does, let's not crash here. Change-Id: I5ff49b9b3c326d9005f70a01435c01bfc7307343 --- core/java/android/app/DialogFragment.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'core') diff --git a/core/java/android/app/DialogFragment.java b/core/java/android/app/DialogFragment.java index 50953d7..c1d5b2f 100644 --- a/core/java/android/app/DialogFragment.java +++ b/core/java/android/app/DialogFragment.java @@ -363,7 +363,11 @@ public class DialogFragment extends Fragment case STYLE_NO_TITLE: mDialog.requestWindowFeature(Window.FEATURE_NO_TITLE); } - return (LayoutInflater)mDialog.getContext().getSystemService( + if (mDialog != null) { + return (LayoutInflater)mDialog.getContext().getSystemService( + Context.LAYOUT_INFLATER_SERVICE); + } + return (LayoutInflater)mActivity.getSystemService( Context.LAYOUT_INFLATER_SERVICE); } -- cgit v1.1