Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3f5f8ab authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not allow custom animation of untrusted Toast" into tm-dev am: b5ef2c67 am: 7e675486 

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



Change-Id: If05d3b749b239ab3c10c1c34d45d836bd04d9e32
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e9c5bb2a 7e675486

services/core/java/com/android/server/wm/DisplayPolicy.java

+4 −0
Original line number Diff line number Diff line
@@ -950,6 +950,10 @@ public class DisplayPolicy { 
                        AccessibilityManager.FLAG_CONTENT_TEXT);

                // Toasts can't be clickable

                attrs.flags |= WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE;

                // Do not allow untrusted toast to customize animation.

                if (!win.mSession.mCanAddInternalSystemWindow) {

                    attrs.windowAnimations = R.style.Animation_Toast;

                }

                break;



            case TYPE_BASE_APPLICATION: