commit c2c611c4e5024bc9405cae4c9ffe9d72599f9751
author Julia Reynolds <juliacr@google.com> Mon Jul 27 20:34:15 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 27 20:34:15 2015 +0000
tree 83db18efc76cd4ec9cf945f22b432ce7d2a86fcf
parent 24d83c1434bd315411c46fb80603ae931000cc82
parent 13ad04e76be2fb34ffc9a039272a82636e215caa

am 13ad04e7: am 3df17a6d: am f68e0236: Merge "Allow Settings to set background data restrict on secondary users." into mnc-dev

* commit '13ad04e76be2fb34ffc9a039272a82636e215caa':
  Allow Settings to set background data restrict on secondary users.

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 395aa27..cd982d3 100644
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -1520,9 +1520,14 @@
         }
 
         synchronized (mRulesLock) {
-            final int oldPolicy = mUidPolicy.get(uid, POLICY_NONE);
-            if (oldPolicy != policy) {
-                setUidPolicyUncheckedLocked(uid, policy, true);
+            final long token = Binder.clearCallingIdentity();
+            try {
+                final int oldPolicy = mUidPolicy.get(uid, POLICY_NONE);
+                if (oldPolicy != policy) {
+                    setUidPolicyUncheckedLocked(uid, policy, true);
+                }
+            } finally {
+                Binder.restoreCallingIdentity(token);
             }
         }
     }