ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
48,205 Commits 2 Branches 0 Tags 54 MiB
19437cb84c
Commit Graph

48205 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy McFadden
2adaf04fab Rename ISurfaceTexture and SurfaceTexture 
The C++ class names don't match what the classes do, so rename
ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to
GLConsumer.

Bug 7736700

Change-Id: Ia03e468888025b5cae3c0ee1995434515dbea387
 2012-12-18 13:10:48 -08:00
Andy McFadden
f7baee731e Merge "Added some comments" 2012-12-17 14:19:46 -08:00
Marco Nelissen
cce6230b3c Merge "Add NULL check to CallStack::toString" 2012-12-17 13:42:05 -08:00
Andy McFadden
0273adbf0b Added some comments 
Added a quick intro section at the top of the class.  Also noted
the proposed new name for the class.

Change-Id: I3f79663527544aa4e910db0e5a1374b54d16ba2f
 2012-12-17 12:40:50 -08:00
Marco Nelissen
32130635f6 Add NULL check to CallStack::toString 
CallStack::toString() has a 0 default argument, which ends up getting
passed to strlen(), resulting in a crash.

Change-Id: If706aff8c400983670f49cdbb66e11191ac76e0e
 2012-12-17 10:28:20 -08:00
Andrew Hsieh
44615b8818 am 8d9f0118: am fdd8551f: Merge "Fix build" 
* commit '8d9f0118926d54b5a5fc1508a7c43aa661839f1f':
  Fix build
 2012-12-16 16:36:43 -08:00
Andrew Hsieh
8d9f011892 am fdd8551f: Merge "Fix build" 
* commit 'fdd8551fe83754846cb91e2d7325ef90d2e0fb28':
  Fix build
 2012-12-16 16:35:31 -08:00
Andrew Hsieh
fdd8551fe8 Merge "Fix build" 2012-12-16 16:03:03 -08:00
Andrew Hsieh
370980c528 Fix build 
Change-Id: Ie011cbf74a08f760ccd93ca37fa2b437b7063462
 2012-12-17 08:01:36 +08:00
Andrew Hsieh
b41ad7ec0c am d8f2daad: am acfcd62a: Merge "Revert "Fix typo"" 
* commit 'd8f2daada3a828c5d9e6dfa29f53ab054618e129':
  Revert "Fix typo"
 2012-12-15 21:24:37 -08:00
Andrew Hsieh
47c100110d am 4bb20303: am 670c570e: Merge "Fix typo" 
* commit '4bb20303d95e7d6242e648ce506ab939420dbe71':
  Fix typo
 2012-12-15 21:24:35 -08:00
Andrew Hsieh
d8f2daada3 am acfcd62a: Merge "Revert "Fix typo"" 
* commit 'acfcd62aa9300087d3e8cca79e59b0abdcaaee35':
  Revert "Fix typo"
 2012-12-15 21:23:12 -08:00
Andrew Hsieh
4bb20303d9 am 670c570e: Merge "Fix typo" 
* commit '670c570e75e399432e96c9fd1dfa3fb92869f10c':
  Fix typo
 2012-12-15 21:23:12 -08:00
Andrew Hsieh
acfcd62aa9 Merge "Revert "Fix typo"" 2012-12-15 20:32:27 -08:00
Andrew Hsieh
c7d5fa98b5 Revert "Fix typo" 
This reverts commit c118edfc1a

Need to go together with https://android-review.googlesource.com/#/c/48117/

Change-Id: Ib413be1035cfb1d18cc9cf4099694a308dadf8f5
 2012-12-15 20:31:56 -08:00
Andrew Hsieh
670c570e75 Merge "Fix typo" 2012-12-15 20:30:31 -08:00
Andrew Hsieh
c118edfc1a Fix typo 
Changed ANDROID_BITMAP_RESUT_SUCCESS -> ANDROID_BITMAP_RESULT_SUCCESS

Change-Id: I4e15e946107ea6f3d0955f72e97894512743c6ca
 2012-12-16 11:20:34 +08:00
