Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 966b624e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in DozeLog"

parents 0737b181 78c8fedd

packages/SystemUI/src/com/android/systemui/doze/DozeLog.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java

+1 −0
Original line number Diff line number Diff line
@@ -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,