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

Expose isUidNetworkingBlocked and isUidRestrictedOnMeteredNetworks am: f969377a96

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

Change-Id: If8a984d3bc2dbfb2d326079d5015c4bdc4edb8f7
This commit is contained in:
Lorenzo Colitti
2021-03-21 16:38:04 +00:00
committed by Automerger Merge Worker
parent 19efae9ff9 f969377a96
commit 6a4ff66e39
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 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 public static boolean isUidBlocked(int, boolean); 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 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); 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 field public static final int BLOCKED_METERED_REASON_ADMIN_DISABLED = 262144; // 0x40000

2
core/api/test-current.txt
View File

@@ -996,6 +996,8 @@ package android.net {
public class NetworkPolicyManager { public class NetworkPolicyManager {
method public boolean getRestrictBackground(); 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 @NonNull public static String resolveNetworkId(@NonNull android.net.wifi.WifiConfiguration);
method public void setRestrictBackground(boolean); method public void setRestrictBackground(boolean);
} }

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

@@ -630,9 +630,8 @@ public class NetworkPolicyManager {
* @param meteredNetwork True if the network is metered. * @param meteredNetwork True if the network is metered.
* @return true if networking is blocked for the given uid according to current networking * @return true if networking is blocked for the given uid according to current networking
* policies. * policies.
*
* @hide
*/ */
@RequiresPermission(android.Manifest.permission.OBSERVE_NETWORK_POLICY)
public boolean isUidNetworkingBlocked(int uid, boolean meteredNetwork) { public boolean isUidNetworkingBlocked(int uid, boolean meteredNetwork) {
try { try {
return mService.isUidNetworkingBlocked(uid, meteredNetwork); return mService.isUidNetworkingBlocked(uid, meteredNetwork);
@@ -671,9 +670,8 @@ public class NetworkPolicyManager {
* *
* @param uid The target uid. * @param uid The target uid.
* @return true if the given uid is restricted from doing networking on metered networks. * @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) { public boolean isUidRestrictedOnMeteredNetworks(int uid) {
try { try {
return mService.isUidRestrictedOnMeteredNetworks(uid); return mService.isUidRestrictedOnMeteredNetworks(uid);