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

Commit 745f103f authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Add shims for setLegacyLockdownVpnEnabled, setRequireVpnForUids." am:... 

Merge "Add shims for setLegacyLockdownVpnEnabled, setRequireVpnForUids." am: a8b726e7 am: 21c2bc7a

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1671527

Change-Id: Icebbb617437354e37d410676329b56c91b7a739f
parents a8a7da36 21c2bc7a

apishim/31/com/android/networkstack/apishim/ConnectivityManagerShimImpl.java

+19 −0
Original line number Original line Diff line number Diff line
@@ -22,12 +22,15 @@ import android.net.ConnectivityManager.NetworkCallback; 
import android.net.NetworkRequest;

import android.net.NetworkRequest;

import android.os.Build;

import android.os.Build;

import android.os.Handler;

import android.os.Handler;

import android.util.Range;





import androidx.annotation.NonNull;

import androidx.annotation.NonNull;





import com.android.networkstack.apishim.common.ConnectivityManagerShim;

import com.android.networkstack.apishim.common.ConnectivityManagerShim;

import com.android.networkstack.apishim.common.ShimUtils;

import com.android.networkstack.apishim.common.ShimUtils;





import java.util.Collection;



/**

/**

 * Implementation of {@link ConnectivityManagerShim} for API 31.

 * Implementation of {@link ConnectivityManagerShim} for API 31.

 */

 */
@@ -77,4 +80,20 @@ public class ConnectivityManagerShimImpl 
            int uid, @NonNull NetworkCallback networkCallback, @NonNull Handler handler) {

            int uid, @NonNull NetworkCallback networkCallback, @NonNull Handler handler) {

        mCm.registerDefaultNetworkCallbackAsUid(uid, networkCallback, handler);

        mCm.registerDefaultNetworkCallbackAsUid(uid, networkCallback, handler);

    }

    }



    /**

     * See android.net.ConnectivityManager#setLegacyLockdownVpnEnabled

     */

    @Override

    public void setLegacyLockdownVpnEnabled(boolean enabled) {

        mCm.setLegacyLockdownVpnEnabled(enabled);

    }



    /**

     * See android.net.ConnectivityManager#setRequireVpnForUids

     */

    @Override

    public void setRequireVpnForUids(boolean requireVpn, Collection<Range<Integer>> ranges) {

        mCm.setRequireVpnForUids(requireVpn, ranges);

    }

}
 
}

apishim/common/com/android/networkstack/apishim/common/ConnectivityManagerShim.java

+14 −0
Original line number Original line Diff line number Diff line
@@ -19,9 +19,12 @@ package com.android.networkstack.apishim.common; 
import android.net.ConnectivityManager.NetworkCallback;

import android.net.ConnectivityManager.NetworkCallback;

import android.net.NetworkRequest;

import android.net.NetworkRequest;

import android.os.Handler;

import android.os.Handler;

import android.util.Range;





import androidx.annotation.NonNull;

import androidx.annotation.NonNull;





import java.util.Collection;



/**

/**

 * Interface used to access API methods in {@link android.net.ConnectivityManager}, with

 * Interface used to access API methods in {@link android.net.ConnectivityManager}, with

 * appropriate fallbacks if the methods are not yet part of the released API.

 * appropriate fallbacks if the methods are not yet part of the released API.
@@ -48,4 +51,15 @@ public interface ConnectivityManagerShim { 
            throws UnsupportedApiLevelException {

            throws UnsupportedApiLevelException {

        throw new UnsupportedApiLevelException("Only supported starting from API 31");

        throw new UnsupportedApiLevelException("Only supported starting from API 31");

    }

    }



    /** See android.net.ConnectivityManager#setLegacyLockdownVpnEnabled */

    default void setLegacyLockdownVpnEnabled(boolean enabled) throws UnsupportedApiLevelException {

        throw new UnsupportedApiLevelException("Only supported starting from API 31");

    }



    /** See android.net.ConnectivityManager#setRequireVpnForUids */

    default void setRequireVpnForUids(boolean requireVpn, Collection<Range<Integer>> ranges)

            throws UnsupportedApiLevelException {

        throw new UnsupportedApiLevelException("Only supported starting from API 31");

    }

}
 
}