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

Commit 8ae81841 authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Set underlying networks into NetworkCapabilities directly" am:... 

Merge "Set underlying networks into NetworkCapabilities directly" am: 528c63e5 am: 8e0a1d95 am: df78a4ec am: 24e87feb am: 9fc58226

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1829954

Change-Id: I111a001fb2ae0b35de32bc37ca954c6b7925d946
parents 0843fc9b 9fc58226

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -1270,6 +1270,9 @@ public class Vpn { 
            capsBuilder.addCapability(NET_CAPABILITY_NOT_METERED);

            capsBuilder.addCapability(NET_CAPABILITY_NOT_METERED);

        }

        }





        capsBuilder.setUnderlyingNetworks((mConfig.underlyingNetworks != null)

                ? Arrays.asList(mConfig.underlyingNetworks) : null);



        mNetworkCapabilities = capsBuilder.build();

        mNetworkCapabilities = capsBuilder.build();

        mNetworkAgent = new NetworkAgent(mContext, mLooper, NETWORKTYPE /* logtag */,

        mNetworkAgent = new NetworkAgent(mContext, mLooper, NETWORKTYPE /* logtag */,

                mNetworkCapabilities, lp,

                mNetworkCapabilities, lp,
@@ -1290,8 +1293,6 @@ public class Vpn { 
        } finally {

        } finally {

            Binder.restoreCallingIdentity(token);

            Binder.restoreCallingIdentity(token);

        }

        }

        mNetworkAgent.setUnderlyingNetworks((mConfig.underlyingNetworks != null)

                ? Arrays.asList(mConfig.underlyingNetworks) : null);

        updateState(DetailedState.CONNECTED, "agentConnect");

        updateState(DetailedState.CONNECTED, "agentConnect");

    }

    }