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

Commit b3a593eb authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Delay calling setHasOptionsMenu() to avoid a crash in Wifi Settings 

If it is called in onCreate(), it's too early for Wifi Settings,
which does its initialization in onActivityCreated().

Change-Id: I3d9b49f63d342e724fd4795fbca48d08faa3c3cc
parent e2b33708

src/com/android/settings/SettingsPreferenceFragment.java

+3 −3
Original line number Diff line number Diff line
@@ -55,15 +55,15 @@ public class SettingsPreferenceFragment extends PreferenceFragment implements Di 
        int helpResource = getHelpResource();

        if (helpResource != 0) {

            mHelpUrl = getResources().getString(helpResource);

            if (!TextUtils.isEmpty(mHelpUrl)) {

                setHasOptionsMenu(true);

            }

        }

    }



    @Override

    public void onActivityCreated(Bundle savedInstanceState) {

        super.onActivityCreated(savedInstanceState);

        if (!TextUtils.isEmpty(mHelpUrl)) {

            setHasOptionsMenu(true);

        }

    }



    /**