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

Commit f23b896c authored by Tyler Gunn's avatar Tyler Gunn Committed by android-build-merger
Browse files

Merge "Update API docs for TelecomManager#endCall." into qt-dev am: 7aefafff 

am: 04747af6

Change-Id: I6365dd6793277e9f13d606690b77e7151abd602b
parents 2ef581e5 04747af6

telecomm/java/android/telecom/TelecomManager.java

+3 −2
Original line number Diff line number Diff line
@@ -1451,6 +1451,9 @@ public class TelecomManager { 
     * foreground call is ended.

     * <p>

     * Requires permission {@link android.Manifest.permission#ANSWER_PHONE_CALLS}.

     * <p>

     * Note: this method CANNOT be used to end ongoing emergency calls and will return {@code false}

     * if an attempt is made to end an emergency call.

     *

     * @return {@code true} if there is a call which will be rejected or terminated, {@code false}

     * otherwise.
@@ -1458,8 +1461,6 @@ public class TelecomManager { 
     * instead.  Apps performing call screening should use the {@link CallScreeningService} API

     * instead.

     */





    @RequiresPermission(Manifest.permission.ANSWER_PHONE_CALLS)

    @Deprecated

    public boolean endCall() {