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
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
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
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
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
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
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
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
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
Shimeng (Simon) Wang
b501f77f1f
Merge "Use rounded interger to represent the last touch point." into honeycomb
2011-01-19 13:58:57 -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
Svetoslav Ganov
9df9ee7491
am 1ebd8c11: am 4243dc39: Updated the Time/Date pickers to be backwards compatible
...
* commit '1ebd8c11f73625050035b4fca35841a9e30bca04':
Updated the Time/Date pickers to be backwards compatible
2011-01-19 12:39:56 -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
Eric Laurent
033b5f63c1
am 28e8c942: am 10f4ffe9: Merge "Issue 3315999: catch ToneGenerator exceptions." into honeycomb
...
* commit '28e8c9423c1e8ac8f5d945f6f7742511e58dac57':
Issue 3315999: catch ToneGenerator exceptions.
2011-01-19 12:22:13 -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
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
Costin Manolache
9079ea4c57
am de2964ec: am f5ffe89e: Token cache was not reset on password change
...
* commit 'de2964ec0aeeda5a280f724b82c2de5700369629':
Token cache was not reset on password change
2011-01-19 12:05:35 -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
Costin Manolache
f5ffe89e73
Token cache was not reset on password change
...
Bug: 3365443
Change-Id: I3e85c56810c0d71ddc82d3c6a1dcbba640444564
2011-01-19 12:00:32 -08:00
Adam Cohen
18f8e6fc61
am 9f97174b: am c446ae83: Merge "Removing deprecated widget api method." into honeycomb
...
* commit '9f97174b9b5048b6ea2f9c8cf9e99df76185f4c4':
Removing deprecated widget api method.
2011-01-19 11:51:42 -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
Romain Guy
78cda1670d
am 4ca3ee26: am c7816cd6: Merge "Don\'t let toasts "leak" Context instances." into honeycomb
...
* commit '4ca3ee261d71ba56a9636655c27d6d038392b746':
Don't let toasts "leak" Context instances.
2011-01-19 11:38:52 -08:00
Romain Guy
4ca3ee261d
am c7816cd6: Merge "Don\'t let toasts "leak" Context instances." into honeycomb
...
* commit 'c7816cd6a1441cd46af57224c616c2d56ced5105':
Don't let toasts "leak" Context instances.
2011-01-19 11:36:10 -08:00
Romain Guy
c7816cd6a1
Merge "Don't let toasts "leak" Context instances." into honeycomb
2011-01-19 11:33:43 -08:00
Dianne Hackborn
d00c6c63b5
am 92ce4f6a: am 7666ebd9: Merge "Bee seeing you..." into honeycomb
...
* commit '92ce4f6afcfce9db08c8c8468bc732eeab3cd7c2':
Bee seeing you...
2011-01-19 11:20:01 -08:00
Dianne Hackborn
92ce4f6afc
am 7666ebd9: Merge "Bee seeing you..." into honeycomb
...
* commit '7666ebd9f29df718f57354e0317db2ccbe6369b0':
Bee seeing you...
2011-01-19 11:18:12 -08:00
Dianne Hackborn
7666ebd9f2
Merge "Bee seeing you..." into honeycomb
2011-01-19 11:16:38 -08:00
Romain Guy
c4d09f2b69
Don't let toasts "leak" Context instances.
...
Change-Id: I05a936579e60360cdb3453ad5cbcead8ca03191a
2011-01-19 10:55:19 -08:00
Mike Lockwood
ee8d313985
am da3bb70a: am 54973710: Merge "Environment.isExternalStorageRemovable() is false if external storage is emulated" into honeycomb
...
* commit 'da3bb70a1f9240766d60bffa039d26e6378f2a6c':
Environment.isExternalStorageRemovable() is false if external storage is emulated
2011-01-19 10:44:32 -08:00
Mike Lockwood
da3bb70a1f
am 54973710: Merge "Environment.isExternalStorageRemovable() is false if external storage is emulated" into honeycomb
...
* commit '54973710d769e4722dc21778f8fcb7b08d2872dd':
Environment.isExternalStorageRemovable() is false if external storage is emulated
2011-01-19 10:42:31 -08:00