diff --git a/core/java/android/os/INetworkManagementService.aidl b/core/java/android/os/INetworkManagementService.aidl index 3bcef901aa4a2..136f6121e585f 100644 --- a/core/java/android/os/INetworkManagementService.aidl +++ b/core/java/android/os/INetworkManagementService.aidl @@ -347,13 +347,6 @@ interface INetworkManagementService void addLegacyRouteForNetId(int netId, in RouteInfo routeInfo, int uid); - /** - * Set permission for a network. - * @param permission PERMISSION_NONE to clear permissions. - * PERMISSION_NETWORK or PERMISSION_SYSTEM to set permission. - */ - void setNetworkPermission(int netId, int permission); - /** * Allow UID to call protect(). */ diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 31872fe0e4010..21ad6de045bb3 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -6256,9 +6256,9 @@ public class ConnectivityService extends IConnectivityManager.Stub final int newPermission = getNetworkPermission(newNc); if (oldPermission != newPermission && nai.created && !nai.isVPN()) { try { - mNMS.setNetworkPermission(nai.network.netId, newPermission); - } catch (RemoteException e) { - loge("Exception in setNetworkPermission: " + e); + mNetd.networkSetPermissionForNetwork(nai.network.netId, newPermission); + } catch (RemoteException | ServiceSpecificException e) { + loge("Exception in networkSetPermissionForNetwork: " + e); } } } diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java index dea6c04b4f372..1c99465dfebfb 100644 --- a/services/core/java/com/android/server/NetworkManagementService.java +++ b/services/core/java/com/android/server/NetworkManagementService.java @@ -2008,17 +2008,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub { } } - @Override - public void setNetworkPermission(int netId, int permission) { - NetworkStack.checkNetworkStackPermission(mContext); - - try { - mNetdService.networkSetPermissionForNetwork(netId, permission); - } catch (RemoteException | ServiceSpecificException e) { - throw new IllegalStateException(e); - } - } - @Override public void allowProtect(int uid) { NetworkStack.checkNetworkStackPermission(mContext);