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

Merge "Remove unused methods from INetworkManagementService"

Browse Source
This commit is contained in:
Treehugger Robot
2019-04-24 14:29:39 +00:00
committed by Gerrit Code Review
parent 6badf7c7da 1e41180dae
commit 5d2c5d5dc2
2 changed files with 0 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -396,9 +396,6 @@ interface INetworkManagementService
*/
void setNetworkPermission(int netId, int permission);
void setPermission(String permission, in int[] uids);
void clearPermission(in int[] uids);
/**
* Allow UID to call protect().
*/

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

@@ -2143,38 +2143,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub {
}
}
private int parsePermission(String permission) {
if (permission.equals("NETWORK")) {
return INetd.PERMISSION_NETWORK;
}
if (permission.equals("SYSTEM")) {
return INetd.PERMISSION_SYSTEM;
}
return INetd.PERMISSION_NONE;
}
@Override
public void setPermission(String permission, int[] uids) {
mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);
try {
mNetdService.networkSetPermissionForUser(parsePermission(permission), uids);
} catch (RemoteException | ServiceSpecificException e) {
throw new IllegalStateException(e);
}
}
@Override
public void clearPermission(int[] uids) {
mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);
try {
mNetdService.networkClearPermissionForUser(uids);
} catch (RemoteException | ServiceSpecificException e) {
throw new IllegalStateException(e);
}
}
@Override
public void allowProtect(int uid) {
mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);