Romain Guy
b08fbaa16f
am fcf3d12d: Merge "Typo in Javadoc"
...
* commit 'fcf3d12d701e41d6e46bae8c13776f56d54f90e8':
Typo in Javadoc
2011-01-08 10:18:10 -08:00
Romain Guy
08b4007d23
Merge "Typo in Javadoc"
2011-01-08 10:04:32 -08:00
Gloria Wang
503e29c1db
am 0544d059: Merge "DRM Framework bug fixes."
...
* commit '0544d05990c0f43a143e98e71f7fc60277872806':
DRM Framework bug fixes.
2011-01-07 15:34:08 -08:00
Scott Main
b521dc0fe7
am 9b447d12: docs: catchup gingerbread to gingerbread-docs with misc changes
...
* commit '9b447d122a2f0a4798f03749e9d93b9a58834fe3':
docs: catchup gingerbread to gingerbread-docs with misc changes
2011-01-07 15:32:04 -08:00
Scott Main
bf1c42089c
am 3d0f0108: cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f docs: update dashboard
...
* commit '3d0f0108f9487512195c7344be2417c30a93c3fc':
cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f docs: update dashboard
2011-01-07 13:36:58 -08:00
Scott Main
2b01f77ccb
am c5602aee: fix bug 3295540
...
* commit 'c5602aeea3f4962dcb66d7a9e4a733259d5c12d5':
fix bug 3295540
2011-01-07 13:34:54 -08:00
Gloria Wang
988b1a4cf1
Merge "DRM Framework bug fixes."
2011-01-07 11:10:49 -08:00
Yu Shan Emily Lau
431a1a8bfe
am 2af4e71d: Merge "Fix the test application orientation. Bug# 3205196" into gingerbread
...
* commit '2af4e71dd47565d794ad48041a156871396a7dde':
Fix the test application orientation. Bug# 3205196
2011-01-07 09:40:18 -08:00
Yu Shan Emily Lau
6d15b27147
Merge "Fix the test application orientation. Bug# 3205196" into gingerbread
2011-01-07 09:38:24 -08:00
Gilles Debunne
83bdcbb887
am 9ffb0a0d: Merge "Ran fixPngMetaTags on all the core/res assets." into gingerbread
...
* commit '9ffb0a0df3a97115234bd50a73ca60efcefb4ef7':
Ran fixPngMetaTags on all the core/res assets.
2011-01-07 09:23:11 -08:00
Gilles Debunne
3fc5d28d2f
am 97664784: Merge "Asset cleanup. DO NOT MERGE" into gingerbread
...
* commit '976647841cc9e52c373679c930d06d81310ff289':
Asset cleanup. DO NOT MERGE
2011-01-07 09:23:07 -08:00
Marco Nelissen
7d6d018d9c
am f13d4501: Send "compilation" tag when inserting into the database. It\'s not actually inserted into the database, but the media provider uses it for disambiguating albums. b/3311831
...
* commit 'f13d4501396aa1679004ad07d440f65ced3ecc2b':
Send "compilation" tag when inserting into the database. It's not actually inserted into the database, but the media provider uses it for disambiguating albums. b/3311831
2011-01-07 09:22:57 -08:00
Dianne Hackborn
0558089724
am 3c902a62: Merge "Avoiding cyclic references when unbinding from a service"
...
* commit '3c902a62eddebc75adb5286e55e1107e0b63551f':
Avoiding cyclic references when unbinding from a service
2011-01-07 00:58:04 -08:00
Dianne Hackborn
dd22cef3dd
Merge "Avoiding cyclic references when unbinding from a service"
2011-01-07 00:43:15 -08:00
Marco Nelissen
62fdd796de
am ba77a3f9: Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831
...
* commit 'ba77a3f9cb1d68b2ed4813aaae856444578e3a75':
Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831
2011-01-06 20:29:11 -08:00
Nick Pelly
7a3abb0236
am f54ad8da: Clean up transceive().
...
* commit 'f54ad8daf6f9dc2b9670ab1abbbfa4308b40bc6a':
Clean up transceive().
2011-01-06 20:29:06 -08:00
Eric Fischer
a37e3b36af
am 06d19ef0: Merge "Import translations for additional languages." into gingerbread
...
* commit '06d19ef0a0f29d9a0bec63097ec443815512e9b1':
Import translations for additional languages.
2011-01-06 20:29:02 -08:00
Jeff Hamilton
f7206eab53
am 0aea1836: Merge "Make the new NFC APIs public." into gingerbread
...
* commit '0aea1836152da049273e581051a878381dcbd73d':
Make the new NFC APIs public.
2011-01-06 20:28:52 -08:00
Dianne Hackborn
5fcfe3ee82
am 3ea5728e: Tweak level at which we reset battery stats to 90%.
...
* commit '3ea5728e703554f8ba0bb3aa1367d6dc45d704bb':
Tweak level at which we reset battery stats to 90%.
2011-01-06 20:28:44 -08:00
Gilles Debunne
2029a91959
Merge "Ran fixPngMetaTags on all the core/res assets." into gingerbread
2011-01-06 18:30:26 -08:00
Gilles Debunne
00a99a94a3
Merge "Asset cleanup. DO NOT MERGE" into gingerbread
2011-01-06 18:29:59 -08:00
Eric Fischer
8f55bbb010
Merge "Import translations for additional languages." into gingerbread
2011-01-06 14:11:47 -08:00
Jeff Hamilton
5a2804ddfc
Merge "Make the new NFC APIs public." into gingerbread
2011-01-06 11:28:42 -08:00
Dianne Hackborn
c414fb98ac
am 3769240b: Merge "Clear reference to the IIntentReceiver in order to avoid memory leak"
...
* commit '3769240b7976bfa50bb7bf235747b7f6bb7be08e':
Clear reference to the IIntentReceiver in order to avoid memory leak
2011-01-05 19:28:33 -08:00
Johannes Carlsson
37d9aaceea
am b5a8654d: Clear reference to the IIntentReceiver in order to avoid memory leak
...
* commit 'b5a8654dea9ea8443b41f8ff3668ae4074e13a07':
Clear reference to the IIntentReceiver in order to avoid memory leak
2011-01-05 19:13:29 -08:00
Dianne Hackborn
611040bae9
Merge "Clear reference to the IIntentReceiver in order to avoid memory leak"
2011-01-05 19:10:15 -08:00
Dianne Hackborn
dc70fde034
am c91f9fe5: Merge "Avoiding cyclic references when unbinding from a service" into gingerbread
...
* commit 'c91f9fe542fd1ca9d6da432faeba60d35c4d5c49':
Avoiding cyclic references when unbinding from a service
2011-01-05 18:55:57 -08:00
Dianne Hackborn
c0cb771cab
Merge "Avoiding cyclic references when unbinding from a service" into gingerbread
2011-01-05 18:54:19 -08:00
James Dong
54f6bb5718
am 35e8dcb9: Merge "Suppress the recording sound in the recorded video" into gingerbread
...
* commit '35e8dcb9df8c3d77ede120e3f1aaf842b2928639':
Suppress the recording sound in the recorded video
2011-01-05 17:55:27 -08:00
James Dong
da57245bae
Merge "Suppress the recording sound in the recorded video" into gingerbread
2011-01-05 17:53:18 -08:00
Brad Fitzpatrick
d02d09416d
am 69ea4e15: Documentation fixes found over vacation hacking.
...
* commit '69ea4e15e52c456537575d21443ac1efdb03a902':
Documentation fixes found over vacation hacking.
2011-01-05 13:52:53 -08:00
Nick Pelly
26e102d2b1
am 8d98aebe: Merge "Fix technology extra naming for IsoDep and NfcB (API part)." into gingerbread
...
* commit '8d98aebe286be0ca963232afce3d5ceec67d3d7a':
Fix technology extra naming for IsoDep and NfcB (API part).
2011-01-04 18:33:41 -08:00
Nick Pelly
83f1f8ce07
Merge "Fix technology extra naming for IsoDep and NfcB (API part)." into gingerbread
2011-01-04 18:31:19 -08:00
Hung-ying Tyan
25cde516e1
am 273d2ea3: Merge "Fix setting audio group mode in SipPhone." into gingerbread
...
* commit '273d2ea3f986f1611d2cf303cc5b93f820c14dd3':
Fix setting audio group mode in SipPhone.
2011-01-04 17:47:47 -08:00
Hung-ying Tyan
675b5b008f
Merge "Fix setting audio group mode in SipPhone." into gingerbread
2011-01-04 17:45:36 -08:00
Chia-chi Yeh
52ff631261
am 3cf71376: RTP: Send silence packets on idle streams for every second.
...
* commit '3cf71376421f942d06b30101fbf0df7f3b23fbdd':
RTP: Send silence packets on idle streams for every second.
2011-01-04 17:37:17 -08:00
Eric Laurent
a017d5b379
Fix issue 3302649.
...
The cause of the problem is that AudioTrack::start() can fail if it is called from a newly created
thread that has the same ID as the AudioTrack callback thread that has just been stopped and not yet exited.
This is possible as the thread ID used by the Thread class is not the TID.
The fix consists in clearing the thread ID before exiting the thread loop.
Change-Id: I66e679665c384403cb3ba2c31746f5de72d5836d
2011-01-04 11:58:04 -08:00
Nick Pelly
3cb847958a
am 8f49c025: Merge "Added response flags and DSFID extras for NfcV technology (API part)." into gingerbread
...
* commit '8f49c025ca5b4ed84290fb9e5e0b7acb1c139b35':
Added response flags and DSFID extras for NfcV technology (API part).
2011-01-03 22:39:42 -08:00
Nick Pelly
84680db3b5
Merge "Added response flags and DSFID extras for NfcV technology (API part)." into gingerbread
2011-01-03 22:38:14 -08:00
Nick Pelly
f75645f66d
am a743448a: Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into gingerbread
...
* commit 'a743448a1b34d950b1e6f06e308ce113cbc9abcb':
Tweak Ndef.getType() API. Rename constants, expand javadoc.
2011-01-03 22:35:49 -08:00
Nick Pelly
ddf6027ea3
Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into gingerbread
2011-01-03 22:32:56 -08:00
Nick Pelly
775997cf4d
am 163bd407: Merge "Added getType() to NDEF technology class (API part)." into gingerbread
...
* commit '163bd407492bbadcdc8f0759191e1b9142d06859':
Added getType() to NDEF technology class (API part).
2011-01-03 21:01:01 -08:00
Nick Pelly
610d72deb5
Merge "Added getType() to NDEF technology class (API part)." into gingerbread
2011-01-03 20:58:26 -08:00
Nick Pelly
139ac3e470
am 8c09ef91: Merge "Removed selectAid() from IsoDep." into gingerbread
...
* commit '8c09ef91aef0706a012e449ba3d16c03e0d64508':
Removed selectAid() from IsoDep.
2011-01-03 20:11:08 -08:00
Nick Pelly
5c5258a1da
Merge "Removed selectAid() from IsoDep." into gingerbread
2011-01-03 20:09:03 -08:00
Nick Pelly
9b21188c5a
am 4b94dee8: Merge "Added transfer/restore convience cmds to MF Classic tech." into gingerbread
...
* commit '4b94dee8336a1135e4fc67a5911223bb5aabad99':
Added transfer/restore convience cmds to MF Classic tech.
2011-01-03 18:34:37 -08:00
Nick Pelly
af84317c80
Merge "Added transfer/restore convience cmds to MF Classic tech." into gingerbread
2011-01-03 18:33:09 -08:00
John Wang
64a7e1f026
am 06fccc32: Merge "Clear request list while timeout." into gingerbread
...
* commit '06fccc325123bf4c9ebd04ac9300b504436724fe':
Clear request list while timeout.
2011-01-03 08:46:47 -08:00
John Wang
d9883db5c5
Merge "Clear request list while timeout." into gingerbread
2011-01-03 08:44:17 -08:00
Jean-Baptiste Queru
f8b1da6be5
am 69ebb984: Merge "according to rfc2617, nc-value = 8LHEX"
...
* commit '69ebb984f230a523dc316bdb2c9e9c28111364fd':
according to rfc2617, nc-value = 8LHEX
2010-12-28 15:47:42 -08:00