Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2c611c4 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android Git Automerger
Browse files

am 13ad04e7: am 3df17a6d: am f68e0236: Merge "Allow Settings to set background... 

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

* commit '13ad04e7':
  Allow Settings to set background data restrict on secondary users.
parents 24d83c14 13ad04e7

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

+8 −3
Original line number Original line Diff line number Diff line
@@ -1520,10 +1520,15 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
        }

        }





        synchronized (mRulesLock) {

        synchronized (mRulesLock) {

            final long token = Binder.clearCallingIdentity();

            try {

                final int oldPolicy = mUidPolicy.get(uid, POLICY_NONE);

                final int oldPolicy = mUidPolicy.get(uid, POLICY_NONE);

                if (oldPolicy != policy) {

                if (oldPolicy != policy) {

                    setUidPolicyUncheckedLocked(uid, policy, true);

                    setUidPolicyUncheckedLocked(uid, policy, true);

                }

                }

            } finally {

                Binder.restoreCallingIdentity(token);

            }

        }

        }

    }

    }