Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4edba01e authored by Erik Kline's avatar Erik Kline
Browse files

Ignore potential SystemProperties errors when setting net.dns 

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

Change-Id: I76ae853ceb61b7b900f36f9c3cd67b2d2284aab0
parent d0f476bd

services/core/java/com/android/server/ConnectivityService.java

+12 −5
Original line number Diff line number Diff line
@@ -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)) {