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

Commit 37653566 authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Self Managed CS Implementation 

- Add API guide for developers giving an overview of what they need
to implement.
- Add @hide setLabel method in PhoneAccount; used when registering a
self-managed CS's phone account; we override it with their app label to
ensure they don't try to give themselves another name.

Test: Unit
Bug: 34159263
Change-Id: I0c890dc2feeb3ee438a80ed425db2aaf1f4c1fdd
parent ad2e7405

api/current.txt

+3 −1
Original line number Diff line number Diff line
@@ -23815,8 +23815,8 @@ package android.net { 
    method public void reportNetworkConnectivity(android.net.Network, boolean);

    method public boolean requestBandwidthUpdate(android.net.Network);

    method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback, android.os.Handler);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback, android.os.Handler);

    method public void requestNetwork(android.net.NetworkRequest, android.app.PendingIntent);

    method public deprecated boolean requestRouteToHost(int, int);
@@ -37108,6 +37108,7 @@ package android.telecom { 
    field public static final java.lang.String EVENT_CALL_MERGE_FAILED = "android.telecom.event.CALL_MERGE_FAILED";

    field public static final java.lang.String EVENT_CALL_PULL_FAILED = "android.telecom.event.CALL_PULL_FAILED";

    field public static final java.lang.String EXTRA_ANSWERING_DROPS_FG_CALL = "android.telecom.extra.ANSWERING_DROPS_FG_CALL";

    field public static final java.lang.String EXTRA_ANSWERING_DROPS_FG_CALL_APP_NAME = "android.telecom.extra.ANSWERING_DROPS_FG_CALL_APP_NAME";

    field public static final java.lang.String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT";

    field public static final java.lang.String EXTRA_CHILD_ADDRESS = "android.telecom.extra.CHILD_ADDRESS";

    field public static final java.lang.String EXTRA_LAST_FORWARDED_NUMBER = "android.telecom.extra.LAST_FORWARDED_NUMBER";
@@ -37515,6 +37516,7 @@ package android.telecom { 
    field public static final java.lang.String EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME = "android.telecom.extra.CHANGE_DEFAULT_DIALER_PACKAGE_NAME";

    field public static final java.lang.String EXTRA_INCOMING_CALL_ADDRESS = "android.telecom.extra.INCOMING_CALL_ADDRESS";

    field public static final java.lang.String EXTRA_INCOMING_CALL_EXTRAS = "android.telecom.extra.INCOMING_CALL_EXTRAS";

    field public static final java.lang.String EXTRA_INCOMING_VIDEO_STATE = "android.telecom.extra.INCOMING_VIDEO_STATE";

    field public static final java.lang.String EXTRA_NOTIFICATION_COUNT = "android.telecom.extra.NOTIFICATION_COUNT";

    field public static final java.lang.String EXTRA_NOTIFICATION_PHONE_NUMBER = "android.telecom.extra.NOTIFICATION_PHONE_NUMBER";

    field public static final java.lang.String EXTRA_OUTGOING_CALL_EXTRAS = "android.telecom.extra.OUTGOING_CALL_EXTRAS";

api/system-current.txt

+3 −1
Original line number Diff line number Diff line
@@ -25602,8 +25602,8 @@ package android.net { 
    method public void reportNetworkConnectivity(android.net.Network, boolean);

    method public boolean requestBandwidthUpdate(android.net.Network);

    method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback, android.os.Handler);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback, android.os.Handler);

    method public void requestNetwork(android.net.NetworkRequest, android.app.PendingIntent);

    method public deprecated boolean requestRouteToHost(int, int);
@@ -40095,6 +40095,7 @@ package android.telecom { 
    field public static final java.lang.String EVENT_CALL_MERGE_FAILED = "android.telecom.event.CALL_MERGE_FAILED";

    field public static final java.lang.String EVENT_CALL_PULL_FAILED = "android.telecom.event.CALL_PULL_FAILED";

    field public static final java.lang.String EXTRA_ANSWERING_DROPS_FG_CALL = "android.telecom.extra.ANSWERING_DROPS_FG_CALL";

    field public static final java.lang.String EXTRA_ANSWERING_DROPS_FG_CALL_APP_NAME = "android.telecom.extra.ANSWERING_DROPS_FG_CALL_APP_NAME";

    field public static final java.lang.String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT";

    field public static final java.lang.String EXTRA_CHILD_ADDRESS = "android.telecom.extra.CHILD_ADDRESS";

    field public static final java.lang.String EXTRA_LAST_FORWARDED_NUMBER = "android.telecom.extra.LAST_FORWARDED_NUMBER";
@@ -40690,6 +40691,7 @@ package android.telecom { 
    field public static final java.lang.String EXTRA_CONNECTION_SERVICE = "android.telecom.extra.CONNECTION_SERVICE";

    field public static final java.lang.String EXTRA_INCOMING_CALL_ADDRESS = "android.telecom.extra.INCOMING_CALL_ADDRESS";

    field public static final java.lang.String EXTRA_INCOMING_CALL_EXTRAS = "android.telecom.extra.INCOMING_CALL_EXTRAS";

    field public static final java.lang.String EXTRA_INCOMING_VIDEO_STATE = "android.telecom.extra.INCOMING_VIDEO_STATE";

    field public static final java.lang.String EXTRA_NOTIFICATION_COUNT = "android.telecom.extra.NOTIFICATION_COUNT";

    field public static final java.lang.String EXTRA_NOTIFICATION_PHONE_NUMBER = "android.telecom.extra.NOTIFICATION_PHONE_NUMBER";

    field public static final java.lang.String EXTRA_OUTGOING_CALL_EXTRAS = "android.telecom.extra.OUTGOING_CALL_EXTRAS";

api/test-current.txt

+3 −1
Original line number Diff line number Diff line
@@ -23888,8 +23888,8 @@ package android.net { 
    method public void reportNetworkConnectivity(android.net.Network, boolean);

    method public boolean requestBandwidthUpdate(android.net.Network);

    method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback, android.os.Handler);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback);

    method public void requestNetwork(android.net.NetworkRequest, int, android.net.ConnectivityManager.NetworkCallback, android.os.Handler);

    method public void requestNetwork(android.net.NetworkRequest, android.app.PendingIntent);

    method public deprecated boolean requestRouteToHost(int, int);
@@ -37190,6 +37190,7 @@ package android.telecom { 
    field public static final java.lang.String EVENT_CALL_MERGE_FAILED = "android.telecom.event.CALL_MERGE_FAILED";

    field public static final java.lang.String EVENT_CALL_PULL_FAILED = "android.telecom.event.CALL_PULL_FAILED";

    field public static final java.lang.String EXTRA_ANSWERING_DROPS_FG_CALL = "android.telecom.extra.ANSWERING_DROPS_FG_CALL";

    field public static final java.lang.String EXTRA_ANSWERING_DROPS_FG_CALL_APP_NAME = "android.telecom.extra.ANSWERING_DROPS_FG_CALL_APP_NAME";

    field public static final java.lang.String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT";

    field public static final java.lang.String EXTRA_CHILD_ADDRESS = "android.telecom.extra.CHILD_ADDRESS";

    field public static final java.lang.String EXTRA_LAST_FORWARDED_NUMBER = "android.telecom.extra.LAST_FORWARDED_NUMBER";
@@ -37597,6 +37598,7 @@ package android.telecom { 
    field public static final java.lang.String EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME = "android.telecom.extra.CHANGE_DEFAULT_DIALER_PACKAGE_NAME";

    field public static final java.lang.String EXTRA_INCOMING_CALL_ADDRESS = "android.telecom.extra.INCOMING_CALL_ADDRESS";

    field public static final java.lang.String EXTRA_INCOMING_CALL_EXTRAS = "android.telecom.extra.INCOMING_CALL_EXTRAS";

    field public static final java.lang.String EXTRA_INCOMING_VIDEO_STATE = "android.telecom.extra.INCOMING_VIDEO_STATE";

    field public static final java.lang.String EXTRA_NOTIFICATION_COUNT = "android.telecom.extra.NOTIFICATION_COUNT";

    field public static final java.lang.String EXTRA_NOTIFICATION_PHONE_NUMBER = "android.telecom.extra.NOTIFICATION_PHONE_NUMBER";

    field public static final java.lang.String EXTRA_OUTGOING_CALL_EXTRAS = "android.telecom.extra.OUTGOING_CALL_EXTRAS";

telecomm/java/android/telecom/Connection.java

+12 −0
Original line number Diff line number Diff line
@@ -435,6 +435,18 @@ public abstract class Connection extends Conferenceable { 
    public static final String EXTRA_ANSWERING_DROPS_FG_CALL =

            "android.telecom.extra.ANSWERING_DROPS_FG_CALL";



    /**

     * String connection extra key set on a {@link Connection} in {@link Connection#STATE_RINGING}

     * state to indicate the name of the third-party app which is responsible for the current

     * foreground call.

     * <p>

     * Used when {@link #EXTRA_ANSWERING_DROPS_FG_CALL} is true to ensure that the default Phone app

     * is able to inform the user that answering the new incoming call will cause a call owned by

     * another app to be dropped when the incoming call is answered.

     */

    public static final String EXTRA_ANSWERING_DROPS_FG_CALL_APP_NAME =

            "android.telecom.extra.ANSWERING_DROPS_FG_CALL_APP_NAME";



    /**

     * Boolean connection extra key on a {@link Connection} which indicates that adding an

     * additional call is disallowed.

telecomm/java/android/telecom/PhoneAccount.java

+12 −0
Original line number Diff line number Diff line
@@ -309,6 +309,18 @@ public final class PhoneAccount implements Parcelable { 
            mSupportedAudioRoutes = phoneAccount.getSupportedAudioRoutes();

        }



        /**

         * Sets the label. See {@link PhoneAccount#getLabel()}.

         *

         * @param label The label of the phone account.

         * @return The builder.

         * @hide

         */

        public Builder setLabel(CharSequence label) {

            this.mLabel = label;

            return this;

        }



        /**

         * Sets the address. See {@link PhoneAccount#getAddress}.

         *