commit 5723ccb7ff9c29f39c43ef16f61c109264d75134
author Sudheer Shanka <sudheersai@google.com> Tue Feb 13 11:08:19 2018 -0800
committer Sudheer Shanka <sudheersai@google.com> Tue Mar 27 19:42:28 2018 +0000
tree b666001f7d39c7b2e79404a33750e5e40d5b3bda
parent 3801d3a7d97e280b025ba210885915a4ab9a6171

Save internal state to disk after updating whitelist revoked uids.

Fixes: 71817859
Test: manual
Change-Id: I555ec29ddf7821972556fda65faa3553a17244a1

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

diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
index 8febecf..ddb2a85 100644
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -2338,7 +2338,7 @@
     }
 
     private void setUidPolicyUncheckedUL(int uid, int oldPolicy, int policy, boolean persist) {
-        setUidPolicyUncheckedUL(uid, policy, persist);
+        setUidPolicyUncheckedUL(uid, policy, false);
 
         final boolean notifyApp;
         if (!isUidValidForWhitelistRules(uid)) {
@@ -2361,6 +2361,11 @@
         }
         mHandler.obtainMessage(MSG_POLICIES_CHANGED, uid, policy, Boolean.valueOf(notifyApp))
                 .sendToTarget();
+        if (persist) {
+            synchronized (mNetworkPoliciesSecondLock) {
+                writePolicyAL();
+            }
+        }
     }
 
     private void setUidPolicyUncheckedUL(int uid, int policy, boolean persist) {