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

Commit 38f5001c authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Add extra key for app-specified outgoing call timeout" am: decc6c9d 

am: 2bc24e25

Change-Id: I1912bfa8856e78f375587d94bf589ef2fd25bee8
parents d4a84749 2bc24e25

telecomm/java/android/telecom/TelecomManager.java

+9 −0
Original line number Diff line number Diff line
@@ -316,6 +316,15 @@ public class TelecomManager { 
     */

    public static final String EXTRA_CALL_BACK_NUMBER = "android.telecom.extra.CALL_BACK_NUMBER";



    /**

     * The number of milliseconds that Telecom should wait after disconnecting a call via the

     * ACTION_NEW_OUTGOING_CALL broadcast, in order to wait for the app which cancelled the call

     * to make a new one.

     * @hide

     */

    public static final String EXTRA_NEW_OUTGOING_CALL_CANCEL_TIMEOUT =

            "android.telecom.extra.NEW_OUTGOING_CALL_CANCEL_TIMEOUT";



    /**

     * A boolean meta-data value indicating whether an {@link InCallService} implements an

     * in-call user interface. Dialer implementations (see {@link #getDefaultDialerPackage()}) which