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

Commit e17db0f7 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7615608 from b998d927 to sc-v2-release 

Change-Id: Id34b766aaa03d43c44360a4456948101a416c1b0
parents 29a8b7af b998d927

libs/input/Input.cpp

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ namespace { 
// coordinates and SurfaceFlinger includes the display rotation in the input window transforms.

bool isPerWindowInputRotationEnabled() {

    static const bool PER_WINDOW_INPUT_ROTATION =

            base::GetBoolProperty("persist.debug.per_window_input_rotation", true);

            base::GetBoolProperty("persist.debug.per_window_input_rotation", false);



    return PER_WINDOW_INPUT_ROTATION;

}

services/inputflinger/reader/mapper/TouchCursorInputMapperCommon.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ namespace android { 
// projection are part of the input window's transform. This means InputReader should work in the

// un-rotated coordinate space.

static bool isPerWindowInputRotationEnabled() {

    return sysprop::InputFlingerProperties::per_window_input_rotation().value_or(true);

    return sysprop::InputFlingerProperties::per_window_input_rotation().value_or(false);

}



static int32_t getInverseRotation(int32_t orientation) {

services/sensorservice/SensorDevice.cpp

+1 −1
Original line number Diff line number Diff line
@@ -915,7 +915,7 @@ bool SensorDevice::isSensorActive(int handle) const { 
    if (activationIndex < 0) {

        return false;

    }

    return mActivationCount.valueAt(activationIndex).numActiveClients() > 0;

    return mActivationCount.valueAt(activationIndex).isActive;

}



void SensorDevice::onMicSensorAccessChanged(void* ident, int handle, nsecs_t samplingPeriodNs) {

services/sensorservice/SensorInterface.cpp

+6 −4
Original line number Diff line number Diff line
@@ -92,14 +92,16 @@ ProximitySensor::ProximitySensor(const sensor_t& sensor, SensorService& service) 
}



status_t ProximitySensor::activate(void* ident, bool enabled) {

    bool wasActive = mActive;

    bool lastState = mSensorDevice.isSensorActive(mSensor.getHandle());



    status_t status = HardwareSensor::activate(ident, enabled);

    if (status != NO_ERROR) {

        return status;

    }

    mActive = enabled;

    if (wasActive != enabled) {

        mSensorService.onProximityActiveLocked(enabled);



    bool currentState = mSensorDevice.isSensorActive(mSensor.getHandle());

    if (currentState != lastState) {

        mSensorService.onProximityActiveLocked(currentState);

    }

    return NO_ERROR;

}

services/sensorservice/SensorInterface.h

+0 −1
Original line number Diff line number Diff line
@@ -119,7 +119,6 @@ public: 
    void didEnableAllSensors() override;

private:

    SensorService& mSensorService;

    bool mActive;

};



// ---------------------------------------------------------------------------