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

Commit 36d9922e authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "API Fix: Remove 200 from PUBLISH_STATE_OK" am: 30537f3d 

Change-Id: Ic6755cb4a6899aa355ef8a75bd70caf1e2dacdd6
parents c1130c25 30537f3d

telephony/java/android/telephony/ims/RcsUceAdapter.java

+3 −3
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ public class RcsUceAdapter { 
     * UCE.

     * @hide

     */

    public static final int PUBLISH_STATE_200_OK = 1;

    public static final int PUBLISH_STATE_OK = 1;



    /**

     * The hasn't published its capabilities since boot or hasn't gotten any publish response yet.
@@ -179,7 +179,7 @@ public class RcsUceAdapter { 
    /**@hide*/

    @Retention(RetentionPolicy.SOURCE)

    @IntDef(prefix = "PUBLISH_STATE_", value = {

            PUBLISH_STATE_200_OK,

            PUBLISH_STATE_OK,

            PUBLISH_STATE_NOT_PUBLISHED,

            PUBLISH_STATE_VOLTE_PROVISION_ERROR,

            PUBLISH_STATE_RCS_PROVISION_ERROR,
@@ -303,7 +303,7 @@ public class RcsUceAdapter { 
     * Gets the last publish result from the UCE service if the device is using an RCS presence

     * server.

     * @return The last publish result from the UCE service. If the device is using SIP OPTIONS,

     * this method will return {@link #PUBLISH_STATE_200_OK} as well.

     * this method will return {@link #PUBLISH_STATE_OK} as well.

     * @throws ImsException if the subscription associated with this instance of

     * {@link RcsUceAdapter} is valid, but the ImsService associated with the subscription is not

     * available. This can happen if the ImsService has crashed, for example, or if the subscription