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

Commit cc4a1925 authored by Winson Chung's avatar Winson Chung
Browse files

Remove debug tracing checks to get logs beteween tests 

Bug: 201305599
Test: Presubmit
Change-Id: Iab4430f88a2cac97a056486edd97895bc30a03b1
parent 5b4145e3

quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

+2 −6
Original line number Diff line number Diff line
@@ -202,9 +202,7 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ 
        updateSysuiStateFlags(sharedState.sysuiStateFlags, true /* fromInit */);



        mWindowManager.addView(mDragLayer, mWindowLayoutParams);

        if (TestProtocol.sDebugTracing) {

            Log.e(TASKBAR_WINDOW_CRASH, "Adding taskbar window");

        }

        Log.d(TASKBAR_WINDOW_CRASH, "Adding taskbar window");

    }



    public boolean isThreeButtonNav() {
@@ -335,9 +333,7 @@ public class TaskbarActivityContext extends ContextThemeWrapper implements Activ 
        setUIController(TaskbarUIController.DEFAULT);

        mControllers.onDestroy();

        mWindowManager.removeViewImmediate(mDragLayer);

        if (TestProtocol.sDebugTracing) {

            Log.e(TASKBAR_WINDOW_CRASH, "Removing taskbar window");

        }

        Log.d(TASKBAR_WINDOW_CRASH, "Removing taskbar window");

    }



    public void updateSysuiStateFlags(int systemUiStateFlags, boolean fromInit) {

quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java

+3 −7
Original line number Diff line number Diff line
@@ -207,10 +207,8 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen 
    }



    private void recreateTaskbar() {

        if (TestProtocol.sDebugTracing) {

            Log.e(TASKBAR_WINDOW_CRASH, "Recreating taskbar: mTaskbarActivityContext="

        Log.d(TASKBAR_WINDOW_CRASH, "Recreating taskbar: mTaskbarActivityContext="

                + mTaskbarActivityContext);

        }

        destroyExistingTaskbar();



        DeviceProfile dp =
@@ -233,9 +231,7 @@ public class TaskbarManager implements DisplayController.DisplayInfoChangeListen 
            mTaskbarActivityContext.setUIController(

                    createTaskbarUIControllerForActivity(mActivity));

        }

        if (TestProtocol.sDebugTracing) {

            Log.e(TASKBAR_WINDOW_CRASH, "Finished recreating taskbar");

        }

        Log.d(TASKBAR_WINDOW_CRASH, "Finished recreating taskbar");

    }



    public void onSystemUiFlagsChanged(int systemUiStateFlags) {

quickstep/src/com/android/quickstep/TouchInteractionService.java

+2 −6
Original line number Diff line number Diff line
@@ -355,9 +355,7 @@ public class TouchInteractionService extends Service 
    @Override

    public void onCreate() {

        super.onCreate();

        if (TestProtocol.sDebugTracing) {

            Log.e(TASKBAR_WINDOW_CRASH, "TIS created");

        }

        Log.d(TASKBAR_WINDOW_CRASH, "TIS created");

        // Initialize anything here that is needed in direct boot mode.

        // Everything else should be initialized in onUserUnlocked() below.

        mMainChoreographer = Choreographer.getInstance();
@@ -519,9 +517,7 @@ public class TouchInteractionService extends Service 
    @Override

    public void onDestroy() {

        Log.d(TAG, "Touch service destroyed: user=" + getUserId());

        if (TestProtocol.sDebugTracing) {

            Log.e(TASKBAR_WINDOW_CRASH, "TIS destroyed");

        }

        Log.d(TASKBAR_WINDOW_CRASH, "TIS destroyed");

        sIsInitialized = false;

        if (mDeviceState.isUserUnlocked()) {

            mInputConsumer.unregisterInputConsumer();