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

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

Merge "Fix a bug where an action bar could be created when it should not be." into honeycomb-mr2

parents f3f2d731 a593d985
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -1760,6 +1760,11 @@ public class Activity extends ContextThemeWrapper
     */
    private void initActionBar() {
        Window window = getWindow();

        // Initializing the window decor can change window feature flags.
        // Make sure that we have the correct set before performing the test below.
        window.getDecorView();

        if (isChild() || !window.hasFeature(Window.FEATURE_ACTION_BAR) || mActionBar != null) {
            return;
        }