Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "cdm_overlay-rvc-dev" into rvc-dev

Browse Source 
* changes:
  Allow CDM to hide overlays
  Prevent non-system overlays from showing over CDM UI
This commit is contained in:
TreeHugger Robot
2021-02-03 00:48:45 +00:00
committed by Android (Google) Code Review
parent 5d559ac700 f717d7195f
commit f82228a753
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/CompanionDeviceManager/AndroidManifest.xml
View File

@@ -31,6 +31,7 @@
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/> <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.RADIO_SCAN_WITHOUT_LOCATION"/>
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/> <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
<uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/>
<application <application
android:allowClearUserData="true" android:allowClearUserData="true"

3
packages/CompanionDeviceManager/src/com/android/companiondevicemanager/DeviceChooserActivity.java
View File

@@ -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 android.app.Activity; import android.app.Activity;
import android.companion.CompanionDeviceManager; 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"); 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);