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

Commit 3ded7cb5 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

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

Merge commit '510f9f86'

* commit '510f9f86':
  Send all Connectivity broadcasts.
parents 96ca16a9 510f9f86

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

+0 −3
Original line number Diff line number Diff line
@@ -943,7 +943,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);
@@ -1059,7 +1058,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);
@@ -1097,7 +1095,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);