Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94b072b6 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #3411615: Crash when getting dialog layout inflator."

parents de1d7b4b 25193d33

core/java/android/app/DialogFragment.java

+5 −1
Original line number Diff line number Diff line
@@ -363,9 +363,13 @@ public class DialogFragment extends Fragment 
            case STYLE_NO_TITLE:

                mDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);

        }

        if (mDialog != null) {

            return (LayoutInflater)mDialog.getContext().getSystemService(

                    Context.LAYOUT_INFLATER_SERVICE);

        }

        return (LayoutInflater)mActivity.getSystemService(

                Context.LAYOUT_INFLATER_SERVICE);

    }

    

    /**

     * Override to build your own custom Dialog container.  This is typically