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

Commit 923df3da authored by Yorke Lee's avatar Yorke Lee Committed by Android Git Automerger
Browse files

am d600966c: Merge "Make ACTION_CONNECTION_SERVICE_CONFIGURE public" into mnc-dev 

* commit 'd600966c':
  Make ACTION_CONNECTION_SERVICE_CONFIGURE public
parents a84e73a7 d600966c

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -30482,6 +30482,7 @@ package android.telecom { 
    method public void unregisterPhoneAccount(android.telecom.PhoneAccountHandle);

    field public static final java.lang.String ACTION_CHANGE_DEFAULT_DIALER = "android.telecom.action.CHANGE_DEFAULT_DIALER";

    field public static final java.lang.String ACTION_CHANGE_PHONE_ACCOUNTS = "android.telecom.action.CHANGE_PHONE_ACCOUNTS";

    field public static final java.lang.String ACTION_CONNECTION_SERVICE_CONFIGURE = "android.telecom.action.CONNECTION_SERVICE_CONFIGURE";

    field public static final java.lang.String ACTION_INCOMING_CALL = "android.telecom.action.INCOMING_CALL";

    field public static final java.lang.String ACTION_SHOW_CALL_ACCESSIBILITY_SETTINGS = "android.telecom.action.SHOW_CALL_ACCESSIBILITY_SETTINGS";

    field public static final java.lang.String ACTION_SHOW_CALL_SETTINGS = "android.telecom.action.SHOW_CALL_SETTINGS";

telecomm/java/android/telecom/TelecomManager.java

+0 −2
Original line number Diff line number Diff line
@@ -69,9 +69,7 @@ public class TelecomManager { 
    /**

     * The {@link android.content.Intent} action used to configure a

     * {@link android.telecom.ConnectionService}.

     * @hide

     */

    @SystemApi

    public static final String ACTION_CONNECTION_SERVICE_CONFIGURE =

            "android.telecom.action.CONNECTION_SERVICE_CONFIGURE";