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

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

Merge "connectivity-change events can happen before boot completes (similar... 

Merge "connectivity-change events can happen before boot completes (similar to: https://android-git.corp.google.com/g/#change,87425 )"
parents 4aa4981f b35d67a8

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -2173,7 +2173,8 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
        if (proxy == null) proxy = new ProxyProperties("", 0, "");

        if (proxy == null) proxy = new ProxyProperties("", 0, "");

        log("sending Proxy Broadcast for " + proxy);

        log("sending Proxy Broadcast for " + proxy);

        Intent intent = new Intent(Proxy.PROXY_CHANGE_ACTION);

        Intent intent = new Intent(Proxy.PROXY_CHANGE_ACTION);

        intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);

        intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING |

            Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);

        intent.putExtra(Proxy.EXTRA_PROXY_INFO, proxy);

        intent.putExtra(Proxy.EXTRA_PROXY_INFO, proxy);

        mContext.sendStickyBroadcast(intent);

        mContext.sendStickyBroadcast(intent);

    }

    }