Merge "Provide access to Shell's apply token"

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

@@ -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

@@ -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 {