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

Commit a708a0cf authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Expose APIs for Settings" am: cf599f82 

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

Change-Id: Ia47e8efc3cc3f40b396c0aa0bd49afea2385e9c3
parents 630a5222 cf599f82

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

+6 −0
Original line number Diff line number Diff line
@@ -6,11 +6,17 @@ package android.net { 
  }



  public class ConnectivityManager {

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void factoryReset();

    method @NonNull @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public java.util.List<android.net.NetworkStateSnapshot> getAllNetworkStateSnapshot();

    method @Nullable public android.net.ProxyInfo getGlobalProxy();

    method @NonNull public static android.util.Range<java.lang.Integer> getIpSecNetIdRange();

    method @NonNull public static String getPrivateDnsMode(@NonNull android.content.Context);

    method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public void registerSystemDefaultNetworkCallback(@NonNull android.net.ConnectivityManager.NetworkCallback, @NonNull android.os.Handler);

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void requestBackgroundNetwork(@NonNull android.net.NetworkRequest, @NonNull android.os.Handler, @NonNull android.net.ConnectivityManager.NetworkCallback);

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void setAcceptPartialConnectivity(@NonNull android.net.Network, boolean, boolean);

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void setAcceptUnvalidated(@NonNull android.net.Network, boolean, boolean);

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void setAvoidUnvalidated(@NonNull android.net.Network);

    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);

    field public static final String PRIVATE_DNS_MODE_OFF = "off";

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

+30 −8
Original line number Diff line number Diff line
@@ -3038,8 +3038,9 @@ public class ConnectivityManager { 
     *        HTTP proxy.  A {@code null} value will clear the global HTTP proxy.

     * @hide

     */

    @SystemApi(client = MODULE_LIBRARIES)

    @RequiresPermission(android.Manifest.permission.NETWORK_STACK)

    public void setGlobalProxy(ProxyInfo p) {

    public void setGlobalProxy(@Nullable ProxyInfo p) {

        try {

            mService.setGlobalProxy(p);

        } catch (RemoteException e) {
@@ -3054,6 +3055,8 @@ public class ConnectivityManager { 
     *        if no global HTTP proxy is set.

     * @hide

     */

    @SystemApi(client = MODULE_LIBRARIES)

    @Nullable

    public ProxyInfo getGlobalProxy() {

        try {

            return mService.getGlobalProxy();
@@ -4388,8 +4391,13 @@ public class ConnectivityManager { 
     *

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS)

    public void setAcceptUnvalidated(Network network, boolean accept, boolean always) {

    @SystemApi(client = MODULE_LIBRARIES)

    @RequiresPermission(anyOf = {

            android.Manifest.permission.NETWORK_SETTINGS,

            android.Manifest.permission.NETWORK_SETUP_WIZARD,

            android.Manifest.permission.NETWORK_STACK,

            NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK})

    public void setAcceptUnvalidated(@NonNull Network network, boolean accept, boolean always) {

        try {

            mService.setAcceptUnvalidated(network, accept, always);

        } catch (RemoteException e) {
@@ -4411,8 +4419,14 @@ public class ConnectivityManager { 
     *

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.NETWORK_STACK)

    public void setAcceptPartialConnectivity(Network network, boolean accept, boolean always) {

    @SystemApi(client = MODULE_LIBRARIES)

    @RequiresPermission(anyOf = {

            android.Manifest.permission.NETWORK_SETTINGS,

            android.Manifest.permission.NETWORK_SETUP_WIZARD,

            android.Manifest.permission.NETWORK_STACK,

            NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK})

    public void setAcceptPartialConnectivity(@NonNull Network network, boolean accept,

            boolean always) {

        try {

            mService.setAcceptPartialConnectivity(network, accept, always);

        } catch (RemoteException e) {
@@ -4430,8 +4444,13 @@ public class ConnectivityManager { 
     *

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS)

    public void setAvoidUnvalidated(Network network) {

    @SystemApi(client = MODULE_LIBRARIES)

    @RequiresPermission(anyOf = {

            android.Manifest.permission.NETWORK_SETTINGS,

            android.Manifest.permission.NETWORK_SETUP_WIZARD,

            android.Manifest.permission.NETWORK_STACK,

            NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK})

    public void setAvoidUnvalidated(@NonNull Network network) {

        try {

            mService.setAvoidUnvalidated(network);

        } catch (RemoteException e) {
@@ -4561,7 +4580,10 @@ public class ConnectivityManager { 
     * Resets all connectivity manager settings back to factory defaults.

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS)

    @SystemApi(client = MODULE_LIBRARIES)

    @RequiresPermission(anyOf = {

            android.Manifest.permission.NETWORK_SETTINGS,

            NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK})

    public void factoryReset() {

        try {

            mService.factoryReset();