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

Merge "DozeLog: Properly initialize" into nyc-mr1-dev

Browse Source
This commit is contained in:
Adrian Roos
2016-08-02 18:39:24 +00:00
committed by Android (Google) Code Review
parent 1340221244 23c14fc01c
commit 9923784efc
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/doze/DozeLog.java
View File

@@ -57,8 +57,9 @@ public class DozeLog {
private static SummaryStats sEmergencyCallStats; private static SummaryStats sEmergencyCallStats;
private static SummaryStats[][] sProxStats; // [reason][near/far] private static SummaryStats[][] sProxStats; // [reason][near/far]
public static void tracePickupPulse(boolean withinVibrationThreshold) { public static void tracePickupPulse(Context context, boolean withinVibrationThreshold) {
if (!ENABLED) return; if (!ENABLED) return;
init(context);
log("pickupPulse withinVibrationThreshold=" + withinVibrationThreshold); log("pickupPulse withinVibrationThreshold=" + withinVibrationThreshold);
(withinVibrationThreshold ? sPickupPulseNearVibrationStats (withinVibrationThreshold ? sPickupPulseNearVibrationStats
: sPickupPulseNotNearVibrationStats).append(); : sPickupPulseNotNearVibrationStats).append();
@@ -76,8 +77,9 @@ public class DozeLog {
log("pulseFinish"); log("pulseFinish");
} }
public static void traceNotificationPulse(long instance) { public static void traceNotificationPulse(Context context, long instance) {
if (!ENABLED) return; if (!ENABLED) return;
init(context);
log("notificationPulse instance=" + instance); log("notificationPulse instance=" + instance);
sNotificationPulseStats.append(); sNotificationPulseStats.append();
} }
@@ -153,9 +155,9 @@ public class DozeLog {
public static void traceProximityResult(Context context, boolean near, long millis, public static void traceProximityResult(Context context, boolean near, long millis,
int pulseReason) { int pulseReason) {
if (!ENABLED) return; if (!ENABLED) return;
init(context);
log("proximityResult reason=" + pulseReasonToString(pulseReason) + " near=" + near log("proximityResult reason=" + pulseReasonToString(pulseReason) + " near=" + near
+ " millis=" + millis); + " millis=" + millis);
init(context);
sProxStats[pulseReason][near ? 0 : 1].append(); sProxStats[pulseReason][near ? 0 : 1].append();
} }

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

@@ -373,7 +373,7 @@ public class DozeService extends DreamService {
if (DEBUG) Log.d(mTag, "mScheduleResetsRemaining = " + mScheduleResetsRemaining); if (DEBUG) Log.d(mTag, "mScheduleResetsRemaining = " + mScheduleResetsRemaining);
mNotificationPulseTime = notificationTimeMs; mNotificationPulseTime = notificationTimeMs;
if (pulseImmediately) { if (pulseImmediately) {
DozeLog.traceNotificationPulse(0); DozeLog.traceNotificationPulse(mContext, 0);
requestPulse(DozeLog.PULSE_REASON_NOTIFICATION); requestPulse(DozeLog.PULSE_REASON_NOTIFICATION);
} }
// schedule the rest of the pulses // schedule the rest of the pulses
@@ -442,7 +442,7 @@ public class DozeService extends DreamService {
if (NOTIFICATION_PULSE_ACTION.equals(intent.getAction())) { if (NOTIFICATION_PULSE_ACTION.equals(intent.getAction())) {
final long instance = intent.getLongExtra(EXTRA_INSTANCE, -1); final long instance = intent.getLongExtra(EXTRA_INSTANCE, -1);
if (DEBUG) Log.d(mTag, "Received notification pulse intent instance=" + instance); if (DEBUG) Log.d(mTag, "Received notification pulse intent instance=" + instance);
DozeLog.traceNotificationPulse(instance); DozeLog.traceNotificationPulse(mContext, instance);
requestPulse(DozeLog.PULSE_REASON_NOTIFICATION); requestPulse(DozeLog.PULSE_REASON_NOTIFICATION);
rescheduleNotificationPulse(mNotificationLightOn); rescheduleNotificationPulse(mNotificationLightOn);
} }
@@ -576,7 +576,7 @@ public class DozeService extends DreamService {
resetNotificationResets(); resetNotificationResets();
} }
if (mSensor.getType() == Sensor.TYPE_PICK_UP_GESTURE) { if (mSensor.getType() == Sensor.TYPE_PICK_UP_GESTURE) {
DozeLog.tracePickupPulse(withinVibrationThreshold); DozeLog.tracePickupPulse(mContext, withinVibrationThreshold);
} }
} finally { } finally {
mWakeLock.release(); mWakeLock.release();