Merge "Fix for recycling key events when sending global button broadcast" am: 8eed59fabb am: 980acce64b am: 950faa1252

Change-Id: I4bab8f0d7c3ad69e77ecf975ac3850f3b2150e2d
2020-01-23 00:10:53 +00:00
parent e4a81f01a6 950faa1252
commit d2be79c17b
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;
            }