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

Commit d57881db authored by Yan Yan's avatar Yan Yan Committed by Automerger Merge Worker
Browse files

Merge "Rename UnderlyingNetworkTracker to UnderlyingNetworkController" am: f249e691 

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

Change-Id: I7ac258ca0cbde70cb1c739c01772ce5ae6707d0d
parents 45e2ad02 f249e691

services/core/java/com/android/server/VcnManagementService.java

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ import java.util.concurrent.TimeUnit; 
 *                      |                     or its properties

 *                      v                              |

 * +-----------------------------------------------------------------------+

 * |                       UnderlyingNetworkTracker                        |

 * |                       UnderlyingNetworkController                     |

 * |                                                                       |

 * | Manages lifecycle of underlying physical networks, filing requests to |

 * | bring them up, and releasing them as they become no longer necessary  |

services/core/java/com/android/server/vcn/VcnGatewayConnection.java

+25 −23
Original line number Diff line number Diff line
@@ -87,9 +87,10 @@ import com.android.internal.util.State; 
import com.android.internal.util.StateMachine;

import com.android.internal.util.WakeupMessage;

import com.android.server.vcn.TelephonySubscriptionTracker.TelephonySubscriptionSnapshot;

import com.android.server.vcn.UnderlyingNetworkTracker.UnderlyingNetworkRecord;

import com.android.server.vcn.UnderlyingNetworkTracker.UnderlyingNetworkTrackerCallback;

import com.android.server.vcn.Vcn.VcnGatewayStatusCallback;

import com.android.server.vcn.routeselection.UnderlyingNetworkController;

import com.android.server.vcn.routeselection.UnderlyingNetworkController.UnderlyingNetworkControllerCallback;

import com.android.server.vcn.routeselection.UnderlyingNetworkController.UnderlyingNetworkRecord;

import com.android.server.vcn.util.LogUtils;

import com.android.server.vcn.util.MtuUtils;

