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

Commit 8a13aa7b authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Ignore wake-up sensor right after sleeping 

Otherwise the phone might not turn off if the sensor false-triggers

Test: manual
Test: atest DozeSensorsTest
Change-Id: If1be8158c5b342e9d892dd55f1a7db156bbf1a17
parent 012281c7

core/java/com/android/internal/hardware/AmbientDisplayConfiguration.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -86,6 +86,10 @@ public class AmbientDisplayConfiguration { 
                && wakeScreenGestureAvailable();

                && wakeScreenGestureAvailable();

    }

    }





    public long getWakeLockScreenDebounce() {

        return mContext.getResources().getInteger(R.integer.config_dozeWakeLockScreenDebounce);

    }



    public String doubleTapSensorType() {

    public String doubleTapSensorType() {

        return mContext.getResources().getString(R.string.config_dozeDoubleTapSensorType);

        return mContext.getResources().getString(R.string.config_dozeDoubleTapSensorType);

    }

    }

core/res/res/values/config.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -2272,6 +2272,7 @@ 




    <!-- If the sensor that wakes up the lock screen is available or not. -->

    <!-- If the sensor that wakes up the lock screen is available or not. -->

    <bool name="config_dozeWakeLockScreenSensorAvailable">false</bool>

    <bool name="config_dozeWakeLockScreenSensorAvailable">false</bool>

    <integer name="config_dozeWakeLockScreenDebounce">3000</integer>





    <!-- Control whether the always on display mode is available. This should only be enabled on

    <!-- Control whether the always on display mode is available. This should only be enabled on

         devices where the display has been tuned to be power efficient in DOZE and/or DOZE_SUSPEND

         devices where the display has been tuned to be power efficient in DOZE and/or DOZE_SUSPEND

core/res/res/values/symbols.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -3404,6 +3404,7 @@ 




  <java-symbol type="string" name="config_dozeLongPressSensorType" />

  <java-symbol type="string" name="config_dozeLongPressSensorType" />

  <java-symbol type="bool" name="config_dozeWakeLockScreenSensorAvailable" />

  <java-symbol type="bool" name="config_dozeWakeLockScreenSensorAvailable" />

  <java-symbol type="integer" name="config_dozeWakeLockScreenDebounce" />





  <java-symbol type="array" name="config_allowedGlobalInstantAppSettings" />

  <java-symbol type="array" name="config_allowedGlobalInstantAppSettings" />

  <java-symbol type="array" name="config_allowedSystemInstantAppSettings" />

  <java-symbol type="array" name="config_allowedSystemInstantAppSettings" />

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

+45 −16
Original line number Original line Diff line number Diff line
@@ -38,6 +38,8 @@ import android.provider.Settings; 
import android.text.TextUtils;

import android.text.TextUtils;

import android.util.Log;

import android.util.Log;





import androidx.annotation.VisibleForTesting;



import com.android.internal.hardware.AmbientDisplayConfiguration;

import com.android.internal.hardware.AmbientDisplayConfiguration;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto;

import com.android.internal.logging.nano.MetricsProto;
@@ -60,7 +62,6 @@ public class DozeSensors { 
    private final Context mContext;

    private final Context mContext;

    private final AlarmManager mAlarmManager;

    private final AlarmManager mAlarmManager;

    private final SensorManager mSensorManager;

    private final SensorManager mSensorManager;

    private final TriggerSensor[] mSensors;

    private final ContentResolver mResolver;

    private final ContentResolver mResolver;

    private final TriggerSensor mPickupSensor;

    private final TriggerSensor mPickupSensor;

    private final DozeParameters mDozeParameters;

    private final DozeParameters mDozeParameters;
@@ -68,10 +69,12 @@ public class DozeSensors { 
    private final WakeLock mWakeLock;

    private final WakeLock mWakeLock;

    private final Consumer<Boolean> mProxCallback;

    private final Consumer<Boolean> mProxCallback;

    private final Callback mCallback;

    private final Callback mCallback;

    @VisibleForTesting

    protected final TriggerSensor[] mSensors;





    private final Handler mHandler = new Handler();

    private final Handler mHandler = new Handler();

    private final ProxSensor mProxSensor;

    private final ProxSensor mProxSensor;



    private long mDebounceFrom;





    public DozeSensors(Context context, AlarmManager alarmManager, SensorManager sensorManager,

    public DozeSensors(Context context, AlarmManager alarmManager, SensorManager sensorManager,

            DozeParameters dozeParameters, AmbientDisplayConfiguration config, WakeLock wakeLock,

            DozeParameters dozeParameters, AmbientDisplayConfiguration config, WakeLock wakeLock,
@@ -134,13 +137,21 @@ public class DozeSensors { 
                        mConfig.wakeScreenGestureAvailable() && alwaysOn,

                        mConfig.wakeScreenGestureAvailable() && alwaysOn,

                        DozeLog.PULSE_REASON_SENSOR_WAKE_LOCK_SCREEN,

                        DozeLog.PULSE_REASON_SENSOR_WAKE_LOCK_SCREEN,

                        false /* reports touch coordinates */,

                        false /* reports touch coordinates */,

                        false /* touchscreen */),

                        false /* touchscreen */, mConfig.getWakeLockScreenDebounce()),

        };

        };





        mProxSensor = new ProxSensor(policy);

        mProxSensor = new ProxSensor(policy);

        mCallback = callback;

        mCallback = callback;

    }

    }





    /**

     * Temporarily disable some sensors to avoid turning on the device while the user is

     * turning it off.

     */

    public void requestTemporaryDisable() {

        mDebounceFrom = SystemClock.uptimeMillis();

    }



    private Sensor findSensorWithType(String type) {

    private Sensor findSensorWithType(String type) {

        return findSensorWithType(mSensorManager, type);

        return findSensorWithType(mSensorManager, type);

    }

    }
@@ -320,7 +331,8 @@ public class DozeSensors { 
        }

        }

    }

    }





    private class TriggerSensor extends TriggerEventListener {

    @VisibleForTesting

    class TriggerSensor extends TriggerEventListener {

        final Sensor mSensor;

        final Sensor mSensor;

        final boolean mConfigured;

        final boolean mConfigured;

        final int mPulseReason;

        final int mPulseReason;
@@ -467,23 +479,25 @@ public class DozeSensors { 
    /**

    /**

     * A Sensor that is injected via plugin.

     * A Sensor that is injected via plugin.

     */

     */

    private class PluginSensor extends TriggerSensor {

    @VisibleForTesting

    class PluginSensor extends TriggerSensor implements SensorManagerPlugin.SensorEventListener {





        private final SensorManagerPlugin.Sensor mPluginSensor;

        final SensorManagerPlugin.Sensor mPluginSensor;

        private final SensorManagerPlugin.SensorEventListener mTriggerEventListener = (event) -> {

        private long mDebounce;

            DozeLog.traceSensor(mContext, mPulseReason);

            mHandler.post(mWakeLock.wrap(() -> {

                if (DEBUG) Log.d(TAG, "onSensorEvent: " + triggerEventToString(event));

                mCallback.onSensorPulse(mPulseReason, true /* sensorPerformsProxCheck */, -1, -1,

                        event.getValues());

            }));

        };





        PluginSensor(SensorManagerPlugin.Sensor sensor, String setting, boolean configured,

        PluginSensor(SensorManagerPlugin.Sensor sensor, String setting, boolean configured,

                int pulseReason, boolean reportsTouchCoordinates, boolean requiresTouchscreen) {

                int pulseReason, boolean reportsTouchCoordinates, boolean requiresTouchscreen) {

            this(sensor, setting, configured, pulseReason, reportsTouchCoordinates,

                    requiresTouchscreen, 0L /* debounce */);

        }



        PluginSensor(SensorManagerPlugin.Sensor sensor, String setting, boolean configured,

                int pulseReason, boolean reportsTouchCoordinates, boolean requiresTouchscreen,

                long debounce) {

            super(null, setting, configured, pulseReason, reportsTouchCoordinates,

            super(null, setting, configured, pulseReason, reportsTouchCoordinates,

                    requiresTouchscreen);

                    requiresTouchscreen);

            mPluginSensor = sensor;

            mPluginSensor = sensor;

            mDebounce = debounce;

        }

        }





        @Override

        @Override
@@ -492,11 +506,11 @@ public class DozeSensors { 
            AsyncSensorManager asyncSensorManager = (AsyncSensorManager) mSensorManager;

            AsyncSensorManager asyncSensorManager = (AsyncSensorManager) mSensorManager;

            if (mRequested && !mDisabled && (enabledBySetting() || mIgnoresSetting)

            if (mRequested && !mDisabled && (enabledBySetting() || mIgnoresSetting)

                    && !mRegistered) {

                    && !mRegistered) {

                asyncSensorManager.registerPluginListener(mPluginSensor, mTriggerEventListener);

                asyncSensorManager.registerPluginListener(mPluginSensor, this);

                mRegistered = true;

                mRegistered = true;

                if (DEBUG) Log.d(TAG, "registerPluginListener");

                if (DEBUG) Log.d(TAG, "registerPluginListener");

            } else if (mRegistered) {

            } else if (mRegistered) {

                asyncSensorManager.unregisterPluginListener(mPluginSensor, mTriggerEventListener);

                asyncSensorManager.unregisterPluginListener(mPluginSensor, this);

                mRegistered = false;

                mRegistered = false;

                if (DEBUG) Log.d(TAG, "unregisterPluginListener");

                if (DEBUG) Log.d(TAG, "unregisterPluginListener");

            }

            }
@@ -524,6 +538,21 @@ public class DozeSensors { 
            }

            }

            return sb.append(']').toString();

            return sb.append(']').toString();

        }

        }



        @Override

        public void onSensorChanged(SensorManagerPlugin.SensorEvent event) {

            DozeLog.traceSensor(mContext, mPulseReason);

            mHandler.post(mWakeLock.wrap(() -> {

                final long now = SystemClock.uptimeMillis();

                if (now < mDebounceFrom + mDebounce) {

                    if (DEBUG) Log.d(TAG, "onSensorEvent dropped: " + triggerEventToString(event));

                    return;

                }

                if (DEBUG) Log.d(TAG, "onSensorEvent: " + triggerEventToString(event));

                mCallback.onSensorPulse(mPulseReason, true /* sensorPerformsProxCheck */, -1, -1,

                        event.getValues());

            }));

        }

    }

    }





    public interface Callback {

    public interface Callback {

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

+9 −1
Original line number Original line Diff line number Diff line
@@ -143,8 +143,12 @@ public class DozeTriggers implements DozeMachine.Part { 




        if (isWakeDisplay) {

        if (isWakeDisplay) {

            onWakeScreen(wakeEvent, mMachine.getState());

            onWakeScreen(wakeEvent, mMachine.getState());

        } else if (isLongPress || isWakeLockScreen) {

        } else if (isLongPress) {

            requestPulse(pulseReason, sensorPerformedProxCheck);

            requestPulse(pulseReason, sensorPerformedProxCheck);

        } else if (isWakeLockScreen) {

            if (wakeEvent) {

                requestPulse(pulseReason, sensorPerformedProxCheck);

            }

        } else {

        } else {

            proximityCheckThenCall((result) -> {

            proximityCheckThenCall((result) -> {

                if (result == ProximityCheck.RESULT_NEAR) {

                if (result == ProximityCheck.RESULT_NEAR) {
@@ -228,6 +232,7 @@ public class DozeTriggers implements DozeMachine.Part { 
                if (mDockManager != null) {

                if (mDockManager != null) {

                    mDockManager.addListener(mDockEventListener);

                    mDockManager.addListener(mDockEventListener);

                }

                }

                mDozeSensors.requestTemporaryDisable();

                checkTriggersAtInit();

                checkTriggersAtInit();

                break;

                break;

            case DOZE:

            case DOZE:
@@ -250,6 +255,9 @@ public class DozeTriggers implements DozeMachine.Part { 
                mDozeSensors.setTouchscreenSensorsListening(false);

                mDozeSensors.setTouchscreenSensorsListening(false);

                mDozeSensors.setProxListening(true);

                mDozeSensors.setProxListening(true);

                break;

                break;

            case DOZE_PULSE_DONE:

                mDozeSensors.requestTemporaryDisable();

                break;

            case FINISH:

            case FINISH:

                mBroadcastReceiver.unregister(mContext);

                mBroadcastReceiver.unregister(mContext);

                mDozeHost.removeCallback(mHostCallback);

                mDozeHost.removeCallback(mHostCallback);