Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '1a517d0c251d2ca577500ec6c0e434725c3ddd21':
  Remove subclass cast for calls to isDnsCheckDisabled.
This commit is contained in:
Wink Saville
2011-04-28 11:53:05 -07:00
committed by Android Git Automerger
parent 69e830dc31 1a517d0c25
commit e4c7f3ba0f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java
View File

@@ -99,9 +99,9 @@ public class CdmaDataConnection extends DataConnection {
@Override @Override
protected boolean isDnsOk(String[] domainNameServers) { protected boolean isDnsOk(String[] domainNameServers) {
if ((NULL_IP.equals(domainNameServers[0]) if (NULL_IP.equals(domainNameServers[0])
&& NULL_IP.equals(domainNameServers[1]) && NULL_IP.equals(domainNameServers[1])
&& !((CDMAPhone) phone).isDnsCheckDisabled())) { && !phone.isDnsCheckDisabled()) {
return false; return false;
} else { } else {
return true; return true;

2
telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java
View File

@@ -130,7 +130,7 @@ public class GsmDataConnection extends DataConnection {
@Override @Override
protected boolean isDnsOk(String[] domainNameServers) { protected boolean isDnsOk(String[] domainNameServers) {
if (NULL_IP.equals(domainNameServers[0]) && NULL_IP.equals(domainNameServers[1]) 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: // Work around a race condition where QMI does not fill in DNS:
// Deactivate PDP and let DataConnectionTracker retry. // Deactivate PDP and let DataConnectionTracker retry.
// Do not apply the race condition workaround for MMS APN // Do not apply the race condition workaround for MMS APN