Shimeng (Simon) Wang
1dc6b9ebc6
am c1e7f2d3: Merge "Set high usage delta to 1 to avoid constant V8 GC." into honeycomb
...
* commit 'c1e7f2d371aa6c2aa9ed3207689cb53a1f704cbc':
Set high usage delta to 1 to avoid constant V8 GC.
2011-01-25 10:30:33 -08:00
Arnaud Ferir
0d1289122c
am 10ab8617: am 5e81a6e2: Fix trace mismatch.
...
* commit '10ab8617e85c9a675ff8251cd328beb4e047777c':
Fix trace mismatch.
2011-01-25 10:29:59 -08:00
Sylvain Fonteneau
a2eced302b
am e97a42e0: am c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel.
...
* commit 'e97a42e05cced70dd5713c731a197187b4751800':
Handle mock tags in android.nfc.Tag conversion to Parcel.
2011-01-25 10:29:51 -08:00
John Wang
c3a5b19c95
am 78eb9238: am 93300ce2: Merge "Enable recovery in RIL wakelock release check." into gingerbread
...
* commit '78eb92388ce30aee9b9aaa3e6c9a2de185f8d6a4':
Enable recovery in RIL wakelock release check.
2011-01-25 10:29:44 -08:00
Shimeng (Simon) Wang
c1e7f2d371
Merge "Set high usage delta to 1 to avoid constant V8 GC." into honeycomb
2011-01-25 10:27:24 -08:00
Nick Pelly
fd06cc10ac
resolved conflicts for merge of 0065f398 to honeycomb-plus-aosp
...
Change-Id: I1fcb292287f82605db41d330ae840fb5f617847b
2011-01-25 10:26:54 -08:00
Nick Pelly
bdd265ba5f
resolved conflicts for merge of 12619677 to honeycomb-plus-aosp
...
Change-Id: I3469ca28b32dd2a8e8011f6f50f9297ba07e933e
2011-01-25 10:20:02 -08:00
Nick Pelly
8bfdd9a651
Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp
2011-01-25 10:03:46 -08:00
Jeff Hamilton
883b26db47
am 535ec16c: am e1e70c57: Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread
...
* commit '535ec16c78eada2d32669f5a2f8e3c227a5beecc':
Allow null filters for foreground dispatch to act as catch all.
2011-01-25 10:03:17 -08:00
John Reck
500c9e99f5
am 7f532976: Merge "Docs for Origin" into honeycomb
...
* commit '7f532976baa54d2935a8ba42cc2c529b7460e57a':
Docs for Origin
2011-01-25 10:03:14 -08:00
Jim Miller
00e37916bc
am 1323ab83: am 42a46157: Fix 3379239: Catch exceptions from workaround for OOM.
...
* commit '1323ab83e4be088fd66ad73ea9da617e46382987':
Fix 3379239: Catch exceptions from workaround for OOM.
2011-01-25 10:02:53 -08:00
Dianne Hackborn
119919b81a
am 1240719a: am bcf2adeb: Merge "aapt: Allow raw "%" in unformatted string-arrays"
...
* commit '1240719ae06855d38f1fa159dd73e2109bb9586f':
aapt: Allow raw "%" in unformatted string-arrays
2011-01-25 10:02:46 -08:00
John Reck
7f532976ba
Merge "Docs for Origin" into honeycomb
2011-01-25 10:01:16 -08:00
Shimeng (Simon) Wang
7c1bcfddcd
Set high usage delta to 1 to avoid constant V8 GC.
...
This value will be passed to native webkit to V8.
3 consecutive dromaeo DOM core are run, there's no crash.
Because of assets change, Passion browser can't be run; this will
need to be checked in I release, I think
issue: 3317722
Change-Id: Ifa6e4116f76f395d98db9f8336f91dc9de6bf125
2011-01-25 09:55:11 -08:00
Nick Pelly
8847fd8532
Merge "Merge commit 'c3563eb9' into honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-01-25 08:58:57 -08:00
Nick Pelly
33bfcd7f22
Merge commit 'c3563eb9' into honeycomb-plus-aosp
...
Change-Id: I63ff88ae3597ea8722a59d16e66f5ea65ffa3b9e
2011-01-25 08:57:50 -08:00
satok
6ee3bcf6c6
am 3a92c5fd: Merge "Fix the return value of switch to last ime." into honeycomb
...
* commit '3a92c5fd3262236e0c6969591da7f6cb50dbddfc':
Fix the return value of switch to last ime.
2011-01-25 08:02:42 -08:00
satok
3a92c5fd32
Merge "Fix the return value of switch to last ime." into honeycomb
2011-01-25 08:00:29 -08:00
satok
c445bcd0bc
Fix the return value of switch to last ime.
...
Change-Id: I5fe8cc696433a7ee72973d16d8f121d3362ab0e0
2011-01-26 00:49:51 +09:00
satok
89bd89a0dd
am b5627921: Merge "Sort IME by id" into honeycomb
...
* commit 'b562792129a547bf124e71be7ca5d556c0aefb55':
Sort IME by id
2011-01-25 07:28:24 -08:00
Ken Wakasa
901a819334
am 24a0b71a: Merge "Clip touch event at SoftInputWindow to handle the event from Inset" into honeycomb
...
* commit '24a0b71a67ca98fbb94ff6ff321acb155d8a1014':
Clip touch event at SoftInputWindow to handle the event from Inset
2011-01-25 07:28:12 -08:00
satok
b562792129
Merge "Sort IME by id" into honeycomb
2011-01-25 06:34:21 -08:00
satok
7dc93a1df7
Sort IME by id
...
Bug: 3364167
Change-Id: I8c8e4ddc4110e2920c8c7beccf108ac7e0227903
2011-01-25 23:28:22 +09:00
Ken Wakasa
24a0b71a67
Merge "Clip touch event at SoftInputWindow to handle the event from Inset" into honeycomb
2011-01-25 05:42:36 -08:00
Tadashi G. Takaoka
7bd6c20f26
Clip touch event at SoftInputWindow to handle the event from Inset
...
Bug: 3238092
Change-Id: I92d98bed75957c8db149e1ad87defe24d44f4d53
2011-01-25 18:02:55 +09:00
Jason Sams
0ac3046426
am 03855bbe: Fix bug 3385881 Launch signals and threads are not always matched in index. Threads grab launch indexes as they start which may not be the order in which they were launched.
...
* commit '03855bbe4a55668d6834514f83f8c2276e9dc594':
Fix bug 3385881 Launch signals and threads are not always matched in index. Threads grab launch indexes as they start which may not be the order in which they were launched.
2011-01-25 00:40:34 -08:00
Jason Sams
03855bbe4a
Fix bug 3385881
...
Launch signals and threads are not always
matched in index. Threads grab launch indexes
as they start which may not be the order in which
they were launched.
Change-Id: I1ff42c3df5d7ebb46de6329ebd11ef67a5fc58ca
2011-01-25 00:34:34 -08:00
Jason Sams
cf20b3aec1
am 887a834c: Merge "Attempt to fix 3333866 Missing memory barrier when the non-locking past path is hit." into honeycomb
...
* commit '887a834c4737bed055bacbc91cc0dd42bd25546c':
Attempt to fix 3333866 Missing memory barrier when the non-locking past path is hit.
2011-01-25 00:26:14 -08:00
Jason Sams
887a834c47
Merge "Attempt to fix 3333866 Missing memory barrier when the non-locking past path is hit." into honeycomb
2011-01-25 00:23:41 -08:00
Dheeraj Sharma
0890280345
am a2edecfe: Merge "Issue no : 3370622" into honeycomb
...
* commit 'a2edecfe75134ba8bb7258ef30941ef3e9024de4':
Issue no : 3370622
2011-01-24 23:06:41 -08:00
Dheeraj Sharma
a2edecfe75
Merge "Issue no : 3370622" into honeycomb
2011-01-24 23:04:54 -08:00
satok
a7207b110d
am 5113382e: Tweak layouts of IME switch button
...
* commit '5113382e95d5f5f322bc6618bef7d1c7f96e295f':
Tweak layouts of IME switch button
2011-01-24 23:04:16 -08:00
satok
5113382e95
Tweak layouts of IME switch button
...
Bug: 3383078
Change-Id: Id522ac6e8363a98be6ac73ee75b0d54e12ef86c4
2011-01-25 16:00:46 +09:00
Dianne Hackborn
dc3bb35b67
am 4989aa7d: Merge "Fix issue #3385054 : HRI24 never enters suspend (LP0) - IKXEVEREST-3439" into honeycomb
...
* commit '4989aa7da319e4fcf95a92c4a2d6f2cf1ed6d563':
Fix issue #3385054 : HRI24 never enters suspend (LP0) - IKXEVEREST-3439
2011-01-24 22:53:25 -08:00
Romain Guy
b372d7cbea
am 89fca351: Merge "Make nested hardware layers work again" into honeycomb
...
* commit '89fca351702e3ec54c2748e2e2676ec1b2fbe9dc':
Make nested hardware layers work again
2011-01-24 22:53:21 -08:00
Dheeraj Sharma
1ac760afab
Issue no : 3370622
...
VideoEditor: Fix for Clear Surface API
Change-Id: I8d4ad90dd2a0d37bd5363c36582a16f08b161bee
2011-01-24 22:52:40 -08:00
Dianne Hackborn
4989aa7da3
Merge "Fix issue #3385054 : HRI24 never enters suspend (LP0) - IKXEVEREST-3439" into honeycomb
2011-01-24 22:51:18 -08:00
Santosh Madhava
a1ec9893b8
am 9c0bd864: Merge "Review rework on Patch Set 2 for issue 3372849" into honeycomb
...
* commit '9c0bd864a302ac2a8cb826c3c8d2f0d0ce6f2406':
Review rework on Patch Set 2 for issue 3372849
2011-01-24 22:35:31 -08:00
Romain Guy
89fca35170
Merge "Make nested hardware layers work again" into honeycomb
2011-01-24 22:35:21 -08:00
Romain Guy
5e7f766e99
Make nested hardware layers work again
...
Change-Id: I97bde694ec1b712a1e010c8137919e6d64af3148
2011-01-24 22:35:56 -08:00
Santosh Madhava
9c0bd864a3
Merge "Review rework on Patch Set 2 for issue 3372849" into honeycomb
2011-01-24 22:33:44 -08:00
Romain Guy
50dc05e5ad
am c6a0944c: Merge "Fix display list support for shapes." into honeycomb
...
* commit 'c6a0944c80b3a9bcea00ce9b5d3a605eaadabb49':
Fix display list support for shapes.
2011-01-24 22:15:53 -08:00
Adam Powell
1ecb461bb7
am e6564ea8: Merge "Fix bug 3178934 - Make MenuBuilder notify its adapters of changes" into honeycomb
...
* commit 'e6564ea8f54ea0872208819aa643a0599d962a3c':
Fix bug 3178934 - Make MenuBuilder notify its adapters of changes
2011-01-24 22:15:47 -08:00
Ken Wakasa
67e9505235
am bc891b67: Merge "Fix NPE in IInputMethodSessionWrapper.executeMessage" into honeycomb
...
* commit 'bc891b67e07fd6f5077f88879299dbdf27ae9ee1':
Fix NPE in IInputMethodSessionWrapper.executeMessage
2011-01-24 22:12:44 -08:00
Dianne Hackborn
98d169eacd
am 5d9d03a0: Maybe fix issue #3093599 : java.lang.IndexOutOfBoundsException...
...
* commit '5d9d03a0234faa3cffd11502f973057045cafe82':
Maybe fix issue #3093599 : java.lang.IndexOutOfBoundsException...
2011-01-24 22:12:36 -08:00
Santosh Madhava
6bcbb3bd09
Review rework on Patch Set 2 for issue 3372849
...
Change-Id: I3c077f3318e44035e8ea6eb160d0024e77aaa710
2011-01-24 22:10:19 -08:00
Dianne Hackborn
c2d9c8e20b
Fix issue #3385054 : HRI24 never enters suspend (LP0) - IKXEVEREST-3439
...
Um. My fix for calling onReceive() even after a receiver is
unregistered actually made it so onReceive() is never called for
the result receiver of a broadcast.
Change-Id: I30efe05d8fdec6fee4222b7d797f2b303073dbcc
2011-01-24 21:59:21 -08:00
Romain Guy
82d41a5153
Fix display list support for shapes.
...
Change-Id: I8b4c9e9ec36266a83c0a53ba3fb6e45d61bbd6d9
2011-01-24 21:53:42 -08:00
Romain Guy
c6a0944c80
Merge "Fix display list support for shapes." into honeycomb
2011-01-24 21:51:43 -08:00
Adam Powell
e6564ea8f5
Merge "Fix bug 3178934 - Make MenuBuilder notify its adapters of changes" into honeycomb
2011-01-24 21:48:56 -08:00