diff options
| -rw-r--r-- | core/java/android/app/Activity.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index edfd6ef04473..fc4d12ca57ca 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -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; } |