Avoid direct usage of ddmlib log use CLog am: 53ed6a8cc4
Original change: https://android-review.googlesource.com/c/platform/test/suite_harness/+/1905381
Change-Id: Id401a932c19f2c88058c632661f748da6dfb0f60
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/MediaPreparer.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/MediaPreparer.java
index d3d2a21..d04898b 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/MediaPreparer.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/MediaPreparer.java
@@ -19,7 +19,6 @@
import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
import com.android.compatibility.common.tradefed.util.DynamicConfigFileReader;
import com.android.ddmlib.IDevice;
-import com.android.ddmlib.Log;
import com.android.tradefed.build.IBuildInfo;
import com.android.tradefed.config.Configuration;
import com.android.tradefed.config.Option;
@@ -27,7 +26,6 @@
import com.android.tradefed.device.DeviceNotAvailableException;
import com.android.tradefed.device.ITestDevice;
import com.android.tradefed.invoker.TestInformation;
-import com.android.tradefed.log.LogUtil;
import com.android.tradefed.log.LogUtil.CLog;
import com.android.tradefed.metrics.proto.MetricMeasurement.Metric;
import com.android.tradefed.result.ITestInvocationListener;
@@ -152,8 +150,6 @@
/* Key to retrieve resolution string in metrics upon MediaPreparerListener.testEnded() */
private static final String RESOLUTION_STRING_KEY = "resolution";
- private static final String LOG_TAG = "MediaPreparer";
-
/*
* In the case of MediaPreparer error, the default maximum resolution to push to the device.
* Pushing higher resolutions may lead to insufficient storage for installing test APKs.
@@ -326,15 +322,11 @@
if (mSimpleCachingSemantics) {
// old semantics: assumes all necessary media files exist inside
- LogUtil.printLog(
- Log.LogLevel.INFO,
- LOG_TAG,
- "old cache semantics: local directory exists, all is well");
+ CLog.i("old cache semantics: local directory exists, all is well");
return mediaFolder;
}
- LogUtil.printLog(
- Log.LogLevel.INFO, LOG_TAG, "new cache semantics: verify against a TOC");
+ CLog.i("new cache semantics: verify against a TOC");
// new caching semantics:
// verify that the contents are still present.
// use the TOC file generated when first downloaded/unpacked.
@@ -371,18 +363,14 @@
}
}
} catch (IOException | SecurityException | NullPointerException e) {
- LogUtil.printLog(
- Log.LogLevel.INFO, LOG_TAG, "TOC or contents missing, redownload");
+ CLog.i("TOC or contents missing, redownload");
passing = false;
} finally {
StreamUtil.close(tocReader);
}
if (passing) {
- LogUtil.printLog(
- Log.LogLevel.INFO,
- LOG_TAG,
- "Host-cached copy is complete in " + mediaFolder);
+ CLog.i("Host-cached copy is complete in " + mediaFolder);
return mediaFolder;
}
}
@@ -407,22 +395,19 @@
File mediaFolderZip = new File(mediaFolder.getAbsolutePath() + ".zip");
FileWriter tocWriter = null;
try {
- LogUtil.printLog(
- Log.LogLevel.INFO,
- LOG_TAG,
- String.format("Downloading media files from %s", url.toString()));
+ CLog.i("Downloading media files from %s", url.toString());
URLConnection conn = url.openConnection();
InputStream in = conn.getInputStream();
mediaFolderZip.createNewFile();
FileUtil.writeToFile(in, mediaFolderZip);
- LogUtil.printLog(Log.LogLevel.INFO, LOG_TAG, "Unzipping media files");
+ CLog.i("Unzipping media files");
ZipUtil.extractZip(new ZipFile(mediaFolderZip), mediaFolder);
// create the TOC when running the new caching scheme
if (!mSimpleCachingSemantics) {
// create a TOC, recursively listing all files/directories.
// used to verify all files still exist before we re-use a prior copy
- LogUtil.printLog(Log.LogLevel.INFO, LOG_TAG, "Generating cache TOC");
+ CLog.i("Generating cache TOC");
File tocFile = new File(mediaFolder, TOC_NAME);
tocWriter = new FileWriter(tocFile, /*append*/ false);
generateDirectoryToc(tocWriter, mediaFolder, "");
@@ -540,7 +525,7 @@
}
if (mediaFilesExistOnDevice(device)) {
// if files already on device, do nothing
- LogUtil.printLog(Log.LogLevel.INFO, LOG_TAG, "Media files found on the device");
+ CLog.i("Media files found on the device");
return;
}
@@ -551,8 +536,7 @@
// set mLocalMediaPath to extraction location of media files
updateLocalMediaPath(device, mediaFolder);
}
- LogUtil.printLog(
- Log.LogLevel.INFO, LOG_TAG, "Media files located on host at: " + mLocalMediaPath);
+ CLog.i("Media files located on host at: " + mLocalMediaPath);
copyMediaFiles(device);
}
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/PreconditionPreparer.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/PreconditionPreparer.java
index a642f58..47af7f6 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/PreconditionPreparer.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/PreconditionPreparer.java
@@ -16,7 +16,6 @@
package com.android.compatibility.common.tradefed.targetprep;
-import com.android.ddmlib.Log;
import com.android.tradefed.build.IBuildInfo;
import com.android.tradefed.config.ConfigurationException;
import com.android.tradefed.config.Option;
@@ -24,7 +23,6 @@
import com.android.tradefed.device.DeviceNotAvailableException;
import com.android.tradefed.device.ITestDevice;
import com.android.tradefed.invoker.TestInformation;
-import com.android.tradefed.log.LogUtil;
import com.android.tradefed.log.LogUtil.CLog;
import com.android.tradefed.targetprep.BaseTargetPreparer;
import com.android.tradefed.targetprep.BuildError;
@@ -58,8 +56,6 @@
)
private List<String> mPreconditionArgs = new ArrayList<>();
- protected final String mLogTag = getClass().getSimpleName();
-
@Override
public void setUp(TestInformation testInfo)
throws TargetSetupError, BuildError, DeviceNotAvailableException {
@@ -106,44 +102,44 @@
/** @deprecated Use {@link CLog} instead. */
@Deprecated
protected void logInfo(String info) {
- LogUtil.printLog(Log.LogLevel.INFO, mLogTag, info);
+ CLog.i(info);
}
/** @deprecated Use {@link CLog} instead. */
@Deprecated
protected void logInfo(String infoFormat, Object... args) {
- LogUtil.printLog(Log.LogLevel.INFO, mLogTag, String.format(infoFormat, args));
+ CLog.i(infoFormat, args);
}
/** @deprecated Use {@link CLog} instead. */
@Deprecated
protected void logWarning(String warning) {
- LogUtil.printLog(Log.LogLevel.WARN, mLogTag, warning);
+ CLog.w(warning);
}
/** @deprecated Use {@link CLog} instead. */
@Deprecated
protected void logWarning(String warningFormat, Object... args) {
- LogUtil.printLog(Log.LogLevel.WARN, mLogTag, String.format(warningFormat, args));
+ CLog.w(warningFormat, args);
}
/** @deprecated Use {@link CLog} instead. */
@Deprecated
protected void logError(String error) {
- LogUtil.printLog(Log.LogLevel.ERROR, mLogTag, error);
+ CLog.e(error);
}
/** @deprecated Use {@link CLog} instead. */
@Deprecated
protected void logError(String errorFormat, Object... args) {
- LogUtil.printLog(Log.LogLevel.ERROR, mLogTag, String.format(errorFormat, args));
+ CLog.e(errorFormat, args);
}
/** @deprecated Use {@link CLog} instead. */
@Deprecated
protected void logError(Throwable t) {
if (t != null) {
- Log.e(mLogTag, t);
+ CLog.e(t);
}
}
}
diff --git a/common/host-side/util/src/com/android/compatibility/common/util/BusinessLogicHostExecutor.java b/common/host-side/util/src/com/android/compatibility/common/util/BusinessLogicHostExecutor.java
index 94b3040..cc061b0 100644
--- a/common/host-side/util/src/com/android/compatibility/common/util/BusinessLogicHostExecutor.java
+++ b/common/host-side/util/src/com/android/compatibility/common/util/BusinessLogicHostExecutor.java
@@ -16,10 +16,8 @@
package com.android.compatibility.common.util;
-import com.android.ddmlib.Log;
import com.android.tradefed.build.IBuildInfo;
import com.android.tradefed.device.ITestDevice;
-import com.android.tradefed.log.LogUtil;
import com.android.tradefed.log.LogUtil.CLog;
import java.lang.reflect.Method;
@@ -53,15 +51,21 @@
/**
* {@inheritDoc}
+ *
+ * @deprecated Use CLog directly
*/
+ @Deprecated
@Override
public void logInfo(String format, Object... args) {
- LogUtil.printLog(Log.LogLevel.INFO, LOG_TAG, String.format(format, args));
+ CLog.i(format, args);
}
/**
* {@inheritDoc}
+ *
+ * @deprecated Use CLog directly
*/
+ @Deprecated
@Override
public void logDebug(String format, Object... args) {
CLog.d(format, args);