diff options
| author | 2018-12-19 03:17:33 +0000 | |
|---|---|---|
| committer | 2018-12-19 03:17:33 +0000 | |
| commit | 966b624eb9d61afbca27cd714729769bb8ccfc1e (patch) | |
| tree | ebb4cb5b745246a24a67fbf87078c9e06d736a8c | |
| parent | 0737b181e344ccde3f3f7672d0f507c7514fcb27 (diff) | |
| parent | 78c8feddd38ed9bb6513786932c902dec56e3bb9 (diff) | |
Merge "Fix NPE in DozeLog"
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/doze/DozeLog.java | 2 | ||||
| -rw-r--r-- | packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeLog.java b/packages/SystemUI/src/com/android/systemui/doze/DozeLog.java index f8c3749dbf2f..974cd8804841 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeLog.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeLog.java @@ -35,7 +35,7 @@ public class DozeLog { private static final int SIZE = Build.IS_DEBUGGABLE ? 400 : 50; static final SimpleDateFormat FORMAT = new SimpleDateFormat("MM-dd HH:mm:ss.SSS"); - private static final int REASONS = 8; + private static final int REASONS = 7; public static final int PULSE_REASON_NONE = -1; public static final int PULSE_REASON_INTENT = 0; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java index c207feff26f3..e5620a5520d5 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java @@ -176,6 +176,7 @@ public class StatusBarTest extends SysuiTestCase { mDependency.injectTestDependency(MetricsLogger.class, mMetricsLogger); mDependency.injectTestDependency(NotificationLogger.class, mNotificationLogger); mNotificationLogger = new NotificationLogger(); + DozeLog.traceDozing(mContext, false /* dozing */); IPowerManager powerManagerService = mock(IPowerManager.class); mPowerManager = new PowerManager(mContext, powerManagerService, |