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

Commit fe78ceab authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Hide NetworkPolicyManager.blockedReasonsToString API." am: 0549ca02 

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

Change-Id: Ic098dc012380be363d7acb088dab34343dd250e0
parents e2d58f37 0549ca02

core/api/module-lib-current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -44,7 +44,6 @@ package android.net { 
  }

  }





  public class NetworkPolicyManager {

  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 getMultipathPreference(@NonNull android.net.Network);

    method @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public int getRestrictBackgroundStatus(int);

    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);

    method @RequiresPermission(android.Manifest.permission.OBSERVE_NETWORK_POLICY) public boolean isUidNetworkingBlocked(int, boolean);

core/java/android/net/NetworkPolicyManager.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -766,7 +766,6 @@ public class NetworkPolicyManager { 
     *                       blocked.

     *                       blocked.

     * @hide

     * @hide

     */

     */

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    @NonNull

    @NonNull

    public static String blockedReasonsToString(int blockedReasons) {

    public static String blockedReasonsToString(int blockedReasons) {

        return DebugUtils.flagsToString(NetworkPolicyManager.class, "BLOCKED_", blockedReasons);

        return DebugUtils.flagsToString(NetworkPolicyManager.class, "BLOCKED_", blockedReasons);

services/core/java/com/android/server/ConnectivityService.java

+2 −3
Original line number Original line Diff line number Diff line
@@ -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_CELLULAR;

import static android.net.NetworkCapabilities.TRANSPORT_TEST;

import static android.net.NetworkCapabilities.TRANSPORT_TEST;

import static android.net.NetworkCapabilities.TRANSPORT_VPN;

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.NetworkRequest.Type.LISTEN_FOR_BEST;

import static android.net.shared.NetworkMonitorUtils.isPrivateDnsValidationRequired;

import static android.net.shared.NetworkMonitorUtils.isPrivateDnsValidationRequired;

import static android.os.Process.INVALID_UID;

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;

                ? nri.getActiveRequest().requestId : nri.mRequests.get(0).requestId;

        mNetworkInfoBlockingLogs.log(String.format(

        mNetworkInfoBlockingLogs.log(String.format(

                "%s %d(%d) on netId %d: %s", action, nri.mAsUid, requestId, net.getNetId(),

                "%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 uid = mUidBlockedReasons.keyAt(i);

                final int blockedReasons = mUidBlockedReasons.valueAt(i);

                final int blockedReasons = mUidBlockedReasons.valueAt(i);

                pw.println("UID=" + uid + " blockedReasons="

                pw.println("UID=" + uid + " blockedReasons="

                        + blockedReasonsToString(blockedReasons));

                        + Integer.toHexString(blockedReasons));

            } catch (ArrayIndexOutOfBoundsException e) {

            } catch (ArrayIndexOutOfBoundsException e) {

                pw.println("  ArrayIndexOutOfBoundsException");

                pw.println("  ArrayIndexOutOfBoundsException");

            } catch (ConcurrentModificationException e) {

            } catch (ConcurrentModificationException e) {