From 20870beed7d91e387eb6687f943a7fdd52b180e2 Mon Sep 17 00:00:00 2001
From: "shawn.kim" <metocks@gmail.com>
Date: Thu, 6 Jan 2022 12:57:57 +0900
Subject: [PATCH 1/2] - stop all of the apps that involve window at the
 start/end of session

---
 .../goog-device/mw/WebsocketProxyOverAdb.ts    | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/server/goog-device/mw/WebsocketProxyOverAdb.ts b/src/server/goog-device/mw/WebsocketProxyOverAdb.ts
index 0a010b7b..91831be2 100644
--- a/src/server/goog-device/mw/WebsocketProxyOverAdb.ts
+++ b/src/server/goog-device/mw/WebsocketProxyOverAdb.ts
@@ -189,7 +189,7 @@ export class WebsocketProxyOverAdb extends WebsocketProxy {
         return service;
     }
 
-    // TODO: HBsmith DEV-12386, DEV-13493, DEV-13549
+    // TODO: HBsmith DEV-12386, DEV-13493, DEV-13549, DEV-13561
     public release(): void {
         this.tearDownTest();
         super.release();
@@ -242,7 +242,8 @@ export class WebsocketProxyOverAdb extends WebsocketProxy {
                     return;
                 }
 
-                const cmdAppStop = `am force-stop '${this.appKey}'`;
+                const cmdAppStop =
+                    'adb shell \'for pp in $(dumpsys window a | grep "/" | cut -d "{" -f2 | cut -d "/" -f1 | cut -d " " -f2); do am force-stop "${pp}"; done\'';
                 const cmdAppStart = `monkey -p '${this.appKey}' -c android.intent.category.LAUNCHER 1`;
 
                 device
@@ -250,7 +251,7 @@ export class WebsocketProxyOverAdb extends WebsocketProxy {
                     .then((output) => {
                         console.log(
                             Utils.getTimeISOString(),
-                            output ? output : `success to stop the app: ${cmdAppStop}`,
+                            output ? output : `success to stop all of the apps: ${cmdAppStop}`,
                         );
                         return device.runShellCommandAdbKit(cmdAppStart);
                     })
@@ -286,15 +287,12 @@ export class WebsocketProxyOverAdb extends WebsocketProxy {
             .then((output) => {
                 console.log(Utils.getTimeISOString(), output ? output : `success to run a command: ${cmdPower}`);
 
-                if (!this.appKey) {
-                    return;
-                }
-
-                const cmdStopApp = `am force-stop '${this.appKey}'`;
+                const cmdAppStop =
+                    'adb shell \'for pp in $(dumpsys window a | grep "/" | cut -d "{" -f2 | cut -d "/" -f1 | cut -d " " -f2); do am force-stop "${pp}"; done\'';
                 device
-                    .runShellCommandAdbKit(cmdStopApp)
+                    .runShellCommandAdbKit(cmdAppStop)
                     .then((output) => {
-                        console.log(Utils.getTimeISOString(), output ? output : `success to stop app: ${cmdStopApp}`);
+                        console.log(Utils.getTimeISOString(), output ? output : `success to stop all of running apps`);
                     })
                     .catch((e) => {
                         console.error(Utils.getTimeISOString(), e);

From 5211618c3041b9c53211b7030ae6c0597d170f79 Mon Sep 17 00:00:00 2001
From: "shawn.kim" <metocks@gmail.com>
Date: Thu, 6 Jan 2022 13:02:36 +0900
Subject: [PATCH 2/2] - fix cmd

---
 src/server/goog-device/mw/WebsocketProxyOverAdb.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/server/goog-device/mw/WebsocketProxyOverAdb.ts b/src/server/goog-device/mw/WebsocketProxyOverAdb.ts
index 91831be2..64bd2a99 100644
--- a/src/server/goog-device/mw/WebsocketProxyOverAdb.ts
+++ b/src/server/goog-device/mw/WebsocketProxyOverAdb.ts
@@ -243,7 +243,7 @@ export class WebsocketProxyOverAdb extends WebsocketProxy {
                 }
 
                 const cmdAppStop =
-                    'adb shell \'for pp in $(dumpsys window a | grep "/" | cut -d "{" -f2 | cut -d "/" -f1 | cut -d " " -f2); do am force-stop "${pp}"; done\'';
+                    'for pp in $(dumpsys window a | grep "/" | cut -d "{" -f2 | cut -d "/" -f1 | cut -d " " -f2); do am force-stop "${pp}"; done';
                 const cmdAppStart = `monkey -p '${this.appKey}' -c android.intent.category.LAUNCHER 1`;
 
                 device
@@ -288,7 +288,7 @@ export class WebsocketProxyOverAdb extends WebsocketProxy {
                 console.log(Utils.getTimeISOString(), output ? output : `success to run a command: ${cmdPower}`);
 
                 const cmdAppStop =
-                    'adb shell \'for pp in $(dumpsys window a | grep "/" | cut -d "{" -f2 | cut -d "/" -f1 | cut -d " " -f2); do am force-stop "${pp}"; done\'';
+                    'for pp in $(dumpsys window a | grep "/" | cut -d "{" -f2 | cut -d "/" -f1 | cut -d " " -f2); do am force-stop "${pp}"; done';
                 device
                     .runShellCommandAdbKit(cmdAppStop)
                     .then((output) => {