commit 5cd290f3284add3bda6085c16346bb37d6cc291e
author Matthew Xie <mattx@google.com> Thu Sep 08 22:16:30 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 08 22:16:30 2011 -0700
tree b079990aed005a3a2d42f496e016bf9a7893812e
parent 03e581f736c926895efa8950f1c662e24774d882
parent 37746f8c5b7a6d37d1cebc22fcbfc957f6e91abc

Merge "Sync main.confs with that of Bluez"

data/main.conf

diff --git a/data/main.conf b/data/main.conf
index 0b3bdb7..2e1cc2d 100644
--- a/data/main.conf
+++ b/data/main.conf
@@ -34,8 +34,8 @@
 PageTimeout = 8192
 
 # Discover scheduler interval used in Adapter.DiscoverDevices
-# The value is in seconds. Defaults is 0 to use controller scheduler.
-DiscoverSchedulerInterval = 0
+# The value is in seconds. Defaults is 30.
+DiscoverSchedulerInterval = 30
 
 # What value should be assumed for the adapter Powered property when
 # SetProperty(Powered, ...) hasn't been called yet. Defaults to true

data/main.le.conf

diff --git a/data/main.le.conf b/data/main.le.conf
index 772a344..040ece1 100644
--- a/data/main.le.conf
+++ b/data/main.le.conf
@@ -34,8 +34,8 @@
 PageTimeout = 8192
 
 # Discover scheduler interval used in Adapter.DiscoverDevices
-# The value is in seconds. Defaults is 0 to use controller scheduler.
-DiscoverSchedulerInterval = 0
+# The value is in seconds. Defaults is 30.
+DiscoverSchedulerInterval = 30
 
 # What value should be assumed for the adapter Powered property when
 # SetProperty(Powered, ...) hasn't been called yet. Defaults to true

data/main.nonsmartphone.conf

diff --git a/data/main.nonsmartphone.conf b/data/main.nonsmartphone.conf
index 5641897..62dc174 100644
--- a/data/main.nonsmartphone.conf
+++ b/data/main.nonsmartphone.conf
@@ -34,8 +34,8 @@
 PageTimeout = 8192
 
 # Discover scheduler interval used in Adapter.DiscoverDevices
-# The value is in seconds. Defaults is 0 to use controller scheduler.
-DiscoverSchedulerInterval = 0
+# The value is in seconds. Defaults is 30.
+DiscoverSchedulerInterval = 30
 
 # What value should be assumed for the adapter Powered property when
 # SetProperty(Powered, ...) hasn't been called yet. Defaults to true

data/main.nonsmartphone.le.conf

diff --git a/data/main.nonsmartphone.le.conf b/data/main.nonsmartphone.le.conf
index ac13cf5..4a6ebe8 100644
--- a/data/main.nonsmartphone.le.conf
+++ b/data/main.nonsmartphone.le.conf
@@ -34,8 +34,8 @@
 PageTimeout = 8192
 
 # Discover scheduler interval used in Adapter.DiscoverDevices
-# The value is in seconds. Defaults is 0 to use controller scheduler.
-DiscoverSchedulerInterval = 0
+# The value is in seconds. Defaults is 30.
+DiscoverSchedulerInterval = 30
 
 # What value should be assumed for the adapter Powered property when
 # SetProperty(Powered, ...) hasn't been called yet. Defaults to true