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

Commit 510f9f86 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

am 6d734693: Merge "Send all Connectivity broadcasts." into gingerbread 

Merge commit '6d734693' into gingerbread-plus-aosp

* commit '6d734693':
  Send all Connectivity broadcasts.
parents 9765b2a0 6d734693

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