commit 947c31d33915d3a346e3011baa85bc4fbf155390
author Vadim Tryshev <vadimt@google.com> Mon Jul 12 21:11:21 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jul 12 21:11:21 2021 +0000
tree 170ffd4d7a68e6c96634e81ff22c810bf47f3ea5
parent f4d0103e5ee7ee12ddf0eb80cd2606b0fd783d4a
parent 3bb05dd3dcd48d264a36d5053fe7f16cf3467c9d

Merge "Deleting screen records for succeeded tests" into sc-dev am: 1d495b2480 am: 3bb05dd3dc

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15193183

Change-Id: I7071ce56e5c8ed4fa485e58b699eeca93a02c142

tests/src/com/android/launcher3/util/rule/ScreenRecordRule.java

diff --git a/tests/src/com/android/launcher3/util/rule/ScreenRecordRule.java b/tests/src/com/android/launcher3/util/rule/ScreenRecordRule.java
index 00b1cdd..7a5cf2c 100644
--- a/tests/src/com/android/launcher3/util/rule/ScreenRecordRule.java
+++ b/tests/src/com/android/launcher3/util/rule/ScreenRecordRule.java
@@ -62,12 +62,17 @@
                 ParcelFileDescriptor output =
                         automation.executeShellCommand("screenrecord " + outputFile);
                 String screenRecordPid = device.executeShellCommand("pidof screenrecord");
+                boolean success = false;
                 try {
                     base.evaluate();
+                    success = true;
                 } finally {
                     device.executeShellCommand("kill -INT " + screenRecordPid);
                     Log.e(TAG, "Screenrecord captured at: " + outputFile);
                     output.close();
+                    if (success) {
+                        automation.executeShellCommand("rm " + outputFile);
+                    }
                 }
             }
         };
@@ -78,5 +83,6 @@
      */
     @Retention(RetentionPolicy.RUNTIME)
     @Target(ElementType.METHOD)
-    public @interface ScreenRecord { }
+    public @interface ScreenRecord {
+    }
 }