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

Commit 2a96cb5a authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Replace calls for updating permission to protect sockets from VPN" into main am: 5d4b7c17 

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



Change-Id: I22d12ae26cba689e8012415801c218a3008f9683
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f472abba 5d4b7c17

services/core/java/com/android/server/connectivity/Vpn.java

+2 −2
Original line number Diff line number Diff line
@@ -1299,7 +1299,7 @@ public class Vpn { 
            }



            try {

                mNms.denyProtect(mOwnerUID);

                mNetd.networkSetProtectDeny(mOwnerUID);

            } catch (Exception e) {

                Log.wtf(TAG, "Failed to disallow UID " + mOwnerUID + " to call protect() " + e);

            }
@@ -1309,7 +1309,7 @@ public class Vpn { 
            mOwnerUID = getAppUid(mContext, newPackage, mUserId);

            mIsPackageTargetingAtLeastQ = doesPackageTargetAtLeastQ(newPackage);

            try {

                mNms.allowProtect(mOwnerUID);

                mNetd.networkSetProtectAllow(mOwnerUID);

            } catch (Exception e) {

                Log.wtf(TAG, "Failed to allow UID " + mOwnerUID + " to call protect() " + e);

            }