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

Merge "Update language to comply with Android’s inclusive language guidance" am: c61b2279f0 am: 3c8639d035 am: 940fab9a0f am: 5b83be6103

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

Change-Id: I58b5a2760d11b4caa06f565373318bf7efd29962
This commit is contained in:
Xevi Miro Bruix
2020-07-27 18:55:50 +00:00
committed by Automerger Merge Worker
parent dd64d79408 5b83be6103
commit f6a4e6796e
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
core/java/android/net/network-policy-restrictions.md
View File

@@ -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 |