Snap for 11200327 from 9597e5f733f7d6aa3f9e1a0b17e14f2b3a1958db to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I173caaf0c947a323b657c5e69946a96bef660fc2

2 files changed, 5 insertions, 6 deletions

diff --git a/src/android/otdaemon_server.cpp b/src/android/otdaemon_server.cpp
index f3e0cab8..cf67016d 100644
--- a/src/android/otdaemon_server.cpp
+++ b/src/android/otdaemon_server.cpp
@@ -249,7 +249,7 @@ exit:
     }
 }
 
-void OtDaemonServer::HandleBackboneMulticastListenerEvent(void                   *aBinderServer,
+void OtDaemonServer::HandleBackboneMulticastListenerEvent(void                                  *aBinderServer,
                                                           otBackboneRouterMulticastListenerEvent aEvent,
                                                           const otIp6Address                    *aAddress)
 {
@@ -590,13 +590,12 @@ Status OtDaemonServer::configureBorderRouter(const BorderRouterConfigurationParc
     {
         if (aBorderRouterConfiguration.isBorderRoutingEnabled)
         {
+            int infraIfIndex = if_nametoindex(aBorderRouterConfiguration.infraInterfaceName.c_str());
             SuccessOrExit(error   = otBorderRoutingSetEnabled(GetOtInstance(), false /* aEnabled */),
                           message = "failed to disable border routing");
             otSysSetInfraNetif(aBorderRouterConfiguration.infraInterfaceName.c_str(), icmp6SocketFd);
             icmp6SocketFd = -1;
-            SuccessOrExit(error = otBorderRoutingInit(
-                              GetOtInstance(), if_nametoindex(aBorderRouterConfiguration.infraInterfaceName.c_str()),
-                              false /* aInfraIfIsRunning */),
+            SuccessOrExit(error   = otBorderRoutingInit(GetOtInstance(), infraIfIndex, otSysInfraIfIsRunning()),
                           message = "failed to initialize border routing");
             SuccessOrExit(error   = otBorderRoutingSetEnabled(GetOtInstance(), true /* aEnabled */),
                           message = "failed to enable border routing");
diff --git a/src/android/otdaemon_server.hpp b/src/android/otdaemon_server.hpp
index 595e0b4c..387a37b1 100644
--- a/src/android/otdaemon_server.hpp
+++ b/src/android/otdaemon_server.hpp
@@ -106,7 +106,7 @@ private:
     static void ReceiveCallback(otMessage *aMessage, void *aBinderServer);
     void        ReceiveCallback(otMessage *aMessage);
     void        TransmitCallback(void);
-    static void HandleBackboneMulticastListenerEvent(void *aBinderServer,
+    static void HandleBackboneMulticastListenerEvent(void                                  *aBinderServer,
                                                      otBackboneRouterMulticastListenerEvent aEvent,
                                                      const otIp6Address                    *aAddress);
 
@@ -125,4 +125,4 @@ private:
 } // namespace Android
 } // namespace otbr
 
-#endif // OTBR_ANDROID_BINDER_SERVER_HPP_
\ No newline at end of file
+#endif // OTBR_ANDROID_BINDER_SERVER_HPP_