Merge "docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug:... (c411b4ec) · Commits · e / os / android_frameworks_base

docs/html/guide/developing/device.jd

+4 −1

Original line number	Diff line number	Diff line
		@@ -119,7 +119,7 @@ USB device support on Linux. The USB Vendor ID is the value given to the

		<table>
		<tr>
		<th>Manufacturer</th><th>USB Vendor ID</th></tr>
		<th>Company</th><th>USB Vendor ID</th></tr>
		<tr>
		<td>Acer</td>
		<td><code>0502</code></td></tr>
		@@ -132,6 +132,9 @@ USB device support on Linux. The USB Vendor ID is the value given to the
		<tr>
		<td>Garmin-Asus</td>
		<td><code>091E</code></td></tr>
		<tr>
		<td>Google</td>
		<td><code>18d1</code></td></tr>
		<tr>
		<td>HTC</td>
		<td><code>0bb4</code></td></tr>

+2 −2

Original line number	Diff line number	Diff line
		@@ -260,8 +260,8 @@ looks like this:</p>

		<p>To fix this problem, simply delete the <code>debug.keystore</code> file.
		The default storage location for AVDs is in <code>~/.android/</code> on OS X and Linux,
		in <code>C:\Documents and Settings\<user>\.android\</code> on Windows XP, and in
		<code>C:\Users\<user>\.android\</code> on Windows Vista.</p>
		in <code>C:\Documents and Settings\<user>\.android\</code> on Windows XP, and in
		<code>C:\Users\<user>\.android\</code> on Windows Vista and Windows 7.</p>


		<p>The next time you build, the build tools will regenerate a new keystore and debug key.</p>

+1 −1

Original line number	Diff line number	Diff line
		@@ -250,7 +250,7 @@ on the data that is currently displayed.</td></tr>
		android:icon="@drawable/group_item1_icon" />
		<item android:id="@+id/group_item2"
		android:onClick="onGroupItemClick"
		android:title="G@string/group_item2"
		android:title="@string/group_item2"
		android:icon="@drawable/group_item2_icon" />
		</group>
		<item android:id="@+id/submenu"

+2 −2

Original line number	Diff line number	Diff line
		@@ -554,7 +554,7 @@ private class AcceptThread extends Thread {
		BluetoothServerSocket tmp = null;
		try {
		// MY_UUID is the app's UUID string, also used by the client code
		tmp = mAdapter.listenUsingRfcommWithServiceRecord(NAME, MY_UUID);
		tmp = mBluetoothAdapter.listenUsingRfcommWithServiceRecord(NAME, MY_UUID);
		} catch (IOException e) { }
		mmServerSocket = tmp;
		}
		@@ -690,7 +690,7 @@ private class ConnectThread extends Thread {

		public void run() {
		// Cancel discovery because it will slow down the connection
		mAdapter.cancelDiscovery();
		mBluetoothAdapter.cancelDiscovery();

		try {
		// Connect the device through the socket. This will block

+1 −1

Original line number	Diff line number	Diff line
		@@ -433,7 +433,7 @@ The entire file should now look like this:
		</pre>
		</li>

		<li>Now open and modify your <code>HelloAndroid</code> class use the
		<li>Now open and modify your <code>HelloAndroid</code> class and use the
		XML layout. Edit the file to look like this:
		<pre>
		package com.example.helloandroid;