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

Commit db6ca772 authored by Brad Ebinger's avatar Brad Ebinger Committed by Automerger Merge Worker
Browse files

Merge "Fix CDMA dial commands for call waiting." into sc-dev am: 8b5a71d7 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/14968652

Change-Id: I1342fa304e0f0eda2bdde63c1ed868ed00a0d477
parents a023e018 8b5a71d7

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

+4 −2
Original line number Diff line number Diff line
@@ -2301,7 +2301,8 @@ public class GsmCdmaPhone extends Phone { 
            extras.putParcelable(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE, phoneAccountHandle);



            final TelecomManager telecomManager = TelecomManager.from(mContext);

            telecomManager.placeCall(Uri.parse(PhoneAccount.SCHEME_TEL + cfNumber), extras);

            telecomManager.placeCall(

                    Uri.fromParts(PhoneAccount.SCHEME_TEL, cfNumber, null), extras);



            AsyncResult.forMessage(onComplete, CommandsInterface.SS_STATUS_UNKNOWN, null);

            onComplete.sendToTarget();
@@ -2466,7 +2467,8 @@ public class GsmCdmaPhone extends Phone { 
            extras.putParcelable(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE, phoneAccountHandle);



            final TelecomManager telecomManager = TelecomManager.from(mContext);

            telecomManager.placeCall(Uri.parse(PhoneAccount.SCHEME_TEL + cwPrefix), extras);

            telecomManager.placeCall(

                    Uri.fromParts(PhoneAccount.SCHEME_TEL, cwPrefix, null), extras);



            AsyncResult.forMessage(onComplete, CommandsInterface.SS_STATUS_UNKNOWN, null);

            onComplete.sendToTarget();