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
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
Gilles Debunne
d6e568c4f3
Removed warnings in DynamicLayout
...
Change-Id: Ied1c330795412d0bdcac1236b466951112fabc7d
2011-01-25 10:14:43 -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
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
Gilles Debunne
f902d7bc49
TextLine cache is used, even for long lines of text.
...
Bug 3381368
The 250 characters limit is passed for long URLs. There are only 3
TextLine objects, so their total size is not an issue. Recycle long
lines as well to make sure we fill the cache and avoid object creation.
Change-Id: I843bf623594312a0fcf0edbb13b7cd64cce0ddd1
2011-01-25 09:09:46 -08:00
Nick Pelly
3b61e47a3f
am b134223f: Make Mifare Classic increment/decrement operands little endian
...
* commit 'b134223f91c8801d577cb72e92a37cb65fec717a':
Make Mifare Classic increment/decrement operands little endian
2011-01-25 08:41:35 -08:00
Nick Pelly
b134223f91
Make Mifare Classic increment/decrement operands little endian
...
Also make sure they are non-negative.
This is not documented in Mifare Classic spec, but based on findings from NXP:
- Operand should be stored in little-endian format in the transceive buffer
- Tag ignores the sign bit on the operand, its effectively 31-bit unsigned
- Overflow and underflow generates an error.
Change-Id: Id3389b3894ded732c4b00d564ca53f5df651359e
2011-01-25 07:45:07 -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
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
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
Dianne Hackborn
4989aa7da3
Merge "Fix issue #3385054 : HRI24 never enters suspend (LP0) - IKXEVEREST-3439" into honeycomb
2011-01-24 22:51:18 -08:00
Romain Guy
5e7f766e99
Make nested hardware layers work again
...
Change-Id: I97bde694ec1b712a1e010c8137919e6d64af3148
2011-01-24 22:35:56 -08:00
Romain Guy
89fca35170
Merge "Make nested hardware layers work again" into honeycomb
2011-01-24 22:35:21 -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
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
Adam Powell
e6564ea8f5
Merge "Fix bug 3178934 - Make MenuBuilder notify its adapters of changes" into honeycomb
2011-01-24 21:48:56 -08:00
Adam Powell
1821ff9022
Fix bug 3178934 - Make MenuBuilder notify its adapters of changes
...
Change-Id: I28603afbdfdd913aa06f3a07065e27aff1dc524b
2011-01-24 21:45:37 -08:00
Ken Wakasa
bc891b67e0
Merge "Fix NPE in IInputMethodSessionWrapper.executeMessage" into honeycomb
2011-01-24 21:37:53 -08:00
Dianne Hackborn
5d9d03a023
Maybe fix issue #3093599 : java.lang.IndexOutOfBoundsException...
...
...Invalid index 0, size is 0 at
android.app.ActivityThread.performPauseActivity(ActivityThread.java:2326)
It looks like if an arrow key is dispatched between the time the
list view is told its data set has changed and it does the resulting
layout pass, we could try to move the position to a now invalid
index. This may prevent that from happening.
Also put in a better error message if saving state of a fragment
whose target is no longer in the fragment manager.
And fix a bug in PackageManager where we could return a null from
queryIntentActivities().
And add a new API to find out whether a fragment is being removed,
to help fix issue #3306021 : NPE at
android.app.AlertDialog.getDefaultDialogTheme(AlertDialog.java)
Next, for new HC apps we can delay committing data to
storage until the activity is stopped.
Finally, use the new multi-threaded AyncTask executor in a few
places, so we don't have worked blocked by long-running tasks from
the application.
Change-Id: I27b2aafedf2e1bf3a2316309889613fa539760f3
2011-01-24 21:23:03 -08:00
Ken Wakasa
a308c0326b
Fix NPE in IInputMethodSessionWrapper.executeMessage
...
bug: 3384715
Change-Id: I4bd8f2b505318a9b3e17dccf6a583dc7f36a8a24
2011-01-25 14:02:07 +09:00
Romain Guy
7b4950ae35
am 169fafe6: Merge "Fix rendering issues with animated layers. Bug #3385247 " into honeycomb
...
* commit '169fafe6797dc4c7ae17eba29b72034be6c9c8ec':
Fix rendering issues with animated layers. Bug #3385247
2011-01-24 20:47:19 -08:00
Romain Guy
8168396d1a
Fix rendering issues with animated layers.
...
Bug #3385247
- The layer's alpha was interpreted in the wrong range 0..255 instead of 0..1
- 9-patches would not correctly dirty the layer region, the generated mesh
was incorrect
Change-Id: I4916249bedcdb0794929f3796bd17854971efc88
2011-01-24 20:40:18 -08:00
Romain Guy
169fafe679
Merge "Fix rendering issues with animated layers. Bug #3385247 " into honeycomb
2011-01-24 20:38:52 -08:00
Romain Guy
74d9a373f9
am 92dcf629: Merge "Fix rendering issues in Movie Studio." into honeycomb
...
* commit '92dcf629e1ecb60fc497b8b1b3d2aab35c334672':
Fix rendering issues in Movie Studio.
2011-01-24 20:23:49 -08:00
Romain Guy
d88f54c5c4
Fix rendering issues in Movie Studio.
...
Change-Id: I5b293767b9bdedeef0df4d27a179d0da48d7fe32
2011-01-24 20:22:49 -08:00
Romain Guy
92dcf629e1
Merge "Fix rendering issues in Movie Studio." into honeycomb
2011-01-24 20:20:50 -08:00
Adam Powell
abb7e56b27
am 68b29902: Merge "Fix bug 3385930 - Holo.SegmentedButton contentarea and disabled state broken" into honeycomb
...
* commit '68b29902c0832d78a6557f915168694f35b7ca8e':
Fix bug 3385930 - Holo.SegmentedButton contentarea and disabled state broken
2011-01-24 19:49:30 -08:00
Adam Powell
68b29902c0
Merge "Fix bug 3385930 - Holo.SegmentedButton contentarea and disabled state broken" into honeycomb
2011-01-24 19:45:41 -08:00
Adam Powell
6d0576d3e8
Fix bug 3385930 - Holo.SegmentedButton contentarea and disabled state broken
...
Fix padding and add disabled states for the group button assets.
Change-Id: Iad7f9022de895fbd6875989289f600d098145b1b
2011-01-24 19:37:59 -08:00
Romain Guy
4e1db6dadd
am 2ff6d705: Merge "Enable partial invalidates when rendering with OpenGL." into honeycomb
...
* commit '2ff6d70521fe1f537f8ebd631f0b9b3aa8becf94':
Enable partial invalidates when rendering with OpenGL.
2011-01-24 18:39:57 -08:00
Romain Guy
2ff6d70521
Merge "Enable partial invalidates when rendering with OpenGL." into honeycomb
2011-01-24 18:38:00 -08:00
Romain Guy
7d7b5490a0
Enable partial invalidates when rendering with OpenGL.
...
Change-Id: Ie8be06c4776b815e8737753eb8003b4fd8936130
2011-01-24 18:39:56 -08:00
Jim Miller
d413ff3ab3
am 7a9662f7: Merge "Fix 3382123: Set default state of LockScreen portrait kb" into honeycomb
...
* commit '7a9662f7c8d95685975a6f1c29151d7ed871c9ba':
Fix 3382123: Set default state of LockScreen portrait kb
2011-01-24 18:23:07 -08:00
Jim Miller
7a9662f7c8
Merge "Fix 3382123: Set default state of LockScreen portrait kb" into honeycomb
2011-01-24 18:20:53 -08:00
Brian Carlstrom
4140faeebb
Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle
...
Bug: 3086427
Change-Id: I7af99fe4c36d9a519777f0499ccab65646313879
2011-01-24 18:17:21 -08:00
Justin Ho
e44f3d7b7a
am 9c91b3f9: Merge "Updated overscroll assets" into honeycomb
...
* commit '9c91b3f9d679a22560141e6388e125879fb9f96a':
Updated overscroll assets
2011-01-24 18:08:23 -08:00
Justin Ho
9c91b3f9d6
Merge "Updated overscroll assets" into honeycomb
2011-01-24 18:05:46 -08:00