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

Commit a4b9d8e9 authored by Chiachang Wang's avatar Chiachang Wang Committed by Gerrit Code Review
Browse files

Merge "Rename getVpnRequiresValidation and getRequiresInternetValdiation"

parents 7451d49d 17237203

apishim/29/com/android/networkstack/apishim/api29/Ikev2VpnProfileShimImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -25,10 +25,10 @@ import com.android.networkstack.apishim.common.UnsupportedApiLevelException; 
 */

public class Ikev2VpnProfileShimImpl<T> implements Ikev2VpnProfileShim<T> {

    /**

     * @see Ikev2VpnProfile#getRequiresInternetValidation(boolean)

     * @see Ikev2VpnProfile#isInternetValidationRequired(boolean)

     */

    @Override

    public boolean getRequiresInternetValidation(T profile)

    public boolean isInternetValidationRequired(T profile)

            throws UnsupportedApiLevelException {

        throw new UnsupportedApiLevelException("Only supported from API level 33.");

    }

apishim/29/com/android/networkstack/apishim/api29/NetworkAgentConfigShimImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import com.android.networkstack.apishim.common.NetworkAgentConfigShim; 
 */

public class NetworkAgentConfigShimImpl implements NetworkAgentConfigShim {

    @Override

    public boolean getVpnRequiresValidation() {

    public boolean isVpnValidationRequired() {

        return false;

    }

}

apishim/33/com/android/networkstack/apishim/Ikev2VpnProfileShimImpl.java

+3 −3
Original line number Diff line number Diff line
@@ -44,10 +44,10 @@ public class Ikev2VpnProfileShimImpl 
    }



    /**

     * @see Ikev2VpnProfile#getRequiresInternetValidation()

     * @see Ikev2VpnProfile#isInternetValidationRequired()

     */

    @Override

    public boolean getRequiresInternetValidation(@NonNull final Ikev2VpnProfile profile) {

        return profile.getRequiresInternetValidation();

    public boolean isInternetValidationRequired(@NonNull final Ikev2VpnProfile profile) {

        return profile.isInternetValidationRequired();

    }

}

apishim/33/com/android/networkstack/apishim/NetworkAgentConfigShimImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -46,11 +46,11 @@ public class NetworkAgentConfigShimImpl 
    }



    @Override

    public boolean getVpnRequiresValidation() {

    public boolean isVpnValidationRequired() {

        if (null == mNetworkAgentConfig) {

            return false;

        } else {

            return mNetworkAgentConfig.getVpnRequiresValidation();

            return mNetworkAgentConfig.isVpnValidationRequired();

        }

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ package com.android.networkstack.apishim.common; 
// TODO : when API29 is no longer supported, remove the type argument

public interface Ikev2VpnProfileShim<T> {

    /**

     * @see Ikev2VpnProfile#getRequiresInternetValidation()

     * @see Ikev2VpnProfile#isInternetValidationRequired()

     */

    boolean getRequiresInternetValidation(T profile) throws UnsupportedApiLevelException;

    boolean isInternetValidationRequired(T profile) throws UnsupportedApiLevelException;

}