Remove MultiLog thing am: 1a60049d0e

Original change: https://googleplex-android-review.googlesource.com/c/platform/platform_testing/+/16251103

Change-Id: I3757354d1ffdfa006cc4fb4c5ea2c52b38f5c511

1 files changed, 1 insertions, 14 deletions

diff --git a/libraries/compatibility-common-util/src/com/android/sts/common/util/StsLogic.java b/libraries/compatibility-common-util/src/com/android/sts/common/util/StsLogic.java
index 1dec855c2..7ffb0b5ba 100644
--- a/libraries/compatibility-common-util/src/com/android/sts/common/util/StsLogic.java
+++ b/libraries/compatibility-common-util/src/com/android/sts/common/util/StsLogic.java
@@ -21,7 +21,6 @@ import static org.junit.Assume.*;
 import android.platform.test.annotations.AsbSecurityTest;
 
 import com.android.compatibility.common.util.BusinessLogicMapStore;
-import com.android.compatibility.common.util.MultiLog;
 
 import org.junit.runner.Description;
 
@@ -31,9 +30,7 @@ import java.util.List;
 import java.util.Map;
 
 /** Common STS extra business logic for host-side and device-side to implement. */
-public interface StsLogic extends MultiLog {
-
-    static final String LOG_TAG = StsLogic.class.getSimpleName();
+public interface StsLogic {
 
     // keep in sync with google3:
     // //wireless/android/partner/apbs/*/config/xtsbgusinesslogic/sts_business_logic.gcl
@@ -73,7 +70,6 @@ public interface StsLogic extends MultiLog {
                 // binary. Neither is a critical issue and the test will run in these cases.
                 // New test: developer should be able to write the test without getting blocked.
                 // Removed bug + old binary: test will run.
-                logInfo(LOG_TAG, "could not find the CVE bug %d in the spl map", cveBugId);
                 continue;
             }
             LocalDate spl = SplUtils.localDateFromSplString(splString);
@@ -95,8 +91,6 @@ public interface StsLogic extends MultiLog {
         for (long cveBugId : getCveBugIds()) {
             String modificationMillisString = map.get(Long.toString(cveBugId));
             if (modificationMillisString == null) {
-                logInfo(LOG_TAG,
-                        "Could not find the CVE bug %d in the modification date map", cveBugId);
                 continue;
             }
             LocalDate modificationDate =
@@ -111,12 +105,10 @@ public interface StsLogic extends MultiLog {
     }
 
     default boolean shouldSkipIncremental() {
-        logDebug(LOG_TAG, "filtering by incremental");
 
         long[] bugIds = getCveBugIds();
         if (bugIds == null) {
             // There were no @AsbSecurityTest annotations
-            logInfo(LOG_TAG, "not an ASB test");
             return false;
         }
 
@@ -130,28 +122,23 @@ public interface StsLogic extends MultiLog {
             if (Arrays.stream(bugIds).min().getAsLong() < 157905780) {
                 // skip if the bug id is older than ~ June 2020
                 // otherwise the test will run due to missing data
-                logDebug(LOG_TAG, "no data for this old test");
                 return true;
             }
           return false;
         }
         if (minTestModifiedDate.isAfter(incrementalCutoffSpl)) {
-            logDebug(LOG_TAG, "the test was recently modified");
             return false;
         }
 
         LocalDate minTestSpl = getMinTestSpl();
         if (minTestSpl == null) {
             // could not get the test spl - run the test
-            logWarn(LOG_TAG, "could not get the test SPL");
             return false;
         }
         if (minTestSpl.isAfter(incrementalCutoffSpl)) {
-            logDebug(LOG_TAG, "the test has a recent SPL");
             return false;
         }
 
-        logDebug(LOG_TAG, "test should skip");
         return true;
     }