summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Susla <eugenesusla@google.com>2021-02-03 01:23:12 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-03 01:23:12 +0000
commitc51c89f233e419810c3a9afee1f8ffbda580b377 (patch)
tree6890fdfb32a04822822c2a54330adb52521f55b8
parentef43403a6bb2fa93e3fdca65692509df14bfbc91 (diff)
parentd7f514abbe0bee01003ef694a67abfaa30667b4d (diff)
downloadbase-c51c89f233e419810c3a9afee1f8ffbda580b377.tar.gz
Prevent non-system overlays from showing over CDM UI am: d7f514abbe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13121152 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifb4d00ec2b870d5ffaffc49137c0da039d240bb5
-rw-r--r--packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java
index 16ef59f201f1..7bc9993751d4 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 @@ public class DeviceChooserActivity extends Activity {
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);