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

* commit 'a2416f7fc99a02a95320a793cc296b959f19acec':
  Doze: Fix trigger sensor re-registration.
This commit is contained in:
John Spurlock
2014-11-10 14:58:09 +00:00
committed by Android Git Automerger

View File

@@ -449,10 +449,12 @@ public class DozeService extends DreamService {
private void updateListener() { private void updateListener() {
if (!mConfigured || mSensor == null) return; if (!mConfigured || mSensor == null) return;
if (mRequested && !mDisabled) { if (mRequested && !mDisabled && !mRegistered) {
mRegistered = mSensors.requestTriggerSensor(this, mSensor); mRegistered = mSensors.requestTriggerSensor(this, mSensor);
if (DEBUG) Log.d(mTag, "requestTriggerSensor " + mRegistered);
} else if (mRegistered) { } else if (mRegistered) {
mSensors.cancelTriggerSensor(this, mSensor); final boolean rt = mSensors.cancelTriggerSensor(this, mSensor);
if (DEBUG) Log.d(mTag, "cancelTriggerSensor " + rt);
mRegistered = false; mRegistered = false;
} }
} }
@@ -483,7 +485,8 @@ public class DozeService extends DreamService {
} }
requestPulse(); 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 // reset the notification pulse schedule, but only if we think we were not triggered
// by a notification-related vibration // by a notification-related vibration