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

Commit 8a16eabf authored by Vinit Deshpande's avatar Vinit Deshpande Committed by Android (Google) Code Review
Browse files

Merge "Don't require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev

parents 26f9ea38 92d141fb

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+2 −4
Original line number Original line Diff line number Diff line
@@ -433,14 +433,12 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 




        // listen for configured wifi networks to be removed

        // listen for configured wifi networks to be removed

        final IntentFilter wifiConfigFilter = new IntentFilter(CONFIGURED_NETWORKS_CHANGED_ACTION);

        final IntentFilter wifiConfigFilter = new IntentFilter(CONFIGURED_NETWORKS_CHANGED_ACTION);

        mContext.registerReceiver(

        mContext.registerReceiver(mWifiConfigReceiver, wifiConfigFilter, null, mHandler);

                mWifiConfigReceiver, wifiConfigFilter, CONNECTIVITY_INTERNAL, mHandler);





        // listen for wifi state changes to catch metered hint

        // listen for wifi state changes to catch metered hint

        final IntentFilter wifiStateFilter = new IntentFilter(

        final IntentFilter wifiStateFilter = new IntentFilter(

                WifiManager.NETWORK_STATE_CHANGED_ACTION);

                WifiManager.NETWORK_STATE_CHANGED_ACTION);

        mContext.registerReceiver(

        mContext.registerReceiver(mWifiStateReceiver, wifiStateFilter, null, mHandler);

                mWifiStateReceiver, wifiStateFilter, CONNECTIVITY_INTERNAL, mHandler);





    }

    }

services/core/java/com/android/server/net/NetworkStatsService.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -318,7 +318,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub { 




        // watch for tethering changes

        // watch for tethering changes

        final IntentFilter tetherFilter = new IntentFilter(ACTION_TETHER_STATE_CHANGED);

        final IntentFilter tetherFilter = new IntentFilter(ACTION_TETHER_STATE_CHANGED);

        mContext.registerReceiver(mTetherReceiver, tetherFilter, CONNECTIVITY_INTERNAL, mHandler);

        mContext.registerReceiver(mTetherReceiver, tetherFilter, null, mHandler);





        // listen for periodic polling events

        // listen for periodic polling events

        final IntentFilter pollFilter = new IntentFilter(ACTION_NETWORK_STATS_POLL);

        final IntentFilter pollFilter = new IntentFilter(ACTION_NETWORK_STATS_POLL);