LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Network-related commands porting"

Browse Source
This commit is contained in:
Luke Huang
2018-10-16 07:44:37 +00:00
committed by Gerrit Code Review
parent 38149e3ea7 b913c8165e
commit 5f81fcf08d
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4782,15 +4782,14 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
} }
private String getNetworkPermission(NetworkCapabilities nc) { private int getNetworkPermission(NetworkCapabilities nc) {
// TODO: make these permission strings AIDL constants instead.
if (!nc.hasCapability(NET_CAPABILITY_NOT_RESTRICTED)) { if (!nc.hasCapability(NET_CAPABILITY_NOT_RESTRICTED)) {
return NetworkManagementService.PERMISSION_SYSTEM; return INetd.PERMISSION_SYSTEM;
} }
if (!nc.hasCapability(NET_CAPABILITY_FOREGROUND)) { if (!nc.hasCapability(NET_CAPABILITY_FOREGROUND)) {
return NetworkManagementService.PERMISSION_NETWORK; return INetd.PERMISSION_NETWORK;
} }
return null; return INetd.PERMISSION_NONE;
} }
/** /**
@@ -4863,9 +4862,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
if (Objects.equals(nai.networkCapabilities, newNc)) return; if (Objects.equals(nai.networkCapabilities, newNc)) return;
final String oldPermission = getNetworkPermission(nai.networkCapabilities); final int oldPermission = getNetworkPermission(nai.networkCapabilities);
final String newPermission = getNetworkPermission(newNc); final int newPermission = getNetworkPermission(newNc);
if (!Objects.equals(oldPermission, newPermission) && nai.created && !nai.isVPN()) { if (oldPermission != newPermission && nai.created && !nai.isVPN()) {
try { try {
mNMS.setNetworkPermission(nai.network.netId, newPermission); mNMS.setNetworkPermission(nai.network.netId, newPermission);
} catch (RemoteException e) { } catch (RemoteException e) {