OSDN Git Service
Jamie Gennis [Mon, 24 Sep 2012 07:49:26 +0000 (00:49 -0700)]
am
f83c2720: am
16cfa2e3: Merge "SurfaceTexture: fix an out of bounds array write" into jb-mr1-dev
* commit '
f83c2720c1aab9c361e8240575386081d5f496af':
SurfaceTexture: fix an out of bounds array write
Jamie Gennis [Mon, 24 Sep 2012 07:48:43 +0000 (00:48 -0700)]
am
849df8cd: am
e0606e29: Merge "Add a spec for EGL_ANDROID_framebuffer_target." into jb-mr1-dev
* commit '
849df8cd6baa26ef431404d1b1eea1e141eb5030':
Add a spec for EGL_ANDROID_framebuffer_target.
Jamie Gennis [Fri, 21 Sep 2012 21:55:41 +0000 (14:55 -0700)]
am
16cfa2e3: Merge "SurfaceTexture: fix an out of bounds array write" into jb-mr1-dev
* commit '
16cfa2e38bfbdafdba21af7f9f1c4d1418cbe1d3':
SurfaceTexture: fix an out of bounds array write
Jamie Gennis [Fri, 21 Sep 2012 20:43:23 +0000 (13:43 -0700)]
Merge "SurfaceTexture: fix an out of bounds array write" into jb-mr1-dev
Jamie Gennis [Fri, 21 Sep 2012 19:17:46 +0000 (12:17 -0700)]
am
e0606e29: Merge "Add a spec for EGL_ANDROID_framebuffer_target." into jb-mr1-dev
* commit '
e0606e29875a55dedc1a4f0a738d5eb40fe1eb41':
Add a spec for EGL_ANDROID_framebuffer_target.
Jamie Gennis [Fri, 21 Sep 2012 19:16:37 +0000 (12:16 -0700)]
Merge "Add a spec for EGL_ANDROID_framebuffer_target." into jb-mr1-dev
Jamie Gennis [Fri, 21 Sep 2012 18:55:35 +0000 (11:55 -0700)]
SurfaceTexture: fix an out of bounds array write
This change fixes an issue causing the mEglContext member of a SurfaceTexture
to get incorrectly zeroed out. This would happen when a call to
ConsumerBase::releaseBufferLocked resulted in the current buffer being freed.
Freeing the current buffer would set SurfaceTexture::mCurrentTexture to -1,
which would then be used by SurfaceTexture::releaseBufferLocked to reset the
current slot's EGLSyncKHR to EGL_NO_SYNC_KHR (= 0). This would overwrite the
mEglContext field, resulting in context mismatch errors in
SurfaceTexture::doGLFenceWaitLocked.
The fix is to simply use the buffer slot that's passed in to
SurfaceTexture::releaseBufferLocked rather than mCurrentTexture.
Change-Id: I0e5e2bd88fcbb354c35a3744f317716fff3e0e41
Jamie Gennis [Thu, 20 Sep 2012 20:55:24 +0000 (13:55 -0700)]
Add a spec for EGL_ANDROID_framebuffer_target.
This change adds a new extension for EGL implementations to indicate the
EGLConfigs that support use as a HWComposer framebuffer target layer.
Change-Id: Ia7c8fbe8da09d57b4ec8bf1d9ddb67ca21aa2885
Mathias Agopian [Fri, 21 Sep 2012 04:43:16 +0000 (21:43 -0700)]
am
7afa3dce: am
4c0751a1: return an error, as expected, when querying a disconnected display
* commit '
7afa3dce092741b63932b901e93216f29e4fa634':
return an error, as expected, when querying a disconnected display
Mathias Agopian [Fri, 21 Sep 2012 04:33:56 +0000 (21:33 -0700)]
am
4c0751a1: return an error, as expected, when querying a disconnected display
* commit '
4c0751a1f6e4ee941791012b31f9dbc65601e1d6':
return an error, as expected, when querying a disconnected display
Mathias Agopian [Fri, 21 Sep 2012 04:28:12 +0000 (21:28 -0700)]
return an error, as expected, when querying a disconnected display
Change-Id: I405a3a7bb42b9bbd2ec7bfe09e60e1b7acf7389d
Mathias Agopian [Fri, 21 Sep 2012 03:31:17 +0000 (20:31 -0700)]
am
245cfe06: am
38e623bc: fix a typo preventing pre hwc-1.1 devices from booting
* commit '
245cfe066fd9f3ba4cfc4a89c257930483e8d557':
fix a typo preventing pre hwc-1.1 devices from booting
Mathias Agopian [Fri, 21 Sep 2012 03:31:16 +0000 (20:31 -0700)]
am
5c1180df: am
f5a33928: we now correctly set-up connected screens during boot
* commit '
5c1180dfe8feb7c673b57cab72f920a0bb1e0bdf':
we now correctly set-up connected screens during boot
Mathias Agopian [Fri, 21 Sep 2012 03:31:15 +0000 (20:31 -0700)]
am
8e52ccbe: am
148994e5: We now report hotplug events to the framework
* commit '
8e52ccbe3738839440ff68dd6d5a911234fdece1':
We now report hotplug events to the framework
Mathias Agopian [Fri, 21 Sep 2012 03:31:14 +0000 (20:31 -0700)]
am
f2fe3932: am
1604f777: one more step toward HDMI support
* commit '
f2fe3932323988167c2695b204167a688b4f85a6':
one more step toward HDMI support
Mathias Agopian [Fri, 21 Sep 2012 03:31:13 +0000 (20:31 -0700)]
am
29c286ee: am
eba8c688: calculate wether we filter on a per-display basis
* commit '
29c286ee9e300400cdf814f9088a8b3c88bd11da':
calculate wether we filter on a per-display basis
Mathias Agopian [Fri, 21 Sep 2012 03:31:13 +0000 (20:31 -0700)]
am
488978de: am
f33e4b6f: GraphicBufferAlloc class was declared twice
* commit '
488978deda3490056d1d9f6bbeb2c838114c329b':
GraphicBufferAlloc class was declared twice
Mathias Agopian [Fri, 21 Sep 2012 03:24:15 +0000 (20:24 -0700)]
am
38e623bc: fix a typo preventing pre hwc-1.1 devices from booting
* commit '
38e623bc5c2d7224ebd5b82efaea401bc8e5367a':
fix a typo preventing pre hwc-1.1 devices from booting
Mathias Agopian [Fri, 21 Sep 2012 03:22:58 +0000 (20:22 -0700)]
am
f5a33928: we now correctly set-up connected screens during boot
* commit '
f5a33928349bebc8eebc9f466618997e98c24e68':
we now correctly set-up connected screens during boot
Mathias Agopian [Fri, 21 Sep 2012 03:22:57 +0000 (20:22 -0700)]
am
148994e5: We now report hotplug events to the framework
* commit '
148994e5f33ce240ff24ceb5bc0500b7f2001959':
We now report hotplug events to the framework
Mathias Agopian [Fri, 21 Sep 2012 03:22:56 +0000 (20:22 -0700)]
am
1604f777: one more step toward HDMI support
* commit '
1604f777d11c40daae8ec91d8ea75625996bfbac':
one more step toward HDMI support
Mathias Agopian [Fri, 21 Sep 2012 03:22:55 +0000 (20:22 -0700)]
am
eba8c688: calculate wether we filter on a per-display basis
* commit '
eba8c688f633f3f3f1b75c2bc64faf799dd2b5f2':
calculate wether we filter on a per-display basis
Mathias Agopian [Fri, 21 Sep 2012 03:22:54 +0000 (20:22 -0700)]
am
f33e4b6f: GraphicBufferAlloc class was declared twice
* commit '
f33e4b6f13bc3ee2d2a4e1abd1ada171c70d3492':
GraphicBufferAlloc class was declared twice
Mathias Agopian [Fri, 21 Sep 2012 02:27:07 +0000 (19:27 -0700)]
fix a typo preventing pre hwc-1.1 devices from booting
Change-Id: Icf01254689633d04967872749ac947a671e47ed8
Mathias Agopian [Thu, 20 Sep 2012 01:16:22 +0000 (18:16 -0700)]
we now correctly set-up connected screens during boot
Change-Id: Ie8b1a3b97ad1821cc970e43abe96c8cec7135b66
Mathias Agopian [Thu, 20 Sep 2012 00:31:36 +0000 (17:31 -0700)]
We now report hotplug events to the framework
Change-Id: I2d6b7787d39e5929485a551e4982498c5053c211
Mathias Agopian [Wed, 19 Sep 2012 04:54:42 +0000 (21:54 -0700)]
one more step toward HDMI support
getDisplayInfo() now returns proper information for
HWC managed displays.
hotplug is sitll not supported; so this is not fully correct
as the information returned will be bogus if the HDMI screen
is not plugged in.
Bug:
7191563
Change-Id: If55d8e829fae0443571548155007f486cdf9bc9f
Mathias Agopian [Thu, 20 Sep 2012 06:14:45 +0000 (23:14 -0700)]
calculate wether we filter on a per-display basis
Change-Id: I79d80b432b20b3d02428da19add464ac1e2b9378
Mathias Agopian [Thu, 20 Sep 2012 23:54:14 +0000 (16:54 -0700)]
GraphicBufferAlloc class was declared twice
this was confusing because the one in FramebufferSurface
wasn't in fact being used
Change-Id: Ied45aec20d804cfbe52440f9b2f2852a85c757cf
Ben Cheng [Thu, 20 Sep 2012 20:20:30 +0000 (13:20 -0700)]
am
6523a82c: am
70f93fb5: Merge "Disable the use of clock_gettime for now." into jb-mr1-dev
* commit '
6523a82ce4e148964f2ed450717d28fdbc92d621':
Disable the use of clock_gettime for now.
Ben Cheng [Thu, 20 Sep 2012 20:19:27 +0000 (13:19 -0700)]
am
70f93fb5: Merge "Disable the use of clock_gettime for now." into jb-mr1-dev
* commit '
70f93fb5c2004c0fe2bd33f106358d516bb615f8':
Disable the use of clock_gettime for now.
Ben Cheng [Thu, 20 Sep 2012 20:17:42 +0000 (13:17 -0700)]
Merge "Disable the use of clock_gettime for now." into jb-mr1-dev
The Android Open Source Project [Thu, 20 Sep 2012 19:49:02 +0000 (12:49 -0700)]
am
015a6f2d: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
015a6f2decfa760604d91b2ae3cfa620a8111ea8':
Check that HWC exists before trying to use it
Andreas Huber [Thu, 20 Sep 2012 19:49:01 +0000 (12:49 -0700)]
am
b2011cad: am
67b9de12: Merge "frameworks/native: Amend HDCP API" into jb-mr1-dev
* commit '
b2011cad4b2d45cb8a95d801f3dfc32f758dc878':
frameworks/native: Amend HDCP API
The Android Open Source Project [Thu, 20 Sep 2012 17:35:55 +0000 (10:35 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I0800e6996dad4753a984e5b3bb2c791f12e7ddf7
Andreas Huber [Thu, 20 Sep 2012 16:42:34 +0000 (09:42 -0700)]
am
67b9de12: Merge "frameworks/native: Amend HDCP API" into jb-mr1-dev
* commit '
67b9de12e13c947ebd272c3074cca832ce7c1aa0':
frameworks/native: Amend HDCP API
Andreas Huber [Thu, 20 Sep 2012 16:29:41 +0000 (09:29 -0700)]
Merge "frameworks/native: Amend HDCP API" into jb-mr1-dev
Jesse Hall [Thu, 20 Sep 2012 16:29:14 +0000 (09:29 -0700)]
am
9aa8ef74: am
1887af43: Merge "Allow 16-bit color EGLConfigs" into jb-mr1-dev
* commit '
9aa8ef745905899a4eaaa8d1ab65d43f4e6d33e0':
Allow 16-bit color EGLConfigs
Mathias Agopian [Thu, 20 Sep 2012 16:29:13 +0000 (09:29 -0700)]
am
278b3016: am
2a60824a: am
516efc1b: am
8a2b5423: Merge "libagl: Transform the vertex if using eye space lighting with point lights"
* commit '
278b301690d5428e4ec97ac8cf2d9bfb8f901f0b':
libagl: Transform the vertex if using eye space lighting with point lights
Mathias Agopian [Thu, 20 Sep 2012 16:29:12 +0000 (09:29 -0700)]
am
12ba3127: am
3a24e8f1: Merge changes I561c198c,Id4865f3c into jb-mr1-dev
* commit '
12ba3127cd3bc8a9d1d024727ed8760d592d4f0a':
improve sensor battery usage tracking
track UID with connections
Mathias Agopian [Thu, 20 Sep 2012 16:29:12 +0000 (09:29 -0700)]
am
5aae981d: am
d56eff2f: fix typo in DisplayDevice logs
* commit '
5aae981d6e85e160282fb608bd04e5ef65bfee8c':
fix typo in DisplayDevice logs
The Android Automerger [Thu, 20 Sep 2012 13:59:49 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jesse Hall [Thu, 20 Sep 2012 13:09:46 +0000 (06:09 -0700)]
am
1887af43: Merge "Allow 16-bit color EGLConfigs" into jb-mr1-dev
* commit '
1887af43a5dd5181f4582a6090ae25c7aa17fa4a':
Allow 16-bit color EGLConfigs
Mathias Agopian [Thu, 20 Sep 2012 13:09:37 +0000 (06:09 -0700)]
am
2a60824a: am
516efc1b: am
8a2b5423: Merge "libagl: Transform the vertex if using eye space lighting with point lights"
* commit '
2a60824abcbfc2c5b936d3711d6d32318c489e88':
libagl: Transform the vertex if using eye space lighting with point lights
Mathias Agopian [Thu, 20 Sep 2012 13:08:10 +0000 (06:08 -0700)]
am
3a24e8f1: Merge changes I561c198c,Id4865f3c into jb-mr1-dev
* commit '
3a24e8f160c7794f44ef9fd5c70a61ff62412717':
improve sensor battery usage tracking
track UID with connections
Mathias Agopian [Thu, 20 Sep 2012 13:08:09 +0000 (06:08 -0700)]
am
d56eff2f: fix typo in DisplayDevice logs
* commit '
d56eff2f49e64bb71863ffb866af8c3f686b96e9':
fix typo in DisplayDevice logs
Jesse Hall [Thu, 20 Sep 2012 05:30:55 +0000 (22:30 -0700)]
Merge "Allow 16-bit color EGLConfigs" into jb-mr1-dev
Mathias Agopian [Thu, 20 Sep 2012 05:05:14 +0000 (22:05 -0700)]
am
516efc1b: am
8a2b5423: Merge "libagl: Transform the vertex if using eye space lighting with point lights"
* commit '
516efc1bea1c05492c5d4636a589cfc686661842':
libagl: Transform the vertex if using eye space lighting with point lights
Jesse Hall [Thu, 20 Sep 2012 04:00:49 +0000 (21:00 -0700)]
Allow 16-bit color EGLConfigs
The emulator without GPU acceleration only supports 16-bit
framebuffers.
Bug:
7185810
Change-Id: I883180367bf5b291d5e70427ab586d2e17868a96
Mathias Agopian [Thu, 20 Sep 2012 03:39:05 +0000 (20:39 -0700)]
am
8a2b5423: Merge "libagl: Transform the vertex if using eye space lighting with point lights"
* commit '
8a2b54235a45f92827b13723380065d1ce308236':
libagl: Transform the vertex if using eye space lighting with point lights
Mathias Agopian [Thu, 20 Sep 2012 02:31:52 +0000 (19:31 -0700)]
Merge "libagl: Transform the vertex if using eye space lighting with point lights"
Mathias Agopian [Wed, 19 Sep 2012 23:26:30 +0000 (16:26 -0700)]
Merge changes I561c198c,Id4865f3c into jb-mr1-dev
* changes:
improve sensor battery usage tracking
track UID with connections
Mathias Agopian [Wed, 19 Sep 2012 23:25:29 +0000 (16:25 -0700)]
fix typo in DisplayDevice logs
Change-Id: I593ef674f12073bd9d690946447031394ef9044e
Mathias Agopian [Wed, 19 Sep 2012 22:19:14 +0000 (15:19 -0700)]
am
d37e1e68: am
3cdccc6f: Merge "fix a typo in SensorService" into jb-mr1-dev
* commit '
d37e1e688e5744b4f053509022c05440b2eb71f3':
fix a typo in SensorService
Iliyan Malchev [Wed, 19 Sep 2012 22:18:51 +0000 (15:18 -0700)]
am
bda132e3: am
2398bc67: Merge "gui: conditionally set USE_NATIVE_FENCE_SYNC for msm8960" into jb-mr1-dev
* commit '
bda132e3cdd4d90fb521e119112441adb057d4b3':
gui: conditionally set USE_NATIVE_FENCE_SYNC for msm8960
Ben Cheng [Wed, 19 Sep 2012 21:53:10 +0000 (14:53 -0700)]
Disable the use of clock_gettime for now.
Bug:
7100774
Change-Id: I6ede2a37a5d485134fe419b5dc766f70ae4af9d4
Deva Ramasubramanian [Tue, 18 Sep 2012 23:15:32 +0000 (16:15 -0700)]
frameworks/native: Amend HDCP API
- Allow caller to set the observer and cookie.
- Add more notifications that the HDCPModule can send to its Observer.
Change-Id: I8bf9cc02a029cd38bbd25d9f0a634452173f4d26
Signed-off-by: Deva Ramasubramanian <dramasub@codeaurora.org>
The Android Automerger [Wed, 19 Sep 2012 14:01:38 +0000 (07:01 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Wed, 19 Sep 2012 06:35:42 +0000 (23:35 -0700)]
am
3cdccc6f: Merge "fix a typo in SensorService" into jb-mr1-dev
* commit '
3cdccc6f852be345c43bdfbc2466aa17c1173c9c':
fix a typo in SensorService
Mathias Agopian [Wed, 19 Sep 2012 01:49:18 +0000 (18:49 -0700)]
improve sensor battery usage tracking
until now we were tracking when a sensors was
physically enabled or disabled and we were reporting
that to the BattaryService.
this wasn incorrect because we could have several different
apps enabling the same sensor, so the accounting by the
battery service would be incorrect in that case (depending
on the order in which these apps disabled said sensor).
BatteryService tracks sensors per uid, however SensorService
does this per binder connection, so we could have several
binder connections for the same uid, to solve this we keep
a list of sensor/uid -> count, which is the bulk of this
change.
Bug:
6661604
Change-Id: I561c198c42ba1736a8671bdacda4c76d72b9dd6f
Mathias Agopian [Wed, 19 Sep 2012 00:02:43 +0000 (17:02 -0700)]
track UID with connections
Change-Id: Id4865f3cd27a95acdbbfdff1f2bb4123f312a13b
Mathias Agopian [Wed, 19 Sep 2012 06:33:20 +0000 (23:33 -0700)]
Merge "fix a typo in SensorService" into jb-mr1-dev
Iliyan Malchev [Wed, 19 Sep 2012 03:30:07 +0000 (20:30 -0700)]
am
2398bc67: Merge "gui: conditionally set USE_NATIVE_FENCE_SYNC for msm8960" into jb-mr1-dev
* commit '
2398bc67bb04e9f087fd46455bf8ff1ce4eb510f':
gui: conditionally set USE_NATIVE_FENCE_SYNC for msm8960
Iliyan Malchev [Wed, 19 Sep 2012 03:28:04 +0000 (20:28 -0700)]
Merge "gui: conditionally set USE_NATIVE_FENCE_SYNC for msm8960" into jb-mr1-dev
Jeff Boody [Mon, 10 Sep 2012 16:24:07 +0000 (10:24 -0600)]
gui: conditionally set USE_NATIVE_FENCE_SYNC for msm8960
Change-Id: Ib7ad11597ef7c79162a0b0a49a1b8ae16d192c10
Signed-off-by: Iliyan Malchev <malchev@google.com>
Mathias Agopian [Wed, 19 Sep 2012 00:18:54 +0000 (17:18 -0700)]
fix a typo in SensorService
It shouldn't have caused much harm though.
Also log a warning when enabling a sensor
for a connection that is already enabled.
Change-Id: Ia4a052381e79183cd4cb1bedc7ba08e5228d7a38
Mathias Agopian [Tue, 18 Sep 2012 22:33:35 +0000 (15:33 -0700)]
am
3edb4950: am
1d12d8a8: improve logging of external displays
* commit '
3edb495060b1742ae2647ae0d45995e7d3b66727':
improve logging of external displays
Mathias Agopian [Tue, 18 Sep 2012 22:14:34 +0000 (15:14 -0700)]
am
1d12d8a8: improve logging of external displays
* commit '
1d12d8a8e61163b35cf42c51c558a67138014e82':
improve logging of external displays
Mathias Agopian [Tue, 18 Sep 2012 08:38:00 +0000 (01:38 -0700)]
improve logging of external displays
Change-Id: I041aebb7fc655aeca98bbf698d15e05d7c12cac9
Jesse Hall [Tue, 18 Sep 2012 18:39:40 +0000 (11:39 -0700)]
Check that HWC exists before trying to use it
Bug:
7185810
Change-Id: I1271d6ba397f3abf0ef166b8d03b9b26b72e28d7
Mathias Agopian [Tue, 18 Sep 2012 20:25:29 +0000 (13:25 -0700)]
am
157bb2c1: am
6ab93290: suppress superfluous log
* commit '
157bb2c1d93ea4184ee3c1046294c83c42aae6db':
suppress superfluous log
Mathias Agopian [Tue, 18 Sep 2012 20:23:56 +0000 (13:23 -0700)]
am
6ab93290: suppress superfluous log
* commit '
6ab93290aeed63f139b0e77819ea889bbce9ec8b':
suppress superfluous log
Mathias Agopian [Tue, 18 Sep 2012 20:19:46 +0000 (13:19 -0700)]
suppress superfluous log
Change-Id: I838f2de4cf99e885833c4f42e2a69d6e3bb8eea5
Jesse Hall [Tue, 18 Sep 2012 19:31:34 +0000 (12:31 -0700)]
am
c7e4e27f: am
aeb76d16: Merge "Check that HWC exists before trying to use it" into jb-mr1-dev
* commit '
c7e4e27fd4e8526d47d17bfe18a48ab05c1d4291':
Check that HWC exists before trying to use it
Jesse Hall [Tue, 18 Sep 2012 19:21:45 +0000 (12:21 -0700)]
am
aeb76d16: Merge "Check that HWC exists before trying to use it" into jb-mr1-dev
* commit '
aeb76d160c530786d58d6a8b35d9b4a75a2279e3':
Check that HWC exists before trying to use it
Jamie Gennis [Tue, 18 Sep 2012 19:19:07 +0000 (12:19 -0700)]
am
21fc3a05: am
3941cb24: SurfaceTexture: default to doing GL sync
* commit '
21fc3a0560521a2609217758eff24babc2a750a3':
SurfaceTexture: default to doing GL sync
Jesse Hall [Tue, 18 Sep 2012 19:16:13 +0000 (12:16 -0700)]
Merge "Check that HWC exists before trying to use it" into jb-mr1-dev
Jamie Gennis [Tue, 18 Sep 2012 19:14:51 +0000 (12:14 -0700)]
am
3941cb24: SurfaceTexture: default to doing GL sync
* commit '
3941cb240d438bfdebe24920bb2ada86456a0bf9':
SurfaceTexture: default to doing GL sync
Jesse Hall [Tue, 18 Sep 2012 18:39:40 +0000 (11:39 -0700)]
Check that HWC exists before trying to use it
Bug:
7185810
Change-Id: I1271d6ba397f3abf0ef166b8d03b9b26b72e28d7
Jamie Gennis [Mon, 17 Sep 2012 23:58:17 +0000 (16:58 -0700)]
SurfaceTexture: default to doing GL sync
This change makes updateTexImage default to performing the necessary
synchronization and adds an argument for SurfaceFlinger to disable that
synchronization so that it can be performed lazily.
Change-Id: I7c20923cc786634126fbf7021c9d2541aa77be5d
Bug:
6991805
Andy McFadden [Tue, 18 Sep 2012 17:28:24 +0000 (10:28 -0700)]
am
721b2a28: am
8dfa92fe: Plumb display name into SurfaceFlinger
* commit '
721b2a281597056a2ad8cf589bd2b697f19cad67':
Plumb display name into SurfaceFlinger
Andy McFadden [Tue, 18 Sep 2012 17:10:14 +0000 (10:10 -0700)]
am
8dfa92fe: Plumb display name into SurfaceFlinger
* commit '
8dfa92fef9759a881e96ee58d59875d35023aab9':
Plumb display name into SurfaceFlinger
Andy McFadden [Tue, 18 Sep 2012 01:27:17 +0000 (18:27 -0700)]
Plumb display name into SurfaceFlinger
The Surface createDisplay() call takes a display name for debugging.
This change carries it through SurfaceFlinger and displays it in
the "dumpsys SurfaceFlinger" output.
Bug
7058158
Change-Id: I79f3474a8656ff1beb7b478e0dbf2c5de666118a
The Android Automerger [Tue, 18 Sep 2012 13:59:48 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Tue, 18 Sep 2012 09:34:41 +0000 (02:34 -0700)]
am
e303e431: am
d870703d: fix external displays
* commit '
e303e4314033869633a0443ca2f69c66590a4719':
fix external displays
Mathias Agopian [Tue, 18 Sep 2012 09:32:47 +0000 (02:32 -0700)]
am
d870703d: fix external displays
* commit '
d870703d5566490cfdfb389d9336b2b8d3c6cc7a':
fix external displays
Mathias Agopian [Tue, 18 Sep 2012 08:21:55 +0000 (01:21 -0700)]
fix external displays
we were not calling eglSwapBuffers() on external displays
because they can't use HWC which caused us to think they
didn't have GLES composition.
Change-Id: I6cef4ae40b138412d2e6f2acda33c9d222b03a83
Mathias Agopian [Tue, 18 Sep 2012 07:10:46 +0000 (00:10 -0700)]
am
cb54b2a4: am
41cb1b5f: Merge changes I53d70510,If34a05f3 into jb-mr1-dev
* commit '
cb54b2a42c3760fd8aba458d16d8676bc0c25313':
add support hwc 1.1
refactor things a bit
Jamie Gennis [Tue, 18 Sep 2012 07:10:46 +0000 (00:10 -0700)]
am
8e7e5399: am
f0f56f32: Merge "EGL: fix an extension string bug" into jb-mr1-dev
* commit '
8e7e5399764c4ef44125c41b172a04dd1403d3a0':
EGL: fix an extension string bug
Mathias Agopian [Tue, 18 Sep 2012 07:04:32 +0000 (00:04 -0700)]
am
41cb1b5f: Merge changes I53d70510,If34a05f3 into jb-mr1-dev
* commit '
41cb1b5f673b7f73e7f781b9f51ed095085dfdcd':
add support hwc 1.1
refactor things a bit
Jamie Gennis [Tue, 18 Sep 2012 07:04:24 +0000 (00:04 -0700)]
am
f0f56f32: Merge "EGL: fix an extension string bug" into jb-mr1-dev
* commit '
f0f56f32bba418ebb42381cd63ba5da36f6fa228':
EGL: fix an extension string bug
Mathias Agopian [Tue, 18 Sep 2012 01:59:04 +0000 (18:59 -0700)]
Merge changes I53d70510,If34a05f3 into jb-mr1-dev
* changes:
add support hwc 1.1
refactor things a bit
Mathias Agopian [Fri, 14 Sep 2012 01:17:13 +0000 (18:17 -0700)]
add support hwc 1.1
Bug:
7124069
Change-Id: I53d705105c4ad8954d3f50ee4f4c8b7ec936b871
Jamie Gennis [Tue, 18 Sep 2012 01:51:55 +0000 (18:51 -0700)]
Merge "EGL: fix an extension string bug" into jb-mr1-dev
Jamie Gennis [Sun, 16 Sep 2012 21:02:20 +0000 (14:02 -0700)]
EGL: fix an extension string bug
This change fixes a bug where initializing EGL multiple times (eglTerminate
followed by eglInitialize) would cause extensions to show up in the extension
string multiple times.
Change-Id: I707a3da62ed30ef13835087167f84a08bc6addd7
Elliott Hughes [Mon, 17 Sep 2012 21:53:49 +0000 (14:53 -0700)]
am
001d3c28: am
c8cff90d: Merge "Use a named constant rather than a magic number." into jb-mr1-dev
* commit '
001d3c28aff88b10d4c52a6c6f77faebf822a0e1':
Use a named constant rather than a magic number.
jp abgrall [Mon, 17 Sep 2012 21:53:22 +0000 (14:53 -0700)]
am
41fc5a48: am
86ca50d8: am
e917bfbd: am
09a22fc2: Merge "Allow disable of dumpstate vibrate"
* commit '
41fc5a48829ca38d5531dfa93bac6596b29f578e':
Allow disable of dumpstate vibrate
Ben Cheng [Mon, 17 Sep 2012 21:45:25 +0000 (14:45 -0700)]
am
149627d1: am
07e8134e: Merge "Print warnings when backwards timestamps are detected." into jb-mr1-dev
* commit '
149627d136ee9fe72928a4f2799e772e0a981f81':
Print warnings when backwards timestamps are detected.
Andy McFadden [Mon, 17 Sep 2012 21:44:40 +0000 (14:44 -0700)]
Andy McFadden [Mon, 17 Sep 2012 21:44:35 +0000 (14:44 -0700)]
am
1d84178f: am
6905205c: Fix transform hints
* commit '
1d84178faf4ae8a544b6b5a80082b9667d22d6d4':
Fix transform hints