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

Commit a37cb8b6 authored by Evan Charlton's avatar Evan Charlton Committed by Android (Google) Code Review
Browse files

Merge "@hide CAPABILITY_CALL_PROVIDER" into lmp-dev

parents 88b771d8 7800fb75

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -28586,7 +28586,6 @@ package android.telecomm { 
    method public java.lang.String getSubscriptionNumber();

    method public boolean isVideoCallingSupported();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final int CAPABILITY_CALL_PROVIDER = 2; // 0x2

    field public static final int CAPABILITY_SIM_CALL_MANAGER = 1; // 0x1

    field public static final int CAPABILITY_SIM_SUBSCRIPTION = 4; // 0x4

    field public static final android.os.Parcelable.Creator CREATOR;

telecomm/java/android/telecomm/PhoneAccount.java

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ public class PhoneAccount implements Parcelable { 
     * calls from or use the built-in telephony stack to place its calls.

     * <p>

     * See {@link #getCapabilities}

     *

     * {@hide}

     */

    public static final int CAPABILITY_CALL_PROVIDER = 0x2;