Jamie Gennis
bd9cbc3b55
surfaceflinger_client: Don't dereference NULL ptrs.
...
This change adds a null pointer check before dereferencing buffers in
a Surface list of known GraphicBuffer objects. If not all the buffers
have been dequeued before this list can legitimately contain NULL
entries.
Change-Id: I0e105b53a3f6f9a5404716b7bf150c793ff648a6
2011-02-27 18:43:17 -08:00
James Dong
be566cb570
Merge "mp4a box contains mp3 audio when the object type indication is 0x6b"
2011-02-25 11:52:14 -08:00
Eric Fischer
4aa1c420b7
Merge "Import revised translations."
2011-02-25 11:48:14 -08:00
Eric Fischer
70cf6e2faf
am 040f6150: (-s ours) am 9967ce04: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '040f61504aeab1d905ac9fb85945699877e78d4e':
Import revised translations. DO NOT MERGE
2011-02-25 11:26:13 -08:00
Eric Fischer
68ca4d3c97
am 9967ce04: Merge "Import revised translations. DO NOT MERGE" into honeycomb
...
* commit '9967ce04572e916a5f68ae0f9345f13b35ec20b0':
Import revised translations. DO NOT MERGE
2011-02-25 11:11:13 -08:00
Eric Fischer
d0a5556b00
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-02-25 10:54:34 -08:00
Shimeng (Simon) Wang
822029f742
Merge "Make sure pinch zoom and overview scale are within limits"
2011-02-25 10:37:33 -08:00
Vasu Nori
66bbadffa3
Merge "bug:3467948 if byteArray couldn't be allocated for blob, throw exception"
2011-02-25 08:57:59 -08:00
Leon Scroggins
4810e557ac
Merge "Comment clean up."
2011-02-25 08:21:23 -08:00
Wu-cheng Li
49ff84c4cc
Merge "Improve camera getSupportedPreviewFormats javadoc."
2011-02-25 01:36:56 -08:00
Wink Saville
aa7ce3a016
Merge "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
2011-02-24 22:08:41 -08:00
Jeff Hamilton
f016da1f3f
am 09979bcf: am fd34aa8e: am 5644d0e1: Support for NDEF on iCODE.
...
* commit '09979bcf730e7df033ab0d8cadf564873c7e624b':
Support for NDEF on iCODE.
2011-02-24 20:45:27 -08:00
Jeff Hamilton
2fcb04e75b
am fd34aa8e: am 5644d0e1: Support for NDEF on iCODE.
...
* commit 'fd34aa8e1386547bcfbaf043f26c054946b92c2b':
Support for NDEF on iCODE.
2011-02-24 20:43:15 -08:00
Robert Ly
c30c83ac81
am dbc796c5: am b7a8c1e7: Merge "Doc change: fixing errors in library proj docs" into honeycomb
...
* commit 'dbc796c5c045af6a5a7730a267c3c3a574e2bd3e':
Doc change: fixing errors in library proj docs
2011-02-24 20:35:06 -08:00
Robert Ly
49052f31ba
am 92a07c63: am 00e08463: Doc change: clarifying nfc tech filter usage
...
* commit '92a07c634d38221cbdb1253124efedc3da0dd487':
Doc change: clarifying nfc tech filter usage
2011-02-24 20:35:00 -08:00
Xavier Ducrohet
cfc429a8ca
am b84c678a: (-s ours) am db1acf52: (-s ours) am 1175ef7e: Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread
...
* commit 'b84c678a9c397d5b3c5141ddda304ceb71426c8d':
LayoutLib: Adapt the HC layoutlib to GB. do not merge.
2011-02-24 20:32:31 -08:00
Xavier Ducrohet
a602be6f8c
am b052ecaa: resolved conflicts for merge of 86e43034 to honeycomb-plus-aosp
...
* commit 'b052ecaa7e6ce40cec43efe5353b4bb12079aa55':
LayoutLib: Original import of Honeycomb's layoutlib. do not merge.
2011-02-24 20:32:13 -08:00
Jeff Hamilton
5f40f7c53f
am 5644d0e1: Support for NDEF on iCODE.
...
* commit '5644d0e18ad847b66a8cb4f185cb28edebe75d88':
Support for NDEF on iCODE.
2011-02-24 20:30:14 -08:00
Romain Guy
ccbe0e188b
Merge "Remove the right entries from the cache when a GC happens."
2011-02-24 19:50:26 -08:00
Jesse Wilson
e288797a81
Merge "Remove default constructors from static utility classes."
2011-02-24 19:37:00 -08:00
Chung-yih Wang
32bed6e430
Merge "Activate the wifi high perf. for sip calls."
2011-02-24 19:27:12 -08:00
Mathias Agopian
d4e5832b69
Merge "Fix a wp<> bug where the owner ID would be wrong"
2011-02-24 18:27:40 -08:00
Robert Ly
33d2935175
am b7a8c1e7: Merge "Doc change: fixing errors in library proj docs" into honeycomb
...
* commit 'b7a8c1e781517b5c6b47ee2b0c7bd0e70d9a1880':
Doc change: fixing errors in library proj docs
2011-02-24 18:13:43 -08:00
Mathias Agopian
d005004f14
Fix a wp<> bug where the owner ID would be wrong
...
this was introduced recently. we make sure to use
the correct owner id (the sp) instead of the wp.
Change-Id: I78fdc6ec0c2d3e687278b70442d74d1924b512a2
2011-02-24 18:12:34 -08:00
Robert Ly
8e41e13a9b
Merge "Doc change: fixing errors in library proj docs" into honeycomb
2011-02-24 18:07:28 -08:00
Robert Ly
3d5887032a
am 00e08463: Doc change: clarifying nfc tech filter usage
...
* commit '00e08463cb8df0969e71fd731a4e078680c4f2b5':
Doc change: clarifying nfc tech filter usage
2011-02-24 18:02:58 -08:00
Basavapatna Dattaguru
f92ab1c8b0
Merge "VideoEditor: Issue:3396697: Update Perf and Stress test code"
2011-02-24 17:56:15 -08:00
Romain Guy
4b07fe8104
Merge "Correctly blend translucent GIF bitmaps."
2011-02-24 17:45:21 -08:00
Daniel Sandler
75fb678304
Merge "Notification flyover tuning:"
2011-02-24 17:33:41 -08:00
Xavier Ducrohet
5000d24f60
am db1acf52: (-s ours) am 1175ef7e: Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread
...
* commit 'db1acf52bb6e4b949bcef09f903d662aed9b8a3a':
LayoutLib: Adapt the HC layoutlib to GB. do not merge.
2011-02-24 17:24:07 -08:00
Xavier Ducrohet
6043f96437
resolved conflicts for merge of 86e43034 to honeycomb-plus-aosp
...
Change-Id: Ia9ad4c3b79821fef6ab8493f4c93ca58f877f9ce
2011-02-24 17:19:38 -08:00
Adam Powell
6e31bee5de
Merge "Ensure WebView passes a complete/in-order event stream to ScaleGestureDetector. Prerequisite for several ScaleGestureDetector bugfixes."
2011-02-24 17:19:20 -08:00
Svetoslav Ganov
f5a68df842
Merge "Exposing the CalendarView of the DatePicker."
2011-02-24 16:48:38 -08:00
Svetoslav Ganov
d3e29cbc0b
Merge "The NumberPicker input cotrols are somtimes not shown."
2011-02-24 16:48:26 -08:00
Jamie Gennis
a0d1fc054e
Merge "Revert "Merge "Expand on the SurfaceTexture API docs."""
2011-02-24 16:48:15 -08:00
Jaikumar Ganesh
203aae27a3
Merge "Refactor android.server.BluetoothService classes."
2011-02-24 16:34:37 -08:00
Andreas Huber
b7a0545851
Merge "Alternate patch for late video issue: seek only the video ahead to the next"
2011-02-24 16:26:14 -08:00
Santosh Madhava
e6fc877616
Merge "Fix for issue 3485010: The project thumbnail is not regenerated"
2011-02-24 16:25:53 -08:00
Mathias Agopian
da26c6662d
Merge "Fix some issues with RefBase debugging."
2011-02-24 16:23:51 -08:00
Xavier Ducrohet
a79113be34
am 1175ef7e: Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread
...
* commit '1175ef7e2e4f68532d8ade672d7f5502d9946ce4':
LayoutLib: Adapt the HC layoutlib to GB. do not merge.
2011-02-24 16:21:41 -08:00
Xavier Ducrohet
c806fe1560
resolved conflicts for merge of a4350fc0 to gingerbread-plus-aosp
...
Change-Id: I065af5d555fa2197847ad47c84003dcd11fe26c7
2011-02-24 16:15:11 -08:00
Andreas Huber
7f5a4dde54
Merge "Suppress the logging of URLs when in incognito mode."
2011-02-24 14:49:10 -08:00
Xavier Ducrohet
be82ce21d5
Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread
2011-02-24 14:44:58 -08:00
Xavier Ducrohet
e90a80a73d
Merge "LayoutLib: Original import of Honeycomb's layoutlib. do not merge." into gingerbread
2011-02-24 14:44:52 -08:00
Xavier Ducrohet
1205610ea2
Merge "LayoutLib: move tests to their own project."
2011-02-24 14:35:01 -08:00
Jamie Gennis
6305946693
Merge "Expand on the SurfaceTexture API docs."
2011-02-24 14:24:04 -08:00
Mike Lockwood
3235a323ef
Merge "UsbManager: Remove redundant Intent extras from USB device and accessory broadcasts"
2011-02-24 14:05:02 -08:00
Eric Fischer
a4a66641a0
Merge "Import revised translations."
2011-02-24 14:03:30 -08:00
Eric Hassold
ccfa7856be
Merge "Detect out of memory in extractAlpha"
2011-02-24 13:47:16 -08:00
Daniel Sandler
6d07aeb4ee
Merge "Remove commented cruft, TODOs, and dead code."
2011-02-24 13:36:52 -08:00