40653 Commits

Author SHA1 Message Date
Brad Fitzpatrick
bd80a12cba resolved conflicts for merge of 9240f16d to honeycomb-plus-aosp
Change-Id: I6e595bb11a5a692ccd730b9d1d2aa367063a61f5
2011-01-19 15:19:08 -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
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
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
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
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
Dharmaray Kundargi
fe93351cf1 Merge "remove eng developement local tags in make file" into honeycomb 2011-01-19 14:02:12 -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
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
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
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
Svetoslav Ganov
1ebd8c11f7 am 4243dc39: Updated the Time/Date pickers to be backwards compatible
* commit '4243dc394d89a93cb207efa36e9755c2424d688b':
  Updated the Time/Date pickers to be backwards compatible
2011-01-19 12:37:36 -08:00
Svetoslav Ganov
4243dc394d Updated the Time/Date pickers to be backwards compatible
bug:3349400

Change-Id: I2a3dda82caf7de0ed203306c89ee774b94b7d82e
2011-01-19 12:35:17 -08:00
Carl Shapiro
8cdf27c36a Add a property for specifying a dalvik heap growth limit.
Change-Id: I7334fb720277888df836414834ecf1e8d6b4b579
2011-01-19 12:33:12 -08:00
Shih-wei Liao
371fd7071d am 9f7e83b4: Merge "c99 bool support" into honeycomb
* commit '9f7e83b4062beba5b3ce7d3693505ec082f7d3f6':
  c99 bool support
2011-01-19 12:24:01 -08:00
Shih-wei Liao
9f7e83b406 Merge "c99 bool support" into honeycomb 2011-01-19 12:21:55 -08:00
Eric Laurent
28e8c9423c am 10f4ffe9: Merge "Issue 3315999: catch ToneGenerator exceptions." into honeycomb
* commit '10f4ffe9619ca3a943e3460d8bb7b5441575a173':
  Issue 3315999: catch ToneGenerator exceptions.
2011-01-19 12:19:51 -08:00
Eric Laurent
10f4ffe961 Merge "Issue 3315999: catch ToneGenerator exceptions." into honeycomb 2011-01-19 12:18:10 -08:00
Shih-wei Liao
cbcced2d15 c99 bool support
Change-Id: I0990425a9362d3ef6ea0b40bf6f00fcc10eed426
2011-01-19 12:17:54 -08:00
Eric Laurent
733a42b24b Issue 3315999: catch ToneGenerator exceptions.
When the AudioFlinger runs out of available AudioTracks (max 32),
the ToneGenerator constructor throws a RuntimeException. Although this
denotes an abnormal situation, VolumePanel should catch this exception.

Change-Id: Ida1312fe4857e99a0ef38b4013cb03e819405689
2011-01-19 12:16:19 -08:00
Dharmaray Kundargi
6dbd3ee67b remove eng developement local tags in make file
Change-Id: I24511cd588c19592bce57e36ccadbf1fb4d44647
2011-01-19 12:14:46 -08:00
Costin Manolache
de2964ec0a am f5ffe89e: Token cache was not reset on password change
* commit 'f5ffe89e736caee1419f0acb469565d5100b8fb8':
  Token cache was not reset on password change
2011-01-19 12:03:26 -08:00
Romain Guy
cdc2f68a4a am 34829553: Merge "Fix the fix for 9patches." into honeycomb
* commit '34829553a803d37ae3555579f4aa130e652644d9':
  Fix the fix for 9patches.
2011-01-19 12:01:20 -08:00
Costin Manolache
f5ffe89e73 Token cache was not reset on password change
Bug: 3365443
Change-Id: I3e85c56810c0d71ddc82d3c6a1dcbba640444564
2011-01-19 12:00:32 -08:00
Romain Guy
a3311ed7a9 Fix the fix for 9patches.
Change-Id: I66dca835d9d0e9766d887746c3265e4b13ae688b
2011-01-19 12:00:08 -08:00
Andreas Huber
4026ea7c25 am 0353459d: Merge "Always revert to the previous bandwidth if the required sequence number cannot be found" into honeycomb
* commit '0353459d405e20750b3ddd8abad83eace1ed2a39':
  Always revert to the previous bandwidth if the required sequence number cannot be found
2011-01-19 11:59:14 -08:00
Romain Guy
34829553a8 Merge "Fix the fix for 9patches." into honeycomb 2011-01-19 11:58:21 -08:00
Andreas Huber
0353459d40 Merge "Always revert to the previous bandwidth if the required sequence number cannot be found" into honeycomb 2011-01-19 11:56:15 -08:00
James Dong
da58076a6b Logging the duration range from different media tracks for recording
Change-Id: I8c3edcf97ce35301f8645e4a1e232d9bfc2c0349
2011-01-19 11:54:59 -08:00
James Dong
894339298e am 4f28901f: Merge "Turn error/exception logging on at the native layer" into honeycomb
* commit '4f28901f2a15f566a98bf5d14ac510e05401f960':
  Turn error/exception logging on at the native layer
2011-01-19 11:52:56 -08:00
James Dong
4f28901f2a Merge "Turn error/exception logging on at the native layer" into honeycomb 2011-01-19 11:50:16 -08:00
Adam Cohen
9f97174b9b am c446ae83: Merge "Removing deprecated widget api method." into honeycomb
* commit 'c446ae83e08fb451589dbacba9aa3f89d0d6acb0':
  Removing deprecated widget api method.
2011-01-19 11:49:44 -08:00
Adam Cohen
c446ae83e0 Merge "Removing deprecated widget api method." into honeycomb 2011-01-19 11:47:56 -08:00
Winson Chung
0fd9be2118 Removing deprecated widget api method.
Change-Id: I0610dcb5cf1001b2b7e86d78a88addf174cedd77
2011-01-19 11:44:25 -08:00
James Dong
581cad2221 Turn error/exception logging on at the native layer
o also fixed some compilation warnings

Change-Id: I66fc1f9972e9fb4b9a25ff3e5835d744d6c71455
2011-01-19 11:42:53 -08:00
Irfan Sheriff
6387174c41 am 7a97ad42: Merge "Fix soft Ap handling on system restart" into honeycomb
* commit '7a97ad421b50208dc2f484cc23fa3bb29331a713':
  Fix soft Ap handling on system restart
2011-01-19 11:42:35 -08:00