Merge "AOD: Add logging" into oc-dr1-dev

am: 22b76d5deb

Change-Id: I478d38cf4681fd45b094fdad6f1e9df5ecd17b37
This commit is contained in:
Adrian Roos
2017-07-07 10:08:36 +00:00
committed by android-build-merger
2 changed files with 14 additions and 0 deletions

View File

@@ -248,6 +248,12 @@ public class DozeLog {
} }
} }
public static void traceSensor(Context context, int pulseReason) {
if (!ENABLED) return;
init(context);
log("sensor type=" + pulseReasonToString(pulseReason));
}
private static class SummaryStats { private static class SummaryStats {
private int mCount; private int mCount;

View File

@@ -174,6 +174,7 @@ public class DozeSensors {
for (TriggerSensor s : mSensors) { for (TriggerSensor s : mSensors) {
pw.print("Sensor: "); pw.println(s.toString()); pw.print("Sensor: "); pw.println(s.toString());
} }
pw.print("ProxSensor: "); pw.println(mProxSensor.toString());
} }
private class ProxSensor implements SensorEventListener { private class ProxSensor implements SensorEventListener {
@@ -246,6 +247,12 @@ public class DozeSensors {
@Override @Override
public void onAccuracyChanged(Sensor sensor, int accuracy) { public void onAccuracyChanged(Sensor sensor, int accuracy) {
} }
@Override
public String toString() {
return String.format("{registered=%s, requested=%s, coolingDown=%s, currentlyFar=%s}",
mRegistered, mRequested, mCooldownTimer.isScheduled(), mCurrentlyFar);
}
} }
private class TriggerSensor extends TriggerEventListener { private class TriggerSensor extends TriggerEventListener {
@@ -312,6 +319,7 @@ public class DozeSensors {
@Override @Override
@AnyThread @AnyThread
public void onTrigger(TriggerEvent event) { public void onTrigger(TriggerEvent event) {
DozeLog.traceSensor(mContext, mPulseReason);
mHandler.post(mWakeLock.wrap(() -> { mHandler.post(mWakeLock.wrap(() -> {
if (DEBUG) Log.d(TAG, "onTrigger: " + triggerEventToString(event)); if (DEBUG) Log.d(TAG, "onTrigger: " + triggerEventToString(event));
boolean sensorPerformsProxCheck = false; boolean sensorPerformsProxCheck = false;