Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replace hidden NMS permission control API" am: d8288fe344

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

Change-Id: I44840dc0c5ab4421976f606afcced0573e3dfe60
This commit is contained in:
Treehugger Robot
2020-10-29 07:34:41 +00:00
committed by Automerger Merge Worker
parent edc0fa3fe5 d8288fe344
commit 38be0ff345
3 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/os/INetworkManagementService.aidl
View File

@@ -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().
*/

6
services/core/java/com/android/server/ConnectivityService.java
View File

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

11
services/core/java/com/android/server/NetworkManagementService.java
View File

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