Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3333aa2 authored Jun 21, 2016 by Marie Janssen Committed by android-build-merger Jun 21, 2016

Merge \\\"Fix links to Bluetooth Guide\\\" am: 6ba39e5642 am: 84abd4a0

am: 1175443e

Change-Id: I99e17125cf95165b911c6e8f294e2f020d483cb2

parents f7dcb74e 1175443e

framework/java/android/bluetooth/BluetoothAdapter.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -90,7 +90,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
		* <div class="special reference">
		* <h3>Developer Guides</h3>
		* <p>For more information about using Bluetooth, read the
		* <a href="{@docRoot}guide/topics/wireless/bluetooth.html">Bluetooth</a> developer guide.
		* <a href="{@docRoot}guide/topics/connectivity/bluetooth.html">Bluetooth</a> developer guide.
		* </div>
		*
		* {@see BluetoothDevice}

framework/java/android/bluetooth/BluetoothDevice.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ import java.util.UUID;
		* <div class="special reference">
		* <h3>Developer Guides</h3>
		* <p>For more information about using Bluetooth, read the
		* <a href="{@docRoot}guide/topics/wireless/bluetooth.html">Bluetooth</a> developer guide.</p>
		* <a href="{@docRoot}guide/topics/connectivity/bluetooth.html">Bluetooth</a> developer guide.</p>
		* </div>
		*
		* {@see BluetoothAdapter}

framework/java/android/bluetooth/BluetoothServerSocket.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ import java.io.IOException;
		* <div class="special reference">
		* <h3>Developer Guides</h3>
		* <p>For more information about using Bluetooth, read the
		* <a href="{@docRoot}guide/topics/wireless/bluetooth.html">Bluetooth</a> developer guide.</p>
		* <a href="{@docRoot}guide/topics/connectivity/bluetooth.html">Bluetooth</a> developer guide.</p>
		* </div>
		*
		* {@see BluetoothSocket}

framework/java/android/bluetooth/BluetoothSocket.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -76,7 +76,7 @@ import java.nio.ByteBuffer;
		* <div class="special reference">
		* <h3>Developer Guides</h3>
		* <p>For more information about using Bluetooth, read the
		* <a href="{@docRoot}guide/topics/wireless/bluetooth.html">Bluetooth</a> developer guide.</p>
		* <a href="{@docRoot}guide/topics/connectivity/bluetooth.html">Bluetooth</a> developer guide.</p>
		* </div>
		*
		* {@see BluetoothServerSocket}