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

Commit 9ae88c5d authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Move an initialization line to prevent merge conflicts from tm-qpr-dev"... 

Merge "Move an initialization line to prevent merge conflicts from tm-qpr-dev" into udc-dev am: bf8ebf8e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22221248



Change-Id: I70467c7e6f3b152dc05c98e4dff830ace46b0bc1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 343ec44f bf8ebf8e

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -864,6 +864,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        mStatusBarSignalPolicy = statusBarSignalPolicy;

        mStatusBarHideIconsForBouncerManager = statusBarHideIconsForBouncerManager;

        mFeatureFlags = featureFlags;

        mIsShortcutListSearchEnabled = featureFlags.isEnabled(Flags.SHORTCUT_LIST_SEARCH_LAYOUT);

        mKeyguardUnlockAnimationController = keyguardUnlockAnimationController;

        mMainExecutor = delayableExecutor;

        mMessageRouter = messageRouter;
@@ -872,7 +873,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 
        mCameraLauncherLazy = cameraLauncherLazy;

        mAlternateBouncerInteractor = alternateBouncerInteractor;

        mUserTracker = userTracker;

        mIsShortcutListSearchEnabled = featureFlags.isEnabled(Flags.SHORTCUT_LIST_SEARCH_LAYOUT);



        mLockscreenShadeTransitionController = lockscreenShadeTransitionController;

        mStartingSurfaceOptional = startingSurfaceOptional;