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

Commit 6d734693 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android (Google) Code Review
Browse files

Merge "Send all Connectivity broadcasts." into gingerbread

parents 2703a42d 9d6b59c0

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

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



        Intent intent = new Intent(ConnectivityManager.CONNECTIVITY_ACTION);

        intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);

        intent.putExtra(ConnectivityManager.EXTRA_NETWORK_INFO, info);

        if (info.isFailover()) {

            intent.putExtra(ConnectivityManager.EXTRA_IS_FAILOVER, true);
@@ -1005,7 +1004,6 @@ public class ConnectivityService extends IConnectivityManager.Stub { 


    private void sendConnectedBroadcast(NetworkInfo info) {

        Intent intent = new Intent(ConnectivityManager.CONNECTIVITY_ACTION);

        intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);

        intent.putExtra(ConnectivityManager.EXTRA_NETWORK_INFO, info);

        if (info.isFailover()) {

            intent.putExtra(ConnectivityManager.EXTRA_IS_FAILOVER, true);
@@ -1043,7 +1041,6 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
        }



        Intent intent = new Intent(ConnectivityManager.CONNECTIVITY_ACTION);

        intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);

        intent.putExtra(ConnectivityManager.EXTRA_NETWORK_INFO, info);

        if (getActiveNetworkInfo() == null) {

            intent.putExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, true);