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

Merge "Expose systemReady for SystemServer" am: 33737f6ac4 am: 7d2c52067f

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

Change-Id: Ic700e27e679a1f56b69ef082d4f5c7f5d12f8b6e
This commit is contained in:
Lucas Lin
2021-03-18 14:29:20 +00:00
committed by Automerger Merge Worker
parent 28f5f912c5 7d2c52067f
commit 91ee69fca8
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@ package android.net {
method @RequiresPermission(android.Manifest.permission.NETWORK_STACK) public void setGlobalProxy(@Nullable android.net.ProxyInfo); method @RequiresPermission(android.Manifest.permission.NETWORK_STACK) public void setGlobalProxy(@Nullable android.net.ProxyInfo);
method @RequiresPermission(android.Manifest.permission.NETWORK_STACK) public void setProfileNetworkPreference(@NonNull android.os.UserHandle, int, @Nullable java.util.concurrent.Executor, @Nullable Runnable); method @RequiresPermission(android.Manifest.permission.NETWORK_STACK) public void setProfileNetworkPreference(@NonNull android.os.UserHandle, int, @Nullable java.util.concurrent.Executor, @Nullable Runnable);
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 public void systemReady();
field public static final String PRIVATE_DNS_MODE_OFF = "off"; field public static final String PRIVATE_DNS_MODE_OFF = "off";
field public static final String PRIVATE_DNS_MODE_OPPORTUNISTIC = "opportunistic"; field public static final String PRIVATE_DNS_MODE_OPPORTUNISTIC = "opportunistic";
field public static final String PRIVATE_DNS_MODE_PROVIDER_HOSTNAME = "hostname"; field public static final String PRIVATE_DNS_MODE_PROVIDER_HOSTNAME = "hostname";

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

@@ -915,8 +915,8 @@ public class ConnectivityManager {
/** /**
* @hide * @hide
* TODO: Expose for SystemServer when becomes a module.
*/ */
@SystemApi(client = MODULE_LIBRARIES)
public void systemReady() { public void systemReady() {
try { try {
mService.systemReady(); mService.systemReady();