Adam Powell
213f391635
am 7e5e3745: Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
...
Merge commit '7e5e3745cf0103219a13071fbd488c3c01da85d9' into froyo-plus-aosp
* commit '7e5e3745cf0103219a13071fbd488c3c01da85d9':
Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
2010-05-24 16:23:53 -07:00
Mark Vandevoorde
310ce46862
am a5437f2d: am 88437284: Fix build error (Boolean -> boolean)
2010-05-24 13:47:47 -07:00
Mathias Agopian
a0b3f1d2eb
fix a bug when reallocating a window's buffers is needed
...
we need to mark the buffers that need to be reallocated,
NOT the buffer's indices.
Change-Id: I809e2e1b03b56c4d2ab983c25523dae99aa1da74
2010-05-24 13:47:24 -07:00
Mark Vandevoorde
8a7186bee4
am 88437284: Fix build error (Boolean -> boolean)
2010-05-24 13:45:42 -07:00
Mike Lockwood
a88af9f9a0
am 749afee8: am 1e11e95f: Merge "Add Geocorder.isImplemented()" into kraken
2010-05-24 13:03:22 -07:00
Mike Lockwood
7c05117570
am 1e11e95f: Merge "Add Geocorder.isImplemented()" into kraken
2010-05-24 13:01:21 -07:00
Mike Lockwood
5ed37d3343
Merge "Add Geocorder.isImplemented()" into kraken
2010-05-24 12:59:27 -07:00
James Dong
cedcd76aa5
am f09cab8c: am 6c537e53: Merge "Properly handle start code in H264/AVC encoder output" into kraken
2010-05-24 10:56:31 -07:00
James Dong
66eb3a968e
am 6c537e53: Merge "Properly handle start code in H264/AVC encoder output" into kraken
2010-05-24 10:55:28 -07:00
James Dong
2673ba5825
Merge "Properly handle start code in H264/AVC encoder output" into kraken
2010-05-24 10:54:25 -07:00
Dirk Dougherty
a9da670807
am 1586f713: am b59fbafe: am 3cffe1ab: am c7c7afd7: Doc change: Fix incorrect adt version reference etc.
2010-05-24 10:05:14 -07:00
Dirk Dougherty
56ae7714ef
am b59fbafe: am 3cffe1ab: am c7c7afd7: Doc change: Fix incorrect adt version reference etc.
2010-05-24 10:03:29 -07:00
Dirk Dougherty
1025833d0e
am 3cffe1ab: am c7c7afd7: Doc change: Fix incorrect adt version reference etc.
...
Merge commit '3cffe1ababdb09f4a90274e25c2f66feee299835' into kraken
* commit '3cffe1ababdb09f4a90274e25c2f66feee299835':
Doc change: Fix incorrect adt version reference etc.
2010-05-24 10:01:49 -07:00
Andreas Huber
2d0443dc62
am ec5f8241: am cbcf8f63: Interestingly, a call to fseek with a NULL file handle now blocks forever...
2010-05-24 10:00:10 -07:00
Andreas Huber
b00f455a99
am cbcf8f63: Interestingly, a call to fseek with a NULL file handle now blocks forever...
2010-05-24 09:58:02 -07:00
Dirk Dougherty
534663ed7b
am c7c7afd7: Doc change: Fix incorrect adt version reference etc.
...
Merge commit 'c7c7afd7a1af36e787266815487f4600196406b8' into froyo-plus-aosp
* commit 'c7c7afd7a1af36e787266815487f4600196406b8':
Doc change: Fix incorrect adt version reference etc.
2010-05-24 09:56:47 -07:00
Daniel Sandler
eec2c03762
am c8a041f1: am 450da449: Merge "New shadowy status bar, direct from Z\'ha\'dum." into kraken
2010-05-24 05:49:05 -07:00
Daniel Sandler
984e8bd169
am 450da449: Merge "New shadowy status bar, direct from Z\'ha\'dum." into kraken
2010-05-24 05:47:03 -07:00
Daniel Sandler
b5f078204e
Merge "New shadowy status bar, direct from Z'ha'dum." into kraken
2010-05-24 05:45:56 -07:00
Wu-cheng Li
e59764bbe4
am bcf50325: am bd329ddb: Improve GPS EXIF parameters comments.
2010-05-24 02:34:57 -07:00
Wu-cheng Li
758d053c22
am bd329ddb: Improve GPS EXIF parameters comments.
2010-05-24 02:32:55 -07:00
Chih-Chung Chang
ed95d48f4c
am f1c81c51: am e12a2a47: Merge "Disable CameraServiceTest in a normal build." into kraken
2010-05-23 21:07:46 -07:00
Chih-Chung Chang
1bb94cb3f7
am e12a2a47: Merge "Disable CameraServiceTest in a normal build." into kraken
2010-05-23 21:06:39 -07:00
Chih-Chung Chang
6697ed5d4e
Merge "Disable CameraServiceTest in a normal build." into kraken
2010-05-23 21:04:01 -07:00
Daisuke Miyakawa
c146f15260
Small fix around intermideate charset (ISO-8859-1).
...
After a few investigation, it is found that ISO-8859-1 is confirmed to be the
best charset for that use.
Modify comment so that we explicitly mention it.
Change-Id: I16e487fab33964a1665a1dd6991f2e8598f8895e
2010-05-21 17:11:09 -07:00
Vasu Nori
67e364280f
Merge "sqlite crashes when closing the database"
2010-05-21 15:48:33 -07:00
Mathias Agopian
1b5bf632f8
am 6099e141: am 25f0bdae: added native_window_set_buffer_count()
2010-05-21 14:38:44 -07:00
Mathias Agopian
8ab024a1e2
am 25f0bdae: added native_window_set_buffer_count()
2010-05-21 14:37:31 -07:00
Mathias Agopian
f10d7fde03
added native_window_set_buffer_count()
...
this method can be used to change the number of buffers
associated to a native window. the default is two.
Change-Id: I608b959e6b29d77f95edb23c31dc9b099a758f2f
2010-05-21 14:34:32 -07:00
Mathias Agopian
44e6d3fcf1
am 9840fe25: am 4f5f2786: Merge "fix the threading issue for setBuffercount()" into kraken
2010-05-21 13:56:48 -07:00
Mathias Agopian
7f00c4cc37
am 4f5f2786: Merge "fix the threading issue for setBuffercount()" into kraken
2010-05-21 13:55:18 -07:00
Mathias Agopian
3e23593d2f
Merge "fix the threading issue for setBuffercount()" into kraken
2010-05-21 13:53:28 -07:00
Mike Lockwood
b467fb03ae
am f1de96d4: am 8e55e88f: Merge "Fix broken Javadoc links" into kraken
2010-05-21 12:31:02 -07:00
Mike Lockwood
f89f8a0d53
am 8e55e88f: Merge "Fix broken Javadoc links" into kraken
2010-05-21 12:29:26 -07:00
Mike Lockwood
1bb6a71178
Merge "Fix broken Javadoc links" into kraken
2010-05-21 12:28:11 -07:00
Mike Lockwood
b89b616d96
am 41285a71: am 5d12d197: Merge "Report number of satellites used in fix instead of total for GPS Location extra" into kraken
2010-05-21 12:19:00 -07:00
Mike Lockwood
a1ff11613a
am 5d12d197: Merge "Report number of satellites used in fix instead of total for GPS Location extra" into kraken
2010-05-21 12:17:28 -07:00
Mike Lockwood
c32b48e2b6
Merge "Report number of satellites used in fix instead of total for GPS Location extra" into kraken
2010-05-21 12:16:19 -07:00
Mike Lockwood
6ad95e8340
am 23025ffd: am 11c6847d: Merge "Unhide new location manager APIs:" into kraken
2010-05-21 11:19:35 -07:00
Mike Lockwood
92285447fc
am 11c6847d: Merge "Unhide new location manager APIs:" into kraken
2010-05-21 11:17:53 -07:00
Mike Lockwood
22b9e3ef1d
Merge "Unhide new location manager APIs:" into kraken
2010-05-21 11:16:51 -07:00
Mike Lockwood
bc5e569c14
am dc0ca1d5: am 88262733: Merge "New Location Manager APIs for Criteria based requests and single shot mode." into kraken
2010-05-21 10:40:48 -07:00
Mike Lockwood
376f4f6b91
am 88262733: Merge "New Location Manager APIs for Criteria based requests and single shot mode." into kraken
2010-05-21 10:38:52 -07:00
Mike Lockwood
9f715b544a
Merge "New Location Manager APIs for Criteria based requests and single shot mode." into kraken
2010-05-21 10:37:42 -07:00
Andreas Huber
c5f308b2b1
am 132f46ff: am df17b084: Merge "Support for media extraction from .mkv/.mka Matroska files in stagefright." into kraken
2010-05-21 08:13:20 -07:00
Andreas Huber
f0f5b7cea1
am df17b084: Merge "Support for media extraction from .mkv/.mka Matroska files in stagefright." into kraken
2010-05-21 08:11:14 -07:00
Andreas Huber
1a4f294419
Merge "Support for media extraction from .mkv/.mka Matroska files in stagefright." into kraken
2010-05-21 08:09:53 -07:00
Jason Sams
cfdc9b0028
Merge "Remove noise functions and update images processing to use new rs namespace names."
2010-05-20 18:20:21 -07:00
Mathias Agopian
bb641244d7
fix the threading issue for setBuffercount()
...
this change introduces R/W locks in the right places.
on the server-side, it guarantees that setBufferCount()
is synchronized with "retire" and "resize".
on the client-side, it guarantees that setBufferCount()
is synchronized with "dequeue", "lockbuffer" and "queue"
2010-05-20 18:00:42 -07:00
Andreas Huber
e9c1eaf823
am 5e03fd5d: am 4979601f: Make the -o option actually terminate.
2010-05-20 16:36:25 -07:00