From 5c080dc85b09856310befbb216740a34e8100721 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Mon, 31 Jan 2022 21:55:43 +0900 Subject: [PATCH] Mark VisibleForTesting members as public Package-private members are not visible across jars; with the latest refactoring of build and jarjar rules for connectivity, tests fail as the utils are picked up from the on-device module rather than the test package, and such members could not be found. Bug: 204830222 Test: atest ConnectivityCoverageTests Change-Id: Ia62b01e2e3123a2d8a432c061e3c576c86356df5 --- .../com/android/net/module/util/NetworkCapabilitiesUtils.java | 4 ++-- .../com/android/net/module/util/NetworkStatsUtils.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java b/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java index 71a0c96611..26c24f8daa 100644 --- a/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java +++ b/staticlibs/framework/com/android/net/module/util/NetworkCapabilitiesUtils.java @@ -85,7 +85,7 @@ public final class NetworkCapabilitiesUtils { * and {@code FORCE_RESTRICTED_CAPABILITIES}. */ @VisibleForTesting - static final long RESTRICTED_CAPABILITIES = packBitList( + public static final long RESTRICTED_CAPABILITIES = packBitList( NET_CAPABILITY_BIP, NET_CAPABILITY_CBS, NET_CAPABILITY_DUN, @@ -115,7 +115,7 @@ public final class NetworkCapabilitiesUtils { * See {@code NetworkCapabilities#maybeMarkCapabilitiesRestricted}. */ @VisibleForTesting - static final long UNRESTRICTED_CAPABILITIES = packBitList( + public static final long UNRESTRICTED_CAPABILITIES = packBitList( NET_CAPABILITY_INTERNET, NET_CAPABILITY_MMS, NET_CAPABILITY_SUPL, diff --git a/staticlibs/framework/com/android/net/module/util/NetworkStatsUtils.java b/staticlibs/framework/com/android/net/module/util/NetworkStatsUtils.java index c4d415efcf..41a9428a00 100644 --- a/staticlibs/framework/com/android/net/module/util/NetworkStatsUtils.java +++ b/staticlibs/framework/com/android/net/module/util/NetworkStatsUtils.java @@ -116,7 +116,7 @@ public class NetworkStatsUtils { } @VisibleForTesting - static android.net.NetworkStats.Entry fromBucket(NetworkStats.Bucket bucket) { + public static android.net.NetworkStats.Entry fromBucket(NetworkStats.Bucket bucket) { return new android.net.NetworkStats.Entry( null /* IFACE_ALL */, bucket.getUid(), convertBucketState(bucket.getState()), convertBucketTag(bucket.getTag()), convertBucketMetered(bucket.getMetered()),