Merge "Send callback if CDMA is not supported in call forwarding/waiting functions" am: 85f5ae015b (4f5a8fac) · Commits · e / os / android_frameworks_opt_telephony

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -2054,6 +2054,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();
		}
		}

		@@ -2105,6 +2108,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();
		}
		}

		@@ -2231,6 +2237,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();
		}
		}