Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53825749 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev 

* changes:
  RESTRICT AUTOMERGE Allow CDM to hide overlays
  RESTRICT AUTOMERGE Prevent non-system overlays from showing over CDM UI
parents f4a72918 6a5777dd

packages/CompanionDeviceManager/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>

    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>

    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>

    <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/>



    <application

        android:allowClearUserData="true"

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

+4 −1
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.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;



import android.app.Activity;

import android.companion.CompanionDeviceManager;
@@ -55,6 +56,8 @@ public class DeviceChooserActivity extends Activity { 
            Log.e(LOG_TAG, "About to show UI, but no devices to show");

        }



        getWindow().addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);



        if (getService().mRequest.isSingleDevice()) {

            setContentView(R.layout.device_confirmation);

            final DeviceFilterPair selectedDevice = getService().mDevicesFound.get(0);