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

Commit b85fe140 authored by Robin Lee's avatar Robin Lee Committed by Android (Google) Code Review
Browse files

Merge "Clean up flag enforce_shell_thread_model" into main

parents 555e38c5 00ee8263

core/java/android/window/flags/windowing_frontend.aconfig

+0 −10
Original line number Original line Diff line number Diff line
@@ -200,16 +200,6 @@ flag { 
  }

  }

}

}





flag {

  name: "enforce_shell_thread_model"

  namespace: "windowing_frontend"

  description: "Crash the shell process if someone calls in from the wrong thread"

  bug: "351189446"

  is_fixed_read_only: true

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}

flag {

flag {

  name: "custom_animations_behind_translucent"

  name: "custom_animations_behind_translucent"

  namespace: "windowing_frontend"

  namespace: "windowing_frontend"

libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java

+2 −7
Original line number Original line Diff line number Diff line
@@ -38,7 +38,6 @@ import static android.window.TransitionInfo.FLAG_IS_WALLPAPER; 
import static android.window.TransitionInfo.FLAG_NO_ANIMATION;

import static android.window.TransitionInfo.FLAG_NO_ANIMATION;

import static android.window.TransitionInfo.FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT;

import static android.window.TransitionInfo.FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT;





import static com.android.window.flags.Flags.enforceShellThreadModel;

import static com.android.window.flags.Flags.ensureWallpaperInTransitions;

import static com.android.window.flags.Flags.ensureWallpaperInTransitions;

import static com.android.systemui.shared.Flags.returnAnimationFrameworkLibrary;

import static com.android.systemui.shared.Flags.returnAnimationFrameworkLibrary;

import static com.android.wm.shell.shared.TransitionUtil.isClosingType;

import static com.android.wm.shell.shared.TransitionUtil.isClosingType;
@@ -936,9 +935,7 @@ public class Transitions implements RemoteCallable<Transitions>, 
    }

    }





    private void onMerged(@NonNull IBinder playingToken, @NonNull IBinder mergedToken) {

    private void onMerged(@NonNull IBinder playingToken, @NonNull IBinder mergedToken) {

        if (enforceShellThreadModel()) {

        mMainExecutor.assertCurrentThread();

        mMainExecutor.assertCurrentThread();

        }





        ActiveTransition playing = mKnownTransitions.get(playingToken);

        ActiveTransition playing = mKnownTransitions.get(playingToken);

        if (playing == null) {

        if (playing == null) {
@@ -1087,9 +1084,7 @@ public class Transitions implements RemoteCallable<Transitions>, 
    }

    }





    private void onFinish(IBinder token, @Nullable WindowContainerTransaction wct) {

    private void onFinish(IBinder token, @Nullable WindowContainerTransaction wct) {

        if (enforceShellThreadModel()) {

        mMainExecutor.assertCurrentThread();

        mMainExecutor.assertCurrentThread();

        }





        final ActiveTransition active = mKnownTransitions.get(token);

        final ActiveTransition active = mKnownTransitions.get(token);

        if (active == null) {

        if (active == null) {