Merge "Adding tracing for non-detection of Pause" into ub-launcher3-rvc-dev
diff --git a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
index 2cb23f1..fc60434 100644
--- a/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
+++ b/quickstep/src/com/android/launcher3/LauncherAnimationRunner.java
@@ -26,6 +26,7 @@
import android.content.Context;
import android.os.Build;
import android.os.Handler;
+import android.util.Log;
import androidx.annotation.BinderThread;
import androidx.annotation.UiThread;
@@ -37,6 +38,8 @@
public abstract class LauncherAnimationRunner implements RemoteAnimationRunnerCompat,
WrappedAnimationRunnerImpl {
+ private static final String TAG = "LauncherAnimationRunner";
+
private final Handler mHandler;
private final boolean mStartAtFrontOfQueue;
private AnimationResult mAnimationResult;
@@ -151,7 +154,16 @@
// Because t=0 has the app icon in its original spot, we can skip the
// first frame and have the same movement one frame earlier.
- mAnimator.setCurrentPlayTime(getSingleFrameMs(context));
+ int singleFrameMs = getSingleFrameMs(context);
+ long playTime = singleFrameMs;
+ // b/153821199 Add logs to debug crash but ensure release builds do not crash.
+ if (Utilities.IS_DEBUG_DEVICE) {
+ Log.e(TAG, "Total duration=[" + mAnimator.getTotalDuration()
+ + "], singleFrameMs=[" + singleFrameMs + "], mAnimator=" + mAnimator);
+ } else {
+ playTime = Math.min(singleFrameMs, mAnimator.getTotalDuration());
+ }
+ mAnimator.setCurrentPlayTime(playTime);
}
}
}