Nick Kralevich
7f5c84a0b2 App home directories are now 0700 for targetSdkVersion > 17 
Have installd set an app's home directory permissions to
0700 if the app has targetSdkVersion > 17.

Bug: 7208882
Change-Id: Iaa4fc42fec69bc1abdfae53704d6264dd6fa965f
 2012-12-14 11:53:14 -08:00
Jesse Hall
31134cd480 Merge extensions as published at khronos.org 
No significant changes. The extensions now have assigned extensions
numbers. And Jon Leech added missing suffixes in the declaration of
eglSetBlobCacheFuncsANDROID; our header and code already had the
suffix.

Change-Id: I2faad8ebe0ca81b13e29729a15515ee6b17b94b2
 2012-12-14 09:58:45 -08:00
Andrew Hsieh
1aa652807b Merge "Fix typo" 2012-12-13 19:37:46 -08:00
Igor Murashkin
0859b78db2 Merge "utils: fix warnings for unused parameters" 2012-12-12 12:47:29 -08:00
Jamie Gennis
189b270ae4 Merge "stop using a deprecated SurfaceTextureClient ctor" 2012-12-12 12:44:29 -08:00
Nick Kralevich
603b6c1975 Merge "remove unused code." 2012-12-12 12:43:19 -08:00
Jamie Gennis
c911ea5318 stop using a deprecated SurfaceTextureClient ctor 
Change-Id: I8c8282a0debd551db290dd6849faf272a88c704c
 2012-12-12 12:38:36 -08:00
Jamie Gennis
3c1ada9822 Merge "SurfaceTextureClient: remove a deprecated ctor" 2012-12-12 12:16:21 -08:00
Jamie Gennis
4def860030 SurfaceTextureClient: remove a deprecated ctor 
Change-Id: Ibf2746fdca26851677cd90199c60eab80f6d0c73
 2012-12-12 12:13:54 -08:00
Jamie Gennis
c6f04666c2 Merge "SurfaceFlinger: Move GraphicBufferAlloc to libgui" 2012-12-12 10:56:42 -08:00
Nick Kralevich
f62d2851a8 remove unused code. 
Change-Id: Iacc8b2664a0e404dfa554f223a44126c41581ae4
 2012-12-12 10:38:54 -08:00
Andrew Hsieh
31e575b4a9 Fix typo 
Changed ANDROID_BITMAP_RESUT_SUCCESS -> ANDROID_BITMAP_RESULT_SUCCESS

Change-Id: I4e15e946107ea6f3d0955f72e97894512743c6ca
 2012-12-12 11:27:12 +08:00
Jamie Gennis
392edd88cb SurfaceFlinger: Move GraphicBufferAlloc to libgui 
This change moves the GraphicBufferAlloc class from SurfaceFlinger to libgui.

Change-Id: Idf31d2004efa2651b60590733f73c4a7b831e8a9
 2012-12-11 17:54:29 -08:00
Andy McFadden
97eba8904c Avoid unnecessary texture bind 
In SurfaceFlingerConsumer, check to see if native fence sync is
enabled.  If so, defer the texture binding step to Layer::onDraw.

Change-Id: I7d4034a31c0143207eea2509dfa13ef3820f9b8c
 2012-12-11 16:26:51 -08:00
Andy McFadden
3325fe16e6 Merge "Refactor SurfaceTexture a bit." 2012-12-11 13:13:32 -08:00
The Android Open Source Project
3a6efcb8ce am 0c6fff72: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit '0c6fff72f78e4f80b28ccccac9584255591dd1a2':
 2012-12-11 11:57:07 -08:00
The Android Open Source Project
0c6fff72f7 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I946e9036a50464f974bc2d12df9d8b119f86fa00
 2012-12-11 11:54:26 -08:00
Andy McFadden
bf974abe92 Refactor SurfaceTexture a bit. 
Rearranges updateTexImage() so that the SurfaceFlinger-specific
behavior is in a new SurfaceFlingerConsumer subclass.

SurfaceTexture behavior should not be altered.  Instead of
acquire-bind-release we now do acquire-release-bind, but since
it's all done with the lock held there shouldn't be any
externally-visible change.

