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

Commit c51dc089 authored by lucaslin's avatar lucaslin Committed by Lucas Lin
Browse files

Expose some APIs from ConnectivityManager 

- Expose setRequireVpnForUids to Vpn.java
- Expose setLegacyLockdownVpnEnabled to LockdownVpnTracker.java
- Expose requestRouteToHostAddress to
  GnssNetworkConnectivityHandler.java

Bug: 182963397
Test: m
Change-Id: I1fb5ecfbe37878ba3534e6c6c7599ca29db2735c
Merged-In: I1fb5ecfbe37878ba3534e6c6c7599ca29db2735c
  (cherry-picked from ag/13927657)
parent 4eca6d0c

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

+3 −0
Original line number Diff line number Diff line
@@ -14,11 +14,14 @@ package android.net { 
    method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public void registerDefaultNetworkCallbackAsUid(int, @NonNull android.net.ConnectivityManager.NetworkCallback, @NonNull android.os.Handler);

    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 @Deprecated public boolean requestRouteToHostAddress(int, java.net.InetAddress);

    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(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public void setLegacyLockdownVpnEnabled(boolean);

    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.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public void setRequireVpnForUids(boolean, @NonNull java.util.Collection<android.util.Range<java.lang.Integer>>);

    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 public void systemReady();

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

+6 −4
Original line number Diff line number Diff line
@@ -1122,12 +1122,13 @@ public class ConnectivityManager { 
     * @param ranges the UID ranges to restrict

     * @param requireVpn whether the specified UID ranges must use a VPN

     *

     * TODO: expose as @SystemApi.

     * @hide

     */

    @RequiresPermission(anyOf = {

            NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK,

            android.Manifest.permission.NETWORK_STACK})

            android.Manifest.permission.NETWORK_STACK,

            android.Manifest.permission.NETWORK_SETTINGS})

    @SystemApi(client = MODULE_LIBRARIES)

    public void setRequireVpnForUids(boolean requireVpn,

            @NonNull Collection<Range<Integer>> ranges) {

        Objects.requireNonNull(ranges);
@@ -1171,13 +1172,13 @@ public class ConnectivityManager { 
     *

     * @param enabled whether legacy lockdown VPN is enabled or disabled

     *

     * TODO: @SystemApi(client = MODULE_LIBRARIES)

     *

     * @hide

     */

    @RequiresPermission(anyOf = {

            NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK,

            android.Manifest.permission.NETWORK_STACK,

            android.Manifest.permission.NETWORK_SETTINGS})

    @SystemApi(client = MODULE_LIBRARIES)

    public void setLegacyLockdownVpnEnabled(boolean enabled) {

        try {

            mService.setLegacyLockdownVpnEnabled(enabled);
@@ -2124,6 +2125,7 @@ public class ConnectivityManager { 
     */

    @Deprecated

    @UnsupportedAppUsage

    @SystemApi(client = MODULE_LIBRARIES)

    public boolean requestRouteToHostAddress(int networkType, InetAddress hostAddress) {

        checkLegacyRoutingApiAccess();

        try {

services/core/java/com/android/server/ConnectivityService.java

+2 −2
Original line number Diff line number Diff line
@@ -5086,7 +5086,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 


    @Override

    public void setRequireVpnForUids(boolean requireVpn, UidRange[] ranges) {

        PermissionUtils.enforceNetworkStackPermission(mContext);

        enforceNetworkStackOrSettingsPermission();

        mHandler.sendMessage(mHandler.obtainMessage(EVENT_SET_REQUIRE_VPN_FOR_UIDS,

                encodeBool(requireVpn), 0 /* arg2 */, ranges));

    }
@@ -5124,7 +5124,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 


    @Override

    public void setLegacyLockdownVpnEnabled(boolean enabled) {

        enforceSettingsPermission();

        enforceNetworkStackOrSettingsPermission();

        mHandler.post(() -> mLockdownEnabled = enabled);

    }