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

Commit 25353257 authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'froyo' into froyo-release

parents 40fca6ae 94f1751c
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -53,10 +53,10 @@ public class AndroidCharacter

    /**
     * Fill the first <code>count</code> bytes of <code>dest</code> with the
     * East Asian Width from the first <code>count</code> chars of
     * <code>src</code>. East Asian Width is calculated based on
     * East Asian Width from <code>count</code> chars of <code>src</code>
     * starting at <code>start</code>. East Asian Width is calculated based on
     * <a href="http://unicode.org/reports/tr11/">Unicode TR#11</a>. Each entry
     * in <code>dest> will be one of {@link #EAST_ASIAN_WIDTH_NEUTRAL},
     * in <code>dest</code> will be one of {@link #EAST_ASIAN_WIDTH_NEUTRAL},
     * {@link #EAST_ASIAN_WIDTH_AMBIGUOUS}, {@link #EAST_ASIAN_WIDTH_HALF_WIDTH},
     * {@link #EAST_ASIAN_WIDTH_FULL_WIDTH}, {@link #EAST_ASIAN_WIDTH_NARROW},
     * or {@link #EAST_ASIAN_WIDTH_WIDE}.
+1 −1
Original line number Diff line number Diff line
@@ -1142,7 +1142,7 @@ currently supported.</p>
emulator checks the value of the <code>http_proxy</code> environment variable at
startup and uses its value automatically, if defined. </p>

<p>You can use the <code>-verbose-proxy</code> option to diagnose proxy
<p>You can use the <code>-debug-proxy</code> option to diagnose proxy
connection problems.</p>

<a name="connecting"></a>
+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ address some of them here.</p>
<p>On devices without a JIT, it is true that invoking methods via a
variable with an exact type rather than an interface is slightly more
efficient. (So, for example, it was cheaper to invoke methods on a
<code>Map map</code> than a <code>HashMap map</code>, even though in both
<code>HashMap map</code> than a <code>Map map</code>, even though in both
cases the map was a <code>HashMap</code>.) It was not the case that this
was 2x slower; the actual difference was more like 6% slower. Furthermore,
the JIT makes the two effectively indistinguishable.</p>
+20 −17
Original line number Diff line number Diff line
@@ -337,17 +337,6 @@ keys)</td>
<td><code>-v</code></td><td>Enable verbose output.</td>
</tr>
<tr>
<td><code>-keystore&nbsp;&lt;keystore-name&gt;.keystore</code></td><td>A name
for the keystore containing the private key.</td>
</tr>
<tr>
<td><code>-storepass &lt;password&gt;</code></td><td><p>A password for the
keystore.</p><p>As a security precaution, do not include this option 
in your command line unless you are working at a secure computer.
If not supplied, Keytool prompts you to enter the password. In this 
way, your password is not stored in your shell history.</p></td>
</tr>
<tr>
<td><code>-alias &lt;alias_name&gt;</code></td><td>An alias for the key. Only
the first 8 characters of the alias are used.</td>
</tr>
@@ -356,6 +345,11 @@ the first 8 characters of the alias are used.</td>
when generating the key. Both DSA and RSA are supported.</td>
</tr>
<tr>
<td><code>-keysize &lt;size&gt;</code></td><td>The size of each generated key
(bits). If not supplied, Keytool uses a default key size of 1024 bits. In
general, we recommend using a key size of 2048 bits or higher. </td>
</tr>
<tr>
<td><code>-dname &lt;name&gt;</code></td><td><p>A Distinguished Name that describes
who created the key. The value is used as the issuer and subject fields in the
self-signed certificate. </p><p>Note that you do not need to specify this option
@@ -363,22 +357,31 @@ in the command line. If not supplied, Jarsigner prompts you to enter each
of the Distinguished Name fields (CN, OU, and so on).</p></td>
</tr>
<tr>
<td><code>-keypass &lt;password&gt;</code></td><td><p>The password for the
key.</p> <p>As a security precaution, do not include this option in your command
line. If not supplied, Keytool prompts you to enter the password. In this way,
your password is not stored in your shell history.</p></td>
</tr>
<tr>
<td><code>-validity &lt;valdays&gt;</code></td><td><p>The validity period for the
key, in days. </p><p><strong>Note:</strong> A value of 10000 or greater is recommended.</p></td>
</tr>
<tr>
<td><code>-keypass &lt;password&gt;</code></td><td><p>The password for the key.</p>
<p>As a security precaution, do not include this option 
in your command line unless you are working at a secure computer.
If not supplied, Keytool prompts you to enter the password. In this 
way, your password is not stored in your shell history.</p></td>
<td><code>-keystore&nbsp;&lt;keystore-name&gt;.keystore</code></td><td>A name
for the keystore containing the private key.</td>
</tr>
<tr>
<td><code>-storepass &lt;password&gt;</code></td><td><p>A password for the
keystore.</p><p>As a security precaution, do not include this option in your
command line. If not supplied, Keytool prompts you to enter the password. In
this way, your password is not stored in your shell history.</p></td>
</tr>
</table>

<p>Here's an example of a Keytool command that generates a private key:</p>

<pre>$ keytool -genkey -v -keystore my-release-key.keystore 
-alias alias_name -keyalg RSA -validity 10000</pre>
-alias alias_name -keyalg RSA -keysize 2048 -validity 10000</pre>

<p>Running the example command above, Keytool prompts you to provide
passwords for the keystore and key, and to provide the Distinguished
+1 −11
Original line number Diff line number Diff line
@@ -178,16 +178,6 @@ people (both controlled by the Contacts content provider) are:
<br/>{@code android.provider.Contacts.Photos.CONTENT_URI}
</p>

<p>
Similarly, the URIs for the table of recent phone calls and the table 
of calendar entries are:
</p>   

<p>
<p style="margin-left: 2em">{@code android.provider.CallLog.Calls.CONTENT_URI}
<br/>{@code android.provider.Calendar.CONTENT_URI}
</p>   

<p>
The URI constant is used in all interactions with the content provider. 
Every {@link android.content.ContentResolver} method takes the URI 
Loading