diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-03-01 17:18:10 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-01 17:18:10 -0800 |
| commit | 94b072b6f4dda9b6847c3eeed14f07a4f6479453 (patch) | |
| tree | e3607bc15f453dfec88f5691280e5ab0e59e73d7 /core/java/android/app | |
| parent | de1d7b4be6cb77734b05c8d7990dc87c60d4f2b1 (diff) | |
| parent | 25193d330e7daaed1d4678609326c4f84bf3d584 (diff) | |
| download | frameworks_base-94b072b6f4dda9b6847c3eeed14f07a4f6479453.zip frameworks_base-94b072b6f4dda9b6847c3eeed14f07a4f6479453.tar.gz frameworks_base-94b072b6f4dda9b6847c3eeed14f07a4f6479453.tar.bz2 | |
Merge "Fix issue #3411615: Crash when getting dialog layout inflator."
Diffstat (limited to 'core/java/android/app')
| -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); } |