Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a71f7d46 authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Expose systemReady for SystemServer" am: 7af6a2e9 am: 151f5266 

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

Change-Id: Ic700e27e679a1f56b69ef082d4f5c7f5d12f8b6e
parents 4195f030 151f5266

packages/Connectivity/framework/api/module-lib-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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 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 public void systemReady();

    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_PROVIDER_HOSTNAME = "hostname";

packages/Connectivity/framework/src/android/net/ConnectivityManager.java

+1 −1
Original line number Diff line number Diff line
@@ -915,8 +915,8 @@ public class ConnectivityManager { 


    /**

     * @hide

     * TODO: Expose for SystemServer when becomes a module.

     */

    @SystemApi(client = MODULE_LIBRARIES)

    public void systemReady() {

        try {

            mService.systemReady();