From 61a660519e6fb11f09241c1bfdbee516bf6621d6 Mon Sep 17 00:00:00 2001
From: Rubin Xu <rubinxu@google.com>
Date: Fri, 24 Sep 2021 12:47:54 +0100
Subject: [PATCH] Protect UnlaunchableAppActivity against overlay attack

Bug: 181785557
Test: manual
Change-Id: If496bbb195b3f33cece6a93e683e9186d6175687
---
 .../com/android/internal/app/UnlaunchableAppActivity.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/app/UnlaunchableAppActivity.java b/core/java/com/android/internal/app/UnlaunchableAppActivity.java
index 957a6365739d2..e56d92b48528b 100644
--- a/core/java/com/android/internal/app/UnlaunchableAppActivity.java
+++ b/core/java/com/android/internal/app/UnlaunchableAppActivity.java
@@ -91,7 +91,12 @@ public class UnlaunchableAppActivity extends Activity
         } else {
             builder.setPositiveButton(R.string.ok, null);
         }
-        builder.show();
+        final AlertDialog dialog = builder.create();
+        dialog.create();
+        // Prevents screen overlay attack.
+        getWindow().setHideOverlayWindows(true);
+        dialog.getButton(DialogInterface.BUTTON_POSITIVE).setFilterTouchesWhenObscured(true);
+        dialog.show();
     }
 
     private String getDialogTitle() {