commit | db48b810b66b2f4f3ec7d4479e10e8c80657ab2a | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Dec 09 00:16:09 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 09 00:16:09 2020 +0000 |
tree | 13a1a7668cf0e2361e88ac96f4f0811e2c1b0cca | |
parent | 85f6ce8e7157eb4c38d7a9cc934a9b35de11861d [diff] | |
parent | 4c4f83eb214da39d95a3e18d041ee1554399a77e [diff] |
Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc am: 537c730ca2 am: 4c4f83eb21 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id38617a0c134feeb458a734a86c57360108fdd15
diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java index 4dd9a40..be383dc 100644 --- a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java +++ b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
@@ -34,6 +34,8 @@ 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 @@ 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)) {