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

Commit 752c2bd1 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... 

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

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



Change-Id: I011904abd0470c9468efa5d87b4a3ba07af437cd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6e728461 f3cc8652

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);

            }