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

Commit 9a79e313 authored by Ben Gilad's avatar Ben Gilad Committed by Android (Google) Code Review
Browse files

Merge "Fix broken build due to ag/428341." into master-nova

parents fa6e4e87 971e9a40

telecomm/java/android/telecomm/CallService.java

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ public abstract class CallService extends Service { 
     * abort an attempt to place a call.  Only ever be invoked after {@link #call} invocations.

     * After this is invoked, Telecomm does not expect any more updates about the call and will

     * actively ignore any such update. This is different from {@link #disconnect} where Telecomm

     * expects confirmation via {@link #markCallAsDisconnected}.

     * expects confirmation via ICallServiceAdapter.markCallAsDisconnected.

     *

     * @param callId The identifier of the call to abort.

     */

telecomm/java/android/telecomm/ICallService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ oneway interface ICallService { 
     * abort an attempt to place a call.  Only ever be invoked after {@link #call} invocations.

     * After this is invoked, Telecomm does not expect any more updates about the call and will

     * actively ignore any such update. This is different from {@link #disconnect} where Telecomm

     * expects confirmation via {@link #markCallAsDisconnected}.

     * expects confirmation via ICallServiceAdapter.markCallAsDisconnected.

     *

     * @param callId The identifier of the call to abort.

     */