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

Commit de2db5e1 authored by Chris Li's avatar Chris Li Committed by Automerger Merge Worker
Browse files

Merge "Fix race condition on size compat UI" into sc-qpr1-dev am: f9c3101d am: 35538469

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15614097

Change-Id: I68ddd42671014ce5a85224d73358612defbbb9b0
parents 62b95625 35538469
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.content.res.Configuration;
import android.graphics.PixelFormat;
import android.graphics.Rect;
import android.os.Binder;
import android.util.Log;
import android.view.SurfaceControl;
import android.view.View;
import android.view.WindowManager;
@@ -45,7 +46,7 @@ import com.android.wm.shell.common.SyncTransactionQueue;
class SizeCompatUILayout {
    private static final String TAG = "SizeCompatUILayout";

    private final SyncTransactionQueue mSyncQueue;
    final SyncTransactionQueue mSyncQueue;
    private final SizeCompatUIController.SizeCompatUICallback mCallback;
    private Context mContext;
    private Configuration mTaskConfig;
@@ -306,6 +307,10 @@ class SizeCompatUILayout {

    private void updateSurfacePosition(SurfaceControl leash, int positionX, int positionY) {
        mSyncQueue.runInSync(t -> {
            if (!leash.isValid()) {
                Log.w(TAG, "The leash has been released.");
                return;
            }
            t.setPosition(leash, positionX, positionY);
            // The size compat UI should be the topmost child of the Task in case there can be more
            // than one children.
+2 −1
Original line number Diff line number Diff line
@@ -110,7 +110,8 @@ class SizeCompatUIWindowManager extends WindowlessWindowManager {
        }

        if (mLeash != null) {
            new SurfaceControl.Transaction().remove(mLeash).apply();
            final SurfaceControl leash = mLeash;
            mLayout.mSyncQueue.runInSync(t -> t.remove(leash));
            mLeash = null;
        }
    }