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

Commit 99e20773 authored by Grace Jia's avatar Grace Jia Committed by Gerrit Code Review
Browse files

Merge "Cleanup hidden API usage of voip-common."

parents 52e94a65 799177d0

api/current.txt

+8 −0
Original line number Diff line number Diff line
@@ -29768,6 +29768,7 @@ 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);
@@ -29785,6 +29786,11 @@ 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
@@ -29794,6 +29800,7 @@ 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();
@@ -29804,6 +29811,7 @@ package android.net.sip { 
    method public String getSipDomain();

    method public String getUriString();

    method public String getUserName();

    method public void setCallingUid(int);

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

    field public static final android.os.Parcelable.Creator<android.net.sip.SipProfile> CREATOR;

  }

core/res/AndroidManifest.xml

+5 −3
Original line number Diff line number Diff line
@@ -556,10 +556,12 @@ 


    <protected-broadcast android:name="com.android.sync.SYNC_CONN_STATUS_CHANGED" />



    <protected-broadcast android:name="com.android.phone.SIP_INCOMING_CALL" />

    <protected-broadcast android:name="android.net.sip.action.SIP_INCOMING_CALL" />

    <protected-broadcast android:name="com.android.phone.SIP_ADD_PHONE" />

    <protected-broadcast android:name="com.android.phone.SIP_REMOVE_PHONE" />

    <protected-broadcast android:name="com.android.phone.SIP_CALL_OPTION_CHANGED" />

    <protected-broadcast android:name="android.net.sip.action.SIP_REMOVE_PROFILE" />

    <protected-broadcast android:name="android.net.sip.action.SIP_SERVICE_UP" />

    <protected-broadcast android:name="android.net.sip.action.SIP_CALL_OPTION_CHANGED" />

    <protected-broadcast android:name="android.net.sip.action.START_SIP" />



    <protected-broadcast android:name="android.bluetooth.adapter.action.BLE_ACL_CONNECTED" />

    <protected-broadcast android:name="android.bluetooth.adapter.action.BLE_ACL_DISCONNECTED" />