Brad Fitzpatrick
29c137d125
am 7972e382: Merge "Removing repetitive conditional; it simply does nothing except slowing down things."
...
* commit '7972e382802348e7914c14507426af450aa7e30c':
Removing repetitive conditional; it simply does nothing except slowing down things.
2011-03-15 11:33:32 -07:00
Brad Fitzpatrick
0a81d3e158
am 38c6e31c: Merge "Removing repetitive conditional; it simply does nothing except slowing down things."
...
* commit '38c6e31c88dec226271e02fbfed675181ae938b7':
Removing repetitive conditional; it simply does nothing except slowing down things.
2011-03-15 11:33:28 -07:00
Romain Guy
993b519082
Merge "Fix disappearing edges in lists/scrollviews/etc. Bug #4093871 " into honeycomb-mr1
2011-03-15 11:31:22 -07:00
Brad Fitzpatrick
8e67eefe36
am 29d75c9a: Merge "Fixing improper boxing to Integer instead of Long."
...
* commit '29d75c9a10a1ff6d60e85a1931d042d3e24d9549':
Fixing improper boxing to Integer instead of Long.
2011-03-15 11:30:08 -07:00
Brad Fitzpatrick
a76bec273a
am 40b207c1: Merge "Using proper key for removing object from the map."
...
* commit '40b207c131e224554e30cde30fe4ee49817432ee':
Using proper key for removing object from the map.
2011-03-15 11:30:04 -07:00
Brad Fitzpatrick
16dfc303e2
am b37f7e59: Merge changes I81fc2f90,I5e7fd759
...
* commit 'b37f7e59ee38472bdd3ca5fe66cc847890c862e2':
Using proper key for removing from map.
Removing wrong equals method in comparator.
2011-03-15 11:29:56 -07:00
Xavier Ducrohet
124eb84c5e
Merge "Merge 6f2fb570 from honeycomb. do not merge." into gingerbread
2011-03-15 11:29:16 -07:00
Xavier Ducrohet
1d0284b613
Merge "Merge c12b4093 from honeycomb. do not merge." into gingerbread
2011-03-15 11:29:07 -07:00
Scott Main
295e6edfaf
am e8f95e7f: docs: update device dashboard
...
* commit 'e8f95e7f353d6205dbb09cc440f47256604229ee':
docs: update device dashboard
2011-03-15 11:28:50 -07:00
Brad Fitzpatrick
dce27d58b5
Merge "Releasing lock even if exception is thrown."
2011-03-15 11:23:44 -07:00
Brad Fitzpatrick
6c8eb099e4
Merge "Lazy initialization must be synchronized to avoid parallel instances cretation."
2011-03-15 11:22:43 -07:00
Brad Fitzpatrick
3b2122f9a2
Merge "Removing self-assignment statement."
2011-03-15 11:19:23 -07:00
Brad Fitzpatrick
47c8e50c57
Merge "Fixing self-assignment in copying code."
2011-03-15 11:18:18 -07:00
Brad Fitzpatrick
03af2d42a4
Merge "Fixing self-assignment in cloning code."
2011-03-15 11:15:19 -07:00
Brad Fitzpatrick
201c38b39c
Merge "Removing repetitive conditional; it simply does nothing except slowing down things."
2011-03-15 11:13:01 -07:00
Brad Fitzpatrick
9860849b8d
Merge "Removing repetitive conditional; it simply does nothing except slowing down things."
2011-03-15 11:12:15 -07:00
Dianne Hackborn
cd79bc5ba0
am f58f041b: am cffde30f: am 44220a56: Merge "Add some debug code to try to track down issue 3183612" into gingerbread
...
* commit 'f58f041beb8a00db201eb3c8eb801dc1b702253d':
Add some debug code to try to track down issue 3183612
2011-03-15 11:06:14 -07:00
Dianne Hackborn
780b0476c9
am cffde30f: am 44220a56: Merge "Add some debug code to try to track down issue 3183612" into gingerbread
...
* commit 'cffde30fc10ecdfca53877fbee61525028eb47ba':
Add some debug code to try to track down issue 3183612
2011-03-15 11:03:42 -07:00
Brad Fitzpatrick
5a98e39e1c
Merge "Fixing improper boxing to Integer instead of Long."
2011-03-15 11:03:29 -07:00
Brad Fitzpatrick
d42a9b74bc
Merge "Using proper key for removing object from the map."
2011-03-15 11:00:51 -07:00
Brad Fitzpatrick
c53163a4a3
Merge changes I81fc2f90,I5e7fd759
...
* changes:
Using proper key for removing from map.
Removing wrong equals method in comparator.
2011-03-15 10:56:16 -07:00
Dianne Hackborn
152f8c41d0
am 44220a56: Merge "Add some debug code to try to track down issue 3183612" into gingerbread
...
* commit '44220a56026ead4583a9db96ced5f1113d4b4f07':
Add some debug code to try to track down issue 3183612
2011-03-15 10:52:27 -07:00
Robert Greenwalt
5fd73cd5d4
am 8d97f87d: am eea577e0: Remove redundant network types.
...
* commit '8d97f87d1fc7b67d57d5894915a4451629d98551':
Remove redundant network types.
2011-03-15 10:51:23 -07:00
Robert Greenwalt
08f43db273
am eea577e0: Remove redundant network types.
...
* commit 'eea577e0c41babadf4f07fd9d5e822bd7faa9385':
Remove redundant network types.
2011-03-15 10:48:22 -07:00
Amith Yamasani
a64eb19581
Merge "Use more padding on the sides for SearchView" into honeycomb-mr1
2011-03-15 10:47:01 -07:00
Jamie Gennis
3f13cf1be5
am c570ee21: am 41a894ad: am 75597105: Merge "SurfaceTextureClient: Add ISurfaceTexture getter." into honeycomb-mr1
...
* commit 'c570ee21e2c2b9802c9d1f58dba024e884b225e6':
SurfaceTextureClient: Add ISurfaceTexture getter.
2011-03-15 10:45:01 -07:00
Jamie Gennis
bc24786225
am b15ab10c: am 1b7dbf45: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
...
* commit 'b15ab10c33058a8a89410085e0b58fd793a0ca54':
2011-03-15 10:44:59 -07:00
Jamie Gennis
5c32e5fddd
am 73d7036d: am c8bff5d9: ANativeWindow: add query for the concrete type.
...
* commit '73d7036da461505af01f2899792f609dc3cdadc9':
ANativeWindow: add query for the concrete type.
2011-03-15 10:44:56 -07:00
Jamie Gennis
cefc876234
am ceb7cb14: am 02805a40: Merge "ANativeWindow: add query for the concrete type." into honeycomb-mr1
...
* commit 'ceb7cb1460484eda1a3cb9cd271d7caf3a3dcbd1':
ANativeWindow: add query for the concrete type.
2011-03-15 10:42:06 -07:00
Jamie Gennis
05f6941e51
am 41a894ad: am 75597105: Merge "SurfaceTextureClient: Add ISurfaceTexture getter." into honeycomb-mr1
...
* commit '41a894ad1379a046b0b7471a33d974c6241a91a9':
SurfaceTextureClient: Add ISurfaceTexture getter.
2011-03-15 10:40:26 -07:00
Jamie Gennis
07294053e7
am 1b7dbf45: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
...
* commit '1b7dbf45f18bea3346a8296cbfd5c1a51cf3e01d':
2011-03-15 10:40:24 -07:00
Jamie Gennis
8d7cd7c633
am c8bff5d9: ANativeWindow: add query for the concrete type.
...
* commit 'c8bff5d9b72482487e6e62c72236bf14abed2aaf':
ANativeWindow: add query for the concrete type.
2011-03-15 10:40:21 -07:00
Jamie Gennis
0a69ff8981
am 75597105: Merge "SurfaceTextureClient: Add ISurfaceTexture getter." into honeycomb-mr1
...
* commit '75597105e6e03f656bdc1e40acac44afb9a3b01b':
SurfaceTextureClient: Add ISurfaceTexture getter.
2011-03-15 10:38:00 -07:00
Jamie Gennis
636452b7f4
Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE
2011-03-15 10:37:59 -07:00
Jamie Gennis
5d8fcc583e
ANativeWindow: add query for the concrete type.
...
This change adds a query to the ANativeWindow interface for getting the
concrete type of the ANativeWindow.
Bug: 4086509
Change-Id: I64aa86d72fbca3b52a98e1fc35608737781a3178
2011-03-15 10:37:57 -07:00
Jamie Gennis
5c0c93a8c4
SurfaceTexture: disallow unsupported uses.
...
This change makes the ANativeWindow_lock NDK function error out if it is
passed an ANativeWindow with a concrete type that is not Surface. It
also makes eglCreateWindowSurface fail if it is passed a
SurfaceTextureClient as its 'window' argument.
Bug: 4087277
Change-Id: Ie68c50c52d88f72d8a387f6c094908044c83a88c
2011-03-15 10:37:37 -07:00
Jamie Gennis
efeeec2564
am 02805a40: Merge "ANativeWindow: add query for the concrete type." into honeycomb-mr1
...
* commit '02805a40d44fa038549e771ec9a15f52b5fa3538':
ANativeWindow: add query for the concrete type.
2011-03-15 10:36:01 -07:00
Jamie Gennis
f9a20d77fa
Merge "SurfaceTextureClient: Add ISurfaceTexture getter." into honeycomb-mr1
2011-03-15 10:34:35 -07:00
Jamie Gennis
3c742ef11b
Merge "ANativeWindow: add query for the concrete type." into honeycomb-mr1
2011-03-15 10:33:35 -07:00
Dianne Hackborn
bebc96ba62
Merge "Add some debug code to try to track down issue 3183612" into gingerbread
2011-03-15 10:29:04 -07:00
James Dong
4ec63136b9
Merge "Add memory leak tracking/debugging code to drm server"
2011-03-15 09:29:11 -07:00
Svetoslav Ganov
8017dbc8df
am 6d4f318f: am e65711b2: Merge "Tapping on the week number sends the DatePicker to epoch start." into honeycomb-mr1
...
* commit '6d4f318f0c836c0c2eac3a1d99debedc6c03578a':
Tapping on the week number sends the DatePicker to epoch start.
2011-03-14 23:17:58 -07:00
Svetoslav Ganov
60b25c2c28
am e65711b2: Merge "Tapping on the week number sends the DatePicker to epoch start." into honeycomb-mr1
...
* commit 'e65711b21f1b351f28d4f04819e1e05a9ac8dfee':
Tapping on the week number sends the DatePicker to epoch start.
2011-03-14 23:15:24 -07:00
Svetoslav Ganov
f15a7cdbfb
Merge "Tapping on the week number sends the DatePicker to epoch start." into honeycomb-mr1
2011-03-14 23:13:49 -07:00
satok
9b5d8fc3dd
am f057524d: am b02b8369: Merge "Remove a workaround for the data inconsistency of SystemProperties" into honeycomb-mr1
...
* commit 'f057524db620c490e96fa886238f3b31bd973060':
Remove a workaround for the data inconsistency of SystemProperties
2011-03-14 22:51:21 -07:00
satok
3b2e2da8ab
am b02b8369: Merge "Remove a workaround for the data inconsistency of SystemProperties" into honeycomb-mr1
...
* commit 'b02b8369c6549417561e2ae1467b615645b5d04c':
Remove a workaround for the data inconsistency of SystemProperties
2011-03-14 22:47:11 -07:00
satok
6fbddcf3af
Merge "Remove a workaround for the data inconsistency of SystemProperties" into honeycomb-mr1
2011-03-14 22:44:23 -07:00
Bart Sears
b350616bc3
am faffbd80: am 0c6e9521: Merge "Update Droid Fonts" into honeycomb-mr1
...
* commit 'faffbd806e6d5b66dbd1bba46f050a055116be74':
Update Droid Fonts
2011-03-14 19:29:33 -07:00
Bart Sears
1f796e2351
am 0c6e9521: Merge "Update Droid Fonts" into honeycomb-mr1
...
* commit '0c6e9521f5a8b57910451a92c1bea142edd4b30d':
Update Droid Fonts
2011-03-14 19:25:30 -07:00
Bart Sears
325daa7336
Merge "Update Droid Fonts" into honeycomb-mr1
2011-03-14 19:24:02 -07:00