Merge "Remove unused testutils lib from tethering tests" am: a8e68bb723 am: d8c1f0dc19 am: a3de2aa6d3 am: 3065a5df85

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433924

Change-Id: I6f7ded717faf6e801102e37863ff9477dde47c8a

Tethering/tests/integration/Android.bp

@@ -22,7 +22,6 @@ java_defaults {
     static_libs: [
         "NetworkStackApiStableLib",
         "androidx.test.rules",
-        "frameworks-base-testutils",
         "mockito-target-extended-minus-junit4",
         "net-tests-utils",
         "testables",

Tethering/tests/unit/jarjar-rules.txt

@@ -9,3 +9,8 @@ rule com.android.internal.util.StateMachine* com.android.networkstack.tethering.
 rule com.android.internal.util.TrafficStatsConstants* com.android.networkstack.tethering.util.TrafficStatsConstants@1
 
 rule android.util.LocalLog* com.android.networkstack.tethering.util.LocalLog@1
+
+# TODO: either stop using frameworks-base-testutils or remove the unit test classes it contains.
+# TestableLooper from "testables" can be used instead of TestLooper from frameworks-base-testutils.
+zap android.os.test.TestLooperTest*
+zap com.android.test.filters.SelectTestTests*