OSDN Git Service
Mike Lockwood [Wed, 24 Oct 2012 18:51:51 +0000 (11:51 -0700)]
Move app_process and system_server back to frameworks/base
due to dependency on libandroid_runtime
Change-Id: Ie30a76ebb57a07ab29dc1b553c0e2dc9ab8d271a
Signed-off-by: Mike Lockwood <lockwood@google.com>
Mike Lockwood [Wed, 24 Oct 2012 17:45:23 +0000 (10:45 -0700)]
Move non-Java commands over from frameworks/base
Change-Id: I0571813c1cfcf66abd36eb9f178fc49b618e88a6
Signed-off-by: Mike Lockwood <lockwood@google.com>
Mathias Agopian [Mon, 22 Oct 2012 22:38:00 +0000 (15:38 -0700)]
am
ef36f2a8: am
d17e3b5f: prevent a client from crashing surfaceflinger
* commit '
ef36f2a84cb8478b0baa299d980922ce7824c0b3':
prevent a client from crashing surfaceflinger
Mathias Agopian [Mon, 22 Oct 2012 22:35:51 +0000 (15:35 -0700)]
am
d17e3b5f: prevent a client from crashing surfaceflinger
* commit '
d17e3b5f6cf71eb52bc81f37719254ce08244b34':
prevent a client from crashing surfaceflinger
Mathias Agopian [Mon, 22 Oct 2012 21:27:45 +0000 (14:27 -0700)]
prevent a client from crashing surfaceflinger
a misbehaving or malicious client could cause SF to crash
by providing a "fake" IInterface. we now check the
IInterface we get is our own and local.
Bug:
7278879
Change-Id: Ia19d05902d4b2385c5a16416148378d4998833fd
Jamie Gennis [Mon, 22 Oct 2012 20:57:51 +0000 (13:57 -0700)]
am
3b6055a7: am
ba7dc2db: Merge "SurfaceFlinger: add support for secure displays" into jb-mr1-dev
* commit '
3b6055a7184a2da7bbdd94118a8c6af875bb28b1':
SurfaceFlinger: add support for secure displays
Jamie Gennis [Mon, 22 Oct 2012 20:54:50 +0000 (13:54 -0700)]
am
ba7dc2db: Merge "SurfaceFlinger: add support for secure displays" into jb-mr1-dev
* commit '
ba7dc2db6e93a2407c8c328f2838591b7b760658':
SurfaceFlinger: add support for secure displays
Jamie Gennis [Mon, 22 Oct 2012 20:50:18 +0000 (13:50 -0700)]
Merge "SurfaceFlinger: add support for secure displays" into jb-mr1-dev
Jamie Gennis [Sat, 20 Oct 2012 01:19:11 +0000 (18:19 -0700)]
SurfaceFlinger: add support for secure displays
This change adds support for displays that are not allowed to display surfaces
with the eSecure flag set. All non-virtual displays are considered secure,
while virtual displays have their secure-ness specified at creation time.
Bug:
7368436
Change-Id: I81ad535d2d1e5a7ff78269017e85b111f0098500
Andy McFadden [Fri, 19 Oct 2012 23:17:41 +0000 (16:17 -0700)]
am
44c985ef: am
620685c2: Fix emulator vsync
* commit '
44c985ef7d0b6d94fa9df3fd5ea718eca0ecdbd1':
Fix emulator vsync
Andy McFadden [Fri, 19 Oct 2012 23:14:34 +0000 (16:14 -0700)]
am
620685c2: Fix emulator vsync
* commit '
620685c2e684082c82657732d1e35cefd0c79006':
Fix emulator vsync
Andy McFadden [Fri, 19 Oct 2012 19:53:46 +0000 (12:53 -0700)]
Fix emulator vsync
The code that reserves display IDs was only run when a hardware
composer was present. The eventControl() function, which handles
enabling of vsync, was ignoring the request because the primary
display didn't appear in its set of allocated IDs. This moves
reservation of IDs for built-in displays outside the HWC-only block.
Also, added a couple of warnings in eventControl().
Bug
7376568
Change-Id: I185ccdf817a25499b5c2668f8f6d594afb8c1568
Romain Guy [Fri, 19 Oct 2012 00:39:13 +0000 (17:39 -0700)]
am
f58475b5: am
60393d45: Merge "Add runtime debugging capabilities to OpenGL" into jb-mr1-dev
* commit '
f58475b5ae4ccb3a31c05c79da8b2914c62a3510':
Add runtime debugging capabilities to OpenGL
Romain Guy [Fri, 19 Oct 2012 00:37:54 +0000 (17:37 -0700)]
am
60393d45: Merge "Add runtime debugging capabilities to OpenGL" into jb-mr1-dev
* commit '
60393d45207b6548e1f61ca104fa59aecee87d30':
Add runtime debugging capabilities to OpenGL
Romain Guy [Fri, 19 Oct 2012 00:33:36 +0000 (17:33 -0700)]
Merge "Add runtime debugging capabilities to OpenGL" into jb-mr1-dev
Romain Guy [Thu, 18 Oct 2012 23:16:10 +0000 (16:16 -0700)]
Add runtime debugging capabilities to OpenGL
The shell property debug.egl.trace can now be set to:
0
disables tracing
1
logs all GL calls
error
checks glGetError after every GL call, logs a stack trace on error
systrace
logs each GL call to systrace
Change-Id: I34a2a2d4e19c373fd9eaa1b0cd93e67c87378996
Jamie Gennis [Wed, 17 Oct 2012 23:58:54 +0000 (16:58 -0700)]
am
caadbc53: am
7c41bf70: SurfaceFlinger: change the animation timeout
* commit '
caadbc5324cd4503450ac6bd9bb09c3c5fcb7430':
SurfaceFlinger: change the animation timeout
Jamie Gennis [Wed, 17 Oct 2012 23:57:01 +0000 (16:57 -0700)]
am
7c41bf70: SurfaceFlinger: change the animation timeout
* commit '
7c41bf7092b75dba6029cd3bbc842d3a2661b0aa':
SurfaceFlinger: change the animation timeout
Jamie Gennis [Wed, 17 Oct 2012 16:40:21 +0000 (09:40 -0700)]
am
9097e144: am
7f79a2bd: Merge "BufferQueue: alloc without holding the lock" into jb-mr1-dev
* commit '
9097e14443767b37ab0831d46c1090a3960d36e1':
BufferQueue: alloc without holding the lock
Jamie Gennis [Wed, 17 Oct 2012 16:29:47 +0000 (09:29 -0700)]
SurfaceFlinger: change the animation timeout
This change changes the animation transaction timeout from 500us to 5s.
Bug:
7362633
Change-Id: I9bed8e74f726dae2daa398afc29babcea00d5b04
Jamie Gennis [Wed, 17 Oct 2012 16:37:40 +0000 (09:37 -0700)]
am
7f79a2bd: Merge "BufferQueue: alloc without holding the lock" into jb-mr1-dev
* commit '
7f79a2bd5c92bc626890dc16ffb8cd2de934e5fb':
BufferQueue: alloc without holding the lock
Jamie Gennis [Wed, 17 Oct 2012 16:32:42 +0000 (09:32 -0700)]
Merge "BufferQueue: alloc without holding the lock" into jb-mr1-dev
Kenny Root [Tue, 16 Oct 2012 23:31:26 +0000 (16:31 -0700)]
am
3fe50abb: am
125becee: am
7abbbc68: Merge "Add TEMP_FAILURE_RETRY to ZipUtils"
* commit '
3fe50abbfd12a8d98717bdaba2f9af30f39affbf':
Add TEMP_FAILURE_RETRY to ZipUtils
Kenny Root [Tue, 16 Oct 2012 23:29:17 +0000 (16:29 -0700)]
am
125becee: am
7abbbc68: Merge "Add TEMP_FAILURE_RETRY to ZipUtils"
* commit '
125beceefd44f6abd17ff336bb989e1850965bd8':
Add TEMP_FAILURE_RETRY to ZipUtils
Kenny Root [Tue, 16 Oct 2012 23:26:42 +0000 (16:26 -0700)]
am
7abbbc68: Merge "Add TEMP_FAILURE_RETRY to ZipUtils"
* commit '
7abbbc680d03dd8e50a709f89b78ace6b81154b0':
Add TEMP_FAILURE_RETRY to ZipUtils
Kenny Root [Tue, 16 Oct 2012 22:57:11 +0000 (15:57 -0700)]
Merge "Add TEMP_FAILURE_RETRY to ZipUtils"
Kenny Root [Tue, 16 Oct 2012 18:34:02 +0000 (11:34 -0700)]
Add TEMP_FAILURE_RETRY to ZipUtils
Change-Id: I275c415f14eeffaf9a58d45f3ea014d766441ec3
Romain Guy [Tue, 16 Oct 2012 16:50:35 +0000 (09:50 -0700)]
am
23bcd8d2: am
825a9a2d: Merge "Update comments to reflect what the code actually does" into jb-mr1-dev
* commit '
23bcd8d298597659622919027c9ea921d5eed513':
Update comments to reflect what the code actually does
Romain Guy [Tue, 16 Oct 2012 16:47:38 +0000 (09:47 -0700)]
am
825a9a2d: Merge "Update comments to reflect what the code actually does" into jb-mr1-dev
* commit '
825a9a2dcd1b3e139dd0677ff46f966fb23f963c':
Update comments to reflect what the code actually does
Romain Guy [Tue, 16 Oct 2012 16:45:01 +0000 (09:45 -0700)]
Merge "Update comments to reflect what the code actually does" into jb-mr1-dev
Mathias Agopian [Tue, 16 Oct 2012 03:39:30 +0000 (20:39 -0700)]
am
179c4db2: am
db9b41fd: fix a corruption in blank/unblank
* commit '
179c4db2c3f26e6586b0b0fe2c576fc9ae349580':
fix a corruption in blank/unblank
Mathias Agopian [Tue, 16 Oct 2012 03:38:09 +0000 (20:38 -0700)]
am
db9b41fd: fix a corruption in blank/unblank
* commit '
db9b41fd157279d1b988a854e0d7c5b43c2fac38':
fix a corruption in blank/unblank
Mathias Agopian [Mon, 15 Oct 2012 23:51:41 +0000 (16:51 -0700)]
fix a corruption in blank/unblank
we were holding a reference (ie: pointer) to a sp<DisplayDevice>
while processing the message. Meanwhile the object itself could
go away and we would end up accessing a dead object.
the root cause of the problem is that we are accessing mDisplays[]
in a few places outside of the main thread.
Bug:
7352770
Change-Id: I89e35dd85fb30e9a6383eca9a0bbc7028363876c
Jamie Gennis [Tue, 16 Oct 2012 03:26:15 +0000 (20:26 -0700)]
am
5c51f0fb: am
3365c567: Merge "SurfaceFlinger: add animation transactions" into jb-mr1-dev
* commit '
5c51f0fb38bd0cd80031da3eee6f335d5d28c3fc':
SurfaceFlinger: add animation transactions
Romain Guy [Tue, 16 Oct 2012 03:26:14 +0000 (20:26 -0700)]
am
49fe8add: am
b96fe085: Merge "Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps" into jb-mr1-dev
* commit '
49fe8addbfe52bf9a3e69e6250e462a70332235c':
Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps
Jamie Gennis [Tue, 16 Oct 2012 03:19:36 +0000 (20:19 -0700)]
am
3365c567: Merge "SurfaceFlinger: add animation transactions" into jb-mr1-dev
* commit '
3365c56716432d3bfdf41bb82fb08df821f41d0c':
SurfaceFlinger: add animation transactions
Romain Guy [Tue, 16 Oct 2012 03:19:18 +0000 (20:19 -0700)]
am
b96fe085: Merge "Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps" into jb-mr1-dev
* commit '
b96fe08540dcf7e90be56919ea9863f687da779c':
Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps
Jamie Gennis [Tue, 16 Oct 2012 02:36:11 +0000 (19:36 -0700)]
Merge "SurfaceFlinger: add animation transactions" into jb-mr1-dev
Romain Guy [Tue, 16 Oct 2012 02:25:18 +0000 (19:25 -0700)]
Update comments to reflect what the code actually does
Change-Id: I2613aa32c29eddc52a00090656c1bd11f9f5732b
Jamie Gennis [Tue, 16 Oct 2012 01:24:43 +0000 (18:24 -0700)]
SurfaceFlinger: add animation transactions
This change adds a transaction flag for WindowManager to indicate that a
transaction is being used to animate windows around the screen. SurfaceFlinger
will not allow more than one of these transactions to be outstanding at a time
to prevent the animation "frames" from being dropped.
Bug:
7353840
Change-Id: I6488a6e0e1ed13d27356d2203c9dc766dc6b1759
Romain Guy [Tue, 16 Oct 2012 01:43:19 +0000 (18:43 -0700)]
Merge "Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps" into jb-mr1-dev
Romain Guy [Tue, 16 Oct 2012 01:13:05 +0000 (18:13 -0700)]
Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps
Change-Id: I53ac91a9ce07b5dd5f2ee0e3cc5b65b6402f9229
Jesse Hall [Mon, 15 Oct 2012 22:01:47 +0000 (15:01 -0700)]
am
c558269b: am
837d2f9e: Always set vertex alpha when drawing screenshot layers
* commit '
c558269b1ab8c4985b86a0f39338d42f162693f2':
Always set vertex alpha when drawing screenshot layers
Jesse Hall [Mon, 15 Oct 2012 21:59:16 +0000 (14:59 -0700)]
am
837d2f9e: Always set vertex alpha when drawing screenshot layers
* commit '
837d2f9e83e7d8625ef482d9c9d9afa852c8dbaa':
Always set vertex alpha when drawing screenshot layers
Jesse Hall [Mon, 15 Oct 2012 19:38:33 +0000 (12:38 -0700)]
Always set vertex alpha when drawing screenshot layers
The screenshot is a GL_RGB texture, and the GL_REPLACE texture env
mode uses vertex alpha for GL_RGB textures instead of alpha=1.0.
Bug:
7340077
Change-Id: I6fbb907023e48f9c422b15a33da79757d6726840
The Android Open Source Project [Mon, 15 Oct 2012 14:42:41 +0000 (07:42 -0700)]
am
935ba809: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
935ba80962920ff420bd4714046d1e4d8910889b':
The Android Open Source Project [Mon, 15 Oct 2012 14:38:56 +0000 (07:38 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I50d7a0cbc6632c78a725810d960e049c310b3597
The Android Automerger [Sat, 13 Oct 2012 10:50:10 +0000 (03:50 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Kenny Root [Sat, 13 Oct 2012 06:45:02 +0000 (23:45 -0700)]
am
e2e95c8c: am
9bdaa60b: Merge "Add TEMP_FAILURE_RETRY around open and write calls" into jb-mr1-dev
* commit '
e2e95c8ccba2c2fb979d0ed42ed905106623d3c3':
Add TEMP_FAILURE_RETRY around open and write calls
Kenny Root [Sat, 13 Oct 2012 06:43:29 +0000 (23:43 -0700)]
am
9bdaa60b: Merge "Add TEMP_FAILURE_RETRY around open and write calls" into jb-mr1-dev
* commit '
9bdaa60b809b223d14619d1f13afdd38acb1738d':
Add TEMP_FAILURE_RETRY around open and write calls
Kenny Root [Sat, 13 Oct 2012 06:39:47 +0000 (23:39 -0700)]
Merge "Add TEMP_FAILURE_RETRY around open and write calls" into jb-mr1-dev
The Android Automerger [Fri, 12 Oct 2012 23:34:34 +0000 (16:34 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 12 Oct 2012 23:32:47 +0000 (16:32 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jamie Gennis [Fri, 12 Oct 2012 21:39:54 +0000 (14:39 -0700)]
am
ec93e762: am
dd57d551: Merge "SurfaceFlinger: make the num FBs a board config" into jb-mr1-dev
* commit '
ec93e762afc46534aadb3f583dbf87e38e85bfe9':
SurfaceFlinger: make the num FBs a board config
Jamie Gennis [Fri, 12 Oct 2012 21:37:22 +0000 (14:37 -0700)]
am
dd57d551: Merge "SurfaceFlinger: make the num FBs a board config" into jb-mr1-dev
* commit '
dd57d551944c01394bc2807d962be4953c58c7c1':
SurfaceFlinger: make the num FBs a board config
Jamie Gennis [Fri, 12 Oct 2012 21:33:51 +0000 (14:33 -0700)]
Merge "SurfaceFlinger: make the num FBs a board config" into jb-mr1-dev
Jamie Gennis [Fri, 12 Oct 2012 21:18:10 +0000 (14:18 -0700)]
SurfaceFlinger: make the num FBs a board config
Bug:
7283132
Change-Id: I38116f39fc18212f2daab94bbfc3daaf89439fc4
Kenny Root [Fri, 12 Oct 2012 06:42:05 +0000 (23:42 -0700)]
Add TEMP_FAILURE_RETRY around open and write calls
Bug:
7330849
Change-Id: I9aef3c3d3a248c3eea7ca060124ad6decaa6b4da
The Android Automerger [Fri, 12 Oct 2012 17:26:47 +0000 (10:26 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Open Source Project [Fri, 12 Oct 2012 14:33:36 +0000 (07:33 -0700)]
am
c5a70b1d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
c5a70b1d2474f47929658b90f51390de700d64c0':
The Android Open Source Project [Fri, 12 Oct 2012 14:31:00 +0000 (07:31 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I38012327dc2f36e7e2a6773a2e1dfc49be6475ad
Jamie Gennis [Fri, 5 Oct 2012 01:34:01 +0000 (18:34 -0700)]
BufferQueue: alloc without holding the lock
This change makes BufferQueue::dequeueBuffer release its mutex before
allocating new buffers. This should alleviate lock contention in
SurfaceFlinger where SF's main thread can get blocked waiting for an allocation
operation to complete.
Bug:
7335075
Change-Id: I1b000539cc616a695afab2e9c68507db69e57b13
Jesse Hall [Fri, 12 Oct 2012 00:54:35 +0000 (17:54 -0700)]
am
f5b27f71: am
b763d5ff: Assume LayerScreenshot has pre-multiplied alpha
* commit '
f5b27f714063361d07a7ca6f107bba3e13b75d38':
Assume LayerScreenshot has pre-multiplied alpha
Jesse Hall [Fri, 12 Oct 2012 00:13:23 +0000 (17:13 -0700)]
am
b763d5ff: Assume LayerScreenshot has pre-multiplied alpha
* commit '
b763d5fffa2f942a6ae3637fab17439dd32dbebc':
Assume LayerScreenshot has pre-multiplied alpha
The Android Automerger [Thu, 11 Oct 2012 23:26:37 +0000 (16:26 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jesse Hall [Thu, 11 Oct 2012 22:41:48 +0000 (15:41 -0700)]
am
42bac0bd: (-s ours) am
b82fb343: (-s ours) am
e3a66965: (-s ours) Merge "Stop using transparent region for computing visible regions (DO NOT MERGE)"
* commit '
42bac0bd1c4e1ef964d37a480d068cfc29310297':
Stop using transparent region for computing visible regions (DO NOT MERGE)
Jesse Hall [Thu, 11 Oct 2012 22:40:40 +0000 (15:40 -0700)]
am
b82fb343: (-s ours) am
e3a66965: (-s ours) Merge "Stop using transparent region for computing visible regions (DO NOT MERGE)"
* commit '
b82fb3431e5d62298b229f3b8758c832dee41f1d':
Stop using transparent region for computing visible regions (DO NOT MERGE)
Jesse Hall [Thu, 11 Oct 2012 22:39:34 +0000 (15:39 -0700)]
am
e3a66965: (-s ours) Merge "Stop using transparent region for computing visible regions (DO NOT MERGE)"
* commit '
e3a669656ae891a510ccbd73d26559a20f5f466b':
Stop using transparent region for computing visible regions (DO NOT MERGE)
Jesse Hall [Thu, 11 Oct 2012 22:06:07 +0000 (15:06 -0700)]
Merge "Stop using transparent region for computing visible regions (DO NOT MERGE)"
The Android Automerger [Thu, 11 Oct 2012 15:19:15 +0000 (08:19 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Open Source Project [Thu, 11 Oct 2012 15:08:16 +0000 (08:08 -0700)]
am
9e7f65fd: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
9e7f65fdc941f9e35faddc5d117bcb40aa91b09a':
The Android Open Source Project [Thu, 11 Oct 2012 15:04:59 +0000 (08:04 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ie746268888d072f9a5bf32320bebc98afdc0ef8b
The Android Automerger [Thu, 11 Oct 2012 14:03:50 +0000 (07:03 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Open Source Project [Thu, 11 Oct 2012 12:59:16 +0000 (05:59 -0700)]
am
ca5aae24: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
ca5aae2425a88ddc0bdf7f03569848fd67e603d2':
The Android Open Source Project [Thu, 11 Oct 2012 12:57:17 +0000 (05:57 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I01ed0fa73e80b3868a53238a8e754970da2f6803
Jesse Hall [Thu, 11 Oct 2012 04:37:22 +0000 (21:37 -0700)]
Assume LayerScreenshot has pre-multiplied alpha
Bug:
7300129
Change-Id: Ie9114adc4b5c9a8cc3c65bfe6d9478b2cba4e0d8
Andy McFadden [Thu, 11 Oct 2012 02:39:21 +0000 (19:39 -0700)]
am
9349b510: am
f0c89b28: Merge "Fix HDMI unblank behavior" into jb-mr1-dev
* commit '
9349b5108c3763337868ffc5de51330c00d6db04':
Fix HDMI unblank behavior
Andy McFadden [Thu, 11 Oct 2012 02:37:57 +0000 (19:37 -0700)]
am
f0c89b28: Merge "Fix HDMI unblank behavior" into jb-mr1-dev
* commit '
f0c89b28be2e74c26d74b2a21b7228516f8c236f':
Fix HDMI unblank behavior
Andy McFadden [Thu, 11 Oct 2012 02:34:11 +0000 (19:34 -0700)]
Merge "Fix HDMI unblank behavior" into jb-mr1-dev
Andy McFadden [Thu, 11 Oct 2012 01:17:51 +0000 (18:17 -0700)]
Fix HDMI unblank behavior
Two issues:
(1) We were announcing the hotplug event before we were ready to
handle blank/unblank events, so we were losing the initial unblank
that power manager sends us when HDMI is first plugged in. This
left the display blank until you toggled the device power off/on.
(2) We were retaining fbTargetHandle for HDMI after the display was
disconnected. The value didn't get updated when HDMI was reconnected
because the display was blank, so we didn't go through that code
path. So, when HDMI was re-connected, we passed stale data into
the HWC.
Bug
7323938
Change-Id: I2335d24fd7b0f00bb23fc63aa7bcf44cb8857c73
The Android Automerger [Wed, 10 Oct 2012 21:06:39 +0000 (14:06 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Siva Velusamy [Wed, 10 Oct 2012 21:02:55 +0000 (14:02 -0700)]
Merge "gltrace: Do not start gltrace from early_egl_init."
Chet Haase [Wed, 10 Oct 2012 20:22:55 +0000 (13:22 -0700)]
am
8b75830c: am
8d5d2019: Revert "Add GL Error logs (temporary)"
* commit '
8b75830c5ce5e0097909c11c559d50d7f6f7303b':
Revert "Add GL Error logs (temporary)"
Chet Haase [Wed, 10 Oct 2012 20:21:39 +0000 (13:21 -0700)]
am
8d5d2019: Revert "Add GL Error logs (temporary)"
* commit '
8d5d2019805df1f27cbec07eeca47dd5ab453dad':
Revert "Add GL Error logs (temporary)"
Chet Haase [Mon, 8 Oct 2012 20:19:08 +0000 (13:19 -0700)]
Revert "Add GL Error logs (temporary)"
This reverts commit
2da2c15068327a4fdad411f638905abcb2209d8a.
Siva Velusamy [Wed, 10 Oct 2012 17:35:41 +0000 (10:35 -0700)]
gltrace: Do not start gltrace from early_egl_init.
The debugging and tracing levels are initialized both during
early_egl_init and egl_display_t::initialize(). For apps this has
no effect since early_egl_init is called in the context of zygote.
This CL removes the unnecessary call from early_egl_init.
Change-Id: Ibc55c26228cd197f2e2623fbfb2d1a63d0722401
The Android Open Source Project [Wed, 10 Oct 2012 16:47:52 +0000 (09:47 -0700)]
am
dc9c3a4f: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
dc9c3a4f2bdd2825e396cb01eafb06122ceea257':
The Android Open Source Project [Wed, 10 Oct 2012 16:44:41 +0000 (09:44 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I9b2354f718f8e792bd040b7fb92f8fd1c77c037a
The Android Automerger [Wed, 10 Oct 2012 15:55:31 +0000 (08:55 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 10 Oct 2012 13:59:29 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Tue, 9 Oct 2012 23:59:54 +0000 (16:59 -0700)]
am
43bd832d: am
0acb00c2: Merge "fix typo that prevented proper loging of EGL error code" into jb-mr1-dev
* commit '
43bd832d128726334de622d67aaac09051c07941':
fix typo that prevented proper loging of EGL error code
Jeff Brown [Tue, 9 Oct 2012 23:58:27 +0000 (16:58 -0700)]
am
70f07572: am
c5b58166: Merge "don\'t automatically unblank external displays" into jb-mr1-dev
* commit '
70f07572f8ce6b83b167170eea9d500e51549395':
don't automatically unblank external displays
Mathias Agopian [Tue, 9 Oct 2012 23:57:47 +0000 (16:57 -0700)]
am
0acb00c2: Merge "fix typo that prevented proper loging of EGL error code" into jb-mr1-dev
* commit '
0acb00c2d780b60ed3d71be256460375dd8715b4':
fix typo that prevented proper loging of EGL error code
Jeff Brown [Tue, 9 Oct 2012 23:56:21 +0000 (16:56 -0700)]
am
c5b58166: Merge "don\'t automatically unblank external displays" into jb-mr1-dev
* commit '
c5b58166e8170a415de108a72acfc432dec1b201':
don't automatically unblank external displays
Mathias Agopian [Tue, 9 Oct 2012 23:52:37 +0000 (16:52 -0700)]
Merge "fix typo that prevented proper loging of EGL error code" into jb-mr1-dev
Jeff Brown [Tue, 9 Oct 2012 23:50:55 +0000 (16:50 -0700)]
Merge "don't automatically unblank external displays" into jb-mr1-dev
Mathias Agopian [Tue, 9 Oct 2012 23:43:50 +0000 (16:43 -0700)]
fix typo that prevented proper loging of EGL error code
needed for investigating
7309949
Bug:
7309949
Change-Id: If29a5c08d0e87f46b44ba2e1030be61cb4d1403b
Mathias Agopian [Tue, 9 Oct 2012 23:41:44 +0000 (16:41 -0700)]
am
98e52bdb: am
45778999: Merge "Fence didn\'t manager sync_wait error codes properly" into jb-mr1-dev
* commit '
98e52bdb18842a7a00e66bf6adb628f2512e2ef0':
Fence didn't manager sync_wait error codes properly
Mathias Agopian [Tue, 9 Oct 2012 23:40:08 +0000 (16:40 -0700)]
am
45778999: Merge "Fence didn\'t manager sync_wait error codes properly" into jb-mr1-dev
* commit '
45778999c705683ec0fcca3e90c7e9969e081d93':
Fence didn't manager sync_wait error codes properly
Mathias Agopian [Tue, 9 Oct 2012 23:36:30 +0000 (16:36 -0700)]
Merge "Fence didn't manager sync_wait error codes properly" into jb-mr1-dev