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

Commit 3c8c8301 authored by xinhe's avatar xinhe Committed by Android Git Automerger
Browse files

am 38aacb31: Merge "Fix for CMAS is not turned on" into lmp-dev 

* commit '38aacb31':
  Fix for CMAS is not turned on
parents a6003c7f 38aacb31

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

+7 −1
Original line number Diff line number Diff line
@@ -296,7 +296,13 @@ public class UiccSmsController extends ISms.Stub { 
     * get sms interface manager object based on subscription.

     **/

    private IccSmsInterfaceManager getIccSmsInterfaceManager(long subId) {

        long phoneId = SubscriptionController.getInstance().getPhoneId(subId);

        int phoneId = SubscriptionController.getInstance().getPhoneId(subId) ;

        //Fixme: for multi-subscription case

        if (!SubscriptionManager.isValidPhoneId(phoneId)

                || phoneId == SubscriptionManager.DEFAULT_PHONE_ID) {

            phoneId = 0;

        }



        try {

            return (IccSmsInterfaceManager)

                ((PhoneProxy)mPhone[(int)phoneId]).getIccSmsInterfaceManager();