diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-03-01 15:01:30 -0800 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2011-03-01 15:01:30 -0800 |
| commit | 25193d330e7daaed1d4678609326c4f84bf3d584 (patch) | |
| tree | 93d5d000d86c279a9412ea59c14ea94f2f3df80b /core | |
| parent | 6c2193a7e26c0794f45dfb60d2a0cf6ae776f390 (diff) | |
| download | frameworks_base-25193d330e7daaed1d4678609326c4f84bf3d584.zip frameworks_base-25193d330e7daaed1d4678609326c4f84bf3d584.tar.gz frameworks_base-25193d330e7daaed1d4678609326c4f84bf3d584.tar.bz2 | |
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
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/DialogFragment.java | 6 |
1 files changed, 5 insertions, 1 deletions
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); } |