Gloria Wang
3bf37ac4a0
am 113529f0: am a4b0cdc9: Merge "More fix for 64 bit offset." into honeycomb
...
* commit '113529f062c43b111efbbd1382e23befdd1cdd30':
More fix for 64 bit offset.
2011-01-19 16:01:34 -08:00
Gloria Wang
113529f062
am a4b0cdc9: Merge "More fix for 64 bit offset." into honeycomb
...
* commit 'a4b0cdc96e309168517f4b4da24b7647668f99a7':
More fix for 64 bit offset.
2011-01-19 15:59:13 -08:00
Gloria Wang
a4b0cdc96e
Merge "More fix for 64 bit offset." into honeycomb
2011-01-19 15:57:23 -08:00
Gloria Wang
d0423d2b12
More fix for 64 bit offset.
...
Change-Id: Ia05060113ca0f43a4362914dc99c89c89e30eb4a
2011-01-19 15:38:16 -08:00
Joe Onorato
c3eb5c6c3d
am 201dd784: am cb109a0e: Add docs for Notification.Builder.
...
* commit '201dd784127b5e7e125cc57f2dfbbe16bc12624c':
Add docs for Notification.Builder.
2011-01-19 15:36:05 -08:00
Joe Onorato
201dd78412
am cb109a0e: Add docs for Notification.Builder.
...
* commit 'cb109a0eeaca12cdd954c567da4fc5f45a23213b':
Add docs for Notification.Builder.
2011-01-19 15:34:04 -08:00
Joe Onorato
cb109a0eea
Add docs for Notification.Builder.
...
Bug: 3362451
Change-Id: I8f16a7f266812190dc8d06751f5ca914e2050111
2011-01-19 15:29:30 -08:00
Jaikumar Ganesh
c5daab8716
am baba2475: am 7457b36b: Merge "Make connection / disconnect failure more robust." into honeycomb
...
* commit 'baba247578c88b39ec6d83150f7992862c6d05c1':
Make connection / disconnect failure more robust.
2011-01-19 15:28:33 -08:00
Andreas Huber
2c9ecf1e73
am 559da2fd: am 3cd6302b: Merge "Prefill the cache before trying to instantiate the media extractor." into honeycomb
...
* commit '559da2fd899dcd88ccea3f7df31a27b41d6ca074':
Prefill the cache before trying to instantiate the media extractor.
2011-01-19 15:28:29 -08:00
Jaikumar Ganesh
baba247578
am 7457b36b: Merge "Make connection / disconnect failure more robust." into honeycomb
...
* commit '7457b36b92490daa6cd7e346919fad74a4b92eb9':
Make connection / disconnect failure more robust.
2011-01-19 15:24:33 -08:00
Andreas Huber
559da2fd89
am 3cd6302b: Merge "Prefill the cache before trying to instantiate the media extractor." into honeycomb
...
* commit '3cd6302b9e54ff888df5eb47b35d25e7dac1d763':
Prefill the cache before trying to instantiate the media extractor.
2011-01-19 15:24:28 -08:00
Brad Fitzpatrick
28d5206519
am bd80a12c: resolved conflicts for merge of 9240f16d to honeycomb-plus-aosp
...
* commit 'bd80a12cba480a0dbb2e9073f35c758d8b396b94':
StrictMode: class instance limits (track object "leaks")
2011-01-19 15:24:02 -08:00
Brad Fitzpatrick
bd80a12cba
resolved conflicts for merge of 9240f16d to honeycomb-plus-aosp
...
Change-Id: I6e595bb11a5a692ccd730b9d1d2aa367063a61f5
2011-01-19 15:19:08 -08:00
Jaikumar Ganesh
7457b36b92
Merge "Make connection / disconnect failure more robust." into honeycomb
2011-01-19 15:13:37 -08:00
Andreas Huber
3cd6302b9e
Merge "Prefill the cache before trying to instantiate the media extractor." into honeycomb
2011-01-19 15:12:41 -08:00
Andreas Huber
9634665ed6
Prefill the cache before trying to instantiate the media extractor.
...
The latter is an operation that otherwise could block on the datasource
for a significant amount of time. During that time we'd be unable to
abort the preparation phase without this prefill.
Change-Id: Ia42496d88a11314386ea8797d665bf4e94871e30
related-to-bug: 3362836
2011-01-19 15:07:19 -08:00
Brad Fitzpatrick
9240f16d77
Merge "StrictMode: class instance limits (track object "leaks")" into honeycomb
2011-01-19 14:53:24 -08:00
Brad Fitzpatrick
bfbe577110
StrictMode: class instance limits (track object "leaks")
...
Change-Id: I2db5a19060c2013078feb88a91caf655469b2f98
2011-01-19 14:52:08 -08:00
Carl Shapiro
6e775641d2
am 82ce9e02: am b098f735: Merge "Add a property for specifying a dalvik heap growth limit." into honeycomb
...
* commit '82ce9e02ecd076971160d0b9503cde9b286e4dd3':
Add a property for specifying a dalvik heap growth limit.
2011-01-19 14:45:34 -08:00
Carl Shapiro
82ce9e02ec
am b098f735: Merge "Add a property for specifying a dalvik heap growth limit." into honeycomb
...
* commit 'b098f73556ae31f505782d2fe7028b83d1564147':
Add a property for specifying a dalvik heap growth limit.
2011-01-19 14:42:07 -08:00
Romain Guy
cf4b6c7cd6
am 1aae1c2a: am 8f36bedc: Merge "Don\'t attempt to create empty layers. Bug #3369888 " into honeycomb
...
* commit '1aae1c2a9ba7ad229e8c2ba8ad1befc598986e57':
Don't attempt to create empty layers. Bug #3369888
2011-01-19 14:41:29 -08:00
Carl Shapiro
b098f73556
Merge "Add a property for specifying a dalvik heap growth limit." into honeycomb
2011-01-19 14:40:24 -08:00
Romain Guy
1aae1c2a9b
am 8f36bedc: Merge "Don\'t attempt to create empty layers. Bug #3369888 " into honeycomb
...
* commit '8f36bedcf3fd3b5b3e5746af689b9915d506365f':
Don't attempt to create empty layers. Bug #3369888
2011-01-19 14:38:04 -08:00
Romain Guy
8f36bedcf3
Merge "Don't attempt to create empty layers. Bug #3369888 " into honeycomb
2011-01-19 14:36:22 -08:00
Romain Guy
514fb18827
Don't attempt to create empty layers.
...
Bug #3369888
Change-Id: Ic17bbd1c04bbf760cb17d0eb9e6767fd6479948c
2011-01-19 14:38:29 -08:00
Gil Dobjanschi
d097e87a14
am fc8ea8ec: am c4edeb5a: Bug fix: 368813 Transition is regenerated when overlay duration changes outside the transition
...
* commit 'fc8ea8ecb408b553c2646b904078c672bf78b343':
Bug fix: 368813 Transition is regenerated when overlay duration changes outside the transition
2011-01-19 14:15:08 -08:00
Gil Dobjanschi
fc8ea8ecb4
am c4edeb5a: Bug fix: 368813 Transition is regenerated when overlay duration changes outside the transition
...
* commit 'c4edeb5a60a45af874474ae7244c921a268430f1':
Bug fix: 368813 Transition is regenerated when overlay duration changes outside the transition
2011-01-19 14:13:41 -08:00
Gil Dobjanschi
c4edeb5a60
Bug fix: 368813 Transition is regenerated when overlay duration changes outside the transition
...
Change-Id: I8217e7fe00392455427e117dc54c3461301f95c5
2011-01-19 14:10:32 -08:00
Dharmaray Kundargi
252422c59d
am 97619db9: am fe93351c: Merge "remove eng developement local tags in make file" into honeycomb
...
* commit '97619db928777d9ebfecf6c5cbbaf0ea7147a453':
remove eng developement local tags in make file
2011-01-19 14:06:54 -08:00
Jaikumar Ganesh
fbe807d064
Make connection / disconnect failure more robust.
...
Add error codes so that the states can be tracked better.
Change-Id: Ic07a5d34589134b68dedeb4803ccb523aa01b567
2011-01-19 14:06:29 -08:00
Dharmaray Kundargi
97619db928
am fe93351c: Merge "remove eng developement local tags in make file" into honeycomb
...
* commit 'fe93351cf1e16dcb32c3c824cf4f1201991b2130':
remove eng developement local tags in make file
2011-01-19 14:04:27 -08:00
Shimeng (Simon) Wang
ba079efd3e
am 9656fff3: am b501f77f: Merge "Use rounded interger to represent the last touch point." into honeycomb
...
* commit '9656fff32b20e707e2697b777ad66c1e95a7406c':
Use rounded interger to represent the last touch point.
2011-01-19 14:03:29 -08:00
Dharmaray Kundargi
fe93351cf1
Merge "remove eng developement local tags in make file" into honeycomb
2011-01-19 14:02:12 -08:00
James Dong
acc8aa5324
am aa474aa6: am fc37018a: Merge "Logging the duration range from different media tracks for recording" into honeycomb
...
* commit 'aa474aa6f9857272c5f74a14d8ab026ae8fc55c3':
Logging the duration range from different media tracks for recording
2011-01-19 14:01:18 -08:00
Shimeng (Simon) Wang
9656fff32b
am b501f77f: Merge "Use rounded interger to represent the last touch point." into honeycomb
...
* commit 'b501f77f1f2cdcfa9b190f33285a2b3a10e782a9':
Use rounded interger to represent the last touch point.
2011-01-19 14:01:10 -08:00
James Dong
aa474aa6f9
am fc37018a: Merge "Logging the duration range from different media tracks for recording" into honeycomb
...
* commit 'fc37018a9040f9b0f7cf4dac6d6fc5a5bdd6c287':
Logging the duration range from different media tracks for recording
2011-01-19 13:59:02 -08:00
Shimeng (Simon) Wang
b501f77f1f
Merge "Use rounded interger to represent the last touch point." into honeycomb
2011-01-19 13:58:57 -08:00
James Dong
fc37018a90
Merge "Logging the duration range from different media tracks for recording" into honeycomb
2011-01-19 13:57:06 -08:00
Christopher Tate
22da4dd48e
am 714066d8: am 5383d077: Merge "Fix a couple of drag & drop crashes" into honeycomb
...
* commit '714066d873b70098c09c2c094d374781b12d65a2':
Fix a couple of drag & drop crashes
2011-01-19 13:55:55 -08:00
Christopher Tate
714066d873
am 5383d077: Merge "Fix a couple of drag & drop crashes" into honeycomb
...
* commit '5383d077ed79e9fec95361046fcd7491ee9a0fd4':
Fix a couple of drag & drop crashes
2011-01-19 13:53:42 -08:00
Christopher Tate
5383d077ed
Merge "Fix a couple of drag & drop crashes" into honeycomb
2011-01-19 13:51:58 -08:00
Romain Guy
741fbc13d2
am 2c197a07: am 9335f5b2: Merge "Make embedded hardware layers work. Bug #3369474 " into honeycomb
...
* commit '2c197a0708dc3cb26c335371b572a3c47ca33736':
Make embedded hardware layers work. Bug #3369474
2011-01-19 13:44:36 -08:00
Romain Guy
2c197a0708
am 9335f5b2: Merge "Make embedded hardware layers work. Bug #3369474 " into honeycomb
...
* commit '9335f5b2fde244614184f45d29cc574d1ba8cbba':
Make embedded hardware layers work. Bug #3369474
2011-01-19 13:42:33 -08:00
Romain Guy
9335f5b2fd
Merge "Make embedded hardware layers work. Bug #3369474 " into honeycomb
2011-01-19 13:40:43 -08:00
Romain Guy
42f3a4b7c3
Make embedded hardware layers work.
...
Bug #3369474
Change-Id: Ib6d7fb44eedda9dc2933b5e1b176f307968af91d
2011-01-19 13:42:26 -08:00
Derek Sollenberger
ea0cc807f1
am c8937d84: am aa2275e3: Fix complex character support for plugins.
...
* commit 'c8937d8452542688ade144a8fc715088cec84f11':
Fix complex character support for plugins.
2011-01-19 13:25:51 -08:00
Derek Sollenberger
c8937d8452
am aa2275e3: Fix complex character support for plugins.
...
* commit 'aa2275e31d1ab6d672013e82a7b8da2559b0e085':
Fix complex character support for plugins.
2011-01-19 13:23:20 -08:00
Shimeng (Simon) Wang
1e07da3651
Use rounded interger to represent the last touch point.
...
This prevents loss of delta calculation accurracy when dragging, which
was done in float and converted to integer.
issue: 3366067
Change-Id: Ia121a6ef4619c9abfb1f76a01db3272d41d02b81
2011-01-19 13:19:56 -08:00
Derek Sollenberger
aa2275e31d
Fix complex character support for plugins.
...
bug: 3369527
Change-Id: I48c3442d7de54589f9f9578f6375b7ad291677db
2011-01-19 16:18:04 -05:00
Christopher Tate
1fc014fd00
Fix a couple of drag & drop crashes
...
1. ViewGroups being removed from the layout during a drag would wind up
crashing the app with an NPE at drag-ended time, due to blind dereference
of now-cleared object pointers.
2. Passing a 'null' ClipData to startDrag() would crash the system
process with an NPE. Should this even be valid? I'm inclined to say
yes, though it means that apps will need to guard against it.
Fixes bug 3369542
Change-Id: I168fc1284d6fd4403999946609725414cf254df0
2011-01-19 13:02:24 -08:00