DeviceNotAvailable track the serial of the device

Required to track which device throw the exception in a
multi device environment.
- Deprecate the old constructor.
- Update TF code base.

Bug: 29043852
Change-Id: Id24fc0f01dd7e96127083b472d0fe0f2763721d0

2 files changed, 3 insertions, 2 deletions

diff --git a/src/com/android/media/tests/Camera2FrameworkStressTest.java b/src/com/android/media/tests/Camera2FrameworkStressTest.java
index 00eb2c9..5bd3f21 100644
--- a/src/com/android/media/tests/Camera2FrameworkStressTest.java
+++ b/src/com/android/media/tests/Camera2FrameworkStressTest.java
@@ -113,7 +113,8 @@ public class Camera2FrameworkStressTest extends CameraTestBase {
                     getDevice().pullFile(resultFilePath, outputFile);
                     if (outputFile == null) {
                         throw new DeviceNotAvailableException(String.format("Failed to pull the "
-                                + "result file: %s", resultFilePath));
+                                + "result file: %s", resultFilePath),
+                                getDevice().getSerialNumber());
                     }
 
                     BufferedReader reader = new BufferedReader(new FileReader(outputFile));
diff --git a/src/com/android/media/tests/Camera2StressTest.java b/src/com/android/media/tests/Camera2StressTest.java
index 3c66a33..55d9ba1 100644
--- a/src/com/android/media/tests/Camera2StressTest.java
+++ b/src/com/android/media/tests/Camera2StressTest.java
@@ -125,7 +125,7 @@ public class Camera2StressTest extends CameraTestBase {
                 getDevice().pullFile(RESULT_FILE, outputFile);
                 if (outputFile == null) {
                     throw new DeviceNotAvailableException(String.format("Failed to pull the result"
-                            + "file: %s", RESULT_FILE));
+                            + "file: %s", RESULT_FILE), getDevice().getSerialNumber());
                 }
                 BufferedReader reader = new BufferedReader(new FileReader(outputFile));
                 String line;