LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolved conflicts for b7f40415 to master

Browse Source 
Change-Id: I1f13a63c3680901fac58ef709118c9242032b11f
This commit is contained in:
Jeff Sharkey
2015-10-12 17:46:35 -07:00
parent 4e99c84bc6 b7f4041550
commit 4c678a94b5
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -948,13 +948,13 @@ public class ConnectivityService extends IConnectivityManager.Stub
uidRules = mUidRules.get(uid, RULE_ALLOW_ALL);
}
if ((uidRules & RULE_REJECT_ALL) != 0
|| (networkCostly && (uidRules & RULE_REJECT_METERED) != 0)) {
if (uidRules == RULE_REJECT_ALL) {
return true;
} else if ((uidRules == RULE_REJECT_METERED) && networkCostly) {
return true;
} else {
return false;
}
// no restrictive rules; network is visible
return false;
}
/**
@@ -3751,7 +3751,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
synchronized(mRulesLock) {
uidRules = mUidRules.get(uid, RULE_ALLOW_ALL);
}
if ((uidRules & (RULE_REJECT_METERED | RULE_REJECT_ALL)) != 0) {
if (uidRules != RULE_ALLOW_ALL) {
// we could silently fail or we can filter the available nets to only give
// them those they have access to. Chose the more useful
networkCapabilities.addCapability(NET_CAPABILITY_NOT_METERED);