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

Commit e2c0987c authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Merge remote-tracking branch 'origin/lineage-18.1' into v1-r

parents f566713f 045f7580
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -31,4 +31,7 @@

    <!-- If not zero, limits the internal screen recorder's framerate to the set value. -->
    <integer name="config_screenRecorderMaxFramerate">0</integer>

    <!-- Whether usage of the proximity sensor during doze is supported -->
    <bool name="doze_proximity_sensor_supported">true</bool>
</resources>
+10 −7
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import com.android.internal.logging.UiEvent;
import com.android.internal.logging.UiEventLogger;
import com.android.internal.logging.UiEventLoggerImpl;
import com.android.internal.logging.nano.MetricsProto;
import com.android.systemui.R;
import com.android.systemui.plugins.SensorManagerPlugin;
import com.android.systemui.statusbar.phone.DozeParameters;
import com.android.systemui.util.sensors.AsyncSensorManager;
@@ -174,6 +175,7 @@ public class DozeSensors {
                        dozeLog),
        };

        if (context.getResources().getBoolean(R.bool.doze_proximity_sensor_supported)) {
            setProxListening(false);  // Don't immediately start listening when we register.
            mProximitySensor.register(
                    proximityEvent -> {
@@ -182,6 +184,7 @@ public class DozeSensors {
                        }
                    });
        }
    }

    /**
     *  Unregister any sensors.