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

Commit ebda19f6 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "API review cleanups." am: 6c812cc9 am: 70c3352c 

Change-Id: I7ffef82ee88947e5025a719103f218eec003a934
parents 5286e87a 70c3352c

api/current.txt

+0 −9
Original line number Diff line number Diff line
@@ -29796,7 +29796,6 @@ package android.net.sip { 
    method public void close();

    method public void continueCall(int) throws android.net.sip.SipException;

    method public void endCall() throws android.net.sip.SipException;

    method @Nullable public android.net.rtp.AudioGroup getAudioGroup();

    method public android.net.sip.SipProfile getLocalProfile();

    method public android.net.sip.SipProfile getPeerProfile();

    method public int getState();
@@ -29807,7 +29806,6 @@ package android.net.sip { 
    method public void makeCall(android.net.sip.SipProfile, android.net.sip.SipSession, int) throws android.net.sip.SipException;

    method public void sendDtmf(int);

    method public void sendDtmf(int, android.os.Message);

    method public void setAudioGroup(@NonNull android.net.rtp.AudioGroup);

    method public void setListener(android.net.sip.SipAudioCall.Listener);

    method public void setListener(android.net.sip.SipAudioCall.Listener, boolean);

    method public void setSpeakerMode(boolean);
@@ -29856,7 +29854,6 @@ package android.net.sip { 
    method public void close(String) throws android.net.sip.SipException;

    method public android.net.sip.SipSession createSipSession(android.net.sip.SipProfile, android.net.sip.SipSession.Listener) throws android.net.sip.SipException;

    method public static String getCallId(android.content.Intent);

    method @NonNull public java.util.List<android.net.sip.SipProfile> getListOfProfiles() throws android.net.sip.SipException;

    method public static String getOfferSessionDescription(android.content.Intent);

    method public android.net.sip.SipSession getSessionFor(android.content.Intent) throws android.net.sip.SipException;

    method public static boolean isApiSupported(android.content.Context);
@@ -29874,11 +29871,6 @@ package android.net.sip { 
    method public void setRegistrationListener(String, android.net.sip.SipRegistrationListener) throws android.net.sip.SipException;

    method public android.net.sip.SipAudioCall takeAudioCall(android.content.Intent, android.net.sip.SipAudioCall.Listener) throws android.net.sip.SipException;

    method public void unregister(android.net.sip.SipProfile, android.net.sip.SipRegistrationListener) throws android.net.sip.SipException;

    field public static final String ACTION_SIP_CALL_OPTION_CHANGED = "android.net.sip.action.SIP_CALL_OPTION_CHANGED";

    field public static final String ACTION_SIP_INCOMING_CALL = "android.net.sip.action.SIP_INCOMING_CALL";

    field public static final String ACTION_SIP_REMOVE_PROFILE = "android.net.sip.action.SIP_REMOVE_PROFILE";

    field public static final String ACTION_SIP_SERVICE_UP = "android.net.sip.action.SIP_SERVICE_UP";

    field public static final String ACTION_START_SIP = "android.net.sip.action.START_SIP";

    field public static final String EXTRA_CALL_ID = "android:sipCallID";

    field public static final String EXTRA_OFFER_SD = "android:sipOfferSD";

    field public static final int INCOMING_CALL_RESULT_CODE = 101; // 0x65
@@ -29888,7 +29880,6 @@ package android.net.sip { 
    method public int describeContents();

    method public String getAuthUserName();

    method public boolean getAutoRegistration();

    method public int getCallingUid();

    method public String getDisplayName();

    method public String getPassword();

    method public int getPort();

api/system-current.txt

+22 −0
Original line number Diff line number Diff line
@@ -5485,6 +5485,28 @@ package android.net.netstats.provider { 














}



























package android.net.sip {

























  public class SipAudioCall {













    method @Nullable public android.net.rtp.AudioGroup getAudioGroup();













    method public void setAudioGroup(@NonNull android.net.rtp.AudioGroup);













  }

























  public class SipManager {













    method @NonNull public java.util.List<android.net.sip.SipProfile> getProfiles() throws android.net.sip.SipException;













    field public static final String ACTION_SIP_CALL_OPTION_CHANGED = "android.net.sip.action.SIP_CALL_OPTION_CHANGED";













    field public static final String ACTION_SIP_INCOMING_CALL = "android.net.sip.action.SIP_INCOMING_CALL";













    field public static final String ACTION_SIP_REMOVE_PROFILE = "android.net.sip.action.SIP_REMOVE_PROFILE";













    field public static final String ACTION_SIP_SERVICE_UP = "android.net.sip.action.SIP_SERVICE_UP";













    field public static final String ACTION_START_SIP = "android.net.sip.action.START_SIP";













  }

























  public class SipProfile implements java.lang.Cloneable android.os.Parcelable java.io.Serializable {













    method public int getCallingUid();













  }

























}



























package android.net.util {





























  public final class SocketUtils {