Merge "Update topology-graph population for new format" into main

status_t android_hardware_display_DisplayTopologyGraphNode_toNative(

        JNIEnv* env, jobject nodeObj,

        std::unordered_map<ui::LogicalDisplayId, std::vector<DisplayTopologyAdjacentDisplay>>&

                graph,

        std::unordered_map<ui::LogicalDisplayId, int>& displaysDensity,

        std::unordered_map<ui::LogicalDisplayId, FloatRect>& displayBoundsDp) {

        std::unordered_map<ui::LogicalDisplayId, DisplayTopologyGraph::Properties>& topologyGraph) {

    ui::LogicalDisplayId displayId = ui::LogicalDisplayId{

            env->GetIntField(nodeObj, gDisplayTopologyGraphNodeClassInfo.displayId)};

    displaysDensity[displayId] =

    topologyGraph[displayId].density =

            env->GetIntField(nodeObj, gDisplayTopologyGraphNodeClassInfo.density);

    ScopedLocalRef<jobject> displayBounds(env,

                                                              gDisplayTopologyGraphNodeClassInfo

                                                                      .boundsInGlobalDp));

    android_hardware_display_DisplayTopologyDisplayBounds_toNative(env, displayBounds.get(),

                                                                   &displayBoundsDp[displayId]);

                                                                   &topologyGraph[displayId]

                                                                            .boundsInGlobalDp);

    jobjectArray adjacentDisplaysArray = static_cast<jobjectArray>(

            env->GetObjectField(nodeObj, gDisplayTopologyGraphNodeClassInfo.adjacentDisplays));

                                                                             adjacentDisplayObj

                                                                                     .get(),

                                                                             &adjacentDisplay);

            graph[displayId].push_back(adjacentDisplay);

            topologyGraph[displayId].adjacentDisplays.push_back(adjacentDisplay);

        }

    }

    return OK;

base::Result<const DisplayTopologyGraph> android_hardware_display_DisplayTopologyGraph_toNative(

        JNIEnv* env, jobject topologyObj) {

    std::unordered_map<ui::LogicalDisplayId, std::vector<DisplayTopologyAdjacentDisplay>>

            topologyGraph;

    std::unordered_map<ui::LogicalDisplayId, int> displaysDensity;

    std::unordered_map<ui::LogicalDisplayId, FloatRect> absoluteDisplayBoundsDp;

    std::unordered_map<ui::LogicalDisplayId, DisplayTopologyGraph::Properties> topologyGraph;

    ui::LogicalDisplayId primaryDisplayId = ui::LogicalDisplayId{

            env->GetIntField(topologyObj, gDisplayTopologyGraphClassInfo.primaryDisplayId)};

            }

            android_hardware_display_DisplayTopologyGraphNode_toNative(env, nodeObj.get(),

                                                                       /*byRef*/ topologyGraph,

                                                                       /*byRef*/ displaysDensity,

                                                                       /*byRef*/

                                                                       absoluteDisplayBoundsDp);

                                                                       /*byRef*/ topologyGraph);

        }

    }

    return DisplayTopologyGraph::create(primaryDisplayId, std::move(topologyGraph),

                                        std::move(displaysDensity),

                                        std::move(absoluteDisplayBoundsDp));

    return DisplayTopologyGraph::create(primaryDisplayId, std::move(topologyGraph));

}

// ----------------------------------------------------------------------------