commit 5d4b7c17d028f67c5173b7612ebfc118b031b847
author Chiachang Wang <chiachangwang@google.com> Mon Dec 18 02:57:27 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 18 02:57:27 2023 +0000
tree 2682a231394cb41c0720810c9d6227089aa62557
parent 9c7660952f4b6b8f19e7bb2131f90e1fccee1fec
parent ad6a32fe34c2ceb29eb4bdbae3ca34a640fe4418

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

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

diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index c517058..b7ece2ea 100644
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -1299,7 +1299,7 @@
             }
 
             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 @@
             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);
             }