LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes I036b7f23,I53c58e7b

Browse Source 
* changes:
  Improve the JavaDoc for FIREWALL_CHAIN_OEM_DENY_x.
  Allow tests to set the NetworkAgent's callbacks when creating it.
This commit is contained in:
Treehugger Robot
2022-08-04 09:50:53 +00:00
committed by Gerrit Code Review
parent f627616fe3 f683c40939
commit bdedaacd88
3 changed files with 116 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
framework/src/android/net/ConnectivityManager.java
View File

@@ -984,7 +984,16 @@ public class ConnectivityManager {
/**
* Firewall chain used for OEM-specific application restrictions.
* Denylist of apps that will not have network access due to OEM-specific restrictions.
*
* Denylist of apps that will not have network access due to OEM-specific restrictions. If an
* app UID is placed on this chain, and the chain is enabled, the app's packets will be dropped.
*
* All the {@code FIREWALL_CHAIN_OEM_DENY_x} chains are equivalent, and each one is
* independent of the others. The chains can be enabled and disabled independently, and apps can
* be added and removed from each chain independently.
*
* @see #FIREWALL_CHAIN_OEM_DENY_2
* @see #FIREWALL_CHAIN_OEM_DENY_3
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
@@ -992,7 +1001,16 @@ public class ConnectivityManager {
/**
* Firewall chain used for OEM-specific application restrictions.
* Denylist of apps that will not have network access due to OEM-specific restrictions.
*
* Denylist of apps that will not have network access due to OEM-specific restrictions. If an
* app UID is placed on this chain, and the chain is enabled, the app's packets will be dropped.
*
* All the {@code FIREWALL_CHAIN_OEM_DENY_x} chains are equivalent, and each one is
* independent of the others. The chains can be enabled and disabled independently, and apps can
* be added and removed from each chain independently.
*
* @see #FIREWALL_CHAIN_OEM_DENY_1
* @see #FIREWALL_CHAIN_OEM_DENY_3
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
@@ -1000,7 +1018,16 @@ public class ConnectivityManager {
/**
* Firewall chain used for OEM-specific application restrictions.
* Denylist of apps that will not have network access due to OEM-specific restrictions.
*
* Denylist of apps that will not have network access due to OEM-specific restrictions. If an
* app UID is placed on this chain, and the chain is enabled, the app's packets will be dropped.
*
* All the {@code FIREWALL_CHAIN_OEM_DENY_x} chains are equivalent, and each one is
* independent of the others. The chains can be enabled and disabled independently, and apps can
* be added and removed from each chain independently.
*
* @see #FIREWALL_CHAIN_OEM_DENY_1
* @see #FIREWALL_CHAIN_OEM_DENY_2
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)