Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hide NetworkPolicyManager.blockedReasonsToString API." am: 0549ca0217 am: fe78ceab36 am: 8027b42fe6

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

Change-Id: If0d8f99d618173d707d2f473d4f6634c3461f0ca
This commit is contained in:
Lorenzo Colitti
2021-04-22 03:29:41 +00:00
committed by Automerger Merge Worker
parent 88d1911f16 8027b42fe6
commit 609f5cff0b
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/module-lib-current.txt
View File

@@ -178,7 +178,6 @@ package android.net {
}
public class NetworkPolicyManager {
method @NonNull public static String blockedReasonsToString(int);
method @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public int getMultipathPreference(@NonNull android.net.Network);
method @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public int getRestrictBackgroundStatus(int);
method @RequiresPermission(android.Manifest.permission.OBSERVE_NETWORK_POLICY) public boolean isUidNetworkingBlocked(int, boolean);

1
core/java/android/net/NetworkPolicyManager.java
View File

@@ -767,7 +767,6 @@ public class NetworkPolicyManager {
* blocked.
* @hide
*/
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
@NonNull
public static String blockedReasonsToString(int blockedReasons) {
return DebugUtils.flagsToString(ConnectivityManager.class, "BLOCKED_", blockedReasons);

5
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -77,7 +77,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;
@@ -1636,7 +1635,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)));
}
/**
@@ -2920,7 +2919,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) {