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

Commit e9f83b62 authored by Piotr Wilczyński's avatar Piotr Wilczyński Committed by Android (Google) Code Review
Browse files

Merge "Don't throw exception when adding display to topology" into main

parents 0143339b fbac3d94

core/java/android/hardware/display/DisplayTopology.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -600,8 +600,7 @@ public final class DisplayTopology implements Parcelable { 




    private void addDisplay(int displayId, float width, float height, boolean shouldLog) {

    private void addDisplay(int displayId, float width, float height, boolean shouldLog) {

        if (findDisplay(displayId, mRoot) != null) {

        if (findDisplay(displayId, mRoot) != null) {

            throw new IllegalArgumentException(

            return;

                    "DisplayTopology: attempting to add a display that already exists");

        }

        }

        if (mRoot == null) {

        if (mRoot == null) {

            mRoot = new TreeNode(displayId, width, height, POSITION_LEFT, /* offset= */ 0);

            mRoot = new TreeNode(displayId, width, height, POSITION_LEFT, /* offset= */ 0);