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

Commit e661ebe8 authored by Tyler Gunn's avatar Tyler Gunn Committed by Automerger Merge Worker
Browse files

Merge "Deprecate EXTRA_CLEAR_MISSED_CALLS_INTENT." am: f2c06577 am:... 

Merge "Deprecate EXTRA_CLEAR_MISSED_CALLS_INTENT." am: f2c06577 am: 29bd3c43 am: 63c581a3 am: ed96b9ef

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2461894



Change-Id: I9137ee513e93264afb936377df8979622bd0bdaa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 64230cc1 ed96b9ef

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -13791,7 +13791,7 @@ package android.telecom { 
    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";

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

    field public static final String EXTRA_CONNECTION_SERVICE = "android.telecom.extra.CONNECTION_SERVICE";

    field public static final String EXTRA_CURRENT_TTY_MODE = "android.telecom.extra.CURRENT_TTY_MODE";

    field public static final String EXTRA_IS_USER_INTENT_EMERGENCY_CALL = "android.telecom.extra.IS_USER_INTENT_EMERGENCY_CALL";

telecomm/java/android/telecom/TelecomManager.java

+8 −3
Original line number Diff line number Diff line
@@ -895,9 +895,13 @@ public class TelecomManager { 
            "android.telecom.extra.NOTIFICATION_PHONE_NUMBER";



    /**

     * The intent to clear missed calls.

     * Included in the extras of the {@link #ACTION_SHOW_MISSED_CALLS_NOTIFICATION}, provides a

     * pending intent which can be used to clear the missed calls notification and mark unread

     * missed call log entries as read.

     * @hide

     * @deprecated Use {@link #cancelMissedCallsNotification()} instead.

     */

    @Deprecated

    @SystemApi

    public static final String EXTRA_CLEAR_MISSED_CALLS_INTENT =

            "android.telecom.extra.CLEAR_MISSED_CALLS_INTENT";
@@ -2262,9 +2266,10 @@ public class TelecomManager { 
    }



    /**

     * Removes the missed-call notification if one is present.

     * Removes the missed-call notification if one is present and marks missed calls in the call

     * log as read.

     * <p>

     * Requires that the method-caller be set as the system dialer app.

     * Requires that the method-caller be set as the default dialer app.

     * </p>

     */

    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)