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

Commit 87fc3909 authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Do not allow custom animation of untrusted Toast 

Since target API level 30 (Android 11), regular text toast is shown
by SystemUI (See Toast#CHANGE_TEXT_TOASTS_IN_THE_SYSTEM). While
legacy apps and deprecated custom view show the toast in its own
processes, so force the default animation style for these usages to
avoid unexpected animation duration.

Such when setForceHideNonSystemOverlayWindowIfNeeded is triggered,
the regular Toast displayed by SystemUI won't be affected (because
SystemUI has internal permission), and the untrusted Toast can be
hidden in a short time (config_longAnimTime=500ms) instead of a
customized duration.

Bug: 408215749
Flag: EXEMPT bugfix
Test: atest DisplayPolicyTests#testNonSystemToastAnimation
Test: Show a Toast with modified
      WindowManager.LayoutParams#windowAnimations
Change-Id: Ib2844dedebfa3ec9fc8333af3f66bb07cd4d3d7f
parent 55cba851

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

+4 −0
Original line number Diff line number Diff line
@@ -1005,6 +1005,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:

services/tests/wmtests/src/com/android/server/wm/DisplayPolicyTests.java

+11 −0
Original line number Diff line number Diff line
@@ -293,6 +293,17 @@ public class DisplayPolicyTests extends WindowTestsBase { 
        assertFalse(wpc.isShowingUiWhileDozing());

    }



    @Test

    public void testNonSystemToastAnimation() {

        final WindowState win = newWindowBuilder("Toast",

                WindowManager.LayoutParams.TYPE_TOAST).build();

        win.mAttrs.windowAnimations = android.R.style.Animation_InputMethod;

        setFieldValue(win.mSession, "mCanAddInternalSystemWindow", false);

        mDisplayContent.getDisplayPolicy().adjustWindowParamsLw(win, win.mAttrs);



        assertEquals(android.R.style.Animation_Toast, win.mAttrs.windowAnimations);

    }



    @Test(expected = IllegalArgumentException.class)

    public void testMainAppWindowDisallowFitSystemWindowTypes() {

        final DisplayPolicy policy = mDisplayContent.getDisplayPolicy();