From a2056b1b5432d5cf95477dc493715e9a106baee3 Mon Sep 17 00:00:00 2001 From: natrajmuthusamy <52849136+natrajmuthusamy@users.noreply.github.com> Date: Wed, 6 May 2026 11:11:59 +0530 Subject: [PATCH 1/7] RDKEMW-18086 : Factory Reset takes more than 7 seconds. Reason for change: Skipped waiting for discovery event from bluez when process termination occurs. Test Procedure: ensure no regressions with bluetooth feature Risks: High Priority: P0 --- src/ifce/btrMgr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ifce/btrMgr.c b/src/ifce/btrMgr.c index 98371b2..ad95477 100644 --- a/src/ifce/btrMgr.c +++ b/src/ifce/btrMgr.c @@ -4695,7 +4695,7 @@ BTRMGR_StartDeviceDiscovery_Internal ( do { usleep(5000); - } while ((!gIsAdapterDiscovering) && (--ui32sleepIdx)); + } while ((!gIsAdapterDiscovering) && (--ui32sleepIdx) && !isDeinitInProgress); } if (!gIsAdapterDiscovering) { @@ -4776,7 +4776,7 @@ BTRMGR_StopDeviceDiscovery_Internal ( { /* Max 6 sec timeout - Polled at 50ms interval */ unsigned int ui32sleepIdx = 120; - while ((gIsAdapterDiscovering) && (ui32sleepIdx--)) { + while ((gIsAdapterDiscovering) && (ui32sleepIdx--) && !isDeinitInProgress) { usleep(50000); } } From fe7f162dcf72a1dc218b911b1f9cf5a18b01cd92 Mon Sep 17 00:00:00 2001 From: natrajmuthusamy <52849136+natrajmuthusamy@users.noreply.github.com> Date: Wed, 6 May 2026 12:09:55 +0530 Subject: [PATCH 2/7] Update btrMgr.c --- src/ifce/btrMgr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ifce/btrMgr.c b/src/ifce/btrMgr.c index ad95477..ca6718f 100644 --- a/src/ifce/btrMgr.c +++ b/src/ifce/btrMgr.c @@ -4775,11 +4775,11 @@ BTRMGR_StopDeviceDiscovery_Internal ( { /* Max 6 sec timeout - Polled at 50ms interval */ unsigned int ui32sleepIdx = 120; - - while ((gIsAdapterDiscovering) && (ui32sleepIdx--) && !isDeinitInProgress) { - usleep(50000); - } - } + do { + usleep(50000); + ui32sleepIdx--; + } while ((gIsAdapterDiscovering) && (ui32sleepIdx--) && !isDeinitInProgress) + } if (gIsAdapterDiscovering) { BTRMGRLOG_WARN ("Discovery is not yet Stopped !!!\n"); From 5a64bf6449a8ede1762de8b6d15efe9383a14fbf Mon Sep 17 00:00:00 2001 From: natrajmuthusamy <52849136+natrajmuthusamy@users.noreply.github.com> Date: Wed, 6 May 2026 12:13:04 +0530 Subject: [PATCH 3/7] Update btrMgr.c --- src/ifce/btrMgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ifce/btrMgr.c b/src/ifce/btrMgr.c index ca6718f..31a313d 100644 --- a/src/ifce/btrMgr.c +++ b/src/ifce/btrMgr.c @@ -4778,7 +4778,7 @@ BTRMGR_StopDeviceDiscovery_Internal ( do { usleep(50000); ui32sleepIdx--; - } while ((gIsAdapterDiscovering) && (ui32sleepIdx--) && !isDeinitInProgress) + } while ((gIsAdapterDiscovering) && (ui32sleepIdx--) && !isDeinitInProgress); } if (gIsAdapterDiscovering) { From 850c97c97745dca1760b0cc755d9e4ada2332d4b Mon Sep 17 00:00:00 2001 From: natrajmuthusamy <52849136+natrajmuthusamy@users.noreply.github.com> Date: Wed, 6 May 2026 12:22:14 +0530 Subject: [PATCH 4/7] Update test_btrMgr.c --- unitTest/unitTest_btmgr/test_btrMgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unitTest/unitTest_btmgr/test_btrMgr.c b/unitTest/unitTest_btmgr/test_btrMgr.c index 658dedd..08d11c7 100644 --- a/unitTest/unitTest_btmgr/test_btrMgr.c +++ b/unitTest/unitTest_btmgr/test_btrMgr.c @@ -123,7 +123,7 @@ void setUp(void) gstBTRMgrStreamingInfo.channels = 0; gstBTRMgrStreamingInfo.bitsPerSample = 0; gstBTRMgrStreamingInfo.i32BytesToEncode = 0; - + isDeinitInProgress = FALSE; } void tearDown(void) { // Clean up any necessary variables or state after each test From 5c11c13b7c9a2be3581d53742035bdd40834b343 Mon Sep 17 00:00:00 2001 From: natrajmuthusamy <52849136+natrajmuthusamy@users.noreply.github.com> Date: Wed, 6 May 2026 12:37:54 +0530 Subject: [PATCH 5/7] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- src/ifce/btrMgr.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/ifce/btrMgr.c b/src/ifce/btrMgr.c index 31a313d..5cfe918 100644 --- a/src/ifce/btrMgr.c +++ b/src/ifce/btrMgr.c @@ -4775,11 +4775,10 @@ BTRMGR_StopDeviceDiscovery_Internal ( { /* Max 6 sec timeout - Polled at 50ms interval */ unsigned int ui32sleepIdx = 120; - do { - usleep(50000); - ui32sleepIdx--; - } while ((gIsAdapterDiscovering) && (ui32sleepIdx--) && !isDeinitInProgress); - } + while ((gIsAdapterDiscovering) && (ui32sleepIdx--) && !isDeinitInProgress) { + usleep(50000); + } + } if (gIsAdapterDiscovering) { BTRMGRLOG_WARN ("Discovery is not yet Stopped !!!\n"); From 6b316c77d86ee934f364e153aa5aa52d918e2e2e Mon Sep 17 00:00:00 2001 From: natrajmuthusamy <52849136+natrajmuthusamy@users.noreply.github.com> Date: Thu, 7 May 2026 13:43:15 +0530 Subject: [PATCH 6/7] Update btmgr_iarm_internal_interface.c --- src/rpc/btmgr_iarm_internal_interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpc/btmgr_iarm_internal_interface.c b/src/rpc/btmgr_iarm_internal_interface.c index 6a6bdb0..572c03e 100644 --- a/src/rpc/btmgr_iarm_internal_interface.c +++ b/src/rpc/btmgr_iarm_internal_interface.c @@ -2239,7 +2239,7 @@ BTRMgr_TermIARMMode ( #ifndef BUILD_FOR_PI BTRMGRLOG_INFO("PowerController_Term started in internal\n"); - PowerController_Term(); + //PowerController_Term(); BTRMGRLOG_INFO("PowerController_Term ended in internal\n"); #endif } From a7e7c713ec85cd7b2556d21f7e1825385a8fc954 Mon Sep 17 00:00:00 2001 From: natrajmuthusamy <52849136+natrajmuthusamy@users.noreply.github.com> Date: Thu, 7 May 2026 15:29:14 +0530 Subject: [PATCH 7/7] Update btmgr_iarm_internal_interface.c --- src/rpc/btmgr_iarm_internal_interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpc/btmgr_iarm_internal_interface.c b/src/rpc/btmgr_iarm_internal_interface.c index 572c03e..6a6bdb0 100644 --- a/src/rpc/btmgr_iarm_internal_interface.c +++ b/src/rpc/btmgr_iarm_internal_interface.c @@ -2239,7 +2239,7 @@ BTRMgr_TermIARMMode ( #ifndef BUILD_FOR_PI BTRMGRLOG_INFO("PowerController_Term started in internal\n"); - //PowerController_Term(); + PowerController_Term(); BTRMGRLOG_INFO("PowerController_Term ended in internal\n"); #endif }