commit e26b5a4e898eabea732a55ef69f616d81726830f
author Eugene Susla <eugenesusla@google.com> Mon Oct 26 09:08:49 2020 -0700
committer venkata Jagadeesh garaga <vgaraga@codeaurora.org> Mon Apr 05 04:54:38 2021 +0000
tree 39b9ad6073d25a7fb2722212a2da3779737f0b48
parent cd1aab48b572c7fb3f258a7d0fbe73dea444f42b

RESTRICT AUTOMERGE Prevent non-system overlays from showing over CDM UI

Since CDM grants privileges, it should have the same overlay
policy as permission UI

Test: use an app wit ha visible overlay to ensure
the overlay disappears when CDM is shown
CRs-Fixed: 2915731
Fixes: 171221090

Change-Id: I4daaee7d8b710a72f6166cbb2252ef8af84c2c60
(cherry picked from commit 2d5a635fec95667d96ba9dd1007d393299018cb2)

packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java

diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java
index 16ef59f..7bc9993 100644
--- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java
+++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java
@@ -17,6 +17,7 @@
 package com.android.companiondevicemanager;
 
 import static android.companion.BluetoothDeviceFilterUtils.getDeviceMacAddress;
+import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
 
 import android.app.Activity;
 import android.companion.CompanionDeviceManager;
@@ -56,6 +57,8 @@
             Log.e(LOG_TAG, "About to show UI, but no devices to show");
         }
 
+        getWindow().addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
+
         if (getService().mRequest.isSingleDevice()) {
             setContentView(R.layout.device_confirmation);
             final DeviceFilterPair selectedDevice = getService().mDevicesFound.get(0);