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

Commit 3a87db23 authored by Neha Jain's avatar Neha Jain Committed by Automerger Merge Worker
Browse files

Merge "WaitForNegativeProximity stopped with power button." into sc-dev am:... 

Merge "WaitForNegativeProximity stopped with power button." into sc-dev am: e77889cb am: 0946f87c

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

Change-Id: I1281c9c9dba668119f59ad3e857057c505817525
parents 8e97f220 0946f87c

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -2122,7 +2122,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 




    private void ignoreProximitySensorUntilChangedInternal() {

    private void ignoreProximitySensorUntilChangedInternal() {

        if (!mIgnoreProximityUntilChanged

        if (!mIgnoreProximityUntilChanged

                && mPowerRequest.useProximitySensor

                && mProximity == PROXIMITY_POSITIVE) {

                && mProximity == PROXIMITY_POSITIVE) {

            // Only ignore if it is still reporting positive (near)

            // Only ignore if it is still reporting positive (near)

            mIgnoreProximityUntilChanged = true;

            mIgnoreProximityUntilChanged = true;

services/core/java/com/android/server/power/PowerManagerService.java

+10 −1
Original line number Original line Diff line number Diff line
@@ -534,6 +534,11 @@ public final class PowerManagerService extends SystemService 
    // True if the proximity sensor reads a positive result.

    // True if the proximity sensor reads a positive result.

    private boolean mProximityPositive;

    private boolean mProximityPositive;





    // Indicates that we have already intercepted the power key to temporarily ignore the proximity

    // wake lock and turn the screen back on. This should get reset when prox reads 'far' again

    // (when {@link #mProximityPositive} is set to false).

    private boolean mInterceptedPowerKeyForProximity;



    // Screen brightness setting limits.

    // Screen brightness setting limits.

    public final float mScreenBrightnessMinimum;

    public final float mScreenBrightnessMinimum;

    public final float mScreenBrightnessMaximum;

    public final float mScreenBrightnessMaximum;
@@ -3323,6 +3328,7 @@ public final class PowerManagerService extends SystemService 
        public void onProximityNegative() {

        public void onProximityNegative() {

            synchronized (mLock) {

            synchronized (mLock) {

                mProximityPositive = false;

                mProximityPositive = false;

                mInterceptedPowerKeyForProximity = false;

                mDirty |= DIRTY_PROXIMITY_POSITIVE;

                mDirty |= DIRTY_PROXIMITY_POSITIVE;

                userActivityNoUpdateLocked(Display.DEFAULT_DISPLAY_GROUP, mClock.uptimeMillis(),

                userActivityNoUpdateLocked(Display.DEFAULT_DISPLAY_GROUP, mClock.uptimeMillis(),

                        PowerManager.USER_ACTIVITY_EVENT_OTHER, 0, Process.SYSTEM_UID);

                        PowerManager.USER_ACTIVITY_EVENT_OTHER, 0, Process.SYSTEM_UID);
@@ -4163,6 +4169,8 @@ public final class PowerManagerService extends SystemService 
            }

            }

            pw.println();

            pw.println();

            pw.println("  mRequestWaitForNegativeProximity=" + mRequestWaitForNegativeProximity);

            pw.println("  mRequestWaitForNegativeProximity=" + mRequestWaitForNegativeProximity);

            pw.println("  mInterceptedPowerKeyForProximity="

                    + mInterceptedPowerKeyForProximity);

            pw.println("  mSandmanScheduled=" + mSandmanScheduled);

            pw.println("  mSandmanScheduled=" + mSandmanScheduled);

            pw.println("  mBatteryLevelLow=" + mBatteryLevelLow);

            pw.println("  mBatteryLevelLow=" + mBatteryLevelLow);

            pw.println("  mLightDeviceIdleMode=" + mLightDeviceIdleMode);

            pw.println("  mLightDeviceIdleMode=" + mLightDeviceIdleMode);
@@ -5994,8 +6002,9 @@ public final class PowerManagerService extends SystemService 
            final DisplayPowerRequest displayPowerRequest =

            final DisplayPowerRequest displayPowerRequest =

                    mDisplayGroupPowerStateMapper.getPowerRequestLocked(

                    mDisplayGroupPowerStateMapper.getPowerRequestLocked(

                            Display.DEFAULT_DISPLAY_GROUP);

                            Display.DEFAULT_DISPLAY_GROUP);

            if (displayPowerRequest.useProximitySensor && mProximityPositive) {

            if (mProximityPositive && !mInterceptedPowerKeyForProximity) {

                mDisplayManagerInternal.ignoreProximitySensorUntilChanged();

                mDisplayManagerInternal.ignoreProximitySensorUntilChanged();

                mInterceptedPowerKeyForProximity = true;

                return true;

                return true;

            }

            }

        }

        }