From 8d71bdf3e63d8cfc66e45f47a031d77e3509cb5b Mon Sep 17 00:00:00 2001 From: Charles Chen Date: Thu, 17 Sep 2020 23:04:57 +0800 Subject: [PATCH] [RESTRICT AUTOMERGE] Fix VrDisplayTest failure Before CL[1], the system regarded system created displays as trusted displays, which provided the ability to gain the focus without user's touch. After CL[1], the system checked if a virtual display is trusted by the flag FLAG_TRUSTED. Therefore, the activity lunched on the Vr2dDisplay can not gain the focus because Vr2dDisplay didn't hold the flag FLAG_TRUSTED. This CL adds the flag to Vr2dDisplay to make it a trusted display. CL[1]: ef7b1333f0e87cd07af115719b94dd37e2de54dc Bug: 168268396 Test: Vr2DisplayTests Change-Id: Iac88859d3fa7cbb75214efcc6ce4a88e0eb718f2 (cherry picked from commit 534bbaeead15bc3c540efd947b3a5ade62cf27be) --- services/core/java/com/android/server/vr/Vr2dDisplay.java | 1 + 1 file changed, 1 insertion(+) diff --git a/services/core/java/com/android/server/vr/Vr2dDisplay.java b/services/core/java/com/android/server/vr/Vr2dDisplay.java index 3f2b5c231dcaa..a713e5b13667d 100644 --- a/services/core/java/com/android/server/vr/Vr2dDisplay.java +++ b/services/core/java/com/android/server/vr/Vr2dDisplay.java @@ -295,6 +295,7 @@ class Vr2dDisplay { flags |= DisplayManager.VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY; flags |= DisplayManager.VIRTUAL_DISPLAY_FLAG_DESTROY_CONTENT_ON_REMOVAL; flags |= DisplayManager.VIRTUAL_DISPLAY_FLAG_SECURE; + flags |= DisplayManager.VIRTUAL_DISPLAY_FLAG_TRUSTED; final VirtualDisplayConfig.Builder builder = new VirtualDisplayConfig.Builder( DISPLAY_NAME, mVirtualDisplayWidth, mVirtualDisplayHeight, mVirtualDisplayDpi);