Change-Id: Ia566e4727945e2cfb9359fc6d2a8f8af64d7b7b7
 2012-12-11 09:42:51 -08:00
The Android Automerger
529cb9ed9c merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-10 19:33:41 -08:00
Jamie Gennis
0e1e53e376 am 884e3bc2: (-s ours) am 6426bd62: am f53f9c6d: [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees 
* commit '884e3bc29ed190a856f7562a73548868a7ecef2f':
  [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees
 2012-12-10 17:59:34 -08:00
Jamie Gennis
884e3bc29e am 6426bd62: am f53f9c6d: [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees 
* commit '6426bd62676c743b0b5bdc397bcab5c669c6e51f':
  [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees
 2012-12-10 17:58:33 -08:00
Jamie Gennis
6426bd6267 am f53f9c6d: [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees 
* commit 'f53f9c6d3668490f6c68f5c094c28f645c1b3da3':
  [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees
 2012-12-10 17:57:40 -08:00
Jamie Gennis
f53f9c6d36 [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async frees 
This change makes GraphicBufferAllocator::alloc wait for pending async frees to
complete before attempting to allocate a gralloc buffer if there are more than
8 pending async frees.

Bug: 7696861
Change-Id: I1fae86e13edefcaa153b8ce9fd057f335716059e
 2012-12-10 17:19:37 -08:00
The Android Open Source Project
acdbbdcecb am 064d2529: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit '064d252918c23cc4c90f8bc62f9ae47ba7afa4d5':
 2012-12-10 15:23:22 -08:00
The Android Open Source Project
064d252918 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I97991f966ea0d3a6f3bad87c82d9926d55e6d63c
 2012-12-10 15:19:43 -08:00
Jamie Gennis
92573f1ba0 atrace: fix the help string 
Change-Id: I19f0093d65d64e669ad71c600c103f4080bfa2c2
 2012-12-07 16:29:03 -08:00
Jamie Gennis
46b6bce198 SurfaceFlinger: work around a driver bug 
Change-Id: I4490f308b12e9b6fda2ea7255eb19d867d6d008c
 2012-12-07 15:43:02 -08:00
Jamie Gennis
6eea6fb259 atrace: clean up tracing option enabling 
This change switches atrace to use a table-driven approach to enabling and
disabling options.  It unifies how framework and kernel tracing are enabled,
and causes userland tracing options to be picked up by currently running
processes.

Change-Id: Iba2a3012ca0a67c4defdd076bce597db26e9f539
 2012-12-07 14:03:07 -08:00
The Android Automerger
4f9fb2ba97 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-07 13:26:18 -08:00
Jamie Gennis
a436799668 am 50f8d285: am d4e70620: am 72c3f7d8: Revert "ConsumerBase: free buffers outside the lock" 
* commit '50f8d2856b6644059b31684687842bf9c1f2e814':
  Revert "ConsumerBase: free buffers outside the lock"
 2012-12-07 11:09:12 -08:00
Jamie Gennis
50f8d2856b am d4e70620: am 72c3f7d8: Revert "ConsumerBase: free buffers outside the lock" 
* commit 'd4e706208c99ff1716fb0009ec867ff29ff04a7c':
  Revert "ConsumerBase: free buffers outside the lock"
 2012-12-07 11:07:03 -08:00
Jamie Gennis
d4e706208c am 72c3f7d8: Revert "ConsumerBase: free buffers outside the lock" 
* commit '72c3f7d88160b7c279f90f0efe3c1cb12cd140ae':
  Revert "ConsumerBase: free buffers outside the lock"
 2012-12-07 11:04:51 -08:00
Jamie Gennis
7e590a04fb am 7df16644: (-s ours) am 2d659286: am 2e59d2c3: DO NOT MERGE GraphicBufferAllocator: make frees async 
* commit '7df16644c4e5fbb30d011b9098d9c8833f89f0aa':
  DO NOT MERGE GraphicBufferAllocator: make frees async
 2012-12-07 11:00:33 -08:00