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

Commit c6b495f6 authored by Mady Mellor's avatar Mady Mellor Committed by Android (Google) Code Review
Browse files

Merge "Fix an NPE in onTopologyChanged" into main

parents 439d0559 c2afe4ff
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -363,10 +363,11 @@ class MultiDisplayVeiledResizeTaskPositioner(
        dragEventListeners.remove(dragEventListener)
    }

    override fun onTopologyChanged(topology: DisplayTopology) {
    override fun onTopologyChanged(topology: DisplayTopology?) {
        // TODO: b/383069173 - Cancel window drag when topology changes happen during drag.

        displayIds.clear()
        if (topology == null) return
        val displayBounds = topology.getAbsoluteBounds()
        displayIds.addAll(List(displayBounds.size()) { displayBounds.keyAt(it) })
    }