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

Commit 251ef71f authored by Hunsuk Choi's avatar Hunsuk Choi Committed by Android (Google) Code Review
Browse files

Merge "Implement onTriggerEpsFallback."

parents b4d3a515 81ac5f5b

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

+2 −1
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ import android.telephony.TelephonyManager; 
import android.telephony.TelephonyManager.HalService;

import android.telephony.emergency.EmergencyNumber;

import android.telephony.ims.RegistrationManager;

import android.telephony.ims.feature.MmTelFeature;

import android.telephony.ims.stub.ImsRegistrationImplBase;

import android.text.TextUtils;

import android.util.LocalLog;
@@ -4929,7 +4930,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
     * @param reason specifies the reason for EPS fallback.

     * @param response is callback message.

     */

    public void triggerEpsFallback(int reason, Message response) {

    public void triggerEpsFallback(@MmTelFeature.EpsFallbackReason int reason, Message response) {

        mCi.triggerEpsFallback(reason, response);

    }

src/java/com/android/internal/telephony/imsphone/ImsPhone.java

+2 −1
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ import android.telephony.ims.ImsRegistrationAttributes; 
import android.telephony.ims.ImsSsData;

import android.telephony.ims.ImsSsInfo;

import android.telephony.ims.RegistrationManager;

import android.telephony.ims.feature.MmTelFeature;

import android.telephony.ims.stub.ImsRegistrationImplBase;

import android.telephony.ims.stub.ImsUtImplBase;

import android.text.TextUtils;
@@ -2743,7 +2744,7 @@ public class ImsPhone extends ImsPhoneBase { 
    }



    @Override

    public void triggerEpsFallback(int reason, Message response) {

    public void triggerEpsFallback(@MmTelFeature.EpsFallbackReason int reason, Message response) {

        mDefaultPhone.triggerEpsFallback(reason, response);

    }

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+8 −0
Original line number Diff line number Diff line
@@ -393,6 +393,14 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
            }, mExecutor);

        }



        @Override

        public void onTriggerEpsFallback(@MmTelFeature.EpsFallbackReason int reason) {

            TelephonyUtils.runWithCleanCallingIdentity(()-> {

                if (DBG) log("onTriggerEpsFallback reason=" + reason);

                mPhone.triggerEpsFallback(reason, null);

            }, mExecutor);

        }



        /**

         * Schedule the given Runnable on mExecutor and block this thread until it finishes.

         * @param r The Runnable to run.