diff options
| author | Matthew Xie <mattx@google.com> | 2011-09-08 22:16:30 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-08 22:16:30 -0700 |
| commit | 5cd290f3284add3bda6085c16346bb37d6cc291e (patch) | |
| tree | b079990aed005a3a2d42f496e016bf9a7893812e | |
| parent | 03e581f736c926895efa8950f1c662e24774d882 (diff) | |
| parent | 37746f8c5b7a6d37d1cebc22fcbfc957f6e91abc (diff) | |
| download | bluetooth-5cd290f3284add3bda6085c16346bb37d6cc291e.tar.gz | |
Merge "Sync main.confs with that of Bluez"android-sdk-adt_r16.0.1android-cts-4.0_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1ics-mr0-releaseics-mr0ics-factoryrom-2-release
| -rw-r--r-- | data/main.conf | 4 | ||||
| -rw-r--r-- | data/main.le.conf | 4 | ||||
| -rw-r--r-- | data/main.nonsmartphone.conf | 4 | ||||
| -rw-r--r-- | data/main.nonsmartphone.le.conf | 4 |
4 files changed, 8 insertions, 8 deletions
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 @@ PairableTimeout = 0 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 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 @@ PairableTimeout = 0 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 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 @@ PairableTimeout = 0 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 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 @@ PairableTimeout = 0 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 |