commit fd697c56b7795a7f0cf50cac55db71a60d5bd357
author Alisher Alikhodjaev <alisher@google.com> Tue Apr 20 15:58:19 2021 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Thu May 20 00:01:12 2021 +0000
tree ca970f112f86971dadbaf344f9654e6da6684ffe
parent 7429a288922ba9e7e6bdefdb97387061ee6f21cf

Tapjacking vulnerability when pairing Bluetooth devices with NFC

Bug: 180422108
Test: build ok
Change-Id: I169a83ff860b4f2062606f4dd15659f3b5813983
(cherry picked from commit 8afc24e296743c5c294444a14da20bc4c44dec6a)

src/com/android/nfc/handover/ConfirmConnectActivity.java

diff --git a/src/com/android/nfc/handover/ConfirmConnectActivity.java b/src/com/android/nfc/handover/ConfirmConnectActivity.java
index c4ac8ab..5574469 100644
--- a/src/com/android/nfc/handover/ConfirmConnectActivity.java
+++ b/src/com/android/nfc/handover/ConfirmConnectActivity.java
@@ -16,6 +16,8 @@
 
 package com.android.nfc.handover;
 
+import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
+
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.bluetooth.BluetoothDevice;
@@ -35,6 +37,7 @@
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        getWindow().addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
         AlertDialog.Builder builder = new AlertDialog.Builder(this,
                 R.style.DialogAlertDayNight);
         Intent launchIntent = getIntent();