From f0ffc77d808bdccdd3991ff0275e0abf956c82f3 Mon Sep 17 00:00:00 2001 From: Sudheer Shanka Date: Wed, 21 Apr 2021 07:23:54 +0000 Subject: [PATCH] Hide NetworkPolicyManager.blockedReasonsToString API. BLOCKED_REASON_* constants have been moved to ConnectivityManager and blockedReasonsToString() util method doesn't belong in NetworkPolicyManager as an API. So, just removing it for now. Bug: 185967486 Test: treehugger Change-Id: Ie04044980fdfc7ec772444be13fc659880953bd1 --- .../core/java/com/android/server/ConnectivityService.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 6460053e1b..149994d46e 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -78,7 +78,6 @@ import static android.net.NetworkCapabilities.REDACT_FOR_NETWORK_SETTINGS; import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR; import static android.net.NetworkCapabilities.TRANSPORT_TEST; import static android.net.NetworkCapabilities.TRANSPORT_VPN; -import static android.net.NetworkPolicyManager.blockedReasonsToString; import static android.net.NetworkRequest.Type.LISTEN_FOR_BEST; import static android.net.shared.NetworkMonitorUtils.isPrivateDnsValidationRequired; import static android.os.Process.INVALID_UID; @@ -1617,7 +1616,7 @@ public class ConnectivityService extends IConnectivityManager.Stub ? nri.getActiveRequest().requestId : nri.mRequests.get(0).requestId; mNetworkInfoBlockingLogs.log(String.format( "%s %d(%d) on netId %d: %s", action, nri.mAsUid, requestId, net.getNetId(), - blockedReasonsToString(blocked))); + Integer.toHexString(blocked))); } /** @@ -2901,7 +2900,7 @@ public class ConnectivityService extends IConnectivityManager.Stub final int uid = mUidBlockedReasons.keyAt(i); final int blockedReasons = mUidBlockedReasons.valueAt(i); pw.println("UID=" + uid + " blockedReasons=" - + blockedReasonsToString(blockedReasons)); + + Integer.toHexString(blockedReasons)); } catch (ArrayIndexOutOfBoundsException e) { pw.println(" ArrayIndexOutOfBoundsException"); } catch (ConcurrentModificationException e) {