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

Commit 17fcb5c8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Stop sharing ProximitySensor in Doze code." into rvc-dev am: a48f9637 

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

Change-Id: I168d62fadd0fef1f6bc4cefcecb06f7a32b22f5c
parents 4f2095f8 a48f9637

packages/SystemUI/src/com/android/systemui/doze/DozeFactory.java

+10 −11
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import com.android.systemui.plugins.FalsingManager; 
import com.android.systemui.statusbar.phone.BiometricUnlockController;

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

import com.android.systemui.statusbar.policy.BatteryController;

import com.android.systemui.util.concurrency.DelayableExecutor;

import com.android.systemui.util.sensors.AsyncSensorManager;

import com.android.systemui.util.sensors.ProximitySensor;

import com.android.systemui.util.wakelock.DelayedWakeLock;
@@ -56,9 +55,9 @@ public class DozeFactory { 
    private final DockManager mDockManager;

    private final IWallpaperManager mWallpaperManager;

    private final ProximitySensor mProximitySensor;

    private final ProximitySensor.ProximityCheck mProximityCheck;

    private final DelayedWakeLock.Builder mDelayedWakeLockBuilder;

    private final Handler mHandler;

    private final DelayableExecutor mDelayableExecutor;

    private final BiometricUnlockController mBiometricUnlockController;

    private final BroadcastDispatcher mBroadcastDispatcher;

    private final DozeHost mDozeHost;
@@ -69,9 +68,8 @@ public class DozeFactory { 
            AsyncSensorManager asyncSensorManager, AlarmManager alarmManager,

            WakefulnessLifecycle wakefulnessLifecycle, KeyguardUpdateMonitor keyguardUpdateMonitor,

            DockManager dockManager, @Nullable IWallpaperManager wallpaperManager,

            ProximitySensor proximitySensor,

            ProximitySensor proximitySensor, ProximitySensor.ProximityCheck proximityCheck,

            DelayedWakeLock.Builder delayedWakeLockBuilder, @Main Handler handler,

            @Main DelayableExecutor delayableExecutor,

            BiometricUnlockController biometricUnlockController,

            BroadcastDispatcher broadcastDispatcher, DozeHost dozeHost) {

        mFalsingManager = falsingManager;
@@ -85,9 +83,9 @@ public class DozeFactory { 
        mDockManager = dockManager;

        mWallpaperManager = wallpaperManager;

        mProximitySensor = proximitySensor;

        mProximityCheck = proximityCheck;

        mDelayedWakeLockBuilder = delayedWakeLockBuilder;

        mHandler = handler;

        mDelayableExecutor = delayableExecutor;

        mBiometricUnlockController = biometricUnlockController;

        mBroadcastDispatcher = broadcastDispatcher;

        mDozeHost = dozeHost;
@@ -112,8 +110,8 @@ public class DozeFactory { 
                new DozePauser(mHandler, machine, mAlarmManager, mDozeParameters.getPolicy()),

                new DozeFalsingManagerAdapter(mFalsingManager),

                createDozeTriggers(dozeService, mAsyncSensorManager, mDozeHost,

                        mAlarmManager, config, mDozeParameters, mDelayableExecutor, wakeLock,

                        machine, mDockManager, mDozeLog),

                        mAlarmManager, config, mDozeParameters, wakeLock,

                        machine, mDockManager, mDozeLog, mProximityCheck),

                createDozeUi(dozeService, mDozeHost, wakeLock, machine, mHandler,

                        mAlarmManager, mDozeParameters, mDozeLog),

                new DozeScreenState(wrappedService, mHandler, mDozeHost, mDozeParameters,
@@ -140,12 +138,13 @@ public class DozeFactory { 


    private DozeTriggers createDozeTriggers(Context context, AsyncSensorManager sensorManager,

            DozeHost host, AlarmManager alarmManager, AmbientDisplayConfiguration config,

            DozeParameters params, DelayableExecutor delayableExecutor, WakeLock wakeLock,

            DozeMachine machine, DockManager dockManager, DozeLog dozeLog) {

            DozeParameters params, WakeLock wakeLock,

            DozeMachine machine, DockManager dockManager, DozeLog dozeLog,

            ProximitySensor.ProximityCheck proximityCheck) {

        boolean allowPulseTriggers = true;

        return new DozeTriggers(context, machine, host, alarmManager, config, params,

                sensorManager, delayableExecutor, wakeLock, allowPulseTriggers, dockManager,

                mProximitySensor, dozeLog, mBroadcastDispatcher);

                sensorManager, wakeLock, allowPulseTriggers, dockManager,

                mProximitySensor, proximityCheck, dozeLog, mBroadcastDispatcher);



    }

packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java

+3 −4
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ import com.android.systemui.broadcast.BroadcastDispatcher; 
import com.android.systemui.dock.DockManager;

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

import com.android.systemui.util.Assert;

import com.android.systemui.util.concurrency.DelayableExecutor;

import com.android.systemui.util.sensors.AsyncSensorManager;

import com.android.systemui.util.sensors.ProximitySensor;

import com.android.systemui.util.wakelock.WakeLock;
@@ -153,8 +152,8 @@ public class DozeTriggers implements DozeMachine.Part { 
    public DozeTriggers(Context context, DozeMachine machine, DozeHost dozeHost,

            AlarmManager alarmManager, AmbientDisplayConfiguration config,

            DozeParameters dozeParameters, AsyncSensorManager sensorManager,

            DelayableExecutor delayableExecutor, WakeLock wakeLock, boolean allowPulseTriggers,

            DockManager dockManager, ProximitySensor proximitySensor,

            WakeLock wakeLock, boolean allowPulseTriggers, DockManager dockManager,

            ProximitySensor proximitySensor, ProximitySensor.ProximityCheck proxCheck,

            DozeLog dozeLog, BroadcastDispatcher broadcastDispatcher) {

        mContext = context;

        mMachine = machine;
@@ -168,7 +167,7 @@ public class DozeTriggers implements DozeMachine.Part { 
                config, wakeLock, this::onSensor, this::onProximityFar, dozeLog, proximitySensor);

        mUiModeManager = mContext.getSystemService(UiModeManager.class);

        mDockManager = dockManager;

        mProxCheck = new ProximitySensor.ProximityCheck(proximitySensor, delayableExecutor);

        mProxCheck = proxCheck;

        mDozeLog = dozeLog;

        mBroadcastDispatcher = broadcastDispatcher;

    }

packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java

+4 −5
Original line number Diff line number Diff line
@@ -41,12 +41,10 @@ import com.android.systemui.SysuiTestCase; 
import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.dock.DockManager;

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

import com.android.systemui.util.concurrency.FakeExecutor;

import com.android.systemui.util.sensors.AsyncSensorManager;

import com.android.systemui.util.sensors.FakeProximitySensor;

import com.android.systemui.util.sensors.FakeSensorManager;

import com.android.systemui.util.sensors.ProximitySensor;

import com.android.systemui.util.time.FakeSystemClock;

import com.android.systemui.util.wakelock.WakeLock;

import com.android.systemui.util.wakelock.WakeLockFake;
@@ -72,11 +70,12 @@ public class DozeTriggersTest extends SysuiTestCase { 
    private BroadcastDispatcher mBroadcastDispatcher;

    @Mock

    private DockManager mDockManager;

    @Mock

    private ProximitySensor.ProximityCheck mProximityCheck;

    private DozeTriggers mTriggers;

    private FakeSensorManager mSensors;

    private Sensor mTapSensor;

    private FakeProximitySensor mProximitySensor;

    private FakeExecutor mFakeExecutor = new FakeExecutor(new FakeSystemClock());



    @Before

    public void setUp() throws Exception {
@@ -91,8 +90,8 @@ public class DozeTriggersTest extends SysuiTestCase { 
        mProximitySensor = new FakeProximitySensor(getContext().getResources(), asyncSensorManager);



        mTriggers = new DozeTriggers(mContext, mMachine, mHost, mAlarmManager, config, parameters,

                asyncSensorManager, mFakeExecutor, wakeLock, true,

                mDockManager, mProximitySensor, mock(DozeLog.class), mBroadcastDispatcher);

                asyncSensorManager, wakeLock, true, mDockManager, mProximitySensor,

                mProximityCheck, mock(DozeLog.class), mBroadcastDispatcher);

        waitForSensorManager();

    }