Robert Greenwalt
374504c059
Merge "Be sure and report NO_CONNECTIVITY when needed." into gingerbread
2010-12-21 16:02:13 -08:00
Dianne Hackborn
0c6568615a
Merge "Fix issue #3224616 : TimeUtils.formatDuration() can drop 0s." into gingerbread
2010-12-21 13:27:15 -08:00
Simon Wilson
c6a0991635
Merge "fix [3127755] Launcher is missing anti-aliasing" into gingerbread
2010-12-20 14:09:52 -08:00
Mike LeBeau
98cb0d3f0f
Merge "Unhide RecognizerResultsIntent. This API was reviewed for Froyo, but we didn't want to make it public then because it wasn't until our first Market release of Voice Search that the APIs would be in use by our app." into gingerbread
2010-12-20 11:55:56 -08:00
Mathias Agopian
902329fb3e
disable the bypass mode. DO NOT MERGE.
...
SF bypass mode triggers a bug in the display controller that
case cause the device to freeze.
Change-Id: If29b4d5132f463d13831b082b904c235f15a19fb
2010-12-18 03:45:26 -08:00
Dianne Hackborn
80880644e6
Merge "Fix issue #3289835 : NullPointerException in..." into gingerbread
2010-12-17 10:37:25 -08:00
Hung-ying Tyan
dce71fbc9c
Merge "Check port in create peer's SIP profile." into gingerbread
2010-12-16 18:04:54 -08:00
Nick Pelly
bb55eef2ee
Merge "Need to check ndef before writing ndef." into gingerbread
2010-12-16 16:35:51 -08:00
Eric Laurent
b6272d14f1
Merge "Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO." into gingerbread
2010-12-16 11:18:29 -08:00
Scott Main
1d7e1b304d
Merge "cherrypick Change-Id: I07634c137e515068911c61c04bf3e9400c3fe0d4 docs: misc changes; add path to adb tool in sdk; fix broken link to ninepatch docs; fix and add some other links" into gingerbread
2010-12-15 17:47:02 -08:00
Dianne Hackborn
a43aa9c8fc
Merge "Fix issue #3149290 : java.lang.RuntimeException: Unable to pause activity" into gingerbread
2010-12-15 12:56:53 -08:00
Dianne Hackborn
a2037834cf
Merge "Work on issue #3255640 : Need to bump GB to API 10 version name "2.4"" into gingerbread
2010-12-14 14:12:37 -08:00
Dan Morrill
78bcc605dd
Merge "GL texture filtering changed from AND to OR, so rename tag name to match. (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen)." into gingerbread
2010-12-14 11:27:20 -08:00
Costin Manolache
eaefb93b61
Merge "Fix bug in permission grant system." into gingerbread
2010-12-14 10:07:26 -08:00
Roman Nurik
992b150891
Merge "Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack." into gingerbread
2010-12-13 19:12:42 -08:00
Brad Fitzpatrick
7ed1f656a6
Merge "Fix StrictMode javadoc copy/paste error." into gingerbread
2010-12-13 15:25:09 -08:00
Nick Kralevich
7fcd6df049
Merge "Avoid leaking sockets." into gingerbread
2010-12-13 15:03:28 -08:00
Nick Pelly
3cb8da45a2
Merge "Make getSystemService(NFC_SERVICE) the NFC entry point." into gingerbread
2010-12-10 17:18:00 -08:00
Megha Joshi
ebce77e665
Merge "Integrating webinar hosting with developer.android.com" into gingerbread
2010-12-10 12:30:35 -08:00
Jean-Baptiste Queru
c288fb7ef3
reconcile with open-source gingerbread
...
Change-Id: I11029c58c7bcfa194dde5584ea1e3ba048fb817b
2010-12-09 10:18:23 -08:00
Mathias Agopian
9215cabfa8
Merge "fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread
2010-12-08 16:17:02 -08:00
James Dong
a8e4eb7e51
Merge "When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again" into gingerbread
2010-12-08 16:14:27 -08:00
Mathias Agopian
c3ce880972
fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo
...
eglQueryContext(..., EGL_CONFIG_ID, ...) is dereferencing an uninitialized pointer
due to a typo.
Change-Id: I100addf3150f19cb6dfbce9987fb5239dd240878
2010-12-08 15:34:02 -08:00
Mathias Agopian
fc84e8269b
Merge "[317580] fix issue where the screen wouldn't be rotated properly in bypass mode" into gingerbread
2010-12-08 15:08:33 -08:00
Nick Pelly
ce561faf57
Merge "Implemented getSize() to return max ndef size." into gingerbread
2010-12-07 22:55:21 -08:00
Dianne Hackborn
84d86eb52b
Merge "Add more checks for bad values to protect from corrupt files." into gingerbread
2010-12-07 22:04:38 -08:00
Mathias Agopian
e24cc7a38d
[317580] fix issue where the screen wouldn't be rotated properly in bypass mode
...
In some situations, the screen transformation would not be
applied while in bypass mode.
Change-Id: I3d6dd52e4c12b11aae97b54bf8e2322536eee37f
2010-12-07 21:16:14 -08:00
Mathias Agopian
db13e364f9
Merge changes Ie03796ae,Ide3e980a into gingerbread
...
* changes:
[3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE)
[3171580] Add transform field to native buffers. (DO NOT MERGE)
2010-12-07 14:18:56 -08:00
Mathias Agopian
c24928fd6f
Merge changes I244b5469,I32044e91 into gingerbread
...
* changes:
[3253328, 3171580] Treat GONE and INVISIBLE views the same when calculating transparent regions
[3171580] Fix two typos related to fixed-size buffers
2010-12-07 14:18:21 -08:00
Mathias Agopian
abf06a734f
Merge "[3171580] don't automatically log GraphicBuffer allocation failures" into gingerbread
2010-12-07 14:17:47 -08:00
Jeff Hamilton
3846f7a9b6
Merge "Remove Type X Tags from the top-level API." into gingerbread
2010-12-07 13:59:29 -08:00
Daniel Sandler
6f14ecd361
Merge "More precise status bar battery icons." into gingerbread
2010-12-07 12:03:36 -08:00
Nick Pelly
95e4f1e8b3
Merge "Corrected MIFARE default key set" into gingerbread
2010-12-07 09:29:21 -08:00
Chung-yih Wang
823f079024
Merge "Fix SIP bug of different transport/port used for requests." into gingerbread
2010-12-06 22:07:59 -08:00
Nick Pelly
7592f8f4d8
Merge "Added NdefFormatable tag, initial class with supported methods." into gingerbread
2010-12-06 18:41:36 -08:00
Mathias Agopian
f219856d5e
Merge "[3229973, 3247470, ...] set EGLNativeWindowSurface's format in EGL" into gingerbread
2010-12-06 18:20:09 -08:00
Nick Pelly
2361dd244d
Merge "Remove ACTION_TAG_DISCOVERED from protected broadcast list." into gingerbread
2010-12-06 17:43:46 -08:00
Nick Pelly
4995b0cd7e
Merge gingerbread-nfc into gingerbread
2010-12-05 18:08:16 -08:00
Nick Pelly
54c9d4a79a
Merge "Merge branch gingerbread-nfc into gingerbread." into gingerbread
2010-12-05 14:46:29 -08:00
Nick Pelly
130f48f5bc
Merge branch gingerbread-nfc into gingerbread.
...
Change-Id: I37d657a16061fddfbb0993463f24d6d3945cddd1
Signed-off-by: Nick Pelly <npelly@google.com>
2010-12-05 14:45:29 -08:00
Irfan Sheriff
10484ac22a
Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread
2010-12-03 17:58:17 -08:00
Mathias Agopian
22c67843be
[3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE)
...
This is a poor's man precursor to the h/w composer HAL.
Basically we detect when a window is full screen and in
that case we bypass surfaceflinger's composition step, which
yields to much improved performance.
Change-Id: Ie03796ae81a1c951949b771c9323044b980cb347
2010-12-03 17:35:07 -08:00
Mathias Agopian
30eb1b1803
[3171580] Add transform field to native buffers. (DO NOT MERGE)
...
This field indicate how the content of the buffer
needs to be transformed.
Change-Id: Ide3e980a90599e931406135693231276626adbbb
2010-12-03 17:35:07 -08:00
Mathias Agopian
733189d408
[3171580] Fix two typos related to fixed-size buffers
...
mFixedSize was never set, this bug was introduced during some "cleanup", in
practice this could cause some issues when a fixed-size buffer was used and
the window was resized.
Layer::drawForSreenShot() had a typo that had no effect.
mFixedSize was used to determine if filtering was needed, which was a bit too
conservative and created a dependency between filtering and "fixed size" states
which should exist.
Now we enable filtering based on the size of the buffer vs. the size of the layer.
Change-Id: I32044e91b0c944c1b137efdceb3f01dfaa78119d
2010-12-03 17:35:06 -08:00
Mathias Agopian
678bdd6349
[3171580] don't automatically log GraphicBuffer allocation failures
...
some of these failures are not fatal and even expected in some cases
so they should not emit a dump in the log in those cases.
Change-Id: Idcfa252e3bfa9d74e27fe4ad8f8623aa01aa9c5e
2010-12-03 17:33:09 -08:00
Mathias Agopian
644bb2a29e
[3229973, 3247470, ...] set EGLNativeWindowSurface's format in EGL
...
(there are multiple bugs this should fix)
we now use the EGL_NATIVE_VISUAL_ID of a config to set
the ANativeWindow's format from eglCreateWindowSurface(),
this guarantees that the surface's format will match
whatever EGLConfig the user chose.
this should fix all current and future config/surface format
mismatch and allow users to easily select 32-bits surfaces.
Change-Id: I3835d0eb70c75eeecded3c3509a0a8207554c98b
2010-12-03 14:15:40 -08:00
Hung-ying Tyan
33f4f32967
Merge "Set AudioGroup mode according to audio settings" into gingerbread
2010-12-02 17:50:33 -08:00
Xia Wang
147abbd117
Merge "Restore Wi-Fi configuration after the test. DO NOT MERGE" into gingerbread
2010-12-02 13:40:23 -08:00
James Dong
11cdf95594
Merge "Be conservative in estimating the file size limit." into gingerbread
2010-12-02 10:13:36 -08:00
Jeff Hamilton
1c79a55b61
Merge remote branch 'ohd/gingerbread' into merge
2010-12-02 09:41:16 -06:00