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

Commit a62e23f7 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 am: 1d273f33 

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



Change-Id: Id86b27b359ca1f7d36a9c47c887d4616bc9ea56a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fee0f40f 1d273f33

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

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

        }





        synchronized (mUidRulesFirstLock) {

        synchronized (mUidRulesFirstLock) {

            final long token = Binder.clearCallingIdentity();

            try {

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

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

                policy |= oldPolicy;

                policy |= oldPolicy;

                if (oldPolicy != policy) {

                if (oldPolicy != policy) {

                    setUidPolicyUncheckedUL(uid, oldPolicy, policy, true);

                    setUidPolicyUncheckedUL(uid, oldPolicy, policy, true);

                    mLogger.uidPolicyChanged(uid, oldPolicy, policy);

                    mLogger.uidPolicyChanged(uid, oldPolicy, policy);

                }

                }

            } finally {

                Binder.restoreCallingIdentity(token);

            }

        }

        }

    }

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

        }





        synchronized (mUidRulesFirstLock) {

        synchronized (mUidRulesFirstLock) {

            final long token = Binder.clearCallingIdentity();

            try {

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

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

                policy = oldPolicy & ~policy;

                policy = oldPolicy & ~policy;

                if (oldPolicy != policy) {

                if (oldPolicy != policy) {

                    setUidPolicyUncheckedUL(uid, oldPolicy, policy, true);

                    setUidPolicyUncheckedUL(uid, oldPolicy, policy, true);

                    mLogger.uidPolicyChanged(uid, oldPolicy, policy);

                    mLogger.uidPolicyChanged(uid, oldPolicy, policy);

                }

                }

            } finally {

                Binder.restoreCallingIdentity(token);

            }

        }

        }

    }

    }