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

Commit 5d4b7c17 authored by Chiachang Wang's avatar Chiachang Wang Committed by Gerrit Code Review
Browse files

Merge "Replace calls for updating permission to protect sockets from VPN" into main

parents 9c766095 ad6a32fe

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

            }