diff options
| author | Wink Saville <wink@google.com> | 2011-04-28 11:54:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-28 11:54:57 -0700 |
| commit | a81490c0ca4e254e15bbb9ed29af05f9e617e579 (patch) | |
| tree | 433739bf9f6b7b7b3bb95feb415c72d1cb32e415 /telephony | |
| parent | d4e264e2fae4a5de981eebd858895edbdff6525a (diff) | |
| parent | e4c7f3ba0fd3cb8f2fce39cd76c36c0df3692eae (diff) | |
| download | frameworks_base-a81490c0ca4e254e15bbb9ed29af05f9e617e579.zip frameworks_base-a81490c0ca4e254e15bbb9ed29af05f9e617e579.tar.gz frameworks_base-a81490c0ca4e254e15bbb9ed29af05f9e617e579.tar.bz2 | |
am e4c7f3ba: am 1a517d0c: Merge "Remove subclass cast for calls to isDnsCheckDisabled." into honeycomb-LTE
* commit 'e4c7f3ba0fd3cb8f2fce39cd76c36c0df3692eae':
Remove subclass cast for calls to isDnsCheckDisabled.
Diffstat (limited to 'telephony')
| -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 |