Merge "Fix for recycling key events when sending global button broadcast"

am: 8eed59fabb Change-Id: I66c2c343a139c2827de2d00c7620e7cd1cc16326
2020-01-22 15:35:48 -08:00
parent cac198c770 8eed59fabb
commit 980acce64b
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/policy/GlobalKeyManager.java
+++ b/services/core/java/com/android/server/policy/GlobalKeyManager.java
@@ -74,7 +74,7 @@ final class GlobalKeyManager {
                Intent intent = new Intent(Intent.ACTION_GLOBAL_BUTTON)
                        .setComponent(component)
                        .setFlags(Intent.FLAG_RECEIVER_FOREGROUND)
-                        .putExtra(Intent.EXTRA_KEY_EVENT, event);
+                        .putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(event));
                context.sendBroadcastAsUser(intent, UserHandle.CURRENT, null);
                return true;
            }