| commit | cde0ce55a2f7b398079d9bbb817dfda59687431b | [log] [tgz] |
|---|---|---|
| author | Huang, Huki <huki.huang@intel.com> | Wed Dec 10 10:42:47 2014 +0800 |
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | Thu Dec 11 01:01:19 2014 +0000 |
| tree | e68e5d00ebafd7d11a51f7ead5dfb79aaa9e1619 | |
| parent | fe9fd14f4d4e7d8dc1ea9627394bb4a9e106a830 [diff] |
CHERRY-PICK: Candy: Add bluetooth device ID BUG=chrome-os-partner:34361 TEST=Verified SDP output for DI contains 00E0:2428:0400 Change-Id: Iad87b33ba807fd847e085c35a44be56188f6addd Original-Change-Id: If46df262b653c9ba7ea377fe037d17da9ac1b7dc Reviewed-on: https://chromium-review.googlesource.com/233921 Tested-by: Huki Huang <huki.huang@intel.com> Reviewed-by: Bernie Thompson <bhthompson@chromium.org> Commit-Queue: Bernie Thompson <bhthompson@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/234275 Commit-Queue: Huki Huang <huki.huang@intel.com> Reviewed-by: Jean Zheng <jean@chromium.org>
diff --git a/overlay-candy/chromeos-base/chromeos-bsp-candy/chromeos-bsp-candy-0.0.1-r2.ebuild b/overlay-candy/chromeos-base/chromeos-bsp-candy/chromeos-bsp-candy-0.0.1-r3.ebuild similarity index 100% rename from overlay-candy/chromeos-base/chromeos-bsp-candy/chromeos-bsp-candy-0.0.1-r2.ebuild rename to overlay-candy/chromeos-base/chromeos-bsp-candy/chromeos-bsp-candy-0.0.1-r3.ebuild
diff --git a/overlay-candy/chromeos-base/chromeos-bsp-candy/chromeos-bsp-candy-0.0.1.ebuild b/overlay-candy/chromeos-base/chromeos-bsp-candy/chromeos-bsp-candy-0.0.1.ebuild index 6ff7888..ede7ec0 100644 --- a/overlay-candy/chromeos-base/chromeos-bsp-candy/chromeos-bsp-candy-0.0.1.ebuild +++ b/overlay-candy/chromeos-base/chromeos-bsp-candy/chromeos-bsp-candy-0.0.1.ebuild
@@ -43,4 +43,8 @@ doins "${FILESDIR}/discharging.png" doins "${FILESDIR}/connect_ac.png" doins "${FILESDIR}/connect_ac_batterycutoff.png" + + # Install Bluetooth ID override. + insinto "/etc/bluetooth" + doins "${FILESDIR}/main.conf" }
diff --git a/overlay-candy/chromeos-base/chromeos-bsp-candy/files/main.conf b/overlay-candy/chromeos-base/chromeos-bsp-candy/files/main.conf new file mode 100644 index 0000000..f6b132f --- /dev/null +++ b/overlay-candy/chromeos-base/chromeos-bsp-candy/files/main.conf
@@ -0,0 +1,2 @@ +[General] +DeviceID = bluetooth:00E0:2428:0400