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

Commit a9224e07 authored by Nancy Chen's avatar Nancy Chen Committed by Android Git Automerger
Browse files

am 225ace3b: am 1c3553b5: am c1d001c3: Merge "Fix build breakage because... 

am 225ace3b: am 1c3553b5: am c1d001c3: Merge "Fix build breakage because missing API methods." into lmp-mr1-dev

* commit '225ace3b':
  Fix build breakage because missing API methods.
parents 3b3b5fa4 225ace3b

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -28461,6 +28461,7 @@ package android.telecom { 
    method public android.telecom.PhoneAccountHandle getAccountHandle();

    method public android.net.Uri getAddress();

    method public int getCapabilities();

    method public int getColor();

    method public android.graphics.drawable.Drawable getIcon(android.content.Context);

    method public int getIconResId();

    method public java.lang.CharSequence getLabel();
@@ -28474,6 +28475,7 @@ package android.telecom { 
    field public static final int CAPABILITY_PLACE_EMERGENCY_CALLS = 16; // 0x10

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

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

    field public static final int NO_COLOR = -1; // 0xffffffff

    field public static final java.lang.String SCHEME_SIP = "sip";

    field public static final java.lang.String SCHEME_TEL = "tel";

    field public static final java.lang.String SCHEME_VOICEMAIL = "voicemail";
@@ -28485,6 +28487,7 @@ package android.telecom { 
    method public android.telecom.PhoneAccount build();

    method public android.telecom.PhoneAccount.Builder setAddress(android.net.Uri);

    method public android.telecom.PhoneAccount.Builder setCapabilities(int);

    method public android.telecom.PhoneAccount.Builder setColor(int);

    method public android.telecom.PhoneAccount.Builder setIconResId(int);

    method public android.telecom.PhoneAccount.Builder setShortDescription(java.lang.CharSequence);

    method public android.telecom.PhoneAccount.Builder setSubscriptionAddress(android.net.Uri);