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

Commit a977dfcb authored by Prabir Pradhan's avatar Prabir Pradhan Committed by android-build-merger
Browse files

Merge "apply empty transaction in startActivitySync" into qt-dev am: f928b661 am: 5cd874d7 

am: fa6f50e1

Change-Id: I563c3459ec859b62d100a9103f9e741c9088d686
parents f408a286 fa6f50e1

core/java/android/app/Instrumentation.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -50,6 +50,7 @@ import android.view.InputDevice; 
import android.view.KeyCharacterMap;

import android.view.KeyCharacterMap;

import android.view.KeyEvent;

import android.view.KeyEvent;

import android.view.MotionEvent;

import android.view.MotionEvent;

import android.view.SurfaceControl;

import android.view.ViewConfiguration;

import android.view.ViewConfiguration;

import android.view.Window;

import android.view.Window;

import android.view.WindowManagerGlobal;

import android.view.WindowManagerGlobal;
@@ -528,6 +529,12 @@ public class Instrumentation { 
            } while (mWaitingActivities.contains(aw));

            } while (mWaitingActivities.contains(aw));





            waitForEnterAnimationComplete(aw.activity);

            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;

            return aw.activity;

        }

        }

    }

    }