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

Commit 8e60e725 authored by Tiger Huang's avatar Tiger Huang Committed by Android (Google) Code Review
Browse files

Merge "Don't throw unsupported exception over binder call" into sc-dev

parents 84c27999 c1577580

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

+2 −2
Original line number Diff line number Diff line
@@ -905,8 +905,8 @@ public class DisplayPolicy { 
                        && win.mActivityRecord.fillsParent()

                        && (win.mAttrs.privateFlags & PRIVATE_FLAG_FORCE_DRAW_BAR_BACKGROUNDS) != 0

                        && attrs.getFitInsetsTypes() != 0) {

                    throw new RuntimeException("Illegal attributes: Main activity window that isn't"

                            + " translucent trying to fit insets: "

                    throw new IllegalArgumentException("Illegal attributes: Main activity window"

                            + " that isn't translucent trying to fit insets: "

                            + attrs.getFitInsetsTypes()

                            + " attrs=" + attrs);

                }

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

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ public class DisplayPolicyTests extends WindowTestsBase { 
        assertEquals(mAppWindow, policy.getTopFullscreenOpaqueWindow());

    }



    @Test(expected = RuntimeException.class)

    @Test(expected = IllegalArgumentException.class)

    public void testMainAppWindowDisallowFitSystemWindowTypes() {

        final DisplayPolicy policy = mDisplayContent.getDisplayPolicy();

        final WindowState activity = createBaseApplicationWindow();