Dirk Dougherty
6ac4448391
am 62ade220: Merge "Doc change: add video to platform highlights and fix a few things." into ics-mr0
...
* commit '62ade220d9b72a9edc8fcc4dfe98ca9541c6d501':
Doc change: add video to platform highlights and fix a few things.
2011-10-19 18:07:16 -07:00
Daniel Sandler
7400a5a52c
Merge "Add hasNavigationBar() to the window manager." into ics-mr0
2011-10-19 18:05:20 -07:00
Dirk Dougherty
e20950052c
Merge "Doc change: add video to platform highlights and fix a few things." into ics-mr0
2011-10-19 18:05:18 -07:00
James Dong
d79306e4ad
am b3cdadb6: Merge "Check whether media recorder client exists before dumping." into ics-mr0
...
* commit 'b3cdadb639027f62c7c1637ca962a70d2d1f3b4d':
Check whether media recorder client exists before dumping.
2011-10-19 17:57:58 -07:00
James Dong
35c9945aa5
Merge "Check whether media recorder client exists before dumping." into ics-mr0
2011-10-19 17:55:45 -07:00
Dianne Hackborn
d72f4bcce3
am 16362041: Merge "Fix issue #5484096 : Device rebooted after turning WiFi tethering ON, IRL19 Crespo." into ics-mr0
...
* commit '163620417bc2980528e2079e3456c9600a92e165':
Fix issue #5484096 : Device rebooted after turning WiFi tethering ON, IRL19 Crespo.
2011-10-19 17:17:29 -07:00
Dianne Hackborn
709adab040
Merge "Fix issue #5484096 : Device rebooted after turning WiFi tethering ON, IRL19 Crespo." into ics-mr0
2011-10-19 17:15:39 -07:00
Romain Guy
c6d209c8bb
Merge "Correctly dump DrawPatch operations in display lists"
2011-10-19 17:07:25 -07:00
Peter Ng
23bc8ddbb8
Merge "Fixing blurry textfields"
2011-10-19 16:55:54 -07:00
Wink Saville
bc10e5a6f7
Merge "Non-default link should be cleaned up on telephony db change."
2011-10-19 16:27:32 -07:00
Svetoslav Ganov
ce662d1d28
am 018cb119: Merge "AdapterView does not check for null adapter when initializing accessibility event." into ics-mr0
...
* commit '018cb119bca7a3a08dd59843e1fec9a3027a8133':
AdapterView does not check for null adapter when initializing accessibility event.
2011-10-19 15:53:28 -07:00
Svetoslav Ganov
3e93cdd119
Merge "AdapterView does not check for null adapter when initializing accessibility event." into ics-mr0
2011-10-19 15:51:18 -07:00
Wink Saville
0c8fe99c96
Merge "Do not always say OTASP_NOT_NEEDED for LTE."
2011-10-19 15:43:38 -07:00
Adam Cohen
21ea0a3d8f
Merge "Manually merging screenshot notification string changes to master."
2011-10-19 15:31:49 -07:00
Jamie Gennis
79e3125d56
SurfaceTexture: add tests for buffer leaks
...
This change adds two tests to ensure that eglDestroySurface does not
cause Gralloc buffers to be leaked.
Bug: 5472838
Change-Id: Id675d74e34b6479f2d68314d40de94aede69f142
2011-10-19 15:19:19 -07:00
Eric Laurent
762d96fbee
am 3c86134a: Merge "Fix issue 381905: BassBoostTest CTS tests fail..." into ics-mr0
...
* commit '3c86134a50618605c86eb9f5f120dbf97826e3e1':
Fix issue 381905: BassBoostTest CTS tests fail...
2011-10-19 14:02:10 -07:00
Eric Laurent
fbab3f7a9c
Merge "Fix issue 381905: BassBoostTest CTS tests fail..." into ics-mr0
2011-10-19 13:59:55 -07:00
Scott Main
80fc292ab9
am bdca5c62: cherrypick from hc-mr2 Change-Id: I20c238ae599db79e41eaa2ea82a1e5631d004967 plus a small tweak to remove "other" data from platform chart docs: dashboard update
...
* commit 'bdca5c6237558015910a14d38f78ba84973e8ed4':
cherrypick from hc-mr2 Change-Id: I20c238ae599db79e41eaa2ea82a1e5631d004967 plus a small tweak to remove "other" data from platform chart docs: dashboard update
2011-10-19 12:25:12 -07:00
Scott Main
4e0e5d6e2b
am 47bc0fea: docs: fix typo in platform notes issue 5481512
...
* commit '47bc0feace5b842b3b8bf07b88e41ff658667bb3':
docs: fix typo in platform notes issue 5481512
2011-10-19 12:04:13 -07:00
Daniel Sandler
a5960ca37f
am 2f6a5327: Merge "Auto-close if you swipe away the last notification." into ics-mr0
...
* commit '2f6a53270f113a244f3b6ca91a1efef2c4a26fac':
Auto-close if you swipe away the last notification.
2011-10-19 12:00:13 -07:00
Daniel Sandler
dee884f13a
Merge "Auto-close if you swipe away the last notification." into ics-mr0
2011-10-19 11:58:27 -07:00
Dianne Hackborn
b3077a6029
am 47f8367a: Merge "Work on issue #5465917 : Wakelock *overflow* held for very long times" into ics-mr0
...
* commit '47f8367ab79247501d5d204632a7797fa8a888e5':
Work on issue #5465917 : Wakelock *overflow* held for very long times
2011-10-19 11:10:18 -07:00
Jamie Gennis
baf0e06dea
am 827d069a: Merge "SurfaceTexture: free buffers when disconnect fails" into ics-mr0
...
* commit '827d069afb297b6d96c995c03da9d4ee17e60679':
SurfaceTexture: free buffers when disconnect fails
2011-10-19 11:08:11 -07:00
Dianne Hackborn
f7db9d8b52
Merge "Work on issue #5465917 : Wakelock *overflow* held for very long times" into ics-mr0
2011-10-19 11:07:34 -07:00
Jamie Gennis
c9362e7b0f
Merge "SurfaceTexture: free buffers when disconnect fails" into ics-mr0
2011-10-19 11:06:05 -07:00
Michael Jurka
860573e62c
am 9a76afff: Merge "Make Recent Apps faster" into ics-mr0
...
* commit '9a76afff4da4bd51685b0938439c4f4a0e19345f':
Make Recent Apps faster
2011-10-19 10:31:47 -07:00
Ben Komalo
65da87a8bd
am 8408e516: Merge "Fix remote device wipe to not hang." into ics-mr0
...
* commit '8408e5165a74ddee7d2d8698314cfda521fbfc76':
Fix remote device wipe to not hang.
2011-10-19 10:31:42 -07:00
Michael Jurka
1248d07eb9
Merge "Make Recent Apps faster" into ics-mr0
2011-10-19 10:04:19 -07:00
Ben Komalo
d5dd8263e6
Merge "Fix remote device wipe to not hang." into ics-mr0
2011-10-19 09:32:50 -07:00
Marco Nelissen
50fc325854
Merge "Refactor FileInserter in MediaScanner and adding unit tests for the newly added class."
2011-10-19 07:50:24 -07:00
The Android Open Source Project
357ae311a5
Reconcile with ics-mr0-release
...
Change-Id: Ie6705bfff564fe89f151753a034decc60f02b03b
2011-10-19 07:23:01 -07:00
The Android Automerger
0e66387805
merge in ics-mr0-release history after reset to ics-mr0
2011-10-19 06:28:30 -07:00
Dave Burke
818fb24357
am 70ac412b: Merge "Add a LayerScreenshot" into ics-mr0
...
* commit '70ac412b2fe7be2507189a9fdfb30c43b36d56ac':
Add a LayerScreenshot
2011-10-18 23:00:08 -07:00
Dave Burke
8b29b65aeb
Merge "Add a LayerScreenshot" into ics-mr0
2011-10-18 22:58:09 -07:00
Dave Burke
6993a07d62
am d7035c58: Merge "Fix a hang in SF caused by invalid transform matrix from the WM" into ics-mr0
...
* commit 'd7035c58b006b62084232c8db6c4f7c4002170cc':
Fix a hang in SF caused by invalid transform matrix from the WM
2011-10-18 22:34:51 -07:00
Dave Burke
98ba099d8f
Merge "Fix a hang in SF caused by invalid transform matrix from the WM" into ics-mr0
2011-10-18 22:33:40 -07:00
James Dong
b1ec65e44e
am 5264f600: Merge "Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format." into ics-mr0
...
* commit '5264f6003bbcb8ca70df034379154914260cc322':
Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format.
2011-10-18 22:17:34 -07:00
James Dong
df17db9941
Merge "Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format." into ics-mr0
2011-10-18 22:16:08 -07:00
Mathias Agopian
675370ab9a
am f7613743: Merge "Don\'t call hwc set() if there is nothing new to do" into ics-mr0
...
* commit 'f7613743f29f38cbbaf4ae09996c380845a17daf':
Don't call hwc set() if there is nothing new to do
2011-10-18 20:24:23 -07:00
Mathias Agopian
5ba8f366bd
am 23bf2505: Merge "Make sure set GL state properly" into ics-mr0
...
* commit '23bf250522b7dff9acd14c5900b66b1df9c76745':
Make sure set GL state properly
2011-10-18 20:24:21 -07:00
Mathias Agopian
7c4cd93ad2
Merge "Don't call hwc set() if there is nothing new to do" into ics-mr0
2011-10-18 20:23:22 -07:00
Mathias Agopian
265eed738d
Merge "Make sure set GL state properly" into ics-mr0
2011-10-18 20:23:15 -07:00
Mathias Agopian
118d0245ee
Add a LayerScreenshot
...
A LayerScreenshot is a special type of layer that contains a screenshot of
the screen acquired when its created. It works just like LayerDim.
Make sure to call compositionComplete() after rendering into a FBO.
Bug: 5446982, 5467587, 5466259
Change-Id: I5d8a1b4c327f9973d950cd4f4c0bca7f62825cd4
2011-10-18 20:21:47 -07:00
Eric Laurent
895146aa5c
am ecfdd7ff: Merge "Limit AudioFlinger log." into ics-mr0
...
* commit 'ecfdd7ff468bfc861e84fe18992e26b89cc63126':
Limit AudioFlinger log.
2011-10-18 19:31:12 -07:00
Eric Laurent
70b9281f94
Merge "Limit AudioFlinger log." into ics-mr0
2011-10-18 19:29:39 -07:00
Dirk Dougherty
dc7a4aa0ea
am cd815fc5: Merge "Doc change: Add Android 4.0 Platform Highlights" into ics-mr0
...
* commit 'cd815fc55bf998578461a95daf8d8fe4a6522961':
Doc change: Add Android 4.0 Platform Highlights
2011-10-18 18:04:33 -07:00
Dirk Dougherty
985573e153
Merge "Doc change: Add Android 4.0 Platform Highlights" into ics-mr0
2011-10-18 18:02:35 -07:00
Romain Guy
cb3a39f004
Merge "Notify a Bitmap is has changed when calling copyPixelFromBuffer"
2011-10-18 17:57:22 -07:00
Scott Main
f0a7b09e3b
am f49ee00f: Merge "docs: fix platform highlights" into ics-mr0
...
* commit 'f49ee00f9e1975887142695e0040cd5dc410b9db':
docs: fix platform highlights
2011-10-18 17:51:42 -07:00
Jim Miller
c469d21e08
am 06398768: Merge "Fix 5288804: Make music trasports in lockscreen more closely match design" into ics-mr0
...
* commit '06398768ec048cf05717ee44b81cb357fdc896dd':
Fix 5288804: Make music trasports in lockscreen more closely match design
2011-10-18 17:51:41 -07:00