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

Merge "Ignore potential SystemProperties errors when setting net.dns"

Browse Source
This commit is contained in:
Treehugger Robot
2017-04-13 05:49:31 +00:00
committed by Gerrit Code Review
parent 972b2717f5 54e35c046d
commit a0d447ce3e
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4580,17 +4580,24 @@ public class ConnectivityService extends IConnectivityManager.Stub
int last = 0;
for (InetAddress dns : dnses) {
++last;
String key = "net.dns" + last;
String value = dns.getHostAddress();
mSystemProperties.set(key, value);
setNetDnsProperty(last, dns.getHostAddress());
}
for (int i = last + 1; i <= mNumDnsEntries; ++i) {
String key = "net.dns" + i;
mSystemProperties.set(key, "");
setNetDnsProperty(i, "");
}
mNumDnsEntries = last;
}
private void setNetDnsProperty(int which, String value) {
final String key = "net.dns" + which;
// Log and forget errors setting unsupported properties.
try {
mSystemProperties.set(key, value);
} catch (Exception e) {
Log.e(TAG, "Error setting unsupported net.dns property: ", e);
}
}
private String getNetworkPermission(NetworkCapabilities nc) {
// TODO: make these permission strings AIDL constants instead.
if (!nc.hasCapability(NET_CAPABILITY_NOT_RESTRICTED)) {