summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Shmidt <>2009-04-20 09:50:17 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-04-20 09:50:17 -0700
commit6d31eb895340f3b25f1388dd4ce1a4314de9a267 (patch)
treee1f6659bafeab78dcce7d4c70ab74739b1d5dbd8
parent4482d8c8e41b02786efae97987394f60b68d6f6e (diff)
parent42554c10b61f747c0689f2304f19a2af17b886ce (diff)
downloadframeworks_base-6d31eb895340f3b25f1388dd4ce1a4314de9a267.zip
frameworks_base-6d31eb895340f3b25f1388dd4ce1a4314de9a267.tar.gz
frameworks_base-6d31eb895340f3b25f1388dd4ce1a4314de9a267.tar.bz2
Merge branch 'readonly-p4-donut' into donut
-rw-r--r--services/java/com/android/server/WifiWatchdogService.java8
1 files changed, 0 insertions, 8 deletions
diff --git a/services/java/com/android/server/WifiWatchdogService.java b/services/java/com/android/server/WifiWatchdogService.java
index fe97b93..9443a95 100644
--- a/services/java/com/android/server/WifiWatchdogService.java
+++ b/services/java/com/android/server/WifiWatchdogService.java
@@ -75,14 +75,6 @@ public class WifiWatchdogService {
private static final boolean V = false || Config.LOGV;
private static final boolean D = true || Config.LOGD;
- /*
- * When this was "net.dns1", sometimes the mobile data's DNS was seen
- * instead due to a race condition. All we really care about is the
- * DHCP-replied DNS server anyway.
- */
- /** The system property whose value provides the current DNS address. */
- private static final String SYSTEMPROPERTY_KEY_DNS = "dhcp.tiwlan0.dns1";
-
private Context mContext;
private ContentResolver mContentResolver;
private WifiStateTracker mWifiStateTracker;