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

Commit 1193aa49 authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Revert "Revert "Move DozeServiceHost out of StatusBar."" 

This restores the refactoring of DozeServiceHost.

It was originally reverted because of strange behavior seen on the
lock screen that prevents the phone from being unlocked. Upon
review, I found that a call to StatusBar.updateDozingState() had been
erroneously omitted from StatusBar.onDozingChanged. Restoring this
call seems to make the observed problem go away.

Bug: 143484506
Test: atest SystemUITests
Change-Id: Ic024db5a3f2bdca3e877aa067f21cab6a5a45454
parent 233ae500

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java

+10 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.content.Context; 
import android.content.res.Configuration;

import android.graphics.Rect;

import android.graphics.drawable.Drawable;

import android.os.PowerManager;

import android.util.DisplayMetrics;

import android.util.Log;

import android.view.GestureDetector;
@@ -107,6 +108,8 @@ import com.android.systemui.statusbar.phone.AutoHideController; 
import com.android.systemui.statusbar.phone.BiometricUnlockController;

import com.android.systemui.statusbar.phone.CollapsedStatusBarFragment;

import com.android.systemui.statusbar.phone.DozeParameters;

import com.android.systemui.statusbar.phone.DozeScrimController;

import com.android.systemui.statusbar.phone.DozeServiceHost;

import com.android.systemui.statusbar.phone.HeadsUpManagerPhone;

import com.android.systemui.statusbar.phone.KeyguardBypassController;

import com.android.systemui.statusbar.phone.LightBarController;
@@ -295,6 +298,9 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
            ScrimController scrimController,

            Lazy<LockscreenWallpaper> lockscreenWallpaperLazy,

            Lazy<BiometricUnlockController> biometricUnlockControllerLazy,

            DozeServiceHost dozeServiceHost,

            PowerManager powerManager,

            DozeScrimController dozeScrimController,



            /* Car Settings injected components. */

            CarNavigationBarController carNavigationBarController) {
@@ -358,7 +364,10 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt 
                dozeParameters,

                scrimController,

                lockscreenWallpaperLazy,

                biometricUnlockControllerLazy);

                biometricUnlockControllerLazy,

                dozeServiceHost,

                powerManager,

                dozeScrimController);

        mScrimController = scrimController;

        mCarNavigationBarController = carNavigationBarController;

    }

packages/SystemUI/src/com/android/systemui/dagger/DependencyBinder.java

+8 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import com.android.systemui.ActivityStarterDelegate; 
import com.android.systemui.appops.AppOpsController;

import com.android.systemui.appops.AppOpsControllerImpl;

import com.android.systemui.classifier.FalsingManagerProxy;

import com.android.systemui.doze.DozeHost;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.plugins.DarkIconDispatcher;

import com.android.systemui.plugins.FalsingManager;
@@ -33,6 +34,7 @@ import com.android.systemui.statusbar.NotificationRemoteInputManager; 
import com.android.systemui.statusbar.StatusBarStateControllerImpl;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

import com.android.systemui.statusbar.phone.DarkIconDispatcherImpl;

import com.android.systemui.statusbar.phone.DozeServiceHost;

import com.android.systemui.statusbar.phone.ManagedProfileController;

import com.android.systemui.statusbar.phone.ManagedProfileControllerImpl;

import com.android.systemui.statusbar.phone.StatusBarIconController;
@@ -241,5 +243,10 @@ public abstract class DependencyBinder { 
    /**

     */

    @Binds

    public abstract FalsingManager provideFalsingmanager(FalsingManagerProxy falsingManagerImpl);

    public abstract FalsingManager provideFalsingManager(FalsingManagerProxy falsingManagerImpl);



    /**

     */

    @Binds

    public abstract DozeHost provideDozeHost(DozeServiceHost dozeServiceHost);

}

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

+2 −2
Original line number Diff line number Diff line
@@ -55,10 +55,10 @@ import javax.inject.Singleton; 
@Singleton

public class BiometricUnlockController extends KeyguardUpdateMonitorCallback {



    private static final String TAG = "BiometricUnlockController";

    private static final String TAG = "BiometricUnlockCtrl";

    private static final boolean DEBUG_BIO_WAKELOCK = KeyguardConstants.DEBUG_BIOMETRIC_WAKELOCK;

    private static final long BIOMETRIC_WAKELOCK_TIMEOUT_MS = 15 * 1000;

    private static final String BIOMETRIC_WAKE_LOCK_NAME = "wake-and-unlock wakelock";

    private static final String BIOMETRIC_WAKE_LOCK_NAME = "wake-and-unlock:wakelock";



    @IntDef(prefix = { "MODE_" }, value = {

            MODE_NONE,

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

+1 −7
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.os.UserHandle; 
import android.provider.Settings;

import android.util.MathUtils;



import com.android.internal.annotations.VisibleForTesting;

import com.android.systemui.R;

import com.android.systemui.dagger.qualifiers.MainResources;

import com.android.systemui.doze.AlwaysOnDisplayPolicy;
@@ -188,12 +187,7 @@ public class DozeParameters implements TunerService.Tunable, 
            return;

        }

        mControlScreenOffAnimation = controlScreenOffAnimation;

        getPowerManager().setDozeAfterScreenOff(!controlScreenOffAnimation);

    }



    @VisibleForTesting

    protected PowerManager getPowerManager() {

        return mPowerManager;

        mPowerManager.setDozeAfterScreenOff(!controlScreenOffAnimation);

    }



    private boolean getBoolean(String propName, int resId) {

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

+2 −0
Original line number Diff line number Diff line
@@ -29,10 +29,12 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController; 
import com.android.systemui.plugins.statusbar.StatusBarStateController.StateListener;



import javax.inject.Inject;

import javax.inject.Singleton;



/**

 * Controller which handles all the doze animations of the scrims.

 */

@Singleton

public class DozeScrimController implements StateListener {

    private static final String TAG = "DozeScrimController";

    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);