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

Commit 8344229d authored by Taesu Lee's avatar Taesu Lee Committed by Brad Ebinger
Browse files

Get IMS reg and SMS format from IMS Service instead 



Get SMS capability and format on IMS via IMS Service if available.

Bug: 155027763
Test: Manual

Signed-off-by: default avatarTaesu Lee <taesu82.lee@samsung.com>
Merged-In: I3e303290e664ab7ed95634e5ba0854d8fcc4e618
Change-Id: I3e303290e664ab7ed95634e5ba0854d8fcc4e618
parent 65dfd4cf

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

+15 −3
Original line number Diff line number Diff line
@@ -510,12 +510,24 @@ public class SmsDispatchersController extends Handler { 
        dispatcher.sendSms(tracker);

    }



    /**

     * SMS over IMS is supported if IMS is registered and SMS is supported on IMS.

     *

     * @return true if SMS over IMS is supported via an IMS Service or mIms is true for the older

     *         implementation. Otherwise, false.

     */

    public boolean isIms() {

        return mIms;

        return mImsSmsDispatcher.isAvailable() ? true : mIms;

    }



    /**

     * Gets SMS format supported on IMS.

     *

     * @return the SMS format from an IMS Service if available. Otherwise, mImsSmsFormat for the

     *         older implementation.

     */

    public String getImsSmsFormat() {

        return mImsSmsFormat;

        return mImsSmsDispatcher.isAvailable() ? mImsSmsDispatcher.getFormat() : mImsSmsFormat;

    }



    /**
@@ -531,7 +543,7 @@ public class SmsDispatchersController extends Handler { 
            return (PhoneConstants.PHONE_TYPE_CDMA == mPhone.getPhoneType());

        }

        // IMS is registered with SMS support

        return isCdmaFormat(mImsSmsFormat);

        return isCdmaFormat(getImsSmsFormat());

    }



    /**