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

Commit fa96c94c authored by Etan Cohen's avatar Etan Cohen
Browse files

Merge commit '9561e741' into merge2

parents 5a4ee7b6 9561e741

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -18292,14 +18292,14 @@ package android.net { 
    method public boolean bindProcessToNetwork(android.net.Network);

    method public android.net.Network getActiveNetwork();

    method public android.net.NetworkInfo getActiveNetworkInfo();

    method public android.net.NetworkInfo[] getAllNetworkInfo();

    method public deprecated android.net.NetworkInfo[] getAllNetworkInfo();

    method public android.net.Network[] getAllNetworks();

    method public deprecated boolean getBackgroundDataSetting();

    method public android.net.Network getBoundNetworkForProcess();

    method public android.net.ProxyInfo getDefaultProxy();

    method public android.net.LinkProperties getLinkProperties(android.net.Network);

    method public android.net.NetworkCapabilities getNetworkCapabilities(android.net.Network);

    method public android.net.NetworkInfo getNetworkInfo(int);

    method public deprecated android.net.NetworkInfo getNetworkInfo(int);

    method public android.net.NetworkInfo getNetworkInfo(android.net.Network);

    method public deprecated int getNetworkPreference();

    method public static deprecated android.net.Network getProcessDefaultNetwork();

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -19751,14 +19751,14 @@ package android.net { 
    method public boolean bindProcessToNetwork(android.net.Network);

    method public android.net.Network getActiveNetwork();

    method public android.net.NetworkInfo getActiveNetworkInfo();

    method public android.net.NetworkInfo[] getAllNetworkInfo();

    method public deprecated android.net.NetworkInfo[] getAllNetworkInfo();

    method public android.net.Network[] getAllNetworks();

    method public deprecated boolean getBackgroundDataSetting();

    method public android.net.Network getBoundNetworkForProcess();

    method public android.net.ProxyInfo getDefaultProxy();

    method public android.net.LinkProperties getLinkProperties(android.net.Network);

    method public android.net.NetworkCapabilities getNetworkCapabilities(android.net.Network);

    method public android.net.NetworkInfo getNetworkInfo(int);

    method public deprecated android.net.NetworkInfo getNetworkInfo(int);

    method public android.net.NetworkInfo getNetworkInfo(android.net.Network);

    method public deprecated int getNetworkPreference();

    method public static deprecated android.net.Network getProcessDefaultNetwork();

core/java/android/net/ConnectivityManager.java

+17 −4
Original line number Diff line number Diff line
@@ -103,8 +103,7 @@ public class ConnectivityManager { 
     *

     * @deprecated Since {@link NetworkInfo} can vary based on UID, applications

     *             should always obtain network information through

     *             {@link #getActiveNetworkInfo()} or

     *             {@link #getAllNetworkInfo()}.

     *             {@link #getActiveNetworkInfo()}.

     * @see #EXTRA_NETWORK_TYPE

     */

    @Deprecated
@@ -112,8 +111,6 @@ public class ConnectivityManager { 


    /**

     * Network type which triggered a {@link #CONNECTIVITY_ACTION} broadcast.

     * Can be used with {@link #getNetworkInfo(int)} to get {@link NetworkInfo}

     * state based on the calling application.

     *

     * @see android.content.Intent#getIntExtra(String, int)

     */
@@ -660,6 +657,10 @@ public class ConnectivityManager { 
     *

     * <p>This method requires the caller to hold the permission

     * {@link android.Manifest.permission#ACCESS_NETWORK_STATE}.

     *

     * @deprecated This method does not support multiple connected networks

     *             of the same type. Use {@link #getAllNetworks} and

     *             {@link #getNetworkInfo(android.net.Network)} instead.

     */

    public NetworkInfo getNetworkInfo(int networkType) {

        try {
@@ -699,6 +700,10 @@ public class ConnectivityManager { 
     *

     * <p>This method requires the caller to hold the permission

     * {@link android.Manifest.permission#ACCESS_NETWORK_STATE}.

     *

     * @deprecated This method does not support multiple connected networks

     *             of the same type. Use {@link #getAllNetworks} and

     *             {@link #getNetworkInfo(android.net.Network)} instead.

     */

    public NetworkInfo[] getAllNetworkInfo() {

        try {
@@ -716,6 +721,9 @@ public class ConnectivityManager { 
     * {@link android.Manifest.permission#ACCESS_NETWORK_STATE}.

     *

     * @hide

     * @deprecated This method does not support multiple connected networks

     *             of the same type. Use {@link #getAllNetworks} and

     *             {@link #getNetworkInfo(android.net.Network)} instead.

     */

    public Network getNetworkForType(int networkType) {

        try {
@@ -808,6 +816,10 @@ public class ConnectivityManager { 
     * <p>This method requires the caller to hold the permission

     * {@link android.Manifest.permission#ACCESS_NETWORK_STATE}.

     * {@hide}

     * @deprecated This method does not support multiple connected networks

     *             of the same type. Use {@link #getAllNetworks},

     *             {@link #getNetworkInfo(android.net.Network)}, and

     *             {@link #getLinkProperties(android.net.Network)} instead.

     */

    public LinkProperties getLinkProperties(int networkType) {

        try {
@@ -1941,6 +1953,7 @@ public class ConnectivityManager { 
     * @param networkType

     *

     * {@hide}

     * @deprecated Doesn't properly deal with multiple connected networks of the same type.

     */

    public void setProvisioningNotificationVisible(boolean visible, int networkType,

            String action) {

telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl

+8 −0
Original line number Diff line number Diff line
@@ -115,4 +115,12 @@ interface IImsCallSessionListener { 
     * - {@link com.android.internal.telephony.Phone#TTY_MODE_VCO}

     */

    void callSessionTtyModeReceived(in IImsCallSession session, in int mode);



    /**

     * Notifies of a change to the multiparty state for this {@code ImsCallSession}.

     *

     * @param session The call session.

     * @param isMultiParty {@code true} if the session became multiparty, {@code false} otherwise.

     */

    void callSessionMultipartyStateChanged(in IImsCallSession session, in boolean isMultiParty);

}