diff options
| author | Ramesh Sudini <ramesh.sudini@motorola.com> | 2011-04-26 21:16:40 -0700 |
|---|---|---|
| committer | Wink Saville <wink@google.com> | 2011-04-26 21:17:06 -0700 |
| commit | 38d284d3235a003e1d330892a1fbde805b2f6669 (patch) | |
| tree | 8bf896043d4cdd5db8e3bfc0f6072d388e612878 | |
| parent | e20c91de9ccb4a8cb76a8e72884f2e9ca001a2de (diff) | |
| download | frameworks_base-38d284d3235a003e1d330892a1fbde805b2f6669.zip frameworks_base-38d284d3235a003e1d330892a1fbde805b2f6669.tar.gz frameworks_base-38d284d3235a003e1d330892a1fbde805b2f6669.tar.bz2 | |
Remove subclass cast for calls to isDnsCheckDisabled.
Change-Id: Ic9121db810b295d9f614046932badf04f07a42db
| -rw-r--r-- | telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java | 4 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java index cd585cf..e299d4a 100644 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaDataConnection.java @@ -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; diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java index 8a11ae3..545ad8a 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java @@ -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 |