commit ae297261c42ba1943bfba698e62e998dba244a60
author aissabekov <aissabekov@google.com> Thu Nov 18 17:02:06 2021 -0800
committer Abzalbek Issabekov <aissabekov@google.com> Fri Nov 19 01:04:08 2021 +0000
tree 438aa8996cf9da06678b4645a4cdee54617b3b3e
parent 5b6ac16b50760a2717d3eb06fabc77f79de5f35c

Kill rule apps after cuj is executed.

Bug: 206704410
Test: youtube-pip-fix-1

Change-Id: I9c67fc8e3c1818458dc8485c2d7169df7a157986

libraries/health/rules/src/android/platform/test/rule/MapsPipRule.java

diff --git a/libraries/health/rules/src/android/platform/test/rule/MapsPipRule.java b/libraries/health/rules/src/android/platform/test/rule/MapsPipRule.java
index 743810f..703afa9 100644
--- a/libraries/health/rules/src/android/platform/test/rule/MapsPipRule.java
+++ b/libraries/health/rules/src/android/platform/test/rule/MapsPipRule.java
@@ -51,7 +51,6 @@
 
     @Override
     protected void finished(Description description) {
-        sMapsHelper.get().backToNavigationFromPip();
-        sMapsHelper.get().exit();
+        executeShellCommand(String.format("am force-stop %s", sMapsHelper.get().getPackage()));
     }
 }

libraries/health/rules/src/android/platform/test/rule/YouTubePipRule.java

diff --git a/libraries/health/rules/src/android/platform/test/rule/YouTubePipRule.java b/libraries/health/rules/src/android/platform/test/rule/YouTubePipRule.java
index 49d702d..d407ebd 100644
--- a/libraries/health/rules/src/android/platform/test/rule/YouTubePipRule.java
+++ b/libraries/health/rules/src/android/platform/test/rule/YouTubePipRule.java
@@ -48,7 +48,6 @@
 
     @Override
     protected void finished(Description description) {
-        sYouTubeHelper.get().backFromYouTubeFromPip();
-        sYouTubeHelper.get().exit();
+        executeShellCommand(String.format("am force-stop %s", sYouTubeHelper.get().getPackage()));
     }
 }