From ce09f9970b5cc8dcacb8870a3a6970baefb6f8d2 Mon Sep 17 00:00:00 2001
From: Prabir Pradhan <prabirmsp@google.com>
Date: Wed, 3 Nov 2021 12:39:58 -0700
Subject: [PATCH] Clean up after enabling per-window-input-rotation

The input feature of per-window-input-rotation is now enabled by
default. Since we don't want to maintain two pipelines for input
rotation, we remove the old code path and clean up accordingly.

Bug: 188939842
Test: presubmit
Test: manual, test that touch and mouse works with display rotated
Change-Id: I8663fbe00f95aa0ce87bfcddd5b9035ef6a65b87
---
 services/core/jni/Android.bp                                  | 1 -
 .../core/jni/com_android_server_input_InputManagerService.cpp | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp
index eb2c8a6b88343..7e092c16386fd 100644
--- a/services/core/jni/Android.bp
+++ b/services/core/jni/Android.bp
@@ -115,7 +115,6 @@ cc_defaults {
         "libui",
         "libvibratorservice",
         "PlatformProperties",
-        "InputFlingerProperties",
         "libinput",
         "libinputflinger",
         "libinputflinger_base",
diff --git a/services/core/jni/com_android_server_input_InputManagerService.cpp b/services/core/jni/com_android_server_input_InputManagerService.cpp
index 790acbf2cd231..c02d6ce037e8f 100644
--- a/services/core/jni/com_android_server_input_InputManagerService.cpp
+++ b/services/core/jni/com_android_server_input_InputManagerService.cpp
@@ -26,7 +26,6 @@
 // Log debug messages about InputDispatcherPolicy
 #define DEBUG_INPUT_DISPATCHER_POLICY 0
 
-#include <InputFlingerProperties.sysprop.h>
 #include <android-base/parseint.h>
 #include <android-base/stringprintf.h>
 #include <android/os/IInputConstants.h>
@@ -2087,9 +2086,6 @@ static void nativeReloadDeviceAliases(JNIEnv* /* env */,
 
 static std::string dumpInputProperties() {
     std::string out = "Input properties:\n";
-    const bool perWindowInputRotation =
-            sysprop::InputFlingerProperties::per_window_input_rotation().value_or(false);
-    out += StringPrintf("  per_window_input_rotation = %s\n", toString(perWindowInputRotation));
     const std::string strategy =
             sysprop::InputProperties::velocitytracker_strategy().value_or("default");
     out += "  persist.input.velocitytracker.strategy = " + strategy + "\n";