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

Commit 6be46067 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Status bar does not show up after boot" into main

parents 1f0f9dee c34cb133

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+3 −2
Original line number Diff line number Diff line
@@ -176,6 +176,8 @@ import com.android.systemui.util.time.SystemClock; 
import com.android.systemui.wallpapers.data.repository.WallpaperRepository;

import com.android.wm.shell.keyguard.KeyguardTransitions;



import dagger.Lazy;



import java.io.PrintWriter;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;
@@ -185,7 +187,6 @@ import java.util.Objects; 
import java.util.concurrent.Executor;

import java.util.function.Consumer;



import dagger.Lazy;

import kotlinx.coroutines.CoroutineDispatcher;



/**
@@ -3014,7 +3015,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
                        && mPM.isInteractive(), WakeAndUnlockUpdateReason.HIDE);

            }



            if ((mShowing && !mOccluded) || mUnlockingAndWakingFromDream) {

            if (mBootCompleted && ((mShowing && !mOccluded) || mUnlockingAndWakingFromDream)) {

                if (mUnlockingAndWakingFromDream) {

                    Log.d(TAG, "hiding keyguard before waking from dream");

                }

packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java

+1 −0
Original line number Diff line number Diff line
@@ -1240,6 +1240,7 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { 
        mViewMediator.start();



        mViewMediator.registerCentralSurfaces(mCentralSurfaces, null, null, null, null);

        mViewMediator.onBootCompleted();

    }



    private void captureKeyguardStateControllerCallback() {