diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-02-03 00:48:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-02-03 00:48:45 +0000 |
| commit | f82228a7538cee2769eeb1e596d0f0932949e029 (patch) | |
| tree | fb65de9ff2621c1e502c760273cbd3b303362d29 | |
| parent | 5d559ac7008e8ee574420f9ac42a4428dbda0e0e (diff) | |
| parent | f717d7195fa8654a7c9e4e28bbe473f8513eef64 (diff) | |
| download | base-f82228a7538cee2769eeb1e596d0f0932949e029.tar.gz | |
Merge changes from topic "cdm_overlay-rvc-dev" into rvc-dev
* changes:
Allow CDM to hide overlays
Prevent non-system overlays from showing over CDM UI
| -rw-r--r-- | packages/CompanionDeviceManager/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/packages/CompanionDeviceManager/AndroidManifest.xml b/packages/CompanionDeviceManager/AndroidManifest.xml index ea9b52cbf3d5..e4e5b9fa781a 100644 --- a/packages/CompanionDeviceManager/AndroidManifest.xml +++ b/packages/CompanionDeviceManager/AndroidManifest.xml @@ -31,6 +31,7 @@ <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/> <uses-permission android:name="android.permission.RADIO_SCAN_WITHOUT_LOCATION"/> <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/> + <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/> <application android:allowClearUserData="true" 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); |