Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 81bc42f2: am 81c30ffd: am 279e0cc4: Merge "Don\'t require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev

Browse Source 
* commit '81bc42f2ea08d3e916f146ec14eb38e885de0764':
  Don't require CONNECTIVITY_INTERNAL check for protected broadcasts
This commit is contained in:
Vinit Deshpande
2014-09-12 19:19:12 +00:00
committed by Android Git Automerger
parent 561974e765 4e62aad90d
commit d9039becc4
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/net/NetworkPolicyManagerService.java
View File

@@ -433,14 +433,12 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
// listen for configured wifi networks to be removed
final IntentFilter wifiConfigFilter = new IntentFilter(CONFIGURED_NETWORKS_CHANGED_ACTION);
mContext.registerReceiver(
mWifiConfigReceiver, wifiConfigFilter, CONNECTIVITY_INTERNAL, mHandler);
mContext.registerReceiver(mWifiConfigReceiver, wifiConfigFilter, null, mHandler);
// listen for wifi state changes to catch metered hint
final IntentFilter wifiStateFilter = new IntentFilter(
WifiManager.NETWORK_STATE_CHANGED_ACTION);
mContext.registerReceiver(
mWifiStateReceiver, wifiStateFilter, CONNECTIVITY_INTERNAL, mHandler);
mContext.registerReceiver(mWifiStateReceiver, wifiStateFilter, null, mHandler);
}

2
services/core/java/com/android/server/net/NetworkStatsService.java
View File

@@ -318,7 +318,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
// watch for tethering changes
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
final IntentFilter pollFilter = new IntentFilter(ACTION_NETWORK_STATS_POLL);