import com.android.server.vcn.util.OneWayBoolean;
@@ -201,7 +202,7 @@ public class VcnGatewayConnection extends StateMachine { 
    private interface EventInfo {}



    /**

     * Sent when there are changes to the underlying network (per the UnderlyingNetworkTracker).

     * Sent when there are changes to the underlying network (per the UnderlyingNetworkController).

     *

     * <p>May indicate an entirely new underlying network, OR a change in network properties.

     *
@@ -522,11 +523,14 @@ public class VcnGatewayConnection extends StateMachine { 


    @NonNull private final VcnContext mVcnContext;

    @NonNull private final ParcelUuid mSubscriptionGroup;

    @NonNull private final UnderlyingNetworkTracker mUnderlyingNetworkTracker;

    @NonNull private final UnderlyingNetworkController mUnderlyingNetworkController;

    @NonNull private final VcnGatewayConnectionConfig mConnectionConfig;

    @NonNull private final VcnGatewayStatusCallback mGatewayStatusCallback;

    @NonNull private final Dependencies mDeps;

    @NonNull private final VcnUnderlyingNetworkTrackerCallback mUnderlyingNetworkTrackerCallback;



    @NonNull

    private final VcnUnderlyingNetworkControllerCallback mUnderlyingNetworkControllerCallback;



    private final boolean mIsMobileDataEnabled;



    @NonNull private final IpSecManager mIpSecManager;
@@ -674,17 +678,17 @@ public class VcnGatewayConnection extends StateMachine { 


        mLastSnapshot = Objects.requireNonNull(snapshot, "Missing snapshot");



        mUnderlyingNetworkTrackerCallback = new VcnUnderlyingNetworkTrackerCallback();

        mUnderlyingNetworkControllerCallback = new VcnUnderlyingNetworkControllerCallback();



        mWakeLock =

                mDeps.newWakeLock(mVcnContext.getContext(), PowerManager.PARTIAL_WAKE_LOCK, TAG);



        mUnderlyingNetworkTracker =

                mDeps.newUnderlyingNetworkTracker(

        mUnderlyingNetworkController =

                mDeps.newUnderlyingNetworkController(

                        mVcnContext,

                        subscriptionGroup,

                        mLastSnapshot,

                        mUnderlyingNetworkTrackerCallback);

                        mUnderlyingNetworkControllerCallback);

        mIpSecManager = mVcnContext.getContext().getSystemService(IpSecManager.class);



        addState(mDisconnectedState);
@@ -748,7 +752,7 @@ public class VcnGatewayConnection extends StateMachine { 
        cancelRetryTimeoutAlarm();

        cancelSafeModeAlarm();



        mUnderlyingNetworkTracker.teardown();

        mUnderlyingNetworkController.teardown();



        mGatewayStatusCallback.onQuit();

    }
@@ -764,12 +768,13 @@ public class VcnGatewayConnection extends StateMachine { 
        mVcnContext.ensureRunningOnLooperThread();



        mLastSnapshot = snapshot;

        mUnderlyingNetworkTracker.updateSubscriptionSnapshot(mLastSnapshot);

        mUnderlyingNetworkController.updateSubscriptionSnapshot(mLastSnapshot);



        sendMessageAndAcquireWakeLock(EVENT_SUBSCRIPTIONS_CHANGED, TOKEN_ALL);

    }



    private class VcnUnderlyingNetworkTrackerCallback implements UnderlyingNetworkTrackerCallback {

    private class VcnUnderlyingNetworkControllerCallback

            implements UnderlyingNetworkControllerCallback {

        @Override

        public void onSelectedUnderlyingNetworkChanged(

                @Nullable UnderlyingNetworkRecord underlying) {
@@ -2264,7 +2269,7 @@ public class VcnGatewayConnection extends StateMachine { 
                        + (mNetworkAgent == null ? null : mNetworkAgent.getNetwork()));

        pw.println();



        mUnderlyingNetworkTracker.dump(pw);

        mUnderlyingNetworkController.dump(pw);

        pw.println();



        pw.decreaseIndent();
@@ -2276,8 +2281,8 @@ public class VcnGatewayConnection extends StateMachine { 
    }



    @VisibleForTesting(visibility = Visibility.PRIVATE)

    UnderlyingNetworkTrackerCallback getUnderlyingNetworkTrackerCallback() {

        return mUnderlyingNetworkTrackerCallback;

    UnderlyingNetworkControllerCallback getUnderlyingNetworkControllerCallback() {

        return mUnderlyingNetworkControllerCallback;

    }



    @VisibleForTesting(visibility = Visibility.PRIVATE)
@@ -2356,17 +2361,14 @@ public class VcnGatewayConnection extends StateMachine { 
    /** External dependencies used by VcnGatewayConnection, for injection in tests */

    @VisibleForTesting(visibility = Visibility.PRIVATE)

    public static class Dependencies {

        /** Builds a new UnderlyingNetworkTracker. */

        public UnderlyingNetworkTracker newUnderlyingNetworkTracker(

        /** Builds a new UnderlyingNetworkController. */

        public UnderlyingNetworkController newUnderlyingNetworkController(

                VcnContext vcnContext,

                ParcelUuid subscriptionGroup,

                TelephonySubscriptionSnapshot snapshot,

                UnderlyingNetworkTrackerCallback callback) {

            return new UnderlyingNetworkTracker(

                    vcnContext,

                    subscriptionGroup,

                    snapshot,

                    callback);

                UnderlyingNetworkControllerCallback callback) {

            return new UnderlyingNetworkController(

                    vcnContext, subscriptionGroup, snapshot, callback);

        }



        /** Builds a new IkeSession. */

services/core/java/com/android/server/vcn/UnderlyingNetworkTracker.java→services/core/java/com/android/server/vcn/routeselection/UnderlyingNetworkController.java

+20 −19
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.server.vcn;

package com.android.server.vcn.routeselection;



import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;

import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
@@ -48,6 +48,7 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.annotations.VisibleForTesting.Visibility;

import com.android.internal.util.IndentingPrintWriter;

import com.android.server.vcn.TelephonySubscriptionTracker.TelephonySubscriptionSnapshot;

import com.android.server.vcn.VcnContext;



import java.util.ArrayList;

import java.util.Collections;
@@ -61,14 +62,14 @@ import java.util.TreeSet; 
/**

 * Tracks a set of Networks underpinning a VcnGatewayConnection.

 *

 * <p>A single UnderlyingNetworkTracker is built to serve a SINGLE VCN Gateway Connection, and MUST

 * be torn down with the VcnGatewayConnection in order to ensure underlying networks are allowed to

 * be reaped.

 * <p>A single UnderlyingNetworkController is built to serve a SINGLE VCN Gateway Connection, and

 * MUST be torn down with the VcnGatewayConnection in order to ensure underlying networks are

 * allowed to be reaped.

 *

 * @hide

 */

public class UnderlyingNetworkTracker {

    @NonNull private static final String TAG = UnderlyingNetworkTracker.class.getSimpleName();

public class UnderlyingNetworkController {

    @NonNull private static final String TAG = UnderlyingNetworkController.class.getSimpleName();



    /**

     * Minimum signal strength for a WiFi network to be eligible for switching to
@@ -122,7 +123,7 @@ public class UnderlyingNetworkTracker { 


    @NonNull private final VcnContext mVcnContext;

    @NonNull private final ParcelUuid mSubscriptionGroup;

    @NonNull private final UnderlyingNetworkTrackerCallback mCb;

    @NonNull private final UnderlyingNetworkControllerCallback mCb;

    @NonNull private final Dependencies mDeps;

    @NonNull private final Handler mHandler;

    @NonNull private final ConnectivityManager mConnectivityManager;
@@ -142,11 +143,11 @@ public class UnderlyingNetworkTracker { 
    @Nullable private UnderlyingNetworkRecord mCurrentRecord;

    @Nullable private UnderlyingNetworkRecord.Builder mRecordInProgress;



    public UnderlyingNetworkTracker(

    public UnderlyingNetworkController(

            @NonNull VcnContext vcnContext,

            @NonNull ParcelUuid subscriptionGroup,

            @NonNull TelephonySubscriptionSnapshot snapshot,

            @NonNull UnderlyingNetworkTrackerCallback cb) {

            @NonNull UnderlyingNetworkControllerCallback cb) {

        this(

                vcnContext,

                subscriptionGroup,
@@ -155,11 +156,11 @@ public class UnderlyingNetworkTracker { 
                new Dependencies());

    }



    private UnderlyingNetworkTracker(

    private UnderlyingNetworkController(

            @NonNull VcnContext vcnContext,

            @NonNull ParcelUuid subscriptionGroup,

            @NonNull TelephonySubscriptionSnapshot snapshot,

            @NonNull UnderlyingNetworkTrackerCallback cb,

            @NonNull UnderlyingNetworkControllerCallback cb,

            @NonNull Dependencies deps) {

        mVcnContext = Objects.requireNonNull(vcnContext, "Missing vcnContext");

        mSubscriptionGroup = Objects.requireNonNull(subscriptionGroup, "Missing subscriptionGroup");
@@ -271,8 +272,8 @@ public class UnderlyingNetworkTracker { 
     * subscription group, while the VCN networks are excluded by virtue of not having subIds set on

     * the VCN-exposed networks.

     *

     * <p>If the VCN that this UnderlyingNetworkTracker belongs to is in test-mode, this will return

     * a NetworkRequest that only matches Test Networks.

     * <p>If the VCN that this UnderlyingNetworkController belongs to is in test-mode, this will

     * return a NetworkRequest that only matches Test Networks.

     */

    private NetworkRequest getRouteSelectionRequest() {

        if (mVcnContext.isInTestMode()) {
@@ -373,9 +374,9 @@ public class UnderlyingNetworkTracker { 
    }



    /**

     * Update this UnderlyingNetworkTracker's TelephonySubscriptionSnapshot.

     * Update this UnderlyingNetworkController's TelephonySubscriptionSnapshot.

     *

     * <p>Updating the TelephonySubscriptionSnapshot will cause this UnderlyingNetworkTracker to

     * <p>Updating the TelephonySubscriptionSnapshot will cause this UnderlyingNetworkController to

     * reevaluate its NetworkBringupCallbacks. This may result in NetworkRequests being registered

     * or unregistered if the subIds mapped to the this Tracker's SubscriptionGroup change.

     */
@@ -410,7 +411,7 @@ public class UnderlyingNetworkTracker { 


    private void reevaluateNetworks() {

        if (mIsQuitting || mRouteSelectionCallback == null) {

            return; // UnderlyingNetworkTracker has quit.

            return; // UnderlyingNetworkController has quit.

        }



        TreeSet<UnderlyingNetworkRecord> sorted =
@@ -572,7 +573,7 @@ public class UnderlyingNetworkTracker { 
        public final boolean isBlocked;



        @VisibleForTesting(visibility = Visibility.PRIVATE)

        UnderlyingNetworkRecord(

        public UnderlyingNetworkRecord(

                @NonNull Network network,

                @NonNull NetworkCapabilities networkCapabilities,

                @NonNull LinkProperties linkProperties,
@@ -780,7 +781,7 @@ public class UnderlyingNetworkTracker { 


    /** Dumps the state of this record for logging and debugging purposes. */

    public void dump(IndentingPrintWriter pw) {

        pw.println("UnderlyingNetworkTracker:");

        pw.println("UnderlyingNetworkController:");

        pw.increaseIndent();



        pw.println("Carrier WiFi Entry Threshold: " + getWifiEntryRssiThreshold(mCarrierConfig));
@@ -811,7 +812,7 @@ public class UnderlyingNetworkTracker { 
    }



    /** Callbacks for being notified of the changes in, or to the selected underlying network. */

    public interface UnderlyingNetworkTrackerCallback {

    public interface UnderlyingNetworkControllerCallback {

        /**

         * Fired when a new underlying network is selected, or properties have changed.

         *

tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java

+4 −4
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ public class VcnGatewayConnectionConnectedStateTest extends VcnGatewayConnection 
    @Test

    public void testNullNetworkDoesNotTriggerDisconnect() throws Exception {

        mGatewayConnection

                .getUnderlyingNetworkTrackerCallback()

                .getUnderlyingNetworkControllerCallback()

                .onSelectedUnderlyingNetworkChanged(null);

        mTestLooper.dispatchAll();
@@ -131,7 +131,7 @@ public class VcnGatewayConnectionConnectedStateTest extends VcnGatewayConnection 
    @Test

    public void testNewNetworkTriggersMigration() throws Exception {

        mGatewayConnection

                .getUnderlyingNetworkTrackerCallback()

                .getUnderlyingNetworkControllerCallback()

                .onSelectedUnderlyingNetworkChanged(TEST_UNDERLYING_NETWORK_RECORD_2);

        mTestLooper.dispatchAll();
@@ -143,7 +143,7 @@ public class VcnGatewayConnectionConnectedStateTest extends VcnGatewayConnection 
    @Test

    public void testSameNetworkDoesNotTriggerMigration() throws Exception {

        mGatewayConnection

                .getUnderlyingNetworkTrackerCallback()

                .getUnderlyingNetworkControllerCallback()

                .onSelectedUnderlyingNetworkChanged(TEST_UNDERLYING_NETWORK_RECORD_1);

        mTestLooper.dispatchAll();
@@ -203,7 +203,7 @@ public class VcnGatewayConnectionConnectedStateTest extends VcnGatewayConnection 
        triggerChildOpened();



        mGatewayConnection

                .getUnderlyingNetworkTrackerCallback()

                .getUnderlyingNetworkControllerCallback()

                .onSelectedUnderlyingNetworkChanged(TEST_UNDERLYING_NETWORK_RECORD_2);

        getChildSessionCallback()

                .onIpSecTransformsMigrated(makeDummyIpSecTransform(), makeDummyIpSecTransform());

tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectingStateTest.java

+3 −3
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public class VcnGatewayConnectionConnectingStateTest extends VcnGatewayConnectio 
    @Test

    public void testNullNetworkTriggersDisconnect() throws Exception {

        mGatewayConnection

                .getUnderlyingNetworkTrackerCallback()

                .getUnderlyingNetworkControllerCallback()

                .onSelectedUnderlyingNetworkChanged(null);

        mTestLooper.dispatchAll();
@@ -76,7 +76,7 @@ public class VcnGatewayConnectionConnectingStateTest extends VcnGatewayConnectio 
    @Test

    public void testNewNetworkTriggersReconnect() throws Exception {

        mGatewayConnection

                .getUnderlyingNetworkTrackerCallback()

                .getUnderlyingNetworkControllerCallback()

                .onSelectedUnderlyingNetworkChanged(TEST_UNDERLYING_NETWORK_RECORD_2);

        mTestLooper.dispatchAll();
@@ -89,7 +89,7 @@ public class VcnGatewayConnectionConnectingStateTest extends VcnGatewayConnectio 
    @Test

    public void testSameNetworkDoesNotTriggerReconnect() throws Exception {

        mGatewayConnection

                .getUnderlyingNetworkTrackerCallback()

                .getUnderlyingNetworkControllerCallback()

                .onSelectedUnderlyingNetworkChanged(TEST_UNDERLYING_NETWORK_RECORD_1);

        mTestLooper.dispatchAll();