Merge "Protect UnlaunchableAppActivity against overlay attack" into tm-dev am: 9c9916e4d9 am: 3327a4c0d7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18197412

Change-Id: I18b8050a1847051671f98c1d435a49d67ae452d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Rubin Xu
2022-05-09 15:29:15 +00:00
committed by Automerger Merge Worker

View File

@@ -91,7 +91,12 @@ public class UnlaunchableAppActivity extends Activity
} else { } else {
builder.setPositiveButton(R.string.ok, null); 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() { private String getDialogTitle() {