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

Commit e8f926a5 authored by Roopa Sattiraju's avatar Roopa Sattiraju Committed by Android (Google) Code Review
Browse files

Merge "Adding SystemApi for remaining Telecomm errors"

parents 33db6c5e 98c76c40

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -12235,6 +12235,7 @@ package android.telecom { 
    field public static final int CALL_SOURCE_EMERGENCY_SHORTCUT = 2; // 0x2

    field public static final int CALL_SOURCE_UNSPECIFIED = 0; // 0x0

    field public static final String EXTRA_CALL_BACK_INTENT = "android.telecom.extra.CALL_BACK_INTENT";

    field public static final String EXTRA_CALL_HAS_IN_BAND_RINGTONE = "android.telecom.extra.CALL_HAS_IN_BAND_RINGTONE";

    field public static final String EXTRA_CALL_SOURCE = "android.telecom.extra.CALL_SOURCE";

    field public static final String EXTRA_CALL_TECHNOLOGY_TYPE = "android.telecom.extra.CALL_TECHNOLOGY_TYPE";

    field public static final String EXTRA_CLEAR_MISSED_CALLS_INTENT = "android.telecom.extra.CLEAR_MISSED_CALLS_INTENT";

telecomm/java/android/telecom/TelecomManager.java

+9 −5
Original line number Diff line number Diff line
@@ -356,13 +356,17 @@ public class TelecomManager { 
            "android.telecom.extra.INCOMING_CALL_EXTRAS";



    /**

     * Optional extra for {@link #ACTION_INCOMING_CALL} containing a boolean to indicate that the

     * call has an externally generated ringer. Used by the HfpClientConnectionService when In Band

     * Ringtone is enabled to prevent two ringers from being generated.

     * Optional extra for {@link #addNewIncomingCall(PhoneAccountHandle, Bundle)} used to indicate

     * that a call has an in-band ringtone associated with it.  This is used when the device is

     * acting as an HFP headset and the Bluetooth stack has received an in-band ringtone from the

     * the HFP host which must be played instead of any local ringtone the device would otherwise

     * have generated.

     *

     * @hide

     */

    public static final String EXTRA_CALL_EXTERNAL_RINGER =

            "android.telecom.extra.CALL_EXTERNAL_RINGER";

    @SystemApi

    public static final String EXTRA_CALL_HAS_IN_BAND_RINGTONE =

            "android.telecom.extra.CALL_HAS_IN_BAND_RINGTONE";



    /**

     * Optional extra for {@link android.content.Intent#ACTION_CALL} and