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

Commit 1d273f33 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Clear caller identity before updating restrictions" into main am: a5d896cd 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3290150



Change-Id: Id641c247d86db5597d748988fc844bbcb3f50575
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 49b3e83b a5d896cd

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

+20 −10
Original line number Diff line number Diff line
@@ -3100,12 +3100,17 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
        }



        synchronized (mUidRulesFirstLock) {

            final long token = Binder.clearCallingIdentity();

            try {

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

                policy |= oldPolicy;

                if (oldPolicy != policy) {

                    setUidPolicyUncheckedUL(uid, oldPolicy, policy, true);

                    mLogger.uidPolicyChanged(uid, oldPolicy, policy);

                }

            } finally {

                Binder.restoreCallingIdentity(token);

            }

        }

    }
@@ -3119,12 +3124,17 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
        }



        synchronized (mUidRulesFirstLock) {

            final long token = Binder.clearCallingIdentity();

            try {

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

                policy = oldPolicy & ~policy;

                if (oldPolicy != policy) {

                    setUidPolicyUncheckedUL(uid, oldPolicy, policy, true);

                    mLogger.uidPolicyChanged(uid, oldPolicy, policy);

                }

            } finally {

                Binder.restoreCallingIdentity(token);

            }

        }

    }