Merge "Add a config for running tf functional tests."
diff --git a/prod-tests/src/com/android/encryption/tests/EncryptionCpuTest.java b/prod-tests/src/com/android/encryption/tests/EncryptionCpuTest.java
index 6e0b49a..6536088 100644
--- a/prod-tests/src/com/android/encryption/tests/EncryptionCpuTest.java
+++ b/prod-tests/src/com/android/encryption/tests/EncryptionCpuTest.java
@@ -26,6 +26,7 @@
 import com.android.tradefed.device.TopHelper;
 import com.android.tradefed.log.LogUtil.CLog;
 import com.android.tradefed.result.ITestInvocationListener;
+import com.android.tradefed.result.InputStreamSource;
 import com.android.tradefed.result.LogDataType;
 import com.android.tradefed.result.SnapshotInputStreamSource;
 import com.android.tradefed.testtype.IDeviceTest;
@@ -160,6 +161,8 @@
                 mTopLogFile.delete();
                 mTopLogFile = null;
             }
+            InputStreamSource bugreport = mTestDevice.getBugreport();
+            listener.testLog(String.format("bugreport_%s", mKey), LogDataType.TEXT, bugreport);
             addTopStats(mTopHelper, mTestDevice.isDeviceEncrypted());
         }
     }