Merge "apply empty transaction in startActivitySync" into qt-dev am: f928b661d9 am: 5cd874d792

am: fa6f50e13d

Change-Id: I30338c95c5ea27b191b20decdcf78cbe240b62c0

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;
         }
     }