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

Commit 6772a875 authored by Erik Kline's avatar Erik Kline Committed by Android Git Automerger
Browse files

am 30246e3d: am 4e9ea5e9: Merge "Rename EXTRA_NETWORK ConnectivityManager... 

am 30246e3d: am 4e9ea5e9: Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-dev automerge: dedd42a2

* commit '30246e3d':
  Rename EXTRA_NETWORK ConnectivityManager constants.
parents 565e9be4 30246e3d

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -17170,8 +17170,8 @@ package android.net { 
    field public static final java.lang.String EXTRA_EXTRA_INFO = "extraInfo";

    field public static final java.lang.String EXTRA_IS_FAILOVER = "isFailover";

    field public static final deprecated java.lang.String EXTRA_NETWORK_INFO = "networkInfo";

    field public static final java.lang.String EXTRA_NETWORK_REQUEST_NETWORK = "networkRequestNetwork";

    field public static final java.lang.String EXTRA_NETWORK_REQUEST_NETWORK_REQUEST = "networkRequestNetworkRequest";

    field public static final java.lang.String EXTRA_NETWORK = "android.net.extra.NETWORK";

    field public static final java.lang.String EXTRA_NETWORK_REQUEST = "android.net.extra.NETWORK_REQUEST";

    field public static final java.lang.String EXTRA_NETWORK_TYPE = "networkType";

    field public static final java.lang.String EXTRA_NO_CONNECTIVITY = "noConnectivity";

    field public static final java.lang.String EXTRA_OTHER_NETWORK_INFO = "otherNetwork";

core/java/android/net/ConnectivityManager.java

+4 −5
Original line number Diff line number Diff line
@@ -2381,15 +2381,14 @@ public class ConnectivityManager { 
     * successfully finding a network for the applications request.  Retrieve it with

     * {@link android.content.Intent#getParcelableExtra(String)}.

     */

    public static final String EXTRA_NETWORK_REQUEST_NETWORK = "networkRequestNetwork";

    public static final String EXTRA_NETWORK = "android.net.extra.NETWORK";



    /**

     * The lookup key for a {@link NetworkRequest} object included with the intent after

     * successfully finding a network for the applications request.  Retrieve it with

     * {@link android.content.Intent#getParcelableExtra(String)}.

     */

    public static final String EXTRA_NETWORK_REQUEST_NETWORK_REQUEST =

            "networkRequestNetworkRequest";

    public static final String EXTRA_NETWORK_REQUEST = "android.net.extra.NETWORK_REQUEST";





    /**
@@ -2405,8 +2404,8 @@ public class ConnectivityManager { 
     * <receiver> tag in an AndroidManifest.xml file

     * <p>

     * The operation Intent is delivered with two extras, a {@link Network} typed

     * extra called {@link #EXTRA_NETWORK_REQUEST_NETWORK} and a {@link NetworkRequest}

     * typed extra called {@link #EXTRA_NETWORK_REQUEST_NETWORK_REQUEST} containing

     * extra called {@link #EXTRA_NETWORK} and a {@link NetworkRequest}

     * typed extra called {@link #EXTRA_NETWORK_REQUEST} containing

     * the original requests parameters.  It is important to create a new,

     * {@link NetworkCallback} based request before completing the processing of the

     * Intent to reserve the network or it will be released shortly after the Intent

services/core/java/com/android/server/ConnectivityService.java

+2 −3
Original line number Diff line number Diff line
@@ -3839,9 +3839,8 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            int notificationType) {

        if (notificationType == ConnectivityManager.CALLBACK_AVAILABLE) {

            Intent intent = new Intent();

            intent.putExtra(ConnectivityManager.EXTRA_NETWORK_REQUEST_NETWORK, nri.request);

            intent.putExtra(ConnectivityManager.EXTRA_NETWORK_REQUEST_NETWORK_REQUEST,

                    networkAgent.network);

            intent.putExtra(ConnectivityManager.EXTRA_NETWORK, nri.request);

            intent.putExtra(ConnectivityManager.EXTRA_NETWORK_REQUEST, networkAgent.network);

            sendIntent(nri.mPendingIntent, intent);

        }

        // else not handled