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

Commit 9d59bdfd authored by Jack Yu's avatar Jack Yu
Browse files

Partial refactoring telephony network factory test cases 

Avoid passing DcTracker into telephony network factory's
constructor. This is the preliminary step for multiple
DcTrackers support.

Also partially refactored the telephony network
factory unit test so it adapts the existing telephony
test infrastructure.

Test: Manual + unit tests
Bug: 73659459
Merged-In: Ib8ac989ed521254f08c9ced9f2b12fbafd97579f
Change-Id: Ib8ac989ed521254f08c9ced9f2b12fbafd97579f
(cherry picked from commit 6d030fc8)
parent 0a453fdc

src/java/com/android/internal/telephony/PhoneFactory.java

+1 −2
Original line number Diff line number Diff line
@@ -259,8 +259,7 @@ public class PhoneFactory { 
                sTelephonyNetworkFactories = new TelephonyNetworkFactory[numPhones];

                for (int i = 0; i < numPhones; i++) {

                    sTelephonyNetworkFactories[i] = new TelephonyNetworkFactory(

                            sPhoneSwitcher, sc, sSubscriptionMonitor, Looper.myLooper(),

                            sContext, i, sPhones[i].mDcTracker);

                            sSubscriptionMonitor, Looper.myLooper(), sPhones[i]);

                }

            }

        }

src/java/com/android/internal/telephony/dataconnection/TelephonyNetworkFactory.java

+19 −16
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.internal.telephony.dataconnection; 


import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID;



import android.content.Context;

import android.net.NetworkCapabilities;

import android.net.NetworkFactory;

import android.net.NetworkRequest;
@@ -29,6 +28,7 @@ import android.os.Message; 
import android.telephony.Rlog;

import android.util.LocalLog;



import com.android.internal.telephony.Phone;

import com.android.internal.telephony.PhoneSwitcher;

import com.android.internal.telephony.SubscriptionController;

import com.android.internal.telephony.SubscriptionMonitor;
@@ -52,7 +52,7 @@ public class TelephonyNetworkFactory extends NetworkFactory { 
    private final HashMap<NetworkRequest, LocalLog> mSpecificRequests =

            new HashMap<NetworkRequest, LocalLog>();



    private final int mPhoneId;

    private final Phone mPhone;

    // Only when this network factory is active, it will apply any network requests.

    private boolean mIsActive;

    // Whether this network factory is active and should handle default network requests.
@@ -68,28 +68,29 @@ public class TelephonyNetworkFactory extends NetworkFactory { 
    private static final int EVENT_NETWORK_REQUEST              = 3;

    private static final int EVENT_NETWORK_RELEASE              = 4;



    public TelephonyNetworkFactory(PhoneSwitcher phoneSwitcher,

            SubscriptionController subscriptionController, SubscriptionMonitor subscriptionMonitor,

            Looper looper, Context context, int phoneId, DcTracker dcTracker) {

        super(looper, context, "TelephonyNetworkFactory[" + phoneId + "]", null);

    public TelephonyNetworkFactory(SubscriptionMonitor subscriptionMonitor, Looper looper,

                                   Phone phone) {

        super(looper, phone.getContext(), "TelephonyNetworkFactory[" + phone.getPhoneId()

                + "]", null);

        mPhone = phone;

        mInternalHandler = new InternalHandler(looper);



        setCapabilityFilter(makeNetworkFilter(subscriptionController, phoneId));

        mSubscriptionController = SubscriptionController.getInstance();



        setCapabilityFilter(makeNetworkFilter(mSubscriptionController, mPhone.getPhoneId()));

        setScoreFilter(TELEPHONY_NETWORK_SCORE);



        mPhoneSwitcher = phoneSwitcher;

        mSubscriptionController = subscriptionController;

        mPhoneSwitcher = PhoneSwitcher.getInstance();

        mSubscriptionMonitor = subscriptionMonitor;

        mPhoneId = phoneId;

        LOG_TAG = "TelephonyNetworkFactory[" + phoneId + "]";

        mDcTracker = dcTracker;

        LOG_TAG = "TelephonyNetworkFactory[" + mPhone.getPhoneId() + "]";

        mDcTracker = mPhone.mDcTracker;



        mIsActive = false;

        mPhoneSwitcher.registerForActivePhoneSwitch(mInternalHandler, EVENT_ACTIVE_PHONE_SWITCH,

                null);



        mSubscriptionId = INVALID_SUBSCRIPTION_ID;

        mSubscriptionMonitor.registerForSubscriptionChanged(mPhoneId, mInternalHandler,

        mSubscriptionMonitor.registerForSubscriptionChanged(mPhone.getPhoneId(), mInternalHandler,

                EVENT_SUBSCRIPTION_CHANGED, null);



        mIsActiveForDefault = false;
@@ -183,9 +184,10 @@ public class TelephonyNetworkFactory extends NetworkFactory { 


    // apply or revoke requests if our active-ness changes

    private void onActivePhoneSwitch() {

        final boolean newIsActive = mPhoneSwitcher.shouldApplySpecifiedRequests(mPhoneId);

        final boolean newIsActive = mPhoneSwitcher.shouldApplySpecifiedRequests(

                mPhone.getPhoneId());

        final boolean newIsActiveForDefault =

                mPhoneSwitcher.shouldApplyUnspecifiedRequests(mPhoneId);

                mPhoneSwitcher.shouldApplyUnspecifiedRequests(mPhone.getPhoneId());



        String logString = "onActivePhoneSwitch(newIsActive " + newIsActive + ", "

                + "newIsActiveForDefault " + newIsActiveForDefault + ")";
@@ -202,7 +204,8 @@ public class TelephonyNetworkFactory extends NetworkFactory { 
    // watch for phone->subId changes, reapply new filter and let

    // that flow through to apply/revoke of requests

    private void onSubIdChange() {

        final int newSubscriptionId = mSubscriptionController.getSubIdUsingPhoneId(mPhoneId);

        final int newSubscriptionId = mSubscriptionController.getSubIdUsingPhoneId(

                mPhone.getPhoneId());

        if (mSubscriptionId != newSubscriptionId) {

            if (DBG) log("onSubIdChange " + mSubscriptionId + "->" + newSubscriptionId);

            mSubscriptionId = newSubscriptionId;