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

Commit 9f9891b5 authored by Jack Yu's avatar Jack Yu Committed by Gerrit Code Review
Browse files

Merge changes I819fe44b,I5598acac,Ie37c67f4,I13bb6701 

* changes:
  Run embbeded subscription update in background thread
  Anomaly report only check IP on setup response
  Unregister callback on data network disconnect
  Fixed the mismatched protocol anomaly detector
parents 54740f91 7971eb24

src/java/com/android/internal/telephony/data/DataNetwork.java

+24 −11
Original line number Diff line number Diff line
@@ -549,6 +549,10 @@ public class DataNetwork extends StateMachine { 
    /** Data network controller. */

    private final @NonNull DataNetworkController mDataNetworkController;



    /** Data network controller callback. */

    private final @NonNull DataNetworkController.DataNetworkControllerCallback

            mDataNetworkControllerCallback;



    /** Data config manager. */

    private final @NonNull DataConfigManager mDataConfigManager;
@@ -885,12 +889,14 @@ public class DataNetwork extends StateMachine { 
        mAccessNetworksManager = phone.getAccessNetworksManager();

        mVcnManager = mPhone.getContext().getSystemService(VcnManager.class);

        mDataNetworkController = phone.getDataNetworkController();

        mDataNetworkController.registerDataNetworkControllerCallback(

                new DataNetworkController.DataNetworkControllerCallback(getHandler()::post) {

        mDataNetworkControllerCallback = new DataNetworkController.DataNetworkControllerCallback(

                getHandler()::post) {

            @Override

            public void onSubscriptionPlanOverride() {

                sendMessage(EVENT_SUBSCRIPTION_PLAN_OVERRIDE);

                    }});

            }};

        mDataNetworkController.registerDataNetworkControllerCallback(

                mDataNetworkControllerCallback);

        mDataConfigManager = mDataNetworkController.getDataConfigManager();

        mDataCallSessionStats = new DataCallSessionStats(mPhone);

        mDataNetworkCallback = callback;
@@ -1583,6 +1589,8 @@ public class DataNetwork extends StateMachine { 
            }

            notifyPreciseDataConnectionState();

            mNetworkAgent.unregister();

            mDataNetworkController.unregisterDataNetworkControllerCallback(

                    mDataNetworkControllerCallback);

            mDataCallSessionStats.onDataCallDisconnected(mFailCause);



            if (mTransport == AccessNetworkConstants.TRANSPORT_TYPE_WLAN
@@ -2382,7 +2390,7 @@ public class DataNetwork extends StateMachine { 
        logl("onSetupResponse: resultCode=" + DataServiceCallback.resultCodeToString(resultCode)

                + ", response=" + response);

        mFailCause = getFailCauseFromDataCallResponse(resultCode, response);

        validateDataCallResponse(response);

        validateDataCallResponse(response, true /*isSetupResponse*/);

        if (mFailCause == DataFailCause.NONE) {

            DataNetwork dataNetwork = mDataNetworkController.getDataNetworkByInterface(

                    response.getInterfaceName());
@@ -2454,8 +2462,10 @@ public class DataNetwork extends StateMachine { 
     * If the {@link DataCallResponse} contains invalid info, triggers an anomaly report.

     *

     * @param response The response to be validated

     * @param isSetupResponse {@code true} if the response is for initial data call setup

     */

    private void validateDataCallResponse(@Nullable DataCallResponse response) {

    private void validateDataCallResponse(@Nullable DataCallResponse response,

            boolean isSetupResponse) {

        if (response == null

                || response.getLinkStatus() == DataCallResponse.LINK_STATUS_INACTIVE) return;

        int failCause = response.getCause();
@@ -2475,9 +2485,12 @@ public class DataNetwork extends StateMachine { 
                reportAnomaly("Invalid DataCallResponse detected",

                        "1f273e9d-b09c-46eb-ad1c-421d01f61164");

            }

            // Check IP for initial setup response

            NetworkRegistrationInfo nri = getNetworkRegistrationInfo();

            if (mDataProfile.getApnSetting() != null && nri != null && nri.isInService()) {

                boolean isRoaming = mPhone.getServiceState().getDataRoamingFromRegistration();

            if (isSetupResponse

                    && mDataProfile.getApnSetting() != null && nri != null && nri.isInService()) {

                boolean isRoaming = nri.getNetworkRegistrationState()

                        == NetworkRegistrationInfo.REGISTRATION_STATE_ROAMING;

                int protocol = isRoaming ? mDataProfile.getApnSetting().getRoamingProtocol()

                        : mDataProfile.getApnSetting().getProtocol();

                String underlyingDataService = mTransport
@@ -2635,7 +2648,7 @@ public class DataNetwork extends StateMachine { 
        if (response != null) {

            if (!response.equals(mDataCallResponse)) {

                log("onDataStateChanged: " + response);

                validateDataCallResponse(response);

                validateDataCallResponse(response, false /*isSetupResponse*/);

                mDataCallResponse = response;

                if (response.getLinkStatus() != DataCallResponse.LINK_STATUS_INACTIVE) {

                    updateDataNetwork(response);
@@ -3213,7 +3226,7 @@ public class DataNetwork extends StateMachine { 
        logl("onHandoverResponse: resultCode=" + DataServiceCallback.resultCodeToString(resultCode)

                + ", response=" + response);

        mFailCause = getFailCauseFromDataCallResponse(resultCode, response);

        validateDataCallResponse(response);

        validateDataCallResponse(response, false /*isSetupResponse*/);

        if (mFailCause == DataFailCause.NONE) {

            // Handover succeeded.

src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java

+18 −2
Original line number Diff line number Diff line
@@ -190,10 +190,19 @@ public class SubscriptionManagerService extends ISub.Stub { 
    @Nullable

    private EuiccController mEuiccController;



    /** The main handler of subscription manager service. */

    /**

     * The main handler of subscription manager service. This is running on phone process's main

     * thread.

     */

    @NonNull

    private final Handler mHandler;



    /**

     * The background handler. This is running on a separate thread.

     */

    @NonNull

    private final Handler mBackgroundHandler;



    /** Local log for most important debug messages. */

    @NonNull

    private final LocalLog mLocalLog = new LocalLog(128);
@@ -364,6 +373,12 @@ public class SubscriptionManagerService extends ISub.Stub { 


        mUiccController = UiccController.getInstance();

        mHandler = new Handler(looper);



        HandlerThread backgroundThread = new HandlerThread(LOG_TAG);

        backgroundThread.start();



        mBackgroundHandler = new Handler(backgroundThread.getLooper());



        TelephonyServiceManager.ServiceRegisterer subscriptionServiceRegisterer =

                TelephonyFrameworkInitializer

                        .getTelephonyServiceManager()
@@ -889,7 +904,8 @@ public class SubscriptionManagerService extends ISub.Stub { 
     */

    public void updateEmbeddedSubscriptions(@NonNull List<Integer> cardIds,

            @Nullable Runnable callback) {

        mHandler.post(() -> {

        // Run this on a background thread.

        mBackgroundHandler.post(() -> {

            // Do nothing if eUICCs are disabled. (Previous entries may remain in the cache, but

            // they are filtered out of list calls as long as EuiccManager.isEnabled returns false).

            if (mEuiccManager == null || !mEuiccManager.isEnabled()) {

tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java

+1 −1
Original line number Diff line number Diff line
@@ -1137,7 +1137,7 @@ public abstract class TelephonyTest { 
     * Remove a TestableLooper from the list of monitored loopers

     * @param looper removed if it does exist

     */

    public void unmonitorTestableLooper(TestableLooper looper) {

    private void unmonitorTestableLooper(TestableLooper looper) {

        if (mTestableLoopers.contains(looper)) {

            mTestableLoopers.remove(looper);

        }

tests/telephonytests/src/com/android/internal/telephony/data/DataNetworkControllerTest.java

+19 −3
Original line number Diff line number Diff line
@@ -1205,16 +1205,32 @@ public class DataNetworkControllerTest extends TelephonyTest { 


    @Test

    public void testDataNetworkControllerCallback() throws Exception {

        Field field = DataNetworkController.class.getDeclaredField(

                "mDataNetworkControllerCallbacks");

        field.setAccessible(true);

        Set<DataNetworkControllerCallback> dataNetworkControllerCallbacks =

                (Set<DataNetworkControllerCallback>) field.get(mDataNetworkControllerUT);



        // Verify register callback

        mDataNetworkControllerUT.registerDataNetworkControllerCallback(

                mMockedDataNetworkControllerCallback);

        TelephonyNetworkRequest request = createNetworkRequest(

                NetworkCapabilities.NET_CAPABILITY_INTERNET);

        mDataNetworkControllerUT.addNetworkRequest(request);

        processAllMessages();

        testSetupDataNetwork();

        verify(mMockedDataNetworkControllerCallback).onAnyDataNetworkExistingChanged(eq(true));

        verify(mMockedDataNetworkControllerCallback).onInternetDataNetworkConnected(any());



        mDataNetworkControllerUT.unregisterDataNetworkControllerCallback(

                mMockedDataNetworkControllerCallback);

        int countOfCallbacks = dataNetworkControllerCallbacks.size();



        // Verify unregister callback

        mDataNetworkControllerUT.removeNetworkRequest(request);

        processAllMessages();

        getDataNetworks().get(0).tearDown(DataNetwork

                .TEAR_DOWN_REASON_CONNECTIVITY_SERVICE_UNWANTED);

        processAllFutureMessages();



        assertEquals(countOfCallbacks - 1, dataNetworkControllerCallbacks.size());

    }



    @Test

tests/telephonytests/src/com/android/internal/telephony/subscription/SubscriptionManagerServiceTest.java

+10 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ import android.content.pm.PackageManager; 
import android.content.res.Resources;

import android.os.Build;

import android.os.Bundle;

import android.os.Handler;

import android.os.Looper;

import android.os.ParcelUuid;

import android.os.UserHandle;
@@ -148,6 +149,8 @@ public class SubscriptionManagerServiceTest extends TelephonyTest { 
                Telephony.Carriers.CONTENT_URI.getAuthority(), mSubscriptionProvider);

        mSubscriptionManagerServiceUT = new SubscriptionManagerService(mContext, Looper.myLooper());



        monitorTestableLooper(new TestableLooper(getBackgroundHandler().getLooper()));



        doAnswer(invocation -> {

            ((Runnable) invocation.getArguments()[0]).run();

            return null;
@@ -182,6 +185,13 @@ public class SubscriptionManagerServiceTest extends TelephonyTest { 
        super.tearDown();

    }



    private Handler getBackgroundHandler() throws Exception {

        Field field = SubscriptionManagerService.class.getDeclaredField(

                "mBackgroundHandler");

        field.setAccessible(true);

        return (Handler) field.get(mSubscriptionManagerServiceUT);

    }



    /**

     * Insert the subscription info to the database.

     *