diff options
| author | 2020-07-27 18:38:52 +0000 | |
|---|---|---|
| committer | 2020-07-27 18:38:52 +0000 | |
| commit | 5b83be61034f370774cce0c8db24447453c8a6da (patch) | |
| tree | 5f29b67c1c98cea2f951effd6604e9bea55208d7 | |
| parent | 2ae5c5405d9a178915735045ed6a3d53eda18a93 (diff) | |
| parent | 940fab9a0f094c93f4c8a48cfc3e35f25a2e760b (diff) | |
Merge "Update language to comply with Android’s inclusive language guidance" am: c61b2279f0 am: 3c8639d035 am: 940fab9a0f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1371800
Change-Id: If61e9362fd0665bf1668c7a4e8661d28308ce116
| -rw-r--r-- | core/java/android/net/network-policy-restrictions.md | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/core/java/android/net/network-policy-restrictions.md b/core/java/android/net/network-policy-restrictions.md index 63ce1a244643..04c658c39ad3 100644 --- a/core/java/android/net/network-policy-restrictions.md +++ b/core/java/android/net/network-policy-restrictions.md @@ -1,11 +1,11 @@ # Data Saver vs Battery Saver -The tables below show whether an app has network access while on background depending on the status of Data Saver mode, Battery Saver mode, and the app's whitelist on those restricted modes. +The tables below show whether an app has network access while on background depending on the status of Data Saver mode, Battery Saver mode, and the app's allowlist on those restricted modes. ### How to read the tables -The 2 topmost rows define the Battery Saver mode and whether the app is whitelisted or not for it. -The 2 leftmost columns define the Data Saver mode and whether the app is whitelisted, not whitelisted, or blacklisted for it. +The 2 topmost rows define the Battery Saver mode and whether the app is allowlisted or not for it. +The 2 leftmost columns define the Data Saver mode and whether the app is allowlisted, not allowlisted, or denylisted for it. The cells define the network status when the app is on background. More specifically: @@ -14,9 +14,9 @@ More specifically: * **DS OFF**: Data Saver Mode is off * **BS ON**: Battery Saver Mode is on * **BS OFF**: Battery Saver Mode is off -* **WL**: app is whitelisted -* **!WL**: app is not whitelisted -* **BL**: app is blacklisted +* **AL**: app is allowlisted +* **!AL**: app is not allowlisted +* **DL**: app is denylisted * **ok**: network access granted while app on background (NetworkInfo's state/detailed state should be `CONNECTED` / `CONNECTED`) * **blk**: network access blocked while app on background (NetworkInfo's state/detailed state should be `DISCONNECTED` / `BLOCKED`) @@ -25,23 +25,23 @@ More specifically: | | | BS | ON | BS | OFF | |:-------:|-------|------|-------|------|-------| -| | | *WL* | *!WL* | *WL* | *!WL* | -| **DS** | *WL* | ok | blk | ok | ok | -| **ON** | *!WL* | blk | blk | blk | blk | -| | *BL* | blk | blk | blk | blk | -| **DS** | *WL* | blk | blk | ok | ok | -| **OFF** | *!WL* | blk | blk | ok | ok | -| | *BL* | blk | blk | blk | blk | +| | | *AL* | *!AL* | *AL* | *!AL* | +| **DS** | *AL* | ok | blk | ok | ok | +| **ON** | *!AL* | blk | blk | blk | blk | +| | *DL* | blk | blk | blk | blk | +| **DS** | *AL* | blk | blk | ok | ok | +| **OFF** | *!AL* | blk | blk | ok | ok | +| | *DL* | blk | blk | blk | blk | ## On non-metered networks | | | BS | ON | BS | OFF | |:-------:|-------|------|-------|------|-------| -| | | *WL* | *!WL* | *WL* | *!WL* | -| **DS** | *WL* | ok | blk | ok | ok | -| **ON** | *!WL* | ok | blk | ok | ok | -| | *BL* | ok | blk | ok | ok | -| **DS** | *WL* | ok | blk | ok | ok | -| **OFF** | *!WL* | ok | blk | ok | ok | -| | *BL* | ok | blk | ok | ok | +| | | *AL* | *!AL* | *AL* | *!AL* | +| **DS** | *AL* | ok | blk | ok | ok | +| **ON** | *!AL* | ok | blk | ok | ok | +| | *DL* | ok | blk | ok | ok | +| **DS** | *AL* | ok | blk | ok | ok | +| **OFF** | *!AL* | ok | blk | ok | ok | +| | *DL* | ok | blk | ok | ok | |