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

Merge "Refactored NetworkPolicyManagerService mUidRules." into nyc-dev am: de66540fd3

Browse Source 
am: 0da215640f

* commit '0da215640fa1aa90e7f3063cfa23df629f268ff2':
  Refactored NetworkPolicyManagerService mUidRules.

Change-Id: I58c29071b21ffdd9285b33964bfc2c5b254dd298
This commit is contained in:
Felipe Leme
2016-05-06 21:58:26 +00:00
committed by android-build-merger
parent 06864ec342 cc2b9c36d3
commit ec7b062a3e
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,10 +30,11 @@ import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED;
import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED; import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED;
import static android.net.NetworkPolicyManager.RULE_ALLOW_ALL; import static android.net.NetworkPolicyManager.RULE_ALLOW_ALL;
import static android.net.NetworkPolicyManager.RULE_ALLOW_METERED; import static android.net.NetworkPolicyManager.RULE_ALLOW_METERED;
import static android.net.NetworkPolicyManager.RULE_NONE;
import static android.net.NetworkPolicyManager.RULE_REJECT_ALL; import static android.net.NetworkPolicyManager.RULE_REJECT_ALL;
import static android.net.NetworkPolicyManager.RULE_REJECT_METERED; import static android.net.NetworkPolicyManager.RULE_REJECT_METERED;
import static android.net.NetworkPolicyManager.RULE_TEMPORARY_ALLOW_METERED; import static android.net.NetworkPolicyManager.RULE_TEMPORARY_ALLOW_METERED;
import static android.net.NetworkPolicyManager.RULE_UNKNOWN; import static android.net.NetworkPolicyManager.uidRulesToString;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.app.BroadcastOptions; import android.app.BroadcastOptions;
@@ -915,7 +916,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
final String iface = (lp == null ? "" : lp.getInterfaceName()); final String iface = (lp == null ? "" : lp.getInterfaceName());
synchronized (mRulesLock) { synchronized (mRulesLock) {
networkMetered = mMeteredIfaces.contains(iface); networkMetered = mMeteredIfaces.contains(iface);
uidRules = mUidRules.get(uid, RULE_UNKNOWN); uidRules = mUidRules.get(uid, RULE_NONE);
} }
switch (uidRules) { switch (uidRules) {
@@ -927,7 +928,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
return networkMetered; return networkMetered;
case RULE_REJECT_ALL: case RULE_REJECT_ALL:
return true; return true;
case RULE_UNKNOWN: case RULE_NONE:
default: default:
// When background data is restricted device-wide, the default // When background data is restricted device-wide, the default
// behavior for apps should be like RULE_REJECT_METERED // behavior for apps should be like RULE_REJECT_METERED
@@ -1861,6 +1862,21 @@ public class ConnectivityService extends IConnectivityManager.Stub
pw.println(mRestrictBackground); pw.println(mRestrictBackground);
pw.println(); pw.println();
pw.println("Status for known UIDs:");
pw.increaseIndent();
final int size = mUidRules.size();
for (int i = 0; i < size; i++) {
final int uid = mUidRules.keyAt(i);
pw.print("UID=");
pw.print(uid);
final int uidRules = mUidRules.get(uid, RULE_NONE);
pw.print(" rules=");
pw.print(uidRulesToString(uidRules));
pw.println();
}
pw.println();
pw.decreaseIndent();
pw.println("Network Requests:"); pw.println("Network Requests:");
pw.increaseIndent(); pw.increaseIndent();
for (NetworkRequestInfo nri : mNetworkRequests.values()) { for (NetworkRequestInfo nri : mNetworkRequests.values()) {