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

Commit 94d585f5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Register binder-depth per remote animation" into sc-v2-dev am: 859ef211 

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

Change-Id: Id53861aa026fa2090bd5e930217f6dea803ea1e5
parents 0445022d 859ef211

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

+27 −10
Original line number Diff line number Diff line
@@ -56,14 +56,7 @@ public class RemoteTransitionHandler implements Transitions.TransitionHandler { 
    private final ArrayList<Pair<TransitionFilter, IRemoteTransition>> mFilters =

            new ArrayList<>();



    private final IBinder.DeathRecipient mTransitionDeathRecipient =

            new IBinder.DeathRecipient() {

                @Override

                @BinderThread

                public void binderDied() {

                    mMainExecutor.execute(() -> mFilters.clear());

                }

            };

    private final ArrayMap<IBinder, RemoteDeathHandler> mDeathHandlers = new ArrayMap<>();



    RemoteTransitionHandler(@NonNull ShellExecutor mainExecutor) {

        mMainExecutor = mainExecutor;
@@ -71,7 +64,9 @@ public class RemoteTransitionHandler implements Transitions.TransitionHandler { 


    void addFiltered(TransitionFilter filter, IRemoteTransition remote) {

        try {

            remote.asBinder().linkToDeath(mTransitionDeathRecipient, 0 /* flags */);

            RemoteDeathHandler handler = new RemoteDeathHandler(remote.asBinder());

            remote.asBinder().linkToDeath(handler, 0 /* flags */);

            mDeathHandlers.put(remote.asBinder(), handler);

        } catch (RemoteException e) {

            Slog.e(TAG, "Failed to link to death");

            return;
@@ -88,7 +83,8 @@ public class RemoteTransitionHandler implements Transitions.TransitionHandler { 
            }

        }

        if (removed) {

            remote.asBinder().unlinkToDeath(mTransitionDeathRecipient, 0 /* flags */);

            RemoteDeathHandler handler = mDeathHandlers.remove(remote.asBinder());

            remote.asBinder().unlinkToDeath(handler, 0 /* flags */);

        }

    }
@@ -206,4 +202,25 @@ public class RemoteTransitionHandler implements Transitions.TransitionHandler { 
                + " for %s: %s", transition, remote);

        return new WindowContainerTransaction();

    }



    /** NOTE: binder deaths can alter the filter order */

    private class RemoteDeathHandler implements IBinder.DeathRecipient {

        private final IBinder mRemote;



        RemoteDeathHandler(IBinder remote) {

            mRemote = remote;

        }



        @Override

        @BinderThread

        public void binderDied() {

            mMainExecutor.execute(() -> {

                for (int i = mFilters.size() - 1; i >= 0; --i) {

                    if (mRemote.equals(mFilters.get(i).second.asBinder())) {

                        mFilters.remove(i);

                    }

                }

            });

        }

    }

}