Merge "Fix a couple trace issues" into ub-launcher3-master (40f87567) · Commits · e / os / android_packages_apps_Trebuchet

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -417,7 +417,8 @@ public class TouchInteractionService extends Service implements
		return;
		}

		TraceHelper.INSTANCE.beginFlagsOverride(TraceHelper.FLAG_ALLOW_BINDER_TRACKING);
		Object traceToken = TraceHelper.INSTANCE.beginFlagsOverride(
		TraceHelper.FLAG_ALLOW_BINDER_TRACKING);
		MotionEvent event = (MotionEvent) ev;
		if (event.getAction() == ACTION_DOWN) {
		GestureState newGestureState = new GestureState(
		@@ -446,7 +447,7 @@ public class TouchInteractionService extends Service implements

		ActiveGestureLog.INSTANCE.addLog("onMotionEvent", event.getActionMasked());
		mUncheckedConsumer.onMotionEvent(event);
		TraceHelper.INSTANCE.endFlagsOverride();
		TraceHelper.INSTANCE.endFlagsOverride(traceToken);
		}

		private InputConsumer newConsumer(GestureState gestureState, boolean useSharedState,

quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java

+13 −6

Original line number	Diff line number	Diff line
		@@ -367,13 +367,19 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity>
		if (mWasLauncherAlreadyVisible) {
		mStateCallback.setState(STATE_LAUNCHER_DRAWN);
		} else {
		TraceHelper.INSTANCE.beginSection("WTS-init");
		Object traceToken = TraceHelper.INSTANCE.beginSection("WTS-init");
		View dragLayer = activity.getDragLayer();
		dragLayer.getViewTreeObserver().addOnDrawListener(new OnDrawListener() {
		boolean mHandled = false;

		@Override
		public void onDraw() {
		TraceHelper.INSTANCE.endSection();
		if (mHandled) {
		return;
		}
		mHandled = true;

		TraceHelper.INSTANCE.endSection(traceToken);
		dragLayer.post(() ->
		dragLayer.getViewTreeObserver().removeOnDrawListener(this));
		if (activity != mActivity) {
		@@ -416,13 +422,14 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity>
		private void initializeLauncherAnimationController() {
		buildAnimationController();

		TraceHelper.INSTANCE.beginSection("logToggleRecents", TraceHelper.FLAG_IGNORE_BINDERS);
		Object traceToken = TraceHelper.INSTANCE.beginSection("logToggleRecents",
		TraceHelper.FLAG_IGNORE_BINDERS);
		// Only used in debug builds
		if (LatencyTrackerCompat.isEnabled(mContext)) {
		LatencyTrackerCompat.logToggleRecents(
		(int) (mLauncherFrameDrawnTime - mTouchTimeMs));
		}
		TraceHelper.INSTANCE.endSection();
		TraceHelper.INSTANCE.endSection(traceToken);

		// This method is only called when STATE_GESTURE_STARTED is set, so we can enable the
		// high-res thumbnail loader here once we are sure that we will end up in an overview state
		@@ -1144,10 +1151,10 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity>
		}
		if (!finishTransitionPosted) {
		// If we haven't posted a draw callback, set the state immediately.
		TraceHelper.INSTANCE.beginSection(SCREENSHOT_CAPTURED_EVT,
		Object traceToken = TraceHelper.INSTANCE.beginSection(SCREENSHOT_CAPTURED_EVT,
		TraceHelper.FLAG_CHECK_FOR_RACE_CONDITIONS);
		setStateOnUiThread(STATE_SCREENSHOT_CAPTURED);
		TraceHelper.INSTANCE.endSection();
		TraceHelper.INSTANCE.endSection(traceToken);
		}
		}
		}

quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/OtherActivityInputConsumer.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -198,7 +198,8 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC

		switch (ev.getActionMasked()) {
		case ACTION_DOWN: {
		TraceHelper.INSTANCE.beginSection(DOWN_EVT, FLAG_CHECK_FOR_RACE_CONDITIONS);
		Object traceToken = TraceHelper.INSTANCE.beginSection(DOWN_EVT,
		FLAG_CHECK_FOR_RACE_CONDITIONS);
		mActivePointerId = ev.getPointerId(0);
		mDownPos.set(ev.getX(), ev.getY());
		mLastPos.set(mDownPos);
		@@ -209,7 +210,7 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
		startTouchTrackingForWindowAnimation(ev.getEventTime(), false);
		}

		TraceHelper.INSTANCE.endSection();
		TraceHelper.INSTANCE.endSection(traceToken);
		break;
		}
		case ACTION_POINTER_DOWN: {
		@@ -355,7 +356,8 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
		* the animation can still be running.
		*/
		private void finishTouchTracking(MotionEvent ev) {
		TraceHelper.INSTANCE.beginSection(UP_EVT, FLAG_CHECK_FOR_RACE_CONDITIONS);
		Object traceToken = TraceHelper.INSTANCE.beginSection(UP_EVT,
		FLAG_CHECK_FOR_RACE_CONDITIONS);

		if (mPassedWindowMoveSlop && mInteractionHandler != null) {
		if (ev.getActionMasked() == ACTION_CANCEL) {
		@@ -389,7 +391,7 @@ public class OtherActivityInputConsumer extends ContextWrapper implements InputC
		mVelocityTracker.recycle();
		mVelocityTracker = null;
		mMotionPauseDetector.clear();
		TraceHelper.INSTANCE.endSection();
		TraceHelper.INSTANCE.endSection(traceToken);
		}

		@Override

src/com/android/launcher3/Launcher.java

+17 −14

Original line number	Diff line number	Diff line
		@@ -313,7 +313,8 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,

		@Override
		protected void onCreate(Bundle savedInstanceState) {
		TraceHelper.INSTANCE.beginSection(ON_CREATE_EVT, TraceHelper.FLAG_UI_EVENT);
		Object traceToken = TraceHelper.INSTANCE.beginSection(ON_CREATE_EVT,
		TraceHelper.FLAG_UI_EVENT);
		if (DEBUG_STRICT_MODE) {
		StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
		.detectDiskReads()
		@@ -431,7 +432,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
		}
		});

		TraceHelper.INSTANCE.endSection();
		TraceHelper.INSTANCE.endSection(traceToken);
		}

		protected LauncherOverlayManager getDefaultOverlay() {
		@@ -936,14 +937,15 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,

		@Override
		protected void onStart() {
		TraceHelper.INSTANCE.beginSection(ON_START_EVT, TraceHelper.FLAG_UI_EVENT);
		Object traceToken = TraceHelper.INSTANCE.beginSection(ON_START_EVT,
		TraceHelper.FLAG_UI_EVENT);
		super.onStart();
		if (!mDeferOverlayCallbacks) {
		mOverlayManager.onActivityStarted(this);
		}

		mAppWidgetHost.setListenIfResumed(true);
		TraceHelper.INSTANCE.endSection();
		TraceHelper.INSTANCE.endSection(traceToken);
		}

		private void handleDeferredResume() {
		@@ -1038,7 +1040,8 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,

		@Override
		protected void onResume() {
		TraceHelper.INSTANCE.beginSection(ON_RESUME_EVT, TraceHelper.FLAG_UI_EVENT);
		Object traceToken = TraceHelper.INSTANCE.beginSection(ON_RESUME_EVT,
		TraceHelper.FLAG_UI_EVENT);
		super.onResume();

		mHandler.removeCallbacks(mHandleDeferredResume);
		@@ -1059,7 +1062,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
		mOverlayManager.onActivityResumed(this);
		}

		TraceHelper.INSTANCE.endSection();
		TraceHelper.INSTANCE.endSection(traceToken);
		}

		@Override
		@@ -1423,7 +1426,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,

		@Override
		protected void onNewIntent(Intent intent) {
		TraceHelper.INSTANCE.beginSection(ON_NEW_INTENT_EVT);
		Object traceToken = TraceHelper.INSTANCE.beginSection(ON_NEW_INTENT_EVT);
		super.onNewIntent(intent);

		boolean alreadyOnHome = hasWindowFocus() && ((intent.getFlags() &
		@@ -1475,7 +1478,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
		mOverlayManager.hideOverlay(isStarted() && !isForceInvisible());
		}

		TraceHelper.INSTANCE.endSection();
		TraceHelper.INSTANCE.endSection(traceToken);
		}

		@Override
		@@ -1978,7 +1981,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
		* Implementation of the method from LauncherModel.Callbacks.
		*/
		public void startBinding() {
		TraceHelper.INSTANCE.beginSection("startBinding");
		Object traceToken = TraceHelper.INSTANCE.beginSection("startBinding");
		// Floating panels (except the full widget sheet) are associated with individual icons. If
		// we are starting a fresh bind, close all such panels as all the icons are about
		// to go away.
		@@ -1996,7 +1999,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
		if (mHotseat != null) {
		mHotseat.resetLayout(getWallpaperDeviceProfile().isVerticalBarLayout());
		}
		TraceHelper.INSTANCE.endSection();
		TraceHelper.INSTANCE.endSection(traceToken);
		}

		@Override
		@@ -2196,7 +2199,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
		return view;
		}

		TraceHelper.INSTANCE.beginSection("BIND_WIDGET_id=" + item.appWidgetId);
		Object traceToken = TraceHelper.INSTANCE.beginSection("BIND_WIDGET_id=" + item.appWidgetId);

		try {
		final LauncherAppWidgetProviderInfo appWidgetInfo;
		@@ -2293,7 +2296,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
		}
		prepareAppWidget(view, item);
		} finally {
		TraceHelper.INSTANCE.endSection();
		TraceHelper.INSTANCE.endSection(traceToken);
		}

		return view;
		@@ -2373,7 +2376,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
		* Implementation of the method from LauncherModel.Callbacks.
		*/
		public void finishBindingItems(int pageBoundFirst) {
		TraceHelper.INSTANCE.beginSection("finishBindingItems");
		Object traceToken = TraceHelper.INSTANCE.beginSection("finishBindingItems");
		mWorkspace.restoreInstanceStateForRemainingPages();

		setWorkspaceLoading(false);
		@@ -2397,7 +2400,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
		mDeviceProfile.inv.numFolderColumns * mDeviceProfile.inv.numFolderRows);
		getViewCache().setCacheSize(R.layout.folder_page, 2);

		TraceHelper.INSTANCE.endSection();
		TraceHelper.INSTANCE.endSection(traceToken);
		}

		private boolean canRunNewAppsAnimation() {

src/com/android/launcher3/model/LoaderTask.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -180,7 +180,7 @@ public class LoaderTask implements Runnable {
		"LoaderTask2 " + this);
		}

		TraceHelper.INSTANCE.beginSection(TAG);
		Object traceToken = TraceHelper.INSTANCE.beginSection(TAG);
		TimingLogger logger = TestProtocol.sDebugTracing ?
		new TimingLogger(TAG, "run") {
		@Override
		@@ -281,7 +281,7 @@ public class LoaderTask implements Runnable {
		} finally {
		logger.dumpToLog();
		}
		TraceHelper.INSTANCE.endSection();
		TraceHelper.INSTANCE.endSection(traceToken);
		}

		public synchronized void stopLocked() {