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

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

Merge "Check NPE and log error condition for enableBlockingTimeout in test... 

Merge "Check NPE and log error condition for enableBlockingTimeout in test harness." into tm-qpr-dev
parents 5ef18e4a 30cc3241

quickstep/src/com/android/quickstep/QuickstepTestInformationHandler.java

+9 −3
Original line number Diff line number Diff line
@@ -179,9 +179,15 @@ public class QuickstepTestInformationHandler extends TestInformationHandler { 


    private void enableBlockingTimeout(

            TouchInteractionService.TISBinder tisBinder, boolean enable) {

        // Allow null-pointer to catch illegal states.

        tisBinder.getTaskbarManager().getCurrentActivityContext().enableBlockingTimeoutDuringTests(

                enable);

        TaskbarActivityContext context = tisBinder.getTaskbarManager().getCurrentActivityContext();

        if (context == null) {

            if (TestProtocol.sDebugTracing) {

                Log.d(NPE_TRANSIENT_TASKBAR, "enableBlockingTimeout: enable=" + enable,

                        new Exception());

            }

        } else {

            context.enableBlockingTimeoutDuringTests(enable);

        }

    }



    private void enableTransientTaskbar(