diff --git a/private/app_neverallows.te b/private/app_neverallows.te
index 6ebbd436a51976d9b19a8507f44bdfa0bda80b6b..892eb9acd2fdc51b8e5c0e8ca4fdfcd851271f76 100644
--- a/private/app_neverallows.te
+++ b/private/app_neverallows.te
@@ -263,6 +263,7 @@ neverallow all_untrusted_apps {
hal_gnss_hwservice
hal_graphics_composer_hwservice
hal_health_hwservice
+ hal_input_classifier_hwservice
hal_ir_hwservice
hal_keymaster_hwservice
hal_light_hwservice
diff --git a/private/compat/28.0/28.0.ignore.cil b/private/compat/28.0/28.0.ignore.cil
index d650d3ce728398aca7cfda8c845fb4c4a93a42a5..fef9c2273fbedfa7fd10b8d5a8f23ca6549648fb 100644
--- a/private/compat/28.0/28.0.ignore.cil
+++ b/private/compat/28.0/28.0.ignore.cil
@@ -38,6 +38,7 @@
hal_atrace_hwservice
hal_face_hwservice
hal_health_storage_hwservice
+ hal_input_classifier_hwservice
hal_power_stats_hwservice
hal_system_suspend_default
hal_system_suspend_default_exec
diff --git a/private/hwservice_contexts b/private/hwservice_contexts
index 908762b9960f43a47d7f554b1372cb3ba860a260..3a1ddfec9ab7a2ecda600e5e5ed4e4a805ea3d0a 100644
--- a/private/hwservice_contexts
+++ b/private/hwservice_contexts
@@ -33,6 +33,7 @@ android.hardware.graphics.composer::IComposer u:object_r:hal_g
android.hardware.graphics.mapper::IMapper u:object_r:hal_graphics_mapper_hwservice:s0
android.hardware.health::IHealth u:object_r:hal_health_hwservice:s0
android.hardware.health.storage::IStorage u:object_r:hal_health_storage_hwservice:s0
+android.hardware.input.classifier::IInputClassifier u:object_r:hal_input_classifier_hwservice:s0
android.hardware.ir::IConsumerIr u:object_r:hal_ir_hwservice:s0
android.hardware.keymaster::IKeymasterDevice u:object_r:hal_keymaster_hwservice:s0
android.hardware.light::ILight u:object_r:hal_light_hwservice:s0
diff --git a/private/system_server.te b/private/system_server.te
index 4b2292146a05d3596e6adf74d03cef6b8038a59c..4fe3735b5faa08024214ffd842c2d95ff3ec5289 100644
--- a/private/system_server.te
+++ b/private/system_server.te
@@ -206,6 +206,7 @@ hal_client_domain(system_server, hal_fingerprint)
hal_client_domain(system_server, hal_gnss)
hal_client_domain(system_server, hal_graphics_allocator)
hal_client_domain(system_server, hal_health)
+hal_client_domain(system_server, hal_input_classifier)
hal_client_domain(system_server, hal_ir)
hal_client_domain(system_server, hal_light)
hal_client_domain(system_server, hal_memtrack)
diff --git a/public/attributes b/public/attributes
index bc3723c5f83afe77cf2c398191f5cf57fd487491..5a4042199e4a6358fae68e152040a7813d41ed7b 100644
--- a/public/attributes
+++ b/public/attributes
@@ -266,6 +266,7 @@ hal_attribute(graphics_allocator);
hal_attribute(graphics_composer);
hal_attribute(health);
hal_attribute(health_storage);
+hal_attribute(input_classifier);
hal_attribute(ir);
hal_attribute(keymaster);
hal_attribute(light);
diff --git a/public/hal_input_classifier.te b/public/hal_input_classifier.te
new file mode 100644
index 0000000000000000000000000000000000000000..70a4b7debb22772985fceadb2a8f294e79ca9683
--- /dev/null
+++ b/public/hal_input_classifier.te
@@ -0,0 +1,4 @@
+# HwBinder IPC from client to server
+binder_call(hal_input_classifier_client, hal_input_classifier_server)
+
+hal_attribute_hwservice(hal_input_classifier, hal_input_classifier_hwservice)
diff --git a/public/hwservice.te b/public/hwservice.te
index 636339260d01ae00d03e9bfefeb0c134aae19e5f..7425878dbd57647646cd8e5c7440145aced45514 100644
--- a/public/hwservice.te
+++ b/public/hwservice.te
@@ -30,6 +30,7 @@ type hal_graphics_composer_hwservice, hwservice_manager_type;
type hal_graphics_mapper_hwservice, hwservice_manager_type, same_process_hwservice;
type hal_health_hwservice, hwservice_manager_type;
type hal_health_storage_hwservice, hwservice_manager_type;
+type hal_input_classifier_hwservice, hwservice_manager_type;
type hal_ir_hwservice, hwservice_manager_type;
type hal_keymaster_hwservice, hwservice_manager_type;
type hal_light_hwservice, hwservice_manager_type;
diff --git a/public/su.te b/public/su.te
index 4a401b86b8c9260a039b2a55d9b9a2fea07a107e..e09248b252707c560fbf498842e6323e7688b5cd 100644
--- a/public/su.te
+++ b/public/su.te
@@ -76,6 +76,7 @@ userdebug_or_eng(`
typeattribute su hal_graphics_allocator_client;
typeattribute su hal_graphics_composer_client;
typeattribute su hal_health_client;
+ typeattribute su hal_input_classifier_client;
typeattribute su hal_ir_client;
typeattribute su hal_keymaster_client;
typeattribute su hal_light_client;
diff --git a/vendor/file_contexts b/vendor/file_contexts
index c0ceb94446d6cce5171ddbd3f1f5ea9964cd1c43..eb03f24188d63a5ed0e664cc70a11239a4ee6a00 100644
--- a/vendor/file_contexts
+++ b/vendor/file_contexts
@@ -31,6 +31,7 @@
/(vendor|system/vendor)/bin/hw/android\.hardware\.health@1\.0-service u:object_r:hal_health_default_exec:s0
/(vendor|system/vendor)/bin/hw/android\.hardware\.health@2\.0-service u:object_r:hal_health_default_exec:s0
/(vendor|system/vendor)/bin/hw/android\.hardware\.health\.storage@1\.0-service u:object_r:hal_health_storage_default_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.input\.classifier@1\.0-service u:object_r:hal_input_classifier_default_exec:s0
/(vendor|system/vendor)/bin/hw/android\.hardware\.ir@1\.0-service u:object_r:hal_ir_default_exec:s0
/(vendor|system/vendor)/bin/hw/android\.hardware\.keymaster@3\.0-service u:object_r:hal_keymaster_default_exec:s0
/(vendor|system/vendor)/bin/hw/android\.hardware\.keymaster@4\.0-service u:object_r:hal_keymaster_default_exec:s0
diff --git a/vendor/hal_input_classifier_default.te b/vendor/hal_input_classifier_default.te
new file mode 100644
index 0000000000000000000000000000000000000000..915cc780a063c13c783bb6568305e8a932ad5ce2
--- /dev/null
+++ b/vendor/hal_input_classifier_default.te
@@ -0,0 +1,5 @@
+type hal_input_classifier_default, domain;
+hal_server_domain(hal_input_classifier_default, hal_input_classifier)
+
+type hal_input_classifier_default_exec, exec_type, vendor_file_type, file_type;
+init_daemon_domain(hal_input_classifier_default)