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

Commit c155bb62 authored by Hall Liu's avatar Hall Liu Committed by Gerrit Code Review
Browse files

Merge changes from topic "mainline-telecom-constants" 

* changes:
  Update documentation for phone account sort order
  API tweaks in response to feedback
parents f8614377 2cf63f72

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -45977,6 +45977,7 @@ package android.telecom { 
    field public static final int MISSED = 5; // 0x5

    field public static final int OTHER = 9; // 0x9

    field public static final String REASON_EMERGENCY_CALL_PLACED = "REASON_EMERGENCY_CALL_PLACED";

    field public static final String REASON_EMULATING_SINGLE_CALL = "EMULATING_SINGLE_CALL";

    field public static final String REASON_IMS_ACCESS_BLOCKED = "REASON_IMS_ACCESS_BLOCKED";

    field public static final String REASON_WIFI_ON_BUT_WFC_OFF = "REASON_WIFI_ON_BUT_WFC_OFF";

    field public static final int REJECTED = 6; // 0x6

api/system-current.txt

+0 −4
Original line number Diff line number Diff line
@@ -10270,10 +10270,6 @@ package android.telecom { 
    method public final void addExistingConnection(@NonNull android.telecom.PhoneAccountHandle, @NonNull android.telecom.Connection, @NonNull android.telecom.Conference);

  }













  public final class DisconnectCause implements android.os.Parcelable {













    field public static final String REASON_EMULATING_SINGLE_CALL = "EMULATING_SINGLE_CALL";













  }



























  public abstract class InCallService extends android.app.Service {















    method @Deprecated public android.telecom.Phone getPhone();















    method @Deprecated public void onPhoneCreated(android.telecom.Phone);

























non-updatable-api/current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -44145,6 +44145,7 @@ package android.telecom {













    field public static final int MISSED = 5; // 0x5















    field public static final int OTHER = 9; // 0x9















    field public static final String REASON_EMERGENCY_CALL_PLACED = "REASON_EMERGENCY_CALL_PLACED";













    field public static final String REASON_EMULATING_SINGLE_CALL = "EMULATING_SINGLE_CALL";















    field public static final String REASON_IMS_ACCESS_BLOCKED = "REASON_IMS_ACCESS_BLOCKED";















    field public static final String REASON_WIFI_ON_BUT_WFC_OFF = "REASON_WIFI_ON_BUT_WFC_OFF";















    field public static final int REJECTED = 6; // 0x6

























non-updatable-api/system-current.txt



+0
−4




























Original line number
Diff line number
Diff line








@@ -9152,10 +9152,6 @@ package android.telecom {













    method public final void addExistingConnection(@NonNull android.telecom.PhoneAccountHandle, @NonNull android.telecom.Connection, @NonNull android.telecom.Conference);















  }



























  public final class DisconnectCause implements android.os.Parcelable {













    field public static final String REASON_EMULATING_SINGLE_CALL = "EMULATING_SINGLE_CALL";













  }



























  public abstract class InCallService extends android.app.Service {















    method @Deprecated public android.telecom.Phone getPhone();















    method @Deprecated public void onPhoneCreated(android.telecom.Phone);

























telecomm/java/android/telecom/DisconnectCause.java



+0
−4




























Original line number
Diff line number
Diff line








@@ -16,7 +16,6 @@





























package android.telecom;





























import android.annotation.SystemApi;















import android.media.ToneGenerator;















import android.os.Parcel;















import android.os.Parcelable;










@@ -97,10 +96,7 @@ public final class DisconnectCause implements Parcelable {













     *















     * This reason code is only used for communication between a {@link ConnectionService} and















     * Telecom and should not be surfaced to the user.













     *













     * @hide















     */













    @SystemApi















    public static final String REASON_EMULATING_SINGLE_CALL = "EMULATING_SINGLE_CALL";































    /**