Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '982e3be2801bcb6b7bed1513cd757048795ddcc7':
  Doze: Fix trigger sensor re-registration.
This commit is contained in:
John Spurlock
2014-11-10 14:54:09 +00:00
committed by Android Git Automerger
parent 06b0fb547f 982e3be280
commit a2416f7fc9
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/doze/DozeService.java
View File

@@ -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