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

Ignore potential SystemProperties errors when setting net.dns

Browse Source 
Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
Bug: 33308258
Bug: 36249702

Change-Id: I76ae853ceb61b7b900f36f9c3cd67b2d2284aab0
(cherry picked from commit 4edba01eb4c05c0a9872014255e9e46c60463fd9)
This commit is contained in:
Erik Kline
2017-04-07 15:29:29 +09:00
parent ac7f4f261c
commit 5e89c9abfb
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

@@ -4470,17 +4470,24 @@ public class ConnectivityService extends IConnectivityManager.Stub
int last = 0; int last = 0;
for (InetAddress dns : dnses) { for (InetAddress dns : dnses) {
++last; ++last;
String key = "net.dns" + last; setNetDnsProperty(last, dns.getHostAddress());
String value = dns.getHostAddress();
mSystemProperties.set(key, value);
} }
for (int i = last + 1; i <= mNumDnsEntries; ++i) { for (int i = last + 1; i <= mNumDnsEntries; ++i) {
String key = "net.dns" + i; setNetDnsProperty(i, "");
mSystemProperties.set(key, "");
} }
mNumDnsEntries = last; 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) { private String getNetworkPermission(NetworkCapabilities nc) {
// TODO: make these permission strings AIDL constants instead. // TODO: make these permission strings AIDL constants instead.
if (!nc.hasCapability(NET_CAPABILITY_NOT_RESTRICTED)) { if (!nc.hasCapability(NET_CAPABILITY_NOT_RESTRICTED)) {