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

Commit 4e4306ab authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Include network type that caused broadcast." into jb-mr1-dev

parents 4cb33847 75fbb4bd

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -12402,6 +12402,7 @@ 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_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";

    field public static final java.lang.String EXTRA_REASON = "reason";

core/java/android/net/ConnectivityManager.java

+10 −0
Original line number Diff line number Diff line
@@ -89,10 +89,20 @@ public class ConnectivityManager { 
     *             should always obtain network information through

     *             {@link #getActiveNetworkInfo()} or

     *             {@link #getAllNetworkInfo()}.

     * @see #EXTRA_NETWORK_TYPE

     */

    @Deprecated

    public static final String EXTRA_NETWORK_INFO = "networkInfo";



    /**

     * 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)

     */

    public static final String EXTRA_NETWORK_TYPE = "networkType";



    /**

     * The lookup key for a boolean that indicates whether a connect event

     * is for a network to which the connectivity manager was failing over

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

+3 −0
Original line number Diff line number Diff line
@@ -1612,6 +1612,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { 


        Intent intent = new Intent(ConnectivityManager.CONNECTIVITY_ACTION);

        intent.putExtra(ConnectivityManager.EXTRA_NETWORK_INFO, info);

        intent.putExtra(ConnectivityManager.EXTRA_NETWORK_TYPE, info.getType());

        if (info.isFailover()) {

            intent.putExtra(ConnectivityManager.EXTRA_IS_FAILOVER, true);

            info.setFailover(false);
@@ -1738,6 +1739,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
    private Intent makeGeneralIntent(NetworkInfo info, String bcastType) {

        Intent intent = new Intent(bcastType);

        intent.putExtra(ConnectivityManager.EXTRA_NETWORK_INFO, info);

        intent.putExtra(ConnectivityManager.EXTRA_NETWORK_TYPE, info.getType());

        if (info.isFailover()) {

            intent.putExtra(ConnectivityManager.EXTRA_IS_FAILOVER, true);

            info.setFailover(false);
@@ -1788,6 +1790,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { 


        Intent intent = new Intent(ConnectivityManager.CONNECTIVITY_ACTION);

        intent.putExtra(ConnectivityManager.EXTRA_NETWORK_INFO, info);

        intent.putExtra(ConnectivityManager.EXTRA_NETWORK_TYPE, info.getType());

        if (getActiveNetworkInfo() == null) {

            intent.putExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, true);

        }