diff options
| author | 2022-05-09 17:35:00 +0000 | |
|---|---|---|
| committer | 2022-05-09 17:35:00 +0000 | |
| commit | 7a6900a0f01d293041d7a9bb69f5518d3bb7d5c9 (patch) | |
| tree | 8b40a96856dbf8e36e9bcbe31e6553b3796829bd | |
| parent | 10f691e129633f7ef8f80e43e779bef72e94e3d4 (diff) | |
| parent | 9c9916e4d9a4f9e8c68c23f251a48e5b6da1f3ce (diff) | |
Merge "Protect UnlaunchableAppActivity against overlay attack" into tm-dev am: 9c9916e4d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18197412
Change-Id: Ia3ab0e8e97c078913578d26ab30d8ef299a0d721
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/com/android/internal/app/UnlaunchableAppActivity.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/java/com/android/internal/app/UnlaunchableAppActivity.java b/core/java/com/android/internal/app/UnlaunchableAppActivity.java index 957a6365739d..e56d92b48528 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() { |