ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
47,294 Commits 2 Branches 0 Tags 54 MiB
ca5f79c2bb
Commit Graph

47294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jamie Gennis
ca5f79c2bb am 363847d4: Merge "EGL: expose the EXT_create_context_robustness ext" into jb-mr1-dev 
* commit '363847d498bffe0e2d8e7b8aba693bb402513413':
  EGL: expose the EXT_create_context_robustness ext
 2012-09-24 18:23:04 -07:00
Jamie Gennis
363847d498 Merge "EGL: expose the EXT_create_context_robustness ext" into jb-mr1-dev 2012-09-24 18:20:51 -07:00
Mathias Agopian
0d45d71197 am 500407a2: log an error when eglCreateContext() fails in an inconsistant way 
* commit '500407a2c07ced40c36e7356574a47bcec9c2fd9':
  log an error when eglCreateContext() fails in an inconsistant way
 2012-09-24 18:09:21 -07:00
Mathias Agopian
500407a2c0 log an error when eglCreateContext() fails in an inconsistant way 
this will help debugging bug: 7216919

Change-Id: I54ac65f20c5ed55cc93a5cbc5350fadfb0fcb804
 2012-09-24 17:57:48 -07:00
Mathias Agopian
81b316aa53 am 98838aa0: am 77af25b6: Merge "Return back-end result from eglDestroyImageKHR" 
* commit '98838aa0836518b7397cbfe763f34305e3387a5f':
  Return back-end result from eglDestroyImageKHR
 2012-09-24 15:43:54 -07:00
Mathias Agopian
98838aa083 am 77af25b6: Merge "Return back-end result from eglDestroyImageKHR" 
* commit '77af25b6dd41e76052b5b0ec6aaeebca896a4dbe':
  Return back-end result from eglDestroyImageKHR
 2012-09-24 15:42:06 -07:00
Mathias Agopian
77af25b6dd Merge "Return back-end result from eglDestroyImageKHR" 2012-09-24 14:56:03 -07:00
Jamie Gennis
09b11432b6 EGL: expose the EXT_create_context_robustness ext 
Change-Id: I1db43e96aa5e9e91a6176a4a3e5aa9d1f3ee4a7e
 2012-09-24 13:45:32 -07:00
Jamie Gennis
2cee285a97 am ff5c4aa6: Merge "ConsumerBase: make fence names meaningful" into jb-mr1-dev 
* commit 'ff5c4aa676d157f4911ef06e328e687725e8b9f9':
  ConsumerBase: make fence names meaningful
 2012-09-24 13:38:46 -07:00
Jamie Gennis
ff5c4aa676 Merge "ConsumerBase: make fence names meaningful" into jb-mr1-dev 2012-09-24 13:36:56 -07:00
Jamie Gennis
7aff4a5de4 ConsumerBase: make fence names meaningful 
Change-Id: I3580120cb63c027c327e80ec70e68650b75395de
 2012-09-24 12:25:53 -07:00
The Android Open Source Project
1dde9c32f2 Reconcile with jb-mr1-release - do not merge 
Change-Id: Id330f9144f47c1a9e314ac85b7b867cbfc7c27e8
 2012-09-24 10:12:21 -07:00
Eino-Ville Talvala
4214402aa2 am 33baee5d: Merge "Add android.hardware.camera.any feature to camera permissions." into jb-mr1-dev 
* commit '33baee5d88974a3b668f9d7f0716eed815966773':
  Add android.hardware.camera.any feature to camera permissions.
 2012-09-24 09:26:03 -07:00
Mathias Agopian
511572b465 am 9e2463e7: add/remove displays properly on hotplug events 
* commit '9e2463e71796964cfaa06bf09a880875ac3537bc':
  add/remove displays properly on hotplug events
 2012-09-24 09:26:02 -07:00
The Android Automerger
7fd6694905 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-23 18:59:59 -07:00
Eino-Ville Talvala
33baee5d88 Merge "Add android.hardware.camera.any feature to camera permissions." into jb-mr1-dev 2012-09-23 10:20:54 -07:00
Eino-Ville Talvala
e95822715e Add android.hardware.camera.any feature to camera permissions. 
Bug: 6847310
Change-Id: I9283932a7c211cd08b3b9fe6a93d8f219e6c9767
 2012-09-23 09:53:51 -07:00
The Android Automerger
0615c8aba8 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-22 09:41:58 -07:00
Mathias Agopian
9e2463e717 add/remove displays properly on hotplug events 
Bug: 7191563
Change-Id: I8f0fbf3b29658c9479443141798e6f288a1f2d52
 2012-09-21 18:26:16 -07:00
Mathias Agopian
6995433214 am ff28e201: Display events now always carry the display id they happened on 
* commit 'ff28e201ec0c6d620eaaa29814ab52958487dc31':
  Display events now always carry the display id they happened on
 2012-09-21 14:55:43 -07:00
Mathias Agopian
98cffd5cf9 am b4d18ed3: fix an issue where hotplug events were not dispatched 
* commit 'b4d18ed34e3513f3a14ea0876c7e330bee72a529':
  fix an issue where hotplug events were not dispatched
 2012-09-21 14:55:42 -07:00
Jamie Gennis
f83c2720c1 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
 2012-09-21 14:55:41 -07:00
