Projects >> platform_frameworks_base >>81519e611a066c6d858c2e4978c46be5f73c247b

Chunk
Conflicting content 
                        String[] dnsServers = mDefaultDnsServers;
                        Collection dnses = linkProperties.getDnses();
                        if (dnses != null) {
<<<<<<< HEAD
                            // we currently only handle IPv4
                            ArrayList v4Dnses =
                                    new ArrayList(dnses.size());
                            for (InetAddress dnsAddress : dnses) {
                                if (dnsAddress instanceof Inet4Address) {
                                    v4Dnses.add(dnsAddress);
                                }
                            }
                            if (v4Dnses.size() > 0) {
                                dnsServers = NetworkUtils.makeStrings(v4Dnses);
                            }
=======
                            dnsServers = NetworkUtils.makeStrings(dnses);
>>>>>>> 67cda1a0ec2f443293d0ada7c49708ff4a11c8c7
                        }
                        try {
                            mNMService.setDnsForwarders(dnsServers);
Solution content 
                        String[] dnsServers = mDefaultDnsServers;
                        Collection dnses = linkProperties.getDnses();
                        if (dnses != null) {
                            // we currently only handle IPv4
                            ArrayList v4Dnses =
                                    new ArrayList(dnses.size());
                            for (InetAddress dnsAddress : dnses) {
                                if (dnsAddress instanceof Inet4Address) {
                                    v4Dnses.add(dnsAddress);
                                }
                            }
                            if (v4Dnses.size() > 0) {
                                dnsServers = NetworkUtils.makeStrings(v4Dnses);
                            }
                        }
                        try {
                            mNMService.setDnsForwarders(dnsServers);
File
Tethering.java
Developer's decision
Version 1
Kind of conflict
Comment
For statement
If statement
Method invocation
Variable