21330 Commits

Author SHA1 Message Date
Tom Taylor
dbac180d83 Fix a merge problem with html mms
Html mms message support was added back in Jan '10. At that time, we
had moved the mms code out of the framework into the mms app. We decided
to back out that change and leave the mms code in its original place.
As a result, the changes to support html messages were lost. This
handmerged CL restores those changes. I'll cherry-pick this into master
as well. Bug 2858888

Change-Id: Icf8835edc8ac396698c167be5433a6fe1cfe6103
2010-07-21 10:49:48 -07:00
Dan Egnor
2f0dc6d9f5 Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo 2010-07-20 13:57:08 -07:00
Scott Main
2316d62608 docs: add information about using color resources as drawables
Change-Id: I24d82292b700104294d268894b660bc8b7e5ddb0
2010-07-20 10:28:09 -07:00
Dan Egnor
b3e4ef3702 COMMENT ONLY change to add some warnings about ParcelFileDescriptor
behavior with Parcel.writeValue().

Change-Id: If55fcce29559379855735ff5297cf4f46d5d6be6
Bug: 2847738
2010-07-20 10:24:38 -07:00
Dan Egnor
9bc4039a58 Merge "COMMENT-ONLY change to clarify Camera documentation." into froyo 2010-07-19 18:14:50 -07:00
Scott Main
85e7ae9bbb Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo 2010-07-19 14:42:13 -07:00
Hung Dang
28fe43be5c Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo 2010-07-16 15:13:12 -07:00
Scott Main
7e48908463 docs: add troubleshooting to eclipse guide about restarting adb
Change-Id: I44bf5f488a2a322dabe86ec2e4f25169fc7091ce
2010-07-16 15:04:22 -07:00
Scott Main
2a8dd4e46f Merge "docs: editorial revisions to Search guide" into froyo 2010-07-16 14:52:03 -07:00
Scott Main
5e892d8183 docs: editorial revisions to Search guide
Change-Id: I6a2065304d1d80c46f3bb3c658ab55f1fe58b211
2010-07-16 14:33:14 -07:00
Yu Shan Emily Lau
ba1348e3c2 Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.
Change-Id: I42527612764252d1c47bd29a2b88d5e3019cfdf9
2010-07-16 12:00:30 -07:00
Scott Main
d59f1dea17 Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo 2010-07-15 18:14:16 -07:00
Scott Main
80fa5c866e docs: dashboard update
Change-Id: I289cc30b0ae2f88429a8a01b4b7219a86b6d479c
2010-07-15 17:56:59 -07:00
Katie McCormick
28da8e5e4a Merge "Doc change: Update AVD create instructions." into froyo 2010-07-15 17:25:10 -07:00
Katie McCormick
c46efe6696 Doc change: Update AVD create instructions.
Change-Id: Icb1a8200d1b8de4aedea0718a014ab57e057235d
2010-07-15 16:20:41 -07:00
Scott Main
38137d7a27 Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo 2010-07-15 11:16:32 -07:00
Andrew Stadler
468c82e4be Merge "Skip hostname verification when using insecure factory" into froyo 2010-07-14 22:26:56 -07:00
Dan Egnor
bfcbeffc54 COMMENT-ONLY change to clarify Camera documentation.
Change-Id: I6b75cfdfc34d1c16d93c02a32649022ce5505b11
2010-07-13 16:43:56 -07:00
Dianne Hackborn
1bcb665825 Merge "Fix issue #2834005: Android Settings.Secure bypass" into froyo 2010-07-12 19:03:26 -07:00
Dianne Hackborn
24117ce3ae Fix issue #2834005: Android Settings.Secure bypass
Change-Id: Ic4f14e2ff5c2b4f623405d30389863a9e3e82572
2010-07-12 17:21:50 -07:00
Dirk Dougherty
3c691a8d7f Doc change: add notes for ndk r4b.
Change-Id: Idf4e4d2ac2ed9c30b3afe258546861084f3f20aa
2010-07-12 15:51:01 -07:00
Andrew Stadler
df27c0c262 Skip hostname verification when using insecure factory
If the factory was obtained by calling getInsecure(), calls to
createSocket() should skip hostname verification (along with all of the
other skipped safety checks.)

This change slightly relaxes the too-strict checking that was introduced
in change 7fc93c36ae235115727296780dbc35101622bbd4.

Bug: 2834174
Change-Id: Iab7ef861ad0ca727f82ee8cdb78b89b9e835740d
2010-07-12 15:31:40 -07:00
Robert Ly
ef13d02821 docchange: fixed typo "Pacskage" to "Package"
Change-Id: I6004dc7743dcd74315cbfc2cccc306ff8724e569
2010-07-12 14:55:59 -07:00
Scott Main
286cf139c3 docs: add redirect for download.html
Change-Id: Id54f1899c1933796524d6c2b5e991a652b354287
2010-07-08 11:26:36 -07:00
Scott Main
5183ae3b0f Merge "docs: add caution about adt in eclipse 3.6" into froyo 2010-07-07 18:37:48 -07:00
Scott Main
1c9bada4b4 docs: add caution about adt in eclipse 3.6
Change-Id: I37c920f6a5290d891c4a6dea5978147a50eec807
2010-07-07 16:47:16 -07:00
Dirk Dougherty
2651504c02 Merge "Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc." into froyo 2010-07-07 14:29:29 -07:00
Dirk Dougherty
0b2395c193 Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc.
Change-Id: I5522406335fbf96164a5b812ec4891c499343d1e
2010-07-02 15:07:47 -07:00
Scott Main
1c8b6ca4d7 docs: fix misc broken links
Change-Id: I7294276aff0c80498215870d5d72f7a3a9b2c99a
2010-07-02 11:11:34 -07:00
Chih-Chung Chang
7df7447112 Merge "Flush binder buffer after setting raw heap to avoid leaking a reference." into froyo 2010-07-02 07:43:31 -07:00
Scott Main
f80372dbc0 Merge "docs: update device dashboard; add historical chart" into froyo 2010-07-01 23:26:58 -07:00
Chih-Chung Chang
fe1bac6762 Flush binder buffer after setting raw heap to avoid leaking a reference.
The problem was:

