diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-08-14 06:42:05 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-08-14 06:42:05 +0000 |
commit | f928b661d9a5f7726d8893557f6b69219924b7a1 (patch) | |
tree | ad11d5ff60cf417b0f2b2e2c8ead360a250fe06e | |
parent | 8931739c16b538800aca170aac399738dbb1837e (diff) | |
parent | 03dde38efcb3c06c6317f9fcf1265e37a66811d9 (diff) | |
download | base-f928b661d9a5f7726d8893557f6b69219924b7a1.tar.gz |
Merge "apply empty transaction in startActivitySync" into qt-dev
-rw-r--r-- | core/java/android/app/Instrumentation.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java index 41733b3af058..9720e9f47f83 100644 --- a/core/java/android/app/Instrumentation.java +++ b/core/java/android/app/Instrumentation.java @@ -50,6 +50,7 @@ import android.view.InputDevice; import android.view.KeyCharacterMap; import android.view.KeyEvent; import android.view.MotionEvent; +import android.view.SurfaceControl; import android.view.ViewConfiguration; import android.view.Window; import android.view.WindowManagerGlobal; @@ -528,6 +529,12 @@ public class Instrumentation { } while (mWaitingActivities.contains(aw)); waitForEnterAnimationComplete(aw.activity); + + // Apply an empty transaction to ensure SF has a chance to update before + // the Activity is ready (b/138263890). + try (SurfaceControl.Transaction t = new SurfaceControl.Transaction()) { + t.apply(true); + } return aw.activity; } } |