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

Commit f0322276 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into... 

Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dc am: 537c730c am: 4c4f83eb

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic5656366002952b9d279910e7e6d6dc217602b1a
parents b31cea60 4c4f83eb

src/com/android/settings/bluetooth/BluetoothPermissionActivity.java

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ import com.android.internal.app.AlertActivity; 
import com.android.internal.app.AlertController;

import com.android.settings.R;



import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;



/**

 * BluetoothPermissionActivity shows a dialog for accepting incoming

 * profile connection request from untrusted devices.
@@ -76,6 +78,7 @@ public class BluetoothPermissionActivity extends AlertActivity implements 
    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);



        getWindow().addPrivateFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

        Intent i = getIntent();

        String action = i.getAction();

        if (!action.equals(BluetoothDevice.ACTION_CONNECTION_ACCESS_REQUEST)) {