Merge "Add API for writing WM trace to file"

core/java/android/view/IWindowManager.aidl

@@ -540,6 +540,11 @@ interface IWindowManager
      */
     void stopWindowTrace();
 
+    /**
+    * If window tracing is active, saves the window trace to file, otherwise does nothing
+    */
+    void saveWindowTraceToFile();
+
     /**
      * Returns true if window trace is enabled.
      */

services/core/java/com/android/server/wm/WindowManagerService.java

@@ -5679,6 +5679,11 @@ public class WindowManagerService extends IWindowManager.Stub
         mWindowTracing.stopTrace(null /* printwriter */);
     }
 
+    @Override
+    public void saveWindowTraceToFile() {
+        mWindowTracing.saveForBugreport(null /* printwriter */);
+    }
+
     @Override
     public boolean isWindowTraceEnabled() {
         return mWindowTracing.isEnabled();