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

Commit cda982bc authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

am f1c595e9: am a2416f7f: am 982e3be2: Merge "Doze: Fix trigger sensor... 

am f1c595e9: am a2416f7f: am 982e3be2: Merge "Doze: Fix trigger sensor re-registration." into lmp-mr1-dev

* commit 'f1c595e9':
  Doze: Fix trigger sensor re-registration.
parents ddfc619d f1c595e9

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

+6 −3
Original line number Diff line number Diff line
@@ -449,10 +449,12 @@ public class DozeService extends DreamService { 


        private void updateListener() {

            if (!mConfigured || mSensor == null) return;

            if (mRequested && !mDisabled) {

            if (mRequested && !mDisabled && !mRegistered) {

                mRegistered = mSensors.requestTriggerSensor(this, mSensor);

                if (DEBUG) Log.d(mTag, "requestTriggerSensor " + mRegistered);

            } else if (mRegistered) {

                mSensors.cancelTriggerSensor(this, mSensor);

                final boolean rt = mSensors.cancelTriggerSensor(this, mSensor);

                if (DEBUG) Log.d(mTag, "cancelTriggerSensor " + rt);

                mRegistered = false;

            }

        }
@@ -483,7 +485,8 @@ public class DozeService extends DreamService { 
                }



                requestPulse();

                setListening(true);  // reregister, this sensor only fires once

                mRegistered = false;

                updateListener();  // reregister, this sensor only fires once



                // reset the notification pulse schedule, but only if we think we were not triggered

                // by a notification-related vibration