Merge "Revert "Feature flag new "MANAGE_KEY_GESTURES" permission"" into main
diff --git a/core/java/android/hardware/input/input_framework.aconfig b/core/java/android/hardware/input/input_framework.aconfig
index 0ddb3e2..83c4de3 100644
--- a/core/java/android/hardware/input/input_framework.aconfig
+++ b/core/java/android/hardware/input/input_framework.aconfig
@@ -99,11 +99,3 @@
description: "Refactor ModifierShortcutManager internal representation of shortcuts."
bug: "358603902"
}
-
-flag {
- namespace: "input_native"
- name: "manage_key_gestures"
- description: "Manage key gestures through Input APIs"
- is_exported: true
- bug: "358569822"
-}
diff --git a/core/res/Android.bp b/core/res/Android.bp
index 17d7bfa..bcc0a97 100644
--- a/core/res/Android.bp
+++ b/core/res/Android.bp
@@ -167,7 +167,6 @@
"android.os.flags-aconfig",
"android.os.vibrator.flags-aconfig",
"android.media.tv.flags-aconfig",
- "com.android.hardware.input.input-aconfig",
],
}
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 8f0927f..17ff2eb 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -8170,8 +8170,7 @@
<p>Not for use by third-party applications.
@hide -->
<permission android:name="android.permission.MANAGE_KEY_GESTURES"
- android:protectionLevel="signature"
- android:featureFlag="com.android.hardware.input.manage_key_gestures" />
+ android:protectionLevel="signature" />
<uses-permission android:name="android.permission.HANDLE_QUERY_PACKAGE_RESTART" />