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

Commit e69c094b authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

Merge "Provide access to Shell's apply token"

parents e410ff78 b7fe2d63

libs/WindowManager/Shell/src/com/android/wm/shell/transition/IShellTransitions.aidl

+5 −0
Original line number Diff line number Diff line
@@ -34,4 +34,9 @@ interface IShellTransitions { 
     * Unregisters a remote transition handler.

     */

    oneway void unregisterRemote(in RemoteTransition remoteTransition) = 2;



    /**

     * Retrieves the apply-token used by transactions in Shell

     */

    IBinder getShellApplyToken() = 3;

}

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

+5 −0
Original line number Diff line number Diff line
@@ -958,6 +958,11 @@ public class Transitions implements RemoteCallable<Transitions> { 
                        transitions.mRemoteTransitionHandler.removeFiltered(remoteTransition);

                    });

        }



        @Override

        public IBinder getShellApplyToken() {

            return SurfaceControl.Transaction.getDefaultApplyToken();

        }

    }



    private class SettingsObserver extends ContentObserver {