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

Commit 4af4078a authored by Piotr Wilczyński's avatar Piotr Wilczyński Committed by Automerger Merge Worker
Browse files

Merge "Report negative proximity if we lose the prox sensor" into tm-qpr-dev am: 257efc5a 

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



Change-Id: I56e6252f42f094fa6a2e4d75920f0e0ffe85cfe7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e1b1e3d9 257efc5a

services/core/java/com/android/server/display/DisplayPowerController.java

+9 −0
Original line number Diff line number Diff line
@@ -1372,8 +1372,17 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                sendOnProximityNegativeWithWakelock();

            }

        } else {

            setProximitySensorEnabled(false);

            mWaitingForNegativeProximity = false;

            mIgnoreProximityUntilChanged = false;



            if (mScreenOffBecauseOfProximity) {

                // The screen *was* off due to prox being near, but now there's no prox sensor, so

                // let's turn the screen back on.

                mScreenOffBecauseOfProximity = false;

                skipRampBecauseOfProximityChangeToNegative = true;

                sendOnProximityNegativeWithWakelock();

            }

        }



        if (!mIsEnabled