Mathias Agopian
ff28e201ec Display events now always carry the display id they happened on 
Change-Id: I12de1d883c23927722bc3a71b782f0079de4e831
 2012-09-21 14:20:35 -07:00
Mathias Agopian
b4d18ed34e fix an issue where hotplug events were not dispatched 
Change-Id: I527eec77f338cd6f1a9021aa4c9d384dbddd6d2a
 2012-09-21 14:20:35 -07:00
Jamie Gennis
16cfa2e38b Merge "SurfaceTexture: fix an out of bounds array write" into jb-mr1-dev 2012-09-21 13:43:24 -07:00
Jamie Gennis
849df8cd6b 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.
 2012-09-21 12:17:46 -07:00
Jamie Gennis
e0606e2987 Merge "Add a spec for EGL_ANDROID_framebuffer_target." into jb-mr1-dev 2012-09-21 12:16:38 -07:00
Jamie Gennis
d1b330de41 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
 2012-09-21 12:15:22 -07:00
Jamie Gennis
aaf421c465 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
 2012-09-21 12:15:22 -07:00
The Android Automerger
ae18e61481 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-21 06:59:47 -07:00
Mathias Agopian
7afa3dce09 am 4c0751a1: return an error, as expected, when querying a disconnected display 
* commit '4c0751a1f6e4ee941791012b31f9dbc65601e1d6':
  return an error, as expected, when querying a disconnected display
 2012-09-20 21:33:56 -07:00
Mathias Agopian
4c0751a1f6 return an error, as expected, when querying a disconnected display 
Change-Id: I405a3a7bb42b9bbd2ec7bfe09e60e1b7acf7389d
 2012-09-20 21:28:12 -07:00
Mathias Agopian
245cfe066f 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
 2012-09-20 20:24:15 -07:00
Mathias Agopian
5c1180dfe8 am f5a33928: we now correctly set-up connected screens during boot 
* commit 'f5a33928349bebc8eebc9f466618997e98c24e68':
  we now correctly set-up connected screens during boot
 2012-09-20 20:22:58 -07:00
Mathias Agopian
8e52ccbe37 am 148994e5: We now report hotplug events to the framework 
* commit '148994e5f33ce240ff24ceb5bc0500b7f2001959':
  We now report hotplug events to the framework
 2012-09-20 20:22:57 -07:00
Mathias Agopian
f2fe393232 am 1604f777: one more step toward HDMI support 
* commit '1604f777d11c40daae8ec91d8ea75625996bfbac':
  one more step toward HDMI support
 2012-09-20 20:22:56 -07:00
Mathias Agopian
29c286ee9e am eba8c688: calculate wether we filter on a per-display basis 
* commit 'eba8c688f633f3f3f1b75c2bc64faf799dd2b5f2':
  calculate wether we filter on a per-display basis
 2012-09-20 20:22:55 -07:00
Mathias Agopian
488978deda am f33e4b6f: GraphicBufferAlloc class was declared twice 
* commit 'f33e4b6f13bc3ee2d2a4e1abd1ada171c70d3492':
  GraphicBufferAlloc class was declared twice
 2012-09-20 20:22:54 -07:00
Mathias Agopian
38e623bc5c fix a typo preventing pre hwc-1.1 devices from booting 
Change-Id: Icf01254689633d04967872749ac947a671e47ed8
 2012-09-20 19:27:07 -07:00
Mathias Agopian
f5a3392834 we now correctly set-up connected screens during boot 
Change-Id: Ie8b1a3b97ad1821cc970e43abe96c8cec7135b66
 2012-09-20 17:13:58 -07:00
Mathias Agopian
148994e5f3 We now report hotplug events to the framework 
Change-Id: I2d6b7787d39e5929485a551e4982498c5053c211
 2012-09-20 17:13:58 -07:00
Mathias Agopian
1604f777d1 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
 2012-09-20 17:13:58 -07:00
Mathias Agopian
eba8c688f6 calculate wether we filter on a per-display basis 
Change-Id: I79d80b432b20b3d02428da19add464ac1e2b9378
 2012-09-20 17:13:58 -07:00
Mathias Agopian
f33e4b6f13 GraphicBufferAlloc class was declared twice 
this was confusing because the one in FramebufferSurface
wasn't in fact being used

Change-Id: Ied45aec20d804cfbe52440f9b2f2852a85c757cf
 2012-09-20 17:13:58 -07:00
Ben Cheng
6523a82ce4 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.
 2012-09-20 13:19:27 -07:00
Ben Cheng
70f93fb5c2 Merge "Disable the use of clock_gettime for now." into jb-mr1-dev 2012-09-20 13:17:43 -07:00
The Android Open Source Project
015a6f2dec Reconcile with jb-mr1-release - do not merge 
Change-Id: I0800e6996dad4753a984e5b3bb2c791f12e7ddf7
 2012-09-20 10:35:55 -07:00
Andreas Huber
b2011cad4b am 67b9de12: Merge "frameworks/native: Amend HDCP API" into jb-mr1-dev 
* commit '67b9de12e13c947ebd272c3074cca832ce7c1aa0':
  frameworks/native: Amend HDCP API
 2012-09-20 09:42:34 -07:00
Andreas Huber
67b9de12e1 Merge "frameworks/native: Amend HDCP API" into jb-mr1-dev 2012-09-20 09:29:42 -07:00
The Android Automerger
e8d09f895e merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-20 06:59:49 -07:00