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

Commit ec1966e3 authored by Chalard Jean's avatar Chalard Jean Committed by Gerrit Code Review
Browse files

Merge changes I623e2983,I8b95e020 

* changes:
  Fix comments from aosp/1455975
  Manage VPN legacy state separately from NetworkInfo
parents 39c6068c e7f602e3

core/java/com/android/internal/net/LegacyVpnInfo.java

+3 −4
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ public class LegacyVpnInfo implements Parcelable { 
     * Return best matching {@link LegacyVpnInfo} state based on given

     * {@link NetworkInfo}.

     */

    public static int stateFromNetworkInfo(NetworkInfo info) {

        switch (info.getDetailedState()) {

    public static int stateFromNetworkInfo(NetworkInfo.DetailedState state) {

        switch (state) {

            case CONNECTING:

                return STATE_CONNECTING;

            case CONNECTED:
@@ -94,8 +94,7 @@ public class LegacyVpnInfo implements Parcelable { 
            case FAILED:

                return STATE_FAILED;

            default:

                Log.w(TAG, "Unhandled state " + info.getDetailedState()

                        + " ; treating as disconnected");

                Log.w(TAG, "Unhandled state " + state + " ; treating as disconnected");

                return STATE_DISCONNECTED;

        }

    }

services/core/java/com/android/server/connectivity/Vpn.java

+5 −1
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ public class Vpn { 
    private final Context mContext;

    @VisibleForTesting final Dependencies mDeps;

    private final NetworkInfo mNetworkInfo;

    private int mLegacyState;

    @VisibleForTesting protected String mPackage;

    private int mOwnerUID;

    private boolean mIsPackageTargetingAtLeastQ;
@@ -415,6 +416,7 @@ public class Vpn { 
            Log.wtf(TAG, "Problem registering observer", e);

        }



        mLegacyState = LegacyVpnInfo.STATE_DISCONNECTED;

        mNetworkInfo = new NetworkInfo(ConnectivityManager.TYPE_VPN, 0 /* subtype */, NETWORKTYPE,

                "" /* subtypeName */);

        mNetworkCapabilities = new NetworkCapabilities();
@@ -440,6 +442,7 @@ public class Vpn { 
    @VisibleForTesting

    protected void updateState(DetailedState detailedState, String reason) {

        if (LOGD) Log.d(TAG, "setting state=" + detailedState + ", reason=" + reason);

        mLegacyState = LegacyVpnInfo.stateFromNetworkInfo(detailedState);

        mNetworkInfo.setDetailedState(detailedState, reason, null);

        if (mNetworkAgent != null) {

            mNetworkAgent.sendNetworkInfo(mNetworkInfo);
@@ -1243,6 +1246,7 @@ public class Vpn { 
        // behaves the same as when it uses the default network.

        mNetworkCapabilities.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);



        mLegacyState = LegacyVpnInfo.STATE_CONNECTING;

        mNetworkInfo.setDetailedState(DetailedState.CONNECTING, null, null);



        NetworkAgentConfig networkAgentConfig = new NetworkAgentConfig();
@@ -2265,7 +2269,7 @@ public class Vpn { 


        final LegacyVpnInfo info = new LegacyVpnInfo();

        info.key = mConfig.user;

        info.state = LegacyVpnInfo.stateFromNetworkInfo(mNetworkInfo);

        info.state = mLegacyState;

        if (mNetworkInfo.isConnected()) {

            info.intent = mStatusIntent;

        }