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

Merge "Expose constants of ConnectivityManager" am: cb20318619 am: 9b01e26848

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

Change-Id: Ibd12c85a42d9b0c13113923c3a61dde7f2cd3e5a
This commit is contained in:
Treehugger Robot
2021-04-07 11:25:59 +00:00
committed by Automerger Merge Worker
parent a97e380d38 9b01e26848
commit bc7c12a84f
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
framework/api/module-lib-current.txt
View File

@@ -26,6 +26,9 @@ package android.net {
method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_TEST_NETWORKS, android.Manifest.permission.NETWORK_STACK}) public void simulateDataStall(int, long, @NonNull android.net.Network, @NonNull android.os.PersistableBundle); method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_TEST_NETWORKS, android.Manifest.permission.NETWORK_STACK}) public void simulateDataStall(int, long, @NonNull android.net.Network, @NonNull android.os.PersistableBundle);
method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void startCaptivePortalApp(@NonNull android.net.Network); method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void startCaptivePortalApp(@NonNull android.net.Network);
method public void systemReady(); method public void systemReady();
field public static final String ACTION_PROMPT_LOST_VALIDATION = "android.net.action.PROMPT_LOST_VALIDATION";
field public static final String ACTION_PROMPT_PARTIAL_CONNECTIVITY = "android.net.action.PROMPT_PARTIAL_CONNECTIVITY";
field public static final String ACTION_PROMPT_UNVALIDATED = "android.net.action.PROMPT_UNVALIDATED";
field public static final int BLOCKED_METERED_REASON_ADMIN_DISABLED = 262144; // 0x40000 field public static final int BLOCKED_METERED_REASON_ADMIN_DISABLED = 262144; // 0x40000
field public static final int BLOCKED_METERED_REASON_DATA_SAVER = 65536; // 0x10000 field public static final int BLOCKED_METERED_REASON_DATA_SAVER = 65536; // 0x10000
field public static final int BLOCKED_METERED_REASON_MASK = -65536; // 0xffff0000 field public static final int BLOCKED_METERED_REASON_MASK = -65536; // 0xffff0000

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

@@ -425,7 +425,8 @@ public class ConnectivityManager {
* *
* @hide * @hide
*/ */
public static final String ACTION_PROMPT_UNVALIDATED = "android.net.conn.PROMPT_UNVALIDATED"; @SystemApi(client = MODULE_LIBRARIES)
public static final String ACTION_PROMPT_UNVALIDATED = "android.net.action.PROMPT_UNVALIDATED";
/** /**
* Action used to display a dialog that asks the user whether to avoid a network that is no * Action used to display a dialog that asks the user whether to avoid a network that is no
@@ -433,8 +434,9 @@ public class ConnectivityManager {
* *
* @hide * @hide
*/ */
@SystemApi(client = MODULE_LIBRARIES)
public static final String ACTION_PROMPT_LOST_VALIDATION = public static final String ACTION_PROMPT_LOST_VALIDATION =
"android.net.conn.PROMPT_LOST_VALIDATION"; "android.net.action.PROMPT_LOST_VALIDATION";
/** /**
* Action used to display a dialog that asks the user whether to stay connected to a network * Action used to display a dialog that asks the user whether to stay connected to a network
@@ -443,8 +445,9 @@ public class ConnectivityManager {
* *
* @hide * @hide
*/ */
@SystemApi(client = MODULE_LIBRARIES)
public static final String ACTION_PROMPT_PARTIAL_CONNECTIVITY = public static final String ACTION_PROMPT_PARTIAL_CONNECTIVITY =
"android.net.conn.PROMPT_PARTIAL_CONNECTIVITY"; "android.net.action.PROMPT_PARTIAL_CONNECTIVITY";
/** /**
* Invalid tethering type. * Invalid tethering type.