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

Commit 35e2478b authored by Youming Ye's avatar Youming Ye Committed by android-build-merger
Browse files

Merge "IMS: Send call barring request over IMS only if UT is enabled" am: 910fa740 am: 62a23a7a 

am: 51f83981

Change-Id: I96d552247d9d4fe31bd08a34a7e951fe1a15d097
parents 68499fd5 51f83981

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

+2 −6
Original line number Diff line number Diff line
@@ -1878,9 +1878,7 @@ public class GsmCdmaPhone extends Phone { 
            int serviceClass) {

        if (isPhoneTypeGsm()) {

            Phone imsPhone = mImsPhone;

            if ((imsPhone != null)

                    && ((imsPhone.getServiceState().getState() == ServiceState.STATE_IN_SERVICE)

                    || imsPhone.isUtEnabled())) {

            if ((imsPhone != null) && imsPhone.isUtEnabled()) {

                imsPhone.getCallBarring(facility, password, onComplete, serviceClass);

                return;

            }
@@ -1895,9 +1893,7 @@ public class GsmCdmaPhone extends Phone { 
            Message onComplete, int serviceClass) {

        if (isPhoneTypeGsm()) {

            Phone imsPhone = mImsPhone;

            if ((imsPhone != null)

                    && ((imsPhone.getServiceState().getState() == ServiceState.STATE_IN_SERVICE)

                    || imsPhone.isUtEnabled())) {

            if ((imsPhone != null) && imsPhone.isUtEnabled()) {

                imsPhone.setCallBarring(facility, lockState, password, onComplete, serviceClass);

                return;

            }