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

Commit 5f83b3ec authored by SongFerng Wang's avatar SongFerng Wang Committed by Android (Google) Code Review
Browse files

Merge "Set call waiting function can control the service class by carrierconfig"

parents 7c8beec3 70c765cb

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

+9 −2
Original line number Diff line number Diff line
@@ -1962,8 +1962,15 @@ public class GsmCdmaPhone extends Phone { 
                imsPhone.setCallWaiting(enable, onComplete);

                return;

            }



            mCi.setCallWaiting(enable, CommandsInterface.SERVICE_CLASS_VOICE, onComplete);

            int serviceClass = CommandsInterface.SERVICE_CLASS_VOICE;

            CarrierConfigManager configManager = (CarrierConfigManager)

                    getContext().getSystemService(Context.CARRIER_CONFIG_SERVICE);

            PersistableBundle b = configManager.getConfigForSubId(getSubId());

            if (b != null) {

                serviceClass = b.getInt(CarrierConfigManager.KEY_CALL_WAITING_SERVICE_CLASS_INT,

                        CommandsInterface.SERVICE_CLASS_VOICE);

            }

            mCi.setCallWaiting(enable, serviceClass, onComplete);

        } else {

            loge("method setCallWaiting is NOT supported in CDMA without IMS!");

        }

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

+9 −1
Original line number Diff line number Diff line
@@ -988,7 +988,15 @@ public class ImsPhone extends ImsPhoneBase { 


    @Override

    public void setCallWaiting(boolean enable, Message onComplete) {

        setCallWaiting(enable, CommandsInterface.SERVICE_CLASS_VOICE, onComplete);

        int serviceClass = CommandsInterface.SERVICE_CLASS_VOICE;

        CarrierConfigManager configManager = (CarrierConfigManager)

                getContext().getSystemService(Context.CARRIER_CONFIG_SERVICE);

        PersistableBundle b = configManager.getConfigForSubId(getSubId());

        if (b != null) {

            serviceClass = b.getInt(CarrierConfigManager.KEY_CALL_WAITING_SERVICE_CLASS_INT,

                    CommandsInterface.SERVICE_CLASS_VOICE);

        }

        setCallWaiting(enable, serviceClass, onComplete);

    }



    public void setCallWaiting(boolean enable, int serviceClass, Message onComplete) {