From c4d8737fd4db8d5fe072e9ae4888ab70ec104f95 Mon Sep 17 00:00:00 2001
From: cobalt-github-releaser-bot
 <95661244+cobalt-github-releaser-bot@users.noreply.github.com>
Date: Thu, 15 Jun 2023 10:50:52 -0700
Subject: [PATCH] Cherry pick PR #629: Remove Android internal
 input_events_filter (#643)

Co-authored-by: Colin Liang <colinliang@google.com>
Co-authored-by: Colin Liang <zhongqi.liang.4u@gmail.com>
---
 starboard/android/shared/BUILD.gn               | 8 --------
 starboard/android/shared/application_android.cc | 6 ------
 starboard/android/shared/application_android.h  | 7 -------
 3 files changed, 21 deletions(-)

diff --git a/starboard/android/shared/BUILD.gn b/starboard/android/shared/BUILD.gn
index 23f25372b9fc..d8a79e3bb47f 100644
--- a/starboard/android/shared/BUILD.gn
+++ b/starboard/android/shared/BUILD.gn
@@ -439,14 +439,6 @@ static_library("starboard_platform") {
     "//third_party/opus",
   ]
 
-  if (is_internal_build) {
-    sources += [
-      "//internal/starboard/android/shared/internal/input_events_filter.cc",
-      "//internal/starboard/android/shared/internal/input_events_filter.h",
-    ]
-    defines = [ "STARBOARD_INPUT_EVENTS_FILTER" ]
-  }
-
   if (sb_is_evergreen_compatible) {
     sources -= [
       "crash_handler.cc",
diff --git a/starboard/android/shared/application_android.cc b/starboard/android/shared/application_android.cc
index 0f81e1d609d3..0334d1f353ae 100644
--- a/starboard/android/shared/application_android.cc
+++ b/starboard/android/shared/application_android.cc
@@ -436,12 +436,6 @@ bool ApplicationAndroid::SendAndroidKeyEvent(
     const GameActivityKeyEvent* event) {
   bool result = false;
 
-#ifdef STARBOARD_INPUT_EVENTS_FILTER
-  if (!input_events_filter_.ShouldProcessKeyEvent(event)) {
-    return result;
-  }
-#endif
-
   ScopedLock lock(input_mutex_);
   if (!input_events_generator_) {
     return false;
diff --git a/starboard/android/shared/application_android.h b/starboard/android/shared/application_android.h
index 336ea9cd37bf..d023e74208c6 100644
--- a/starboard/android/shared/application_android.h
+++ b/starboard/android/shared/application_android.h
@@ -22,9 +22,6 @@
 #include <vector>
 
 #include "game-activity/GameActivity.h"
-#ifdef STARBOARD_INPUT_EVENTS_FILTER
-#include "internal/starboard/android/shared/internal/input_events_filter.h"
-#endif
 #include "starboard/android/shared/input_events_generator.h"
 #include "starboard/android/shared/jni_env_ext.h"
 #include "starboard/atomic.h"
@@ -168,10 +165,6 @@ class ApplicationAndroid
   Mutex input_mutex_;
   scoped_ptr<InputEventsGenerator> input_events_generator_;
 
-#ifdef STARBOARD_INPUT_EVENTS_FILTER
-  internal::InputEventsFilter input_events_filter_;
-#endif
-
   bool last_is_accessibility_high_contrast_text_enabled_;
 
   jobject resource_overlay_;