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

Commit e7f602e3 authored by Chalard Jean's avatar Chalard Jean
Browse files

Fix comments from aosp/1455975

Test: FrameworksNetTests NetworkStackTests
Change-Id: I623e29833c22b5c8ab84a74c7f5732423f00d07c
parent 1f832406
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ public class Vpn {
    private final Context mContext;
    @VisibleForTesting final Dependencies mDeps;
    private final NetworkInfo mNetworkInfo;
    private int mLegacyState = LegacyVpnInfo.STATE_DISCONNECTED;
    private int mLegacyState;
    @VisibleForTesting protected String mPackage;
    private int mOwnerUID;
    private boolean mIsPackageTargetingAtLeastQ;
@@ -416,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();
@@ -1245,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();