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

Commit 1db3c98f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix StationaryListener updating." into tm-dev am: 98d80bd7 

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



Change-Id: I23e1440d8997e92e659a859fe098aa0e7ecdde8f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d1acf458 98d80bd7

apex/jobscheduler/service/java/com/android/server/DeviceIdleController.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -693,6 +693,7 @@ public class DeviceIdleController extends SystemService 
        synchronized (DeviceIdleController.this) {

        synchronized (DeviceIdleController.this) {

            if (mStationaryListeners.size() > 0) {

            if (mStationaryListeners.size() > 0) {

                startMonitoringMotionLocked();

                startMonitoringMotionLocked();

                scheduleMotionTimeoutAlarmLocked();

            }

            }

        }

        }

    };

    };
@@ -3859,7 +3860,7 @@ public class DeviceIdleController extends SystemService 
    void handleMotionDetectedLocked(long timeout, String type) {

    void handleMotionDetectedLocked(long timeout, String type) {

        if (mStationaryListeners.size() > 0) {

        if (mStationaryListeners.size() > 0) {

            postStationaryStatusUpdated();

            postStationaryStatusUpdated();

            scheduleMotionTimeoutAlarmLocked();

            cancelMotionTimeoutAlarmLocked();

            // We need to re-register the motion listener, but we don't want the sensors to be

            // We need to re-register the motion listener, but we don't want the sensors to be

            // constantly active or to churn the CPU by registering too early, register after some

            // constantly active or to churn the CPU by registering too early, register after some

            // delay.

            // delay.

services/tests/mockingservicestests/src/com/android/server/DeviceIdleControllerTest.java

+65 −1
Original line number Original line Diff line number Diff line
@@ -284,7 +284,7 @@ public class DeviceIdleControllerTest { 
        @Override

        @Override

        public void onDeviceStationaryChanged(boolean isStationary) {

        public void onDeviceStationaryChanged(boolean isStationary) {

            if (isStationary == motionExpected) {

            if (isStationary == motionExpected) {

                fail("Unexpected device stationary status: " + isStationary);

                fail("Got unexpected device stationary status: " + isStationary);

            }

            }

            this.isStationary = isStationary;

            this.isStationary = isStationary;

        }

        }
@@ -2096,6 +2096,70 @@ public class DeviceIdleControllerTest { 
                        eq(SensorManager.SENSOR_DELAY_NORMAL));

                        eq(SensorManager.SENSOR_DELAY_NORMAL));

    }

    }





    @Test

    public void testStationaryDetection_NoDoze_AfterMotion() {

        // Short timeout for testing.

        mConstants.MOTION_INACTIVE_TIMEOUT = 6000L;

        doReturn(Sensor.REPORTING_MODE_CONTINUOUS).when(mMotionSensor).getReportingMode();

        setAlarmSoon(true);



        final ArgumentCaptor<AlarmManager.OnAlarmListener> regAlarmListener = ArgumentCaptor

                .forClass(AlarmManager.OnAlarmListener.class);

        final ArgumentCaptor<AlarmManager.OnAlarmListener> motionAlarmListener = ArgumentCaptor

                .forClass(AlarmManager.OnAlarmListener.class);

        doNothing().when(mAlarmManager).setWindow(

                anyInt(), anyLong(), anyLong(), eq("DeviceIdleController.motion"),

                motionAlarmListener.capture(), any());

        doNothing().when(mAlarmManager).setWindow(anyInt(), anyLong(), anyLong(),

                eq("DeviceIdleController.motion_registration"),

                regAlarmListener.capture(), any());

        ArgumentCaptor<SensorEventListener> listenerCaptor =

                ArgumentCaptor.forClass(SensorEventListener.class);



        StationaryListenerForTest stationaryListener = new StationaryListenerForTest();

        spyOn(stationaryListener);

        InOrder inOrder = inOrder(stationaryListener, mSensorManager, mAlarmManager);



        stationaryListener.motionExpected = true;

        mDeviceIdleController.registerStationaryListener(stationaryListener);

        inOrder.verify(stationaryListener, timeout(1000L).times(1))

                .onDeviceStationaryChanged(eq(false));

        assertFalse(stationaryListener.isStationary);

        inOrder.verify(mSensorManager)

                .registerListener(listenerCaptor.capture(), eq(mMotionSensor),

                        eq(SensorManager.SENSOR_DELAY_NORMAL));

        inOrder.verify(mAlarmManager).setWindow(

                anyInt(), eq(mInjector.nowElapsed + mConstants.MOTION_INACTIVE_TIMEOUT), anyLong(),

                eq("DeviceIdleController.motion"), any(), any());

        final SensorEventListener listener = listenerCaptor.getValue();



        // Trigger motion

        listener.onSensorChanged(mock(SensorEvent.class));

        inOrder.verify(stationaryListener, timeout(1000L).times(1))

                .onDeviceStationaryChanged(eq(false));

        final ArgumentCaptor<Long> registrationTimeCaptor = ArgumentCaptor.forClass(Long.class);

        inOrder.verify(mAlarmManager).setWindow(

                anyInt(), registrationTimeCaptor.capture(), anyLong(),

                eq("DeviceIdleController.motion_registration"), any(), any());



        // Make sure the listener is re-registered.

        mInjector.nowElapsed = registrationTimeCaptor.getValue();

        regAlarmListener.getValue().onAlarm();

        inOrder.verify(mSensorManager)

                .registerListener(eq(listener), eq(mMotionSensor),

                        eq(SensorManager.SENSOR_DELAY_NORMAL));

        final ArgumentCaptor<Long> timeoutCaptor = ArgumentCaptor.forClass(Long.class);

        inOrder.verify(mAlarmManager).setWindow(anyInt(), timeoutCaptor.capture(), anyLong(),

                eq("DeviceIdleController.motion"), any(), any());



        // No motion before timeout

        stationaryListener.motionExpected = false;

        mInjector.nowElapsed = timeoutCaptor.getValue();

        motionAlarmListener.getValue().onAlarm();

        inOrder.verify(stationaryListener, timeout(1000L).times(1))

                .onDeviceStationaryChanged(eq(true));

    }



    private void enterDeepState(int state) {

    private void enterDeepState(int state) {

        switch (state) {

        switch (state) {

            case STATE_ACTIVE:

            case STATE_ACTIVE: