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

Commit bd5f015e authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Use binned brightness sensor instead of prox" into qt-dev am: cdc566df 

am: a65f90b8

Change-Id: I2b63b2140106d34f8c5274de28db63579f481d74
parents a1c136d7 a65f90b8

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

+14 −3
Original line number Original line Diff line number Diff line
@@ -43,6 +43,7 @@ import androidx.annotation.VisibleForTesting; 




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;

import com.android.systemui.R;

import com.android.systemui.plugins.SensorManagerPlugin;

import com.android.systemui.plugins.SensorManagerPlugin;

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

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

import com.android.systemui.util.AlarmTimeout;

import com.android.systemui.util.AlarmTimeout;
@@ -290,12 +291,21 @@ public class DozeSensors { 
        long mLastNear;

        long mLastNear;

        final AlarmTimeout mCooldownTimer;

        final AlarmTimeout mCooldownTimer;

        final AlwaysOnDisplayPolicy mPolicy;

        final AlwaysOnDisplayPolicy mPolicy;



        final Sensor mSensor;





        public ProxSensor(AlwaysOnDisplayPolicy policy) {

        public ProxSensor(AlwaysOnDisplayPolicy policy) {

            mPolicy = policy;

            mPolicy = policy;

            mCooldownTimer = new AlarmTimeout(mAlarmManager, this::updateRegistered,

            mCooldownTimer = new AlarmTimeout(mAlarmManager, this::updateRegistered,

                    "prox_cooldown", mHandler);

                    "prox_cooldown", mHandler);



            // The default prox sensor can be noisy, so let's use a prox gated brightness sensor

            // if available.

            Sensor sensor = DozeSensors.findSensorWithType(mSensorManager,

                    mContext.getString(R.string.doze_brightness_sensor_type));

            if (sensor == null) {

                sensor = mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY);

            }

            mSensor = sensor;

        }

        }





        void setRequested(boolean requested) {

        void setRequested(boolean requested) {
@@ -359,8 +369,9 @@ public class DozeSensors { 




        @Override

        @Override

        public String toString() {

        public String toString() {

            return String.format("{registered=%s, requested=%s, coolingDown=%s, currentlyFar=%s}",

            return String.format("{registered=%s, requested=%s, coolingDown=%s, currentlyFar=%s,"

                    mRegistered, mRequested, mCooldownTimer.isScheduled(), mCurrentlyFar);

                    + " sensor=%s}", mRegistered, mRequested, mCooldownTimer.isScheduled(),

                    mCurrentlyFar, mSensor);

        }

        }

    }

    }