Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over CDM UI" into rvc-qpr-dev (32cb36ec) · Commits · e / os / android_frameworks_base

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -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 static java.util.Objects.requireNonNull;

		@@ -58,6 +59,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);