Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6617dc19 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Remove unused testutils lib from tethering tests" am: 5fad8b26 am:... 

Merge "Remove unused testutils lib from tethering tests" am: 5fad8b26 am: b16646a9 am: a63fbe82 am: 2b79bd6e am: 0a8d8caf

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

Change-Id: Ibbd6698b108ae67f0db7c435c8e7178e14ee1bb0
parents 018a02f8 0a8d8caf

packages/Tethering/tests/integration/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ java_defaults { 
    static_libs: [

        "NetworkStackApiStableLib",

        "androidx.test.rules",

        "frameworks-base-testutils",

        "mockito-target-extended-minus-junit4",

        "net-tests-utils",

        "testables",

packages/Tethering/tests/unit/jarjar-rules.txt

+5 −0
Original line number Diff line number Diff line
@@ -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*
 
 No newline at end of file