From f2d6889df96605093857d0e611199061727271d8 Mon Sep 17 00:00:00 2001
From: Steven Timotius <stimo@google.com>
Date: Mon, 28 Aug 2017 17:00:01 -0700
Subject: [PATCH] Add Rotation Information to WindowManager proto dumpsys

Test: adb shell dumpsys window --proto | protoc --decode_raw
Change-Id: I48b14f5cfe409cc1e780b4913ab65bc2f4af3610
---
 core/proto/android/server/windowmanagerservice.proto   |  8 ++++++++
 .../java/com/android/server/wm/DisplayContent.java     |  8 ++++++++
 .../com/android/server/wm/ScreenRotationAnimation.java | 10 ++++++++++
 3 files changed, 26 insertions(+)

diff --git a/core/proto/android/server/windowmanagerservice.proto b/core/proto/android/server/windowmanagerservice.proto
index 7fb48028494d3..ee8a6dc452b78 100644
--- a/core/proto/android/server/windowmanagerservice.proto
+++ b/core/proto/android/server/windowmanagerservice.proto
@@ -91,6 +91,8 @@ message DisplayProto {
   repeated WindowTokenProto ime_windows = 7;
   int32 dpi = 8;
   .android.view.DisplayInfoProto display_info = 9;
+  int32 rotation = 10;
+  ScreenRotationAnimationProto screen_rotation_animation = 11;
 }
 
 
@@ -170,4 +172,10 @@ message WindowStateAnimatorProto {
 message WindowSurfaceControllerProto {
   bool shown = 1;
   int32 layer = 2;
+}
+
+/* represents ScreenRotationAnimation */
+message ScreenRotationAnimationProto {
+  bool started = 1;
+  bool animation_running = 2;
 }
\ No newline at end of file
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index bf1c3f7463263..07ba517900383 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -108,6 +108,8 @@ import static com.android.server.wm.proto.DisplayProto.DPI;
 import static com.android.server.wm.proto.DisplayProto.ID;
 import static com.android.server.wm.proto.DisplayProto.IME_WINDOWS;
 import static com.android.server.wm.proto.DisplayProto.PINNED_STACK_CONTROLLER;
+import static com.android.server.wm.proto.DisplayProto.ROTATION;
+import static com.android.server.wm.proto.DisplayProto.SCREEN_ROTATION_ANIMATION;
 import static com.android.server.wm.proto.DisplayProto.STACKS;
 
 import android.annotation.NonNull;
@@ -2139,6 +2141,12 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
         }
         proto.write(DPI, mBaseDisplayDensity);
         mDisplayInfo.writeToProto(proto, DISPLAY_INFO);
+        proto.write(ROTATION, mRotation);
+        final ScreenRotationAnimation screenRotationAnimation =
+                mService.mAnimator.getScreenRotationAnimationLocked(mDisplayId);
+        if (screenRotationAnimation != null) {
+            screenRotationAnimation.writeToProto(proto, SCREEN_ROTATION_ANIMATION);
+        }
         proto.end(token);
     }
 
diff --git a/services/core/java/com/android/server/wm/ScreenRotationAnimation.java b/services/core/java/com/android/server/wm/ScreenRotationAnimation.java
index 97e9a609b2a14..d5b6d24631e63 100644
--- a/services/core/java/com/android/server/wm/ScreenRotationAnimation.java
+++ b/services/core/java/com/android/server/wm/ScreenRotationAnimation.java
@@ -25,12 +25,15 @@ import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;
 import static com.android.server.wm.WindowManagerService.TYPE_LAYER_MULTIPLIER;
 import static com.android.server.wm.WindowStateAnimator.WINDOW_FREEZE_LAYER;
 import static com.android.server.wm.WindowSurfaceController.SurfaceTrace;
+import static com.android.server.wm.proto.ScreenRotationAnimationProto.ANIMATION_RUNNING;
+import static com.android.server.wm.proto.ScreenRotationAnimationProto.STARTED;
 
 import android.content.Context;
 import android.graphics.Matrix;
 import android.graphics.PixelFormat;
 import android.graphics.Rect;
 import android.util.Slog;
+import android.util.proto.ProtoOutputStream;
 import android.view.Display;
 import android.view.DisplayInfo;
 import android.view.Surface;
@@ -216,6 +219,13 @@ class ScreenRotationAnimation {
         }
     }
 
+    public void writeToProto(ProtoOutputStream proto, long fieldId) {
+        final long token = proto.start(fieldId);
+        proto.write(STARTED, mStarted);
+        proto.write(ANIMATION_RUNNING, mAnimRunning);
+        proto.end(token);
+    }
+
     public ScreenRotationAnimation(Context context, DisplayContent displayContent,
             SurfaceSession session, boolean inTransaction, boolean forceDefaultOrientation,
             boolean isSecure, WindowManagerService service) {