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

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

Expose isUidNetworkingBlocked and isUidRestrictedOnMeteredNetworks am: f969377a am: 6a4ff66e 

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

Change-Id: I305e00fd86e01c7fed4253bc2bbd761cfbfd4b16
parents ff568939 6a4ff66e

core/api/module-lib-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ package android.net { 
    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 public static boolean isUidBlocked(int, boolean);

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

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

    method @RequiresPermission(android.Manifest.permission.OBSERVE_NETWORK_POLICY) public void registerNetworkPolicyCallback(@Nullable java.util.concurrent.Executor, @NonNull android.net.NetworkPolicyManager.NetworkPolicyCallback);

    method @RequiresPermission(android.Manifest.permission.OBSERVE_NETWORK_POLICY) public void unregisterNetworkPolicyCallback(@NonNull android.net.NetworkPolicyManager.NetworkPolicyCallback);

    field public static final int BLOCKED_METERED_REASON_ADMIN_DISABLED = 262144; // 0x40000

core/api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -996,6 +996,8 @@ package android.net { 


  public class NetworkPolicyManager {

    method public boolean getRestrictBackground();

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

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

    method @NonNull public static String resolveNetworkId(@NonNull android.net.wifi.WifiConfiguration);

    method public void setRestrictBackground(boolean);

  }

core/java/android/net/NetworkPolicyManager.java

+2 −4
Original line number Diff line number Diff line
@@ -630,9 +630,8 @@ public class NetworkPolicyManager { 
     * @param meteredNetwork True if the network is metered.

     * @return true if networking is blocked for the given uid according to current networking

     *         policies.

     *

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.OBSERVE_NETWORK_POLICY)

    public boolean isUidNetworkingBlocked(int uid, boolean meteredNetwork) {

        try {

            return mService.isUidNetworkingBlocked(uid, meteredNetwork);
@@ -671,9 +670,8 @@ public class NetworkPolicyManager { 
     *

     * @param uid The target uid.

     * @return true if the given uid is restricted from doing networking on metered networks.

     *

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.OBSERVE_NETWORK_POLICY)

    public boolean isUidRestrictedOnMeteredNetworks(int uid) {

        try {

            return mService.isUidRestrictedOnMeteredNetworks(uid);