commit ddb19703f60992fbad53dff8ba31ef296db8710d
author Paul McLean <pmclean@google.com> Tue Aug 31 11:18:06 2021 -0600
committer Ayana Adylova <ayanaadylova@google.com> Wed Dec 15 07:44:38 2021 +0000
tree 1e02fcf57cbfce59a5cddb8a5747b50854b31166
parent a4ea978272f7842ec144cea509b1d064a6366d3e

Fix CTS-V ReportLog exporting

Bug: 198303556
Testing: build,install, run CTS-Verifier, Create a ReportLog (for ProAudioTest say...)
  export test results, pull verifier results zip, unzip and verify presence of ReporLog (json) file.

Change-Id: Iacdf5ff8714cccf752701d48ca08b6f3c302c65f
(cherry picked from commit 979a2bc6ead5cfbb4dc2e8d1f69b1457bff1504d)

apps/CtsVerifier/src/com/android/cts/verifier/ReportExporter.java

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/ReportExporter.java b/apps/CtsVerifier/src/com/android/cts/verifier/ReportExporter.java
index fe314c42..495c3ef 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/ReportExporter.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/ReportExporter.java
@@ -23,6 +23,7 @@
 import android.os.Environment;
 import android.os.FileUtils;
 import android.os.ParcelFileDescriptor;
+import android.util.Log;
 
 import com.android.compatibility.common.util.FileUtil;
 import com.android.compatibility.common.util.IInvocationResult;
@@ -49,6 +50,8 @@
  * Background task to generate a report and save it to external storage.
  */
 class ReportExporter extends AsyncTask<Void, Void, String> {
+    private static final String TAG = ReportExporter.class.getSimpleName();
+    private static final boolean DEBUG = true;
 
     public static final String REPORT_DIRECTORY = "VerifierReports";
     public static final String LOGS_DIRECTORY = "ReportLogFiles";
@@ -76,11 +79,15 @@
     // so that they will get ZIPped into the transmitted file.
     //
     private void copyReportFiles(File tempDir) {
+        if (DEBUG) {
+            Log.d(TAG, "copyReportFiles(" + tempDir.getAbsolutePath() + ")");
+        }
+
         File externalStorageDirectory = Environment.getExternalStorageDirectory();
         File reportLogFolder =
                 new File(Environment.getExternalStorageDirectory().getAbsolutePath()
                         + File.separator
-                        + REPORT_DIRECTORY);
+                        + LOGS_DIRECTORY);
         File[] reportLogFiles = reportLogFolder.listFiles();
 
         // if no ReportLog files have been created (i.e. the folder doesn't exist)
@@ -156,6 +163,9 @@
     }
 
     private void saveReportOnInternalStorage(File reportZipFile) {
+        if (DEBUG) {
+            Log.d(TAG, "---- saveReportOnInternalStorage(" + reportZipFile.getAbsolutePath() + ")");
+        }
         try {
             ParcelFileDescriptor pfd = ParcelFileDescriptor.open(
                     reportZipFile, ParcelFileDescriptor.MODE_READ_ONLY);