Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over CDM UI" into rvc-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
32cb36ec45
@@ -17,6 +17,7 @@
|
|||||||
package com.android.companiondevicemanager;
|
package com.android.companiondevicemanager;
|
||||||
|
|
||||||
import static android.companion.BluetoothDeviceFilterUtils.getDeviceMacAddress;
|
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;
|
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");
|
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()) {
|
if (getService().mRequest.isSingleDevice()) {
|
||||||
setContentView(R.layout.device_confirmation);
|
setContentView(R.layout.device_confirmation);
|
||||||
final DeviceFilterPair selectedDevice = getService().mDevicesFound.get(0);
|
final DeviceFilterPair selectedDevice = getService().mDevicesFound.get(0);
|
||||||
|
|||||||
Reference in New Issue
Block a user