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

Commit 6f23fc2a authored by Tiger Huang's avatar Tiger Huang
Browse files

Only create valid insets sources of display cutout 

This CL only creates valid insets sources of display cutout, but not
always creates ones for all sides. Othereise, the redundant sources may
waste the performance.

Fix: 236112953
Test: adb shell dumpsys window displays
Change-Id: Idc4d8921d044652e84b946b91a2c9fb1b27c2ec0
parent 2b13efde

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

+13 −4
Original line number Diff line number Diff line
@@ -99,19 +99,28 @@ public class DisplayFrames { 
        state.setRoundedCorners(roundedCorners);

        state.setPrivacyIndicatorBounds(indicatorBounds);

        state.getDisplayCutoutSafe(safe);

        if (!cutout.isEmpty()) {

        if (safe.left > unrestricted.left) {

            state.getSource(ITYPE_LEFT_DISPLAY_CUTOUT).setFrame(

                    unrestricted.left, unrestricted.top, safe.left, unrestricted.bottom);

        } else {

            state.removeSource(ITYPE_LEFT_DISPLAY_CUTOUT);

        }

        if (safe.top > unrestricted.top) {

            state.getSource(ITYPE_TOP_DISPLAY_CUTOUT).setFrame(

                    unrestricted.left, unrestricted.top, unrestricted.right, safe.top);

        } else {

            state.removeSource(ITYPE_TOP_DISPLAY_CUTOUT);

        }

        if (safe.right < unrestricted.right) {

            state.getSource(ITYPE_RIGHT_DISPLAY_CUTOUT).setFrame(

                    safe.right, unrestricted.top, unrestricted.right, unrestricted.bottom);

        } else {

            state.removeSource(ITYPE_RIGHT_DISPLAY_CUTOUT);

        }

        if (safe.bottom < unrestricted.bottom) {

            state.getSource(ITYPE_BOTTOM_DISPLAY_CUTOUT).setFrame(

                    unrestricted.left, safe.bottom, unrestricted.right, unrestricted.bottom);

        } else {

            state.removeSource(ITYPE_LEFT_DISPLAY_CUTOUT);

            state.removeSource(ITYPE_TOP_DISPLAY_CUTOUT);

            state.removeSource(ITYPE_RIGHT_DISPLAY_CUTOUT);

            state.removeSource(ITYPE_BOTTOM_DISPLAY_CUTOUT);

        }

        return true;