commit 40abd23968b6f2896ceba825bd79caf8e633dd30
author Abhijeet Kaur <abkaur@google.com> Wed Apr 01 17:22:36 2020 +0100
committer Anis Assi <anisassi@google.com> Tue Jun 30 16:13:07 2020 -0700
tree fe832855e02b8281be9b14b0cb21fb6cb6fac06d
parent 5d1bbbaefdde30d3a591f0bd75d9e7e93ec8bafd

Copy Screenshot to fd if and only if user consent approved

Currently the dumpstate screenshot file is copied to the screenshot fd
(provided by the API caller) even when user consent times out.

Bug: 152944488
Test: BugreportManagerTest#normalflow_full
Change-Id: I0ede8bc8cf5333ea586218a37fd6456f782a50c7
Merged-in: I0ede8bc8cf5333ea586218a37fd6456f782a50c7
(cherry picked from commit 90f8249030e02080e937eeed12fc8c8c692bbc64)

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 4ac7b68..f4d4f93 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -2717,13 +2717,6 @@
             MYLOGI("User denied consent. Returning\n");
             return status;
         }
-        if (options_->do_fb && options_->screenshot_fd.get() != -1) {
-            bool copy_succeeded = android::os::CopyFileToFd(screenshot_path_,
-                                                            options_->screenshot_fd.get());
-            if (copy_succeeded) {
-                android::os::UnlinkAndLogOnError(screenshot_path_);
-            }
-        }
         if (status == Dumpstate::RunStatus::USER_CONSENT_TIMED_OUT) {
             MYLOGI(
                 "Did not receive user consent yet."
@@ -2831,6 +2824,13 @@
         bool copy_succeeded = android::os::CopyFileToFd(path_, options_->bugreport_fd.get());
         if (copy_succeeded) {
             android::os::UnlinkAndLogOnError(path_);
+            if (options_->do_fb && options_->screenshot_fd.get() != -1) {
+                copy_succeeded = android::os::CopyFileToFd(screenshot_path_,
+                                                           options_->screenshot_fd.get());
+                if (copy_succeeded) {
+                    android::os::UnlinkAndLogOnError(screenshot_path_);
+                }
+            }
         }
         return copy_succeeded ? Dumpstate::RunStatus::OK : Dumpstate::RunStatus::ERROR;
     } else if (consent_result == UserConsentResult::UNAVAILABLE) {