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

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

Telecom API updates for mainline support. 

Moving some Telecom APIs into public since they are harmless to expose.
Moving some other Telecom APIs into the System API space since they're
API details specific to the TelephonyConnectionService so don't need to
be exposed in the public API.

Bug: 141576016
Test: Manual smoke test.
Test: Run unit tests.
Test: Run CTS tests.
Change-Id: Iaf75b9d671712d791f501c11536e73436908f7de
parent 7c1c0f8b

api/current.txt

+12 −0
Original line number Diff line number Diff line
@@ -43464,8 +43464,10 @@ package android.telecom { 
    method public final int getState();

    method public final android.telecom.StatusHints getStatusHints();

    method public final android.telecom.Connection.VideoProvider getVideoProvider();

    method public final int getVideoState();

    method public void handleRttUpgradeResponse(@Nullable android.telecom.Connection.RttTextStream);

    method public final boolean isRingbackRequested();

    method public final void notifyConferenceMergeFailed();

    method public void onAbort();

    method public void onAnswer(int);

    method public void onAnswer();
@@ -43544,8 +43546,15 @@ package android.telecom { 
    field public static final int CAPABILITY_SUPPORT_DEFLECT = 33554432; // 0x2000000

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

    field public static final int CAPABILITY_SWAP_CONFERENCE = 8; // 0x8

    field public static final String EVENT_CALL_HOLD_FAILED = "android.telecom.event.CALL_HOLD_FAILED";

    field public static final String EVENT_CALL_MERGE_FAILED = "android.telecom.event.CALL_MERGE_FAILED";

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

    field public static final String EVENT_CALL_REMOTELY_HELD = "android.telecom.event.CALL_REMOTELY_HELD";

    field public static final String EVENT_CALL_REMOTELY_UNHELD = "android.telecom.event.CALL_REMOTELY_UNHELD";

    field public static final String EVENT_MERGE_COMPLETE = "android.telecom.event.MERGE_COMPLETE";

    field public static final String EVENT_MERGE_START = "android.telecom.event.MERGE_START";

    field public static final String EVENT_ON_HOLD_TONE_END = "android.telecom.event.ON_HOLD_TONE_END";

    field public static final String EVENT_ON_HOLD_TONE_START = "android.telecom.event.ON_HOLD_TONE_START";

    field public static final String EVENT_RTT_AUDIO_INDICATION_CHANGED = "android.telecom.event.RTT_AUDIO_INDICATION_CHANGED";

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

    field public static final String EXTRA_ANSWERING_DROPS_FG_CALL_APP_NAME = "android.telecom.extra.ANSWERING_DROPS_FG_CALL_APP_NAME";
@@ -43555,9 +43564,12 @@ package android.telecom { 
    field public static final String EXTRA_LAST_FORWARDED_NUMBER = "android.telecom.extra.LAST_FORWARDED_NUMBER";

    field public static final String EXTRA_SIP_INVITE = "android.telecom.extra.SIP_INVITE";

    field public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 32; // 0x20

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

    field public static final int PROPERTY_IS_EXTERNAL_CALL = 16; // 0x10

    field public static final int PROPERTY_IS_RTT = 256; // 0x100

    field public static final int PROPERTY_NETWORK_IDENTIFIED_EMERGENCY_CALL = 1024; // 0x400

    field public static final int PROPERTY_SELF_MANAGED = 128; // 0x80

    field public static final int PROPERTY_WIFI = 8; // 0x8

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

    field public static final int STATE_DIALING = 3; // 0x3

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

api/system-current.txt

+19 −0
Original line number Diff line number Diff line
@@ -7001,7 +7001,26 @@ package android.telecom { 














  public abstract class Connection extends android.telecom.Conferenceable {















    method @Deprecated public final android.telecom.AudioState getAudioState();













    method public final int getCallRadioTech();













    method public final long getConnectElapsedTimeMillis();













    method public final long getConnectTimeMillis();













    method @Nullable public android.telecom.PhoneAccountHandle getPhoneAccountHandle();













    method @Nullable public final String getTelecomCallId();















    method @Deprecated public void onAudioStateChanged(android.telecom.AudioState);













    method public final void resetConnectionTime();













    method public void setCallDirection(int);













    method public final void setCallRadioTech(int);













    method public final void setConnectTimeMillis(long);













    method public final void setConnectionStartElapsedRealTime(long);













    method public void setPhoneAccountHandle(@NonNull android.telecom.PhoneAccountHandle);













    method public void setTelecomCallId(@NonNull String);













    field public static final int CAPABILITY_CONFERENCE_HAS_NO_CHILDREN = 2097152; // 0x200000













    field public static final int CAPABILITY_SPEED_UP_MT_AUDIO = 262144; // 0x40000













    field public static final String EXTRA_DISABLE_ADD_CALL = "android.telecom.extra.DISABLE_ADD_CALL";













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













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













    field public static final int PROPERTY_IS_DOWNGRADED_CONFERENCE = 64; // 0x40













    field public static final int PROPERTY_REMOTELY_HOSTED = 2048; // 0x800















  }





























  public abstract class InCallService extends android.app.Service {

































telecomm/java/android/telecom/Connection.java



+143
−191


























File changed.
Preview size limit exceeded, changes collapsed.