OSDN Git Service
Siva Velusamy [Thu, 15 Mar 2012 23:43:05 +0000 (16:43 -0700)]
Merge "gltrace: Only accept connections from the shell."
Siva Velusamy [Thu, 15 Mar 2012 23:18:38 +0000 (16:18 -0700)]
gltrace: Only accept connections from the shell.
Only accept incoming connections from the shell user.
Change-Id: Ibef1a796d794d45f73db59949b39cb1ce68542b4
Eino-Ville Talvala [Thu, 15 Mar 2012 17:33:59 +0000 (10:33 -0700)]
Merge "Move CameraParameters.h to frameworks/native."
Eino-Ville Talvala [Thu, 15 Mar 2012 00:17:05 +0000 (17:17 -0700)]
Move CameraParameters.h to frameworks/native.
CameraParameters.h is indirectly required to implement the Camera
HAL. Move it to frameworks/native.
Bug:
6171735
Change-Id: If4ccb273ea7ca79f54402ebc00febf1c3e59799f
Andrew Hsieh [Tue, 13 Mar 2012 22:48:50 +0000 (15:48 -0700)]
Merge "Added rules to build f/n/libs/utils in 64-bit: lib64utils.a"
Daniel Lam [Thu, 23 Feb 2012 22:35:13 +0000 (14:35 -0800)]
SurfaceTexture: Fully refactored from BufferQueue
SurfaceTexture and BufferQueue are separate objects.
Change-Id: I230bc0ae6f78d0f9b2b5df902f40ab443ed5a055
Mathias Agopian [Mon, 12 Mar 2012 19:18:42 +0000 (15:18 -0400)]
add ATRACE logs for screenshots
Change-Id: Ie8146c4d7608159e9d28b7338f9109b8fcdf955f
Andrew Hsieh [Tue, 13 Mar 2012 07:55:34 +0000 (00:55 -0700)]
Added rules to build f/n/libs/utils in 64-bit: lib64utils.a
It's needed to build four shared libraries in 64-bit for 64-bit
emulator with "-gpu on"
lib64OpenglRender.so
lib64EGL_translator.so
lib64GLES_CM_translator.so
lib64GLES_V2_translator.so
Change-Id: Ia6c05b23df1e9cd9e7f2e94e4cd5bde4be5d336b
Dave Burke [Tue, 13 Mar 2012 05:38:38 +0000 (22:38 -0700)]
Merge "attempt to fix a deadlock in SurfaceTextureClient::disconnect"
Dave Burke [Tue, 13 Mar 2012 04:49:41 +0000 (21:49 -0700)]
attempt to fix a deadlock in SurfaceTextureClient::disconnect
- condition wasn't signaled if an error happened between acquire and release
- also replace signal with broadcasts
Bug:
6109450
Change-Id: I8ac03c7eca35c9cc04a00ef7fad36bb9cb3fcef6
James Dong [Tue, 13 Mar 2012 01:55:13 +0000 (18:55 -0700)]
Copy one more file to /frameworks/native
o related-to-bug:
6044887
Change-Id: I920c487089eb258ada87603134f2597db6fe14e9
Siva Velusamy [Tue, 13 Mar 2012 01:10:04 +0000 (18:10 -0700)]
Merge "gltrace: Expose a function to set OpenGL trace level."
James Dong [Mon, 12 Mar 2012 22:00:47 +0000 (15:00 -0700)]
Merge "Copied some headers from /frameworks/base to /frameworks/native to support PDK effort"
Jeff Brown [Mon, 12 Mar 2012 20:25:00 +0000 (13:25 -0700)]
Merge "Expose the set of enabled tags."
James Dong [Mon, 12 Mar 2012 19:47:14 +0000 (12:47 -0700)]
Copied some headers from /frameworks/base to /frameworks/native to support PDK effort
o added some minor header include changes
o related-to-bug:
6044887
Change-Id: Ia8e7ba861c509a4fb688ab2ed1e81151a708861a
James Dong [Mon, 12 Mar 2012 17:44:15 +0000 (10:44 -0700)]
Move II420ColorConverter.h to /frameworks/native/include/media/editor
o related-to-bug:
6044894
Change-Id: Ib8f5406e32bd6c190d65e4a2e014f73e759d4415
Siva Velusamy [Fri, 9 Mar 2012 22:51:28 +0000 (14:51 -0800)]
gltrace: Expose a function to set OpenGL trace level.
This patch adds a function setGlDebugLevel() to libEGL to enable
GL tracing. This will be used by the Java layer to add an option
to "am start" that can enable tracing for a particular application.
Change-Id: Ie1dbdd550f502df8633553595cb33ee9d9ae44e1
Jeff Brown [Fri, 9 Mar 2012 22:46:01 +0000 (14:46 -0800)]
Expose the set of enabled tags.
This is used by the Java trace wrappers to avoid JNI overhead
when trace tags are disabled.
Also added a new tag for the input subsystem and view hierarchy.
Change-Id: Ia04a507e42a37b1d3bbb19859e6c07a92f4fe9aa
Mathias Agopian [Fri, 9 Mar 2012 07:42:41 +0000 (23:42 -0800)]
Merge "BufferQueue: fixed issues with buffer slots not available"
Daniel Lam [Wed, 7 Mar 2012 22:11:29 +0000 (14:11 -0800)]
BufferQueue: fixed issues with buffer slots not available
Bug:
6120953
Change-Id: I61d97d650c8dee0a6d7c19f2f50aa92a5f159095
Mathias Agopian [Fri, 9 Mar 2012 06:01:51 +0000 (22:01 -0800)]
fix surfaceflinger's dumpsys
Change-Id: I7b95c3e04f145003f9c0eef321a21f3f36dfe835
Mathias Agopian [Thu, 8 Mar 2012 03:46:57 +0000 (19:46 -0800)]
fix include path
Change-Id: I84adf53594cd4083a4a8ab475f175abb7414cda5
Jeff Sharkey [Wed, 7 Mar 2012 20:07:01 +0000 (12:07 -0800)]
Merge "Caliper benchmarks for Parcel."
Jean-Michel Trivi [Wed, 7 Mar 2012 19:53:21 +0000 (11:53 -0800)]
Merge "Effect for multichannel PCM downmix to stereo"
Michael Jurka [Wed, 7 Mar 2012 19:25:20 +0000 (11:25 -0800)]
Merge "Don't draw layers in buildLayer()"
Glenn Kasten [Wed, 7 Mar 2012 18:44:29 +0000 (10:44 -0800)]
Merge "Make applyVolume private to DirectOutputThread"
Eric Fischer [Wed, 7 Mar 2012 18:43:23 +0000 (10:43 -0800)]
Merge "Mark all of config.xml not translatable in the top-level comment."
Glenn Kasten [Wed, 7 Mar 2012 18:38:12 +0000 (10:38 -0800)]
Merge "Add comments about sequence for setting parameters"
Alex Sakhartchouk [Wed, 7 Mar 2012 17:25:56 +0000 (09:25 -0800)]
Merge "Adding more modes to the sampler test app. Fixing pixel placement."
Glenn Kasten [Wed, 7 Mar 2012 15:16:46 +0000 (07:16 -0800)]
Merge "Remove references to sched_policy.h in RS"
Jeff Sharkey [Wed, 7 Mar 2012 04:04:26 +0000 (20:04 -0800)]
Merge "Avoid updating network stats after shutdown."
Dianne Hackborn [Wed, 7 Mar 2012 03:06:25 +0000 (19:06 -0800)]
Merge "Work on more low memory reporting to apps."
John Reck [Wed, 7 Mar 2012 02:22:14 +0000 (18:22 -0800)]
Merge "Fix focus rings for buttons"
Adam Powell [Wed, 7 Mar 2012 01:43:48 +0000 (17:43 -0800)]
Merge "Fix some action bar menu layout bugs around config changes"
Wink Saville [Wed, 7 Mar 2012 01:13:16 +0000 (17:13 -0800)]
Merge "Telephony: Create and use UiccController"
John Reck [Wed, 7 Mar 2012 01:05:48 +0000 (17:05 -0800)]
Merge "Fix unhandled navigation path"
John Reck [Wed, 7 Mar 2012 01:04:13 +0000 (17:04 -0800)]
Merge "Fix FOCUS_BACKWARD search if view had no id"
Jeff Brown [Wed, 7 Mar 2012 00:51:13 +0000 (16:51 -0800)]
Merge "Don't close the database until all references released."
Glenn Kasten [Wed, 7 Mar 2012 00:22:30 +0000 (16:22 -0800)]
Merge "Rename fields of AudioSessionRef"
Glenn Kasten [Tue, 6 Mar 2012 23:23:58 +0000 (15:23 -0800)]
Merge "Fix indentation for re-organized code"
Nicolas Roard [Tue, 6 Mar 2012 22:13:54 +0000 (14:13 -0800)]
Merge "Pass the version down to native"
Gilles Debunne [Tue, 6 Mar 2012 21:57:16 +0000 (13:57 -0800)]
Merge "Ellipsize avoids spaces and starts right after text"
Glenn Kasten [Tue, 6 Mar 2012 21:44:56 +0000 (13:44 -0800)]
Merge "Rename updateWaitTime since a lock is held"
Fabrice Di Meglio [Tue, 6 Mar 2012 19:48:14 +0000 (11:48 -0800)]
Merge "Fix bug #
4972463 Update CTS tests for TextView textDirection"
Robert Greenwalt [Tue, 6 Mar 2012 19:30:28 +0000 (11:30 -0800)]
Merge "Make NDC not block forever and handle restart."
Craig Mautner [Tue, 6 Mar 2012 19:12:40 +0000 (11:12 -0800)]
Merge "Fix deadlock by making DropBoxManager call async."
Eric Laurent [Tue, 6 Mar 2012 18:53:39 +0000 (10:53 -0800)]
Merge "MediaPlayerService: fix AudioSink latency"
Eric Laurent [Tue, 6 Mar 2012 18:52:18 +0000 (10:52 -0800)]
Merge "AudioTrack: relax check on minimum buffer size"
Dianne Hackborn [Tue, 6 Mar 2012 18:34:18 +0000 (10:34 -0800)]
Merge "Fix issues #
6103378 and #
5959515."
James Dong [Tue, 6 Mar 2012 18:23:58 +0000 (10:23 -0800)]
Merge "Remove unused code - MediaSourceSplitter"
James Dong [Tue, 6 Mar 2012 18:23:51 +0000 (10:23 -0800)]
Merge "There was copy and paste code in JNI to create a DrmConvertedStatus object."
Siva Velusamy [Tue, 6 Mar 2012 16:59:32 +0000 (08:59 -0800)]
Merge "gltrace: Send vertex attribute data after glDraw() call."
Alex Sakhartchouk [Tue, 6 Mar 2012 16:31:54 +0000 (08:31 -0800)]
Merge "First draft of the sample function implementation."
Glenn Kasten [Tue, 6 Mar 2012 16:17:43 +0000 (08:17 -0800)]
Merge "Remove obsolete references to sched_policy.h"
Glenn Kasten [Tue, 6 Mar 2012 16:17:20 +0000 (08:17 -0800)]
Merge "Remove references to sched_policy.h"
Derek Sollenberger [Tue, 6 Mar 2012 13:27:31 +0000 (05:27 -0800)]
Merge "Add missing includes for Mutex.h"
Daniel Sandler [Tue, 6 Mar 2012 13:18:08 +0000 (05:18 -0800)]
Merge changes I8343449c,I4eaf69a1
* changes:
New slide-out mechanism.
Newly reimplemented PhoneStatusBar, now with fewer windows.
Jeff Brown [Tue, 6 Mar 2012 04:38:12 +0000 (20:38 -0800)]
Merge "Rename remove callback methods."
Mathias Agopian [Tue, 6 Mar 2012 03:41:29 +0000 (19:41 -0800)]
Merge "Add ATRACEs for Buffer indices"
Jeff Brown [Tue, 6 Mar 2012 03:05:02 +0000 (19:05 -0800)]
Merge "Support posting delayed animation/draw callbacks."
Glenn Kasten [Tue, 6 Mar 2012 02:12:45 +0000 (18:12 -0800)]
Remove obsolete references to sched_policy.h
As part of scheduling policy cleanup, remove or isolate
all references to the scheduling policy APIs.
Change-Id: Ia1ea2fe711a399039f25217309e061267744b856
Mathias Agopian [Tue, 6 Mar 2012 00:08:26 +0000 (16:08 -0800)]
Merge "fixup include paths"
Mathias Agopian [Mon, 5 Mar 2012 21:57:02 +0000 (13:57 -0800)]
fixup include paths
- remove unneeded include deps
- remove some hardcoded include paths
Change-Id: Ifae0e2b2d738e0f94f8525c45be78f4227ce1673
Nick Pelly [Mon, 5 Mar 2012 23:57:13 +0000 (15:57 -0800)]
Merge "Clarify docs for the thread used in BroadcastReceiver.onReceive()"
Jeff Brown [Mon, 5 Mar 2012 23:38:47 +0000 (15:38 -0800)]
Merge "Change widgets to post invalidate to the animation timer."
Guang Zhu [Mon, 5 Mar 2012 23:35:27 +0000 (15:35 -0800)]
Merge "Update to DumpRenderTree test harness"
Gilles Debunne [Mon, 5 Mar 2012 23:22:28 +0000 (15:22 -0800)]
Merge "EditText caches only text in its internal display list."
Eric Fischer [Mon, 5 Mar 2012 23:18:30 +0000 (15:18 -0800)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Mon, 5 Mar 2012 23:18:20 +0000 (15:18 -0800)]
Merge "Import translations. DO NOT MERGE"
Jean-Michel Trivi [Mon, 5 Mar 2012 22:51:54 +0000 (14:51 -0800)]
Merge "Add channel mask in AudioSink"
Tom Taylor [Mon, 5 Mar 2012 22:47:27 +0000 (14:47 -0800)]
Merge "Remove deleted pdu items from the updated cache"
Scott Main [Mon, 5 Mar 2012 22:43:11 +0000 (14:43 -0800)]
am
5186f094: am
8b0f6881: am
a47d88a7: docs: dashboard update for march 5
* commit '
5186f094ba6d37f47ae52085e34dd87267ec41d4':
docs: dashboard update for march 5
Fabrice Di Meglio [Mon, 5 Mar 2012 22:40:50 +0000 (14:40 -0800)]
Merge "Fix bug #
5815381 [DA] [Android Gallery] [Cut string in "no-response" box]"
Scott Main [Mon, 5 Mar 2012 22:39:46 +0000 (14:39 -0800)]
am
8b0f6881: am
a47d88a7: docs: dashboard update for march 5
* commit '
8b0f688156919cec527bc60df43c527d2dd940dc':
docs: dashboard update for march 5
Scott Main [Mon, 5 Mar 2012 22:36:05 +0000 (14:36 -0800)]
am
a47d88a7: docs: dashboard update for march 5
* commit '
a47d88a7d25da74319dc3decf80d98516a85fab2':
docs: dashboard update for march 5
Jim Miller [Mon, 5 Mar 2012 21:50:48 +0000 (13:50 -0800)]
Merge "Fix
5958806: Allow play button to be hidden in TransportControlView"
Romain Guy [Mon, 5 Mar 2012 21:48:55 +0000 (13:48 -0800)]
Merge "Delete display list objects and resources on the UI thread Bug #
6073717 Bug #
6065504 Bug #
6026515 Bug #
5971725"
Jeff Brown [Mon, 5 Mar 2012 21:38:59 +0000 (13:38 -0800)]
Merge "Make SQLiteDatabase final."
Jeff Brown [Mon, 5 Mar 2012 21:38:24 +0000 (13:38 -0800)]
Merge "Don't log SQLITE_SCHEMA errors."
Fabrice Di Meglio [Mon, 5 Mar 2012 21:36:20 +0000 (13:36 -0800)]
Merge "Fix bug #
6029615 Update Javadoc for onPaddingChanged()"
Scott Main [Mon, 5 Mar 2012 21:35:05 +0000 (13:35 -0800)]
am
7342817e: am
afdf856d: am
2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
* commit '
7342817ec382ad45dffdf48ad34e0805ed026a2a':
Scott Main [Mon, 5 Mar 2012 21:32:20 +0000 (13:32 -0800)]
am
afdf856d: am
2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
* commit '
afdf856d432fe5bae56152e42cb2c28ba63a5af0':
Scott Main [Mon, 5 Mar 2012 21:30:15 +0000 (13:30 -0800)]
am
2814c8be: am
97aa69d3: am
2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
* commit '
2814c8be993ddfb2c64b0dcbeb1443427b3fca3d':
docs: add note about declaring file sizes with sample app's code
Scott Main [Mon, 5 Mar 2012 21:27:33 +0000 (13:27 -0800)]
am
97aa69d3: am
2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
* commit '
97aa69d32f52499db001970829a0e654564ea551':
docs: add note about declaring file sizes with sample app's code
Scott Main [Mon, 5 Mar 2012 21:26:26 +0000 (13:26 -0800)]
am
2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
* commit '
2df6ecc508f6b30fd5d005394effa64272584caa':
docs: add note about declaring file sizes with sample app's code
Scott Main [Mon, 5 Mar 2012 21:25:54 +0000 (13:25 -0800)]
am
2df6ecc5: docs: add note about declaring file sizes with sample app\'s code
* commit '
2df6ecc508f6b30fd5d005394effa64272584caa':
docs: add note about declaring file sizes with sample app's code
Romain Guy [Mon, 5 Mar 2012 21:20:46 +0000 (13:20 -0800)]
Merge "Deferred layer updates"
Dima Zavin [Mon, 5 Mar 2012 21:19:33 +0000 (13:19 -0800)]
Merge "PowerManagerService: only turn off screen when we really mean to"
Glenn Kasten [Mon, 5 Mar 2012 20:18:14 +0000 (12:18 -0800)]
Merge "threadLoop merge"
Mathias Agopian [Mon, 5 Mar 2012 20:09:45 +0000 (12:09 -0800)]
Merge "BufferQueue: fixed acquire operation"
Scott Main [Mon, 5 Mar 2012 19:58:52 +0000 (11:58 -0800)]
am
668f8125: am
a7368087: am
6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
* commit '
668f8125bb7e72780ee204278e4d0da189b8a4b3':
Scott Main [Mon, 5 Mar 2012 19:56:48 +0000 (11:56 -0800)]
am
a7368087: am
6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
* commit '
a7368087d6f1f2682174139d9cacab48dc7bc198':
Scott Main [Mon, 5 Mar 2012 19:56:43 +0000 (11:56 -0800)]
am
6c4faf74: am
6d2a18b5: am
6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
* commit '
6c4faf74ae45ebd705620144150acfb677844523':
docs: updates to OBB guide for naming; plus other edits
Scott Main [Mon, 5 Mar 2012 19:54:36 +0000 (11:54 -0800)]
am
6d2a18b5: am
6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
* commit '
6d2a18b51ee7f7f3aad0b7b76ab55a90900f9403':
docs: updates to OBB guide for naming; plus other edits
Scott Main [Mon, 5 Mar 2012 19:52:59 +0000 (11:52 -0800)]
am
6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
* commit '
6f63d6fc044f259b7c796e7b7e8c5c8e4a3a3aed':
docs: updates to OBB guide for naming; plus other edits
Scott Main [Mon, 5 Mar 2012 19:52:41 +0000 (11:52 -0800)]
am
6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
* commit '
6f63d6fc044f259b7c796e7b7e8c5c8e4a3a3aed':
docs: updates to OBB guide for naming; plus other edits
Scott Main [Mon, 5 Mar 2012 19:51:03 +0000 (11:51 -0800)]
Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
Dianne Hackborn [Mon, 5 Mar 2012 19:45:19 +0000 (11:45 -0800)]
Merge "More work on rotation animation."
John Reck [Mon, 5 Mar 2012 19:33:44 +0000 (11:33 -0800)]
Merge "Delete more navcache stuff"
Jeff Sharkey [Mon, 5 Mar 2012 18:49:11 +0000 (10:49 -0800)]
Merge "Report leaked Context registrations to StrictMode."