Call stopSampling on browser stop during android power testing. (#2176)

* Call stopSampling on browser stop in android power testing. * Add stopSampling call for chrome.
sitespeedio · Sep 4, 2024 · 9579377 · 9579377
1 parent 367a571
commit 9579377
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/lib/chrome/webdriver/chromium.js b/lib/chrome/webdriver/chromium.js
@@ -489,8 +489,12 @@ export class Chromium {
       await unlink(netlog);
     }
 
-    if (this.android && this.options.androidPower) {
-      await this.android.stopPowerTesting();
+    if (this.android) {
+      if (this.options.androidPower) {
+        await this.android.stopPowerTesting();
+      } else if (this.options.androidUsbPower) {
+        await usbPowerProfiler.stopSampling();
+      }
     }
 
     if (this.cdpClient) {

diff --git a/lib/firefox/webdriver/firefox.js b/lib/firefox/webdriver/firefox.js
@@ -397,8 +397,12 @@ export class Firefox {
    * Before the browser is stopped/closed.
    */
   async beforeBrowserStop() {
-    if (isAndroidConfigured(this.options) && this.options.androidPower) {
-      await this.android.stopPowerTesting();
+    if (isAndroidConfigured(this.options)) {
+      if (this.options.androidPower) {
+        await this.android.stopPowerTesting();
+      } else if (this.options.androidUsbPower) {
+        await usbPowerProfiler.stopSampling();
+      }
     }
   }