diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2021-03-26 03:30:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-26 03:30:11 +0000 |
| commit | 2108a92452004f0115bca8cfdcba3435e9391452 (patch) | |
| tree | 5dfc57ea92c32603cd0530d8f452f34bd0e757f5 /core/java | |
| parent | 7236cf6dca8a05273b4dc2bc9c369289f0fd909d (diff) | |
| parent | 8cbf5883ffe0282a7d89e295ac49bd6e09d9a24f (diff) | |
Merge changes from topic "blocked-reasons-callback-tests"
* changes:
Add unit tests for onBlockedStatusChanged(Network, int).
Add onBlockedStatusChanged(Network, int) to NetworkCallback.
Add MOBILE_DATA_PREFERRED_APPS setting
Add PRIVATE_DNS_MODE setting setter
Expose ConnectivitySettingsManager as module-lib API
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/NetworkPolicyManager.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/core/java/android/net/NetworkPolicyManager.java b/core/java/android/net/NetworkPolicyManager.java index 40fbfbb51424..39713297e762 100644 --- a/core/java/android/net/NetworkPolicyManager.java +++ b/core/java/android/net/NetworkPolicyManager.java @@ -18,6 +18,7 @@ package android.net; import static android.app.ActivityManager.procStateToString; import static android.content.pm.PackageManager.GET_SIGNATURES; +import static android.net.ConnectivityManager.BLOCKED_METERED_REASON_MASK; import static android.net.ConnectivityManager.BLOCKED_REASON_NONE; import android.annotation.IntDef; @@ -204,9 +205,6 @@ public class NetworkPolicyManager { }) public @interface SubscriptionOverrideMask {} - /** @hide */ - public static final int BLOCKED_METERED_REASON_MASK = 0xffff0000; - /** * Flag to indicate that app is not exempt from any network restrictions. * |