diff --git a/docs/html/guide/developing/tools/emulator.jd b/docs/html/guide/developing/tools/emulator.jd index 6363ab29d1147..f07cdd58d541d 100644 --- a/docs/html/guide/developing/tools/emulator.jd +++ b/docs/html/guide/developing/tools/emulator.jd @@ -1142,7 +1142,7 @@ currently supported.

emulator checks the value of the http_proxy environment variable at startup and uses its value automatically, if defined.

-

You can use the -verbose-proxy option to diagnose proxy +

You can use the -debug-proxy option to diagnose proxy connection problems.

diff --git a/docs/html/guide/practices/design/performance.jd b/docs/html/guide/practices/design/performance.jd index b3f883082620d..f22d2d31a80c2 100644 --- a/docs/html/guide/practices/design/performance.jd +++ b/docs/html/guide/practices/design/performance.jd @@ -279,7 +279,7 @@ address some of them here.

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 -Map map than a HashMap map, even though in both +HashMap map than a Map map, even though in both cases the map was a HashMap.) 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.

diff --git a/docs/html/guide/topics/providers/content-providers.jd b/docs/html/guide/topics/providers/content-providers.jd index 5da760a17eb0c..30f8d8c3c9c13 100644 --- a/docs/html/guide/topics/providers/content-providers.jd +++ b/docs/html/guide/topics/providers/content-providers.jd @@ -176,17 +176,7 @@ people (both controlled by the Contacts content provider) are:

{@code android.provider.Contacts.Phones.CONTENT_URI}
{@code android.provider.Contacts.Photos.CONTENT_URI} -

- -

-Similarly, the URIs for the table of recent phone calls and the table -of calendar entries are: -

- -

-

{@code android.provider.CallLog.Calls.CONTENT_URI} -
{@code android.provider.Calendar.CONTENT_URI} -

+

The URI constant is used in all interactions with the content provider. diff --git a/docs/html/sdk/adt_download.jd b/docs/html/sdk/adt_download.jd index 96896c7d63ed2..f98caf5d61b8e 100644 --- a/docs/html/sdk/adt_download.jd +++ b/docs/html/sdk/adt_download.jd @@ -22,11 +22,18 @@ ADT Installation.

Notes - 0.9.6 - ADT-0.9.6.zip + 0.9.7 + ADT-0.9.7.zip {@adtZipBytes} bytes {@adtZipChecksum} - Requires SDK Tools, Revision 5 March 2009 + Requires SDK Tools, Revision 6 May 2010 + + + 0.9.6 + ADT-0.9.6.zip + 7456339 bytes + ea45d271be52b87b5dd1c9fb17536223 + Requires SDK Tools, Revision 5 March 2010 0.9.5