1. In handleShutter(), thread A in CameraService calls
   registerBuffers(IMemoryHeap) and it's received by thread B
   in system_server. [transaction 1]
2. While thread A is waiting for the reply, thread B calls
   back to thread A to get the id of the heap
   (IMemoryHeap.getHeapID). [transaction 2]
3. Thread A replies transaction 2 and is preemptied in kernel.
   Thread B gets the reply and finishes registerBuffers and send
   reply for transaction 1.
4. When thread A runs again, it gets the reply for transaction 1
   and returns to handleShutter().
5. At this point the transaction buffer for transaction 2 (which
   holds a reference to IMemoryHeap) is not freed because the
   BC_FREE_BUFFER command is kept in thread A's local command
   queue and not sent to the kernel.
6. Normally when thread A makes next transaction, the
   BC_FREE_BUFFER command will be sent together (piggyback) with
   the commands for that transaction. But in this case thread A
   is a callback thread from camera driver, so it does not make
   any binder calls afterwards, and the IMemoryHeap is never freed
   (until the next time handleShutter is called).

Change-Id: I435a258187509bdbbaf353339eb9ea577610cbd2
2010-07-02 12:56:54 +08:00
Eric Laurent
c03befe3d6 Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
Problem:
When the bluetooth device is removed, the AudioService clears all active SCO connections
and unlinks from the client application's binder interface death.
The problem is that the unlinking is done even if no more connections are active for a given client,
which throws a runtime exception that is not catched causing the system server to crash.

The fix consists in calling unlinkToDeath() in ScoClient.clearCount() only if the number of
active SCO connections for this client is not 0. The NoSuchElementException exception is also
catched when calling unlinkToDeath()

Change-Id: I7086424301fc63a5666da61c38169349d3e078f4
2010-07-01 16:23:34 -07:00
Scott Main
db3b598c93 docs: update device dashboard; add historical chart
Change-Id: Iafed4ed927141d34dcdb728918320be2fa2cf151
2010-07-01 14:57:41 -07:00
Doug Zongker
d581484ef8 Merge "Verify hostname where possible, and clarify where not." into froyo 2010-06-30 11:12:19 -07:00
Dan Egnor
7fc93c36ae Verify hostname where possible, and clarify where not.
Bug: 2807409
Change-Id: I6f6a6b22a48149d9f1f45ff8f53103b25706ecc0
2010-06-29 19:19:10 -07:00
Scott Main
b4d2e42a85 docs: revise menu guide to focus more on using menu resources
instead of defining menus in code.
And revise some style.

Change-Id: I0a5a19a51062d72cdb9045c9607cab04b69f554c
2010-06-29 17:13:02 -07:00
Scott Main
4fb91d9f1b docs: fix typo
Change-Id: I39849068bb1b35a766df93ab3440829730efabaa
2010-06-29 15:22:03 -07:00
Scott Main
337b0873f4 docs: update backup guide and bmgr tool
elaborate the guide to testing a backup agent and add links between the docs

Change-Id: I35f815d1848c6bd7c6bfaee214f333e35a6cb23c
2010-06-28 12:28:31 -07:00
Scott Main
56c778e6cf Merge "docs: Remove the TOS from download flow and remove TOS entirely because it's no longer relevant to the SDK download package" into froyo 2010-06-24 18:10:41 -07:00
Scott Main
654d9414de docs: Remove the TOS from download flow and remove TOS entirely because
it's no longer relevant to the SDK download package

Change-Id: I5f0b2b6258db1f09f300567fc0d22b5e3effd324
2010-06-24 17:29:13 -07:00
Dianne Hackborn
5827d3eaf3 Merge "Properly note the current active restore set's token" into froyo 2010-06-24 16:00:06 -07:00
Christopher Tate
2950555aac Properly note the current active restore set's token
Bug: 2796780
Change-Id: Iad601ed96ae73cf34910a276350712e6af19bb4e
2010-06-24 15:58:01 -07:00
Nick Pelly
d19c397b04 Merge "Do not log AT command traffic by default." into froyo 2010-06-24 11:52:39 -07:00
Nick Pelly
801dbe26ee Do not log AT command traffic by default.
Bug: 2792732
Change-Id: I0ef25f38f38685291af6680cf653046eb391da5a
2010-06-24 11:48:54 -07:00
Scott Main
753e56090e Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo 2010-06-23 09:57:46 -07:00
Scott Main
964384962d docs: update backup dev guide with Android Backup Service registration info
Change-Id: I16696abbd517a5a740ff641ca0b17ffafbcf4993
2010-06-22 19:26:16 -07:00
Dirk Dougherty
17ae646586 Merge "Doc change: Fix description of certificate matching requirement for app updates." into froyo 2010-06-22 11:13:48 -07:00
Dirk Dougherty
a767076f46 Doc change: Fix description of certificate matching requirement for app updates.
Change-Id: I38a0b997f5cb634bfdab1c0ecaa2b0d19e68256a
2010-06-21 16:22:06 -07:00
Scott Main
dfe5c20440 docs: lots of additions to the resources docs
new drawable resources
add <merge> and <include> to layout resource
update drawable class descriptioons to point to resources guide
add ID resource type

Change-Id: I733eec50bb2671f28c9e6dd7dec14eb6586f5193
2010-06-21 15:19:23 -07:00