From 17dbc199973f3532d360d26ecbe4f13a4ecafebc Mon Sep 17 00:00:00 2001
From: Austin Hsieh <77706079+austinh0@users.noreply.github.com>
Date: Fri, 25 Jun 2021 23:47:57 -0700
Subject: [PATCH] Remove ServiceEvents() call from Java and Python controller
 (#7930)

---
 src/controller/java/AndroidDeviceControllerWrapper.cpp     | 7 -------
 .../python/ChipDeviceController-ScriptBinding.cpp          | 1 -
 2 files changed, 8 deletions(-)

diff --git a/src/controller/java/AndroidDeviceControllerWrapper.cpp b/src/controller/java/AndroidDeviceControllerWrapper.cpp
index 012cf341e680fe..8bf806c0b42557 100644
--- a/src/controller/java/AndroidDeviceControllerWrapper.cpp
+++ b/src/controller/java/AndroidDeviceControllerWrapper.cpp
@@ -123,13 +123,6 @@ AndroidDeviceControllerWrapper * AndroidDeviceControllerWrapper::AllocateNew(Jav
         return nullptr;
     }
 
-    *errInfoOnFailure = wrapper->Controller()->ServiceEvents();
-
-    if (*errInfoOnFailure != CHIP_NO_ERROR)
-    {
-        return nullptr;
-    }
-
     return wrapper.release();
 }
 
diff --git a/src/controller/python/ChipDeviceController-ScriptBinding.cpp b/src/controller/python/ChipDeviceController-ScriptBinding.cpp
index 8e58e19e563bfa..527bd0886d7b09 100644
--- a/src/controller/python/ChipDeviceController-ScriptBinding.cpp
+++ b/src/controller/python/ChipDeviceController-ScriptBinding.cpp
@@ -165,7 +165,6 @@ CHIP_ERROR pychip_DeviceController_NewDeviceController(chip::Controller::DeviceC
 
     (*outDevCtrl)->SetUdpListenPort(CHIP_PORT + 1);
     ReturnErrorOnFailure((*outDevCtrl)->Init(localDeviceId, initParams));
-    ReturnErrorOnFailure((*outDevCtrl)->ServiceEvents());
 
     return CHIP_NO_ERROR;
 }