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

Commit aec1ba04 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Handle slice config change" am: 32bad0f6 am: cb9a4b22 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2034108

Change-Id: I45f68143358e02bd5bce1123132735770b017801
parents 0fdec443 cb9a4b22

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

+2 −0
Original line number Diff line number Diff line
@@ -205,6 +205,8 @@ public class DataEvaluation { 
        DATA_HANDOVER,

        /** Preferred transport changed. */

        PREFERRED_TRANSPORT_CHANGED,

        /** Slice config changed. */

        SLICE_CONFIG_CHANGED,

    }



    /** Disallowed reasons. There could be multiple reasons if it is not allowed. */

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

+8 −0
Original line number Diff line number Diff line
@@ -187,6 +187,9 @@ public class DataNetworkController extends Handler { 
    /** Event for unmetered or congested subscription override. */

    private static final int EVENT_SUBSCRIPTION_OVERRIDE = 23;



    /** Event for slice config changed. */

    private static final int EVENT_SLICE_CONFIG_CHANGED = 24;



    /** The supported IMS features. This is for IMS graceful tear down support. */

    private static final Collection<Integer> SUPPORTED_IMS_FEATURES =

            List.of(ImsFeature.FEATURE_MMTEL, ImsFeature.FEATURE_RCS);
@@ -859,6 +862,7 @@ public class DataNetworkController extends Handler { 
            mPhone.getImsPhone().getCallTracker().registerForVoiceCallEnded(

                    this, EVENT_VOICE_CALL_ENDED, null);

        }

        mPhone.mCi.registerForSlicingConfigChanged(this, EVENT_SLICE_CONFIG_CHANGED, null);

    }



    @Override
@@ -891,6 +895,10 @@ public class DataNetworkController extends Handler { 
                sendMessage(obtainMessage(EVENT_REEVALUATE_UNSATISFIED_NETWORK_REQUESTS,

                        DataEvaluationReason.VOICE_CALL_ENDED));

                break;

            case EVENT_SLICE_CONFIG_CHANGED:

                sendMessage(obtainMessage(EVENT_REEVALUATE_UNSATISFIED_NETWORK_REQUESTS,

                        DataEvaluationReason.SLICE_CONFIG_CHANGED));

                break;

            case EVENT_PS_RESTRICT_ENABLED:

                mPsRestricted = true;

                sendMessage(obtainMessage(EVENT_REEVALUATE_EXISTING_DATA_NETWORKS,