Merge "Protect UnlaunchableAppActivity against overlay attack" into tm-dev

2022-05-09 11:41:02 +00:00
parent 56043e3d57 61a660519e
commit 9c9916e4d9
1 changed files with 6 additions and 1 deletions
--- 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() {