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

Commit 379565f7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DisplayTopology: make allNodesIdMap public" into main

parents d1ed65aa ad10b92a

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

+7 −1
Original line number Diff line number Diff line
@@ -813,7 +813,13 @@ public final class DisplayTopology implements Parcelable { 
        return a == b || (Float.isNaN(a) && Float.isNaN(b)) || Math.abs(a - b) < EPSILON;

    }



    private Map<Integer, TreeNode> allNodesIdMap() {

    /**

     * Returns a map of all TreeNodes indexed by the display ID.

     *

     * @hide

     */

    @NonNull

    public Map<Integer, TreeNode> allNodesIdMap() {

        var pend = new ArrayDeque<TreeNode>();

        var found = new HashMap<Integer, TreeNode>();

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/MultiDisplayVeiledResizeTaskPositioner.kt

+1 −2
Original line number Diff line number Diff line
@@ -382,8 +382,7 @@ class MultiDisplayVeiledResizeTaskPositioner( 


        displayIds.clear()

        if (topology == null) return

        val displayBounds = topology.getAbsoluteBounds()

        displayIds.addAll(List(displayBounds.size()) { displayBounds.keyAt(it) })

        displayIds.addAll(topology.allNodesIdMap().keys)

    }



    companion object {