commit 861712dcf155742edecf7035b4cde242d40bc4b0
author Rubin Xu <rubinxu@google.com> Wed Sep 15 21:43:18 2021 +0800
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Oct 08 01:25:11 2021 +0000
tree 734b987abd924ad528128a0a63e1a2e092be2ccc
parent a5685eed3a4262ac1e0cc48a43f27a5072b9ef07

DO NOT MERGE KeyChain protect against overlays.

Set setFilterTouchesWhenObsucred on positive confirmation button.

Test: N/A
Bug: 199754277
Change-Id: I096afafb74b69e86e82f89f6121ba52d65c99564
(cherry picked from commit 2b7ea9710d2069f9768cc3c2350df74b60f9ecbf)

src/com/android/keychain/KeyChainActivity.java

diff --git a/src/com/android/keychain/KeyChainActivity.java b/src/com/android/keychain/KeyChainActivity.java
index 8fc70ea..f8cb0d3 100644
--- a/src/com/android/keychain/KeyChainActivity.java
+++ b/src/com/android/keychain/KeyChainActivity.java
@@ -394,6 +394,9 @@
                 finish(null);
             }
         });
+        dialog.create();
+        // Prevents screen overlay attack.
+        dialog.getButton(DialogInterface.BUTTON_POSITIVE).setFilterTouchesWhenObscured(true);
         dialog.show();
     }