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

Commit 22158e29 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Send callback if CDMA is not supported in call forwarding/waiting... 

Merge "Send callback if CDMA is not supported in call forwarding/waiting functions" into rvc-dev am: 005449a3

Change-Id: I973203d477f0bb20a2bf1864d17b51050c82f8fa
parents 4153b24d 005449a3

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

+9 −0
Original line number Diff line number Diff line
@@ -2079,6 +2079,9 @@ public class GsmCdmaPhone extends Phone { 
            }

        } else {

            loge("getCallForwardingOption: not possible in CDMA without IMS");

            AsyncResult.forMessage(onComplete, null,

                    CommandException.fromRilErrno(RILConstants.REQUEST_NOT_SUPPORTED));

            onComplete.sendToTarget();

        }

    }
@@ -2130,6 +2133,9 @@ public class GsmCdmaPhone extends Phone { 
            }

        } else {

            loge("setCallForwardingOption: not possible in CDMA without IMS");

            AsyncResult.forMessage(onComplete, null,

                    CommandException.fromRilErrno(RILConstants.REQUEST_NOT_SUPPORTED));

            onComplete.sendToTarget();

        }

    }
@@ -2256,6 +2262,9 @@ public class GsmCdmaPhone extends Phone { 
            mCi.setCallWaiting(enable, serviceClass, onComplete);

        } else {

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

            AsyncResult.forMessage(onComplete, null,

                    CommandException.fromRilErrno(RILConstants.REQUEST_NOT_SUPPORTED));

            onComplete.sendToTarget();

        }

    }