Revert "DeviceReportLog: Fix storage path"
This reverts commit 034cee862b68e28055a7f6bc70734beb60c53390.
Test: Camera cts test on Q
Bug: 131325771
Change-Id: I2d10f0f17dff81541521f19ac6b53b50a953a55e
Merged-In: Ice381aa6977f635798f438867ab14f9ef3887811
diff --git a/common/device-side/util-axt/src/com/android/compatibility/common/util/DeviceReportLog.java b/common/device-side/util-axt/src/com/android/compatibility/common/util/DeviceReportLog.java
index c680fc3..d170263 100644
--- a/common/device-side/util-axt/src/com/android/compatibility/common/util/DeviceReportLog.java
+++ b/common/device-side/util-axt/src/com/android/compatibility/common/util/DeviceReportLog.java
@@ -25,8 +25,6 @@
import java.io.IOException;
import java.util.List;
-import androidx.test.InstrumentationRegistry;
-
/**
* Handles adding results to the report for device side tests.
*
@@ -42,10 +40,8 @@
private ReportLogDeviceInfoStore store;
public DeviceReportLog(String reportLogName, String streamName) {
- this(reportLogName, streamName, new File(InstrumentationRegistry
- .getInstrumentation().getTargetContext()
- .getExternalFilesDir(null).getPath(),
- "report-log-files"));
+ this(reportLogName, streamName,
+ new File(Environment.getExternalStorageDirectory(), "report-log-files"));
}
public DeviceReportLog(String reportLogName, String streamName, File logDirectory) {
diff --git a/common/device-side/util/Android.bp b/common/device-side/util/Android.bp
index e1552b6..134b4f7 100644
--- a/common/device-side/util/Android.bp
+++ b/common/device-side/util/Android.bp
@@ -22,7 +22,6 @@
],
static_libs: [
- "androidx.test.rules",
"compatibility-common-util-devicesidelib",
"android-support-test",
"ub-uiautomator",
@@ -37,4 +36,4 @@
],
jarjar_rules: "protobuf-jarjar-rules.txt",
-}
+}
\ No newline at end of file
diff --git a/common/device-side/util/src/com/android/compatibility/common/util/DeviceReportLog.java b/common/device-side/util/src/com/android/compatibility/common/util/DeviceReportLog.java
index 12c9f1a..d170263 100644
--- a/common/device-side/util/src/com/android/compatibility/common/util/DeviceReportLog.java
+++ b/common/device-side/util/src/com/android/compatibility/common/util/DeviceReportLog.java
@@ -21,8 +21,6 @@
import android.os.Environment;
import android.util.Log;
-import androidx.test.InstrumentationRegistry;
-
import java.io.File;
import java.io.IOException;
import java.util.List;
@@ -42,10 +40,8 @@
private ReportLogDeviceInfoStore store;
public DeviceReportLog(String reportLogName, String streamName) {
- this(reportLogName, streamName, new File(InstrumentationRegistry
- .getInstrumentation().getTargetContext()
- .getExternalFilesDir(null).getPath(),
- "report-log-files"));
+ this(reportLogName, streamName,
+ new File(Environment.getExternalStorageDirectory(), "report-log-files"));
}
public DeviceReportLog(String reportLogName, String streamName, File logDirectory) {
