Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix some javadocs" into master-nova

Browse Source
This commit is contained in:
Evan Charlton
2014-02-21 22:12:09 +00:00
committed by Android (Google) Code Review
parent d7f20e9823 832ddb3fe6
commit 7413c7a231
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
telecomm/java/android/telecomm/CallService.java
View File

@@ -29,7 +29,7 @@ import com.android.internal.os.SomeArgs;
* in-call UI. CallService is a one-way service from the framework's CallsManager to any app
* that would like to provide calls managed by the default system in-call user interface.
* When the service is bound by the framework, CallsManager will call setCallServiceAdapter
* which will provide CallService with an instance of {@link CallServiceAdapter} to be used
* which will provide CallService with an instance of {@link ICallServiceAdapter} to be used
* for communicating back to CallsManager. Subsequently, more specific methods of the service
* will be called to perform various call actions including making an outgoing call and
* disconnected existing calls.
@@ -168,8 +168,8 @@ public abstract class CallService extends Service {
* SIP address, or some other kind of user ID. Note that the set of handle types is
* dynamically extensible since call providers should be able to implement arbitrary
* handle-calling systems. See {@link #isCompatibleWith}. It is expected that the
* call service respond via {@link ICallServiceAdapter#handleIncomingCall} if it can
* successfully make the call.
* call service respond via {@link ICallServiceAdapter#handleSuccessfulOutgoingCall(String)}
* if it can successfully make the call.
*
* @param callInfo The details of the relevant call.
*/

4
telecomm/java/android/telecomm/ICallService.aidl
View File

@@ -59,8 +59,8 @@ oneway interface ICallService {
* SIP address, or some other kind of user ID. Note that the set of handle types is
* dynamically extensible since call providers should be able to implement arbitrary
* handle-calling systems. See {@link #isCompatibleWith}. It is expected that the
* call service respond via {@link ICallServiceAdapter#newOutgoingCall} if it can successfully
* make the call.
* call service respond via {@link ICallServiceAdapter#handleSuccessfulOutgoingCall} if it can
* successfully make the call.
* TODO(santoscordon): Figure out how a calls service can short-circuit a failure to
* the adapter.
*

2
telecomm/java/android/telecomm/TelecommConstants.java
View File

@@ -27,7 +27,7 @@ public final class TelecommConstants {
* and bind to the appropriate {@link android.telecomm.CallService} which Telecomm will
* ultimately use to control and get information about the call.</p>
*
* <p>Input: get*Extra field {@link #EXTRA_CALL_SERVICE} contains the component name
* <p>Input: get*Extra field {@link #EXTRA_CALL_SERVICE_DESCRIPTOR} contains the component name
* of the {@link android.telecomm.CallService} that Telecomm should bind to. Telecomm will then
* ask the call service for more information about the call prior to showing any UI.
*