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

Merge "Postpone updating the bw rules until NMS is ready."

Browse Source
This commit is contained in:
Sudheer Shanka
2018-07-20 22:16:24 +00:00
committed by Android (Google) Code Review
parent 4c436c0f4d 1536fb6e55
commit 3261b948e5
1 changed files with 6 additions and 0 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

@@ -430,6 +430,8 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
private final CountDownLatch mAdminDataAvailableLatch = new CountDownLatch(1);
private volatile boolean mNetworkManagerReady;
/** Defined network policies. */
@GuardedBy("mNetworkPoliciesSecondLock")
final ArrayMap<NetworkTemplate, NetworkPolicy> mNetworkPolicy = new ArrayMap<>();
@@ -872,6 +874,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
}
public CountDownLatch networkScoreAndNetworkManagementServiceReady() {
mNetworkManagerReady = true;
final CountDownLatch initCompleteSignal = new CountDownLatch(1);
mHandler.post(() -> initService(initCompleteSignal));
return initCompleteSignal;
@@ -5024,6 +5027,9 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
private void handleRestrictedPackagesChangeUL(Set<Integer> oldRestrictedUids,
Set<Integer> newRestrictedUids) {
if (!mNetworkManagerReady) {
return;
}
if (oldRestrictedUids == null) {
for (int uid : newRestrictedUids) {
updateRulesForDataUsageRestrictionsUL(uid);