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

Commit e4c7f3ba authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am 1a517d0c: Merge "Remove subclass cast for calls to isDnsCheckDisabled." into honeycomb-LTE 

* commit '1a517d0c':
  Remove subclass cast for calls to isDnsCheckDisabled.
parents 69e830dc 1a517d0c

telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java

+2 −2
Original line number Diff line number Diff line
@@ -99,9 +99,9 @@ public class CdmaDataConnection extends DataConnection { 


    @Override

    protected boolean isDnsOk(String[] domainNameServers) {

        if ((NULL_IP.equals(domainNameServers[0])

        if (NULL_IP.equals(domainNameServers[0])

                && NULL_IP.equals(domainNameServers[1])

                && !((CDMAPhone) phone).isDnsCheckDisabled())) {

                && !phone.isDnsCheckDisabled()) {

            return false;

        } else {

            return true;

telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ public class GsmDataConnection extends DataConnection { 
    @Override

    protected boolean isDnsOk(String[] domainNameServers) {

        if (NULL_IP.equals(domainNameServers[0]) && NULL_IP.equals(domainNameServers[1])

                && !((GSMPhone) phone).isDnsCheckDisabled()) {

                && !phone.isDnsCheckDisabled()) {

            // Work around a race condition where QMI does not fill in DNS:

            // Deactivate PDP and let DataConnectionTracker retry.

            // Do not apply the race condition workaround for MMS APN