ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
51,386 Commits 2 Branches 0 Tags 54 MiB
236e790608
Commit Graph

51386 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Riley Andrews
131866e1a4 Merge "Add glFlush in surfaceflinger screenshot code." into lmp-mr1-dev 2014-10-24 18:30:07 +00:00
Riley Andrews
9707f4df64 Add glFlush in surfaceflinger screenshot code. 
After creating a syncKHR object with type EGL_SYNC_NATIVE_FENCE_ANDROID,
glFlush must be called before the EGL_SYNC_NATIVE_FENCE_FD_ANDROID attribute
is populated with a sync fd. We currently call eglDupNativeFenceFDANDROID
before issuing the flush.

Bug 18052459
Taken verbatim from matthew.k.gumbel@intel.com.

Change-Id: I3781d14f92862076e2bca7d27341a6dc6e7e3775
 2014-10-23 16:25:17 -07:00
The Android Automerger
a9ba83829e merge in lmp-mr1-release history after reset to 8ad8c0a775 2014-10-23 06:12:15 -07:00
Jesse Hall
11f2e08a66 am 8ad8c0a7: am afe2b1fa: surfaceflinger: don\'t close fence fds after passing to queueBuffer 
* commit '8ad8c0a775a1d4592479731973238b82480f76b2':
  surfaceflinger: don't close fence fds after passing to queueBuffer
 2014-10-22 21:27:11 +00:00
Jesse Hall
8ad8c0a775 am afe2b1fa: surfaceflinger: don\'t close fence fds after passing to queueBuffer 
* commit 'afe2b1fadd29149ceed639357e44e06e97c3a5ca':
  surfaceflinger: don't close fence fds after passing to queueBuffer
 2014-10-22 20:45:35 +00:00
The Android Automerger
02e639d333 merge in lmp-mr1-release history after reset to dcc959beb7 2014-10-22 06:10:41 -07:00
Michael Lentine
15b2ecf599 am dcc959be: Merge "Adding eglInitialize and eglTerminate image creation and deletion." into lmp-mr1-dev 
* commit 'dcc959beb77099d319a94e3985da2f4ea4064e7b':
  Adding eglInitialize and eglTerminate image creation and deletion.
 2014-10-21 18:35:24 +00:00
Michael Lentine
dcc959beb7 Merge "Adding eglInitialize and eglTerminate image creation and deletion." into lmp-mr1-dev 2014-10-21 18:20:45 +00:00
Jesse Hall
afe2b1fadd surfaceflinger: don't close fence fds after passing to queueBuffer 
ANativeWindow::queueBuffer takes ownership of the fence fd passed to
it, and will close it before returning. SurfaceFlinger's screenshot
code was also closing the syncFd it passed to queueBuffer. Most of the
time this meant the second close() silently failed, but in a rare race
condition the file descriptor could be reused between the two
close()s.

Bug: 17946343
Change-Id: Ib74fcb1dce52cc21328059c99b7c4c76f41aa3a5
 2014-10-21 11:11:53 -07:00
The Android Automerger
48ddeb7db7 merge in lmp-mr1-release history after reset to bf46706f36 2014-10-21 06:12:38 -07:00
Dmitriy Ivanov
8b81ce563f am cb8a9fcc: Merge "Switch to libsigchain.a" 
* commit 'cb8a9fcc56288378d05d80c55396db7981e3828d':
  Switch to libsigchain.a
 2014-10-21 03:30:55 +00:00
Dmitriy Ivanov
5cf92d4a85 am cb8a9fcc: Merge "Switch to libsigchain.a" 
* commit 'cb8a9fcc56288378d05d80c55396db7981e3828d':
  Switch to libsigchain.a
 2014-10-21 03:30:18 +00:00
Dmitriy Ivanov
cb8a9fcc56 Merge "Switch to libsigchain.a" 2014-10-21 03:14:18 +00:00
Arve Hjønnevåg
54d613e33c am bf46706f: Merge "dumpstate: Add trusty version if driver is found" into lmp-mr1-dev 
* commit 'bf46706f366f0446e60971e32acfcd221b7f19cf':
  dumpstate: Add trusty version if driver is found
 2014-10-20 22:07:49 +00:00
Arve Hjønnevåg
bf46706f36 Merge "dumpstate: Add trusty version if driver is found" into lmp-mr1-dev 2014-10-20 21:58:27 +00:00
Dmitriy Ivanov
4340a14fbf Switch to libsigchain.a 
Use LOCAL_WHOLE_STATIC_LIBRARIES to instruct static linker
  to export symbols from the static library.

Change-Id: I0e41cf173be96c52cdad72b1ef4a1bf819e65dd2
 2014-10-20 14:17:26 -07:00
Dmitriy Ivanov
db61825743 am 042e5078: Merge "Link sigchain to surfaceflinger main executable" into lmp-mr1-dev 
* commit '042e5078f7444a68d22d706b66ba32efc220c263':
  Link sigchain to surfaceflinger main executable
 2014-10-20 18:28:14 +00:00
Dmitriy Ivanov
042e5078f7 Merge "Link sigchain to surfaceflinger main executable" into lmp-mr1-dev 2014-10-20 17:14:44 +00:00
Jesse Hall
937052fb1c am a069e853: am 649bafb7: Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)" into lmp-dev 
* commit 'a069e8532ba272ac5b935e332e426a3dacf827fc':
  bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)
 2014-10-20 14:31:38 +00:00
Jesse Hall
a069e8532b am 649bafb7: Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)" into lmp-dev 
* commit '649bafb7ba2c3204295bc3451ff7af7e28e714ed':
  bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)
 2014-10-20 14:17:18 +00:00
Jesse Hall
f35a5ba664 am 649bafb7: Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)" into lmp-dev 
* commit '649bafb7ba2c3204295bc3451ff7af7e28e714ed':
  bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)
 2014-10-20 14:13:05 +00:00
Jesse Hall
649bafb7ba Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)" into lmp-dev 2014-10-20 13:59:25 +00:00
The Android Automerger
559935102f merge in lmp-mr1-release history after reset to 899891ec95 2014-10-20 06:10:37 -07:00
Aravind Akella
f65fba5cc9 am 899891ec: am 0b6acb22: Add version number to SensorService dump output. 
* commit '899891ec95c0581d35f47db7bdea75bd49fdca1b':
  Add version number to SensorService dump output.
 2014-10-19 21:23:55 +00:00
Aravind Akella
899891ec95 am 0b6acb22: Add version number to SensorService dump output. 
* commit '0b6acb2231baed861488f2d181621272d0658d25':
  Add version number to SensorService dump output.
 2014-10-19 21:14:54 +00:00
Aravind Akella
433fe2af0d am 0b6acb22: Add version number to SensorService dump output. 
* commit '0b6acb2231baed861488f2d181621272d0658d25':
  Add version number to SensorService dump output.
 2014-10-19 21:05:16 +00:00
Aravind Akella
0b6acb2231 Add version number to SensorService dump output. 
Change-Id: I64f9482ade523ec3fafe14bff14db7196e32413f
 2014-10-19 20:30:58 +00:00
The Android Automerger
6fc658bac9 merge in lmp-mr1-release history after reset to 91c395f6c3 2014-10-19 06:09:58 -07:00
Jesse Hall
5b0cbcf946 bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE) 
On one device there is a bug, not yet root-caused, that causes fence
fds to not make it across binder from producer to consumer in the
IGraphicBufferProducer::queueBuffer call. Rather than returning an
error, which the producer typically treats as a fatal error, this
change allows the buffer to be queued with no fence. This avoids an
application crash at the risk of (likely single-frame) visible
corruption.

Bug: 17946343
Change-Id: I9ca89f94098c455e1e90f5f58d5336c936b04a9c
 2014-10-19 04:57:10 +00:00
The Android Automerger
86e63d6297 merge in lmp-mr1-release history after reset to 91c395f6c3 2014-10-18 06:11:01 -07:00
Dan Albert
3235d8e477 am c52e54c4: Merge "Some more test cleanup." 
* commit 'c52e54c47184704613d446eb15d051ceb43d82b3':
  Some more test cleanup.
 2014-10-17 17:53:10 +00:00
Dan Albert
55833709ab am c52e54c4: Merge "Some more test cleanup." 
* commit 'c52e54c47184704613d446eb15d051ceb43d82b3':
  Some more test cleanup.
 2014-10-17 17:53:05 +00:00
Dan Albert
c52e54c471 Merge "Some more test cleanup." 2014-10-17 17:43:58 +00:00
Narayan Kamath
39efe3e5bf Clean up unused parameter warnings. 
Manual application of change 692018430f115343e36b0680acc659f2a731a5d7.

Change-Id: I100f838d70e591a13abb198dc420000ef114a429
(cherry picked from commit 97a3367a1b)
 2014-10-17 10:12:58 +00:00
Narayan Kamath
97a3367a1b Clean up unused parameter warnings. 
Manual application of change 692018430f115343e36b0680acc659f2a731a5d7.

Change-Id: I100f838d70e591a13abb198dc420000ef114a429
 2014-10-17 10:37:08 +01:00
Dan Albert
ed7d193ae9 Some more test cleanup. 
Needed to build successfully when libc++ is the default STL.

Also fix a missing include. Not sure how this was getting by before.
Probably some transitive include.

Change-Id: Ie96b79e96b4e154d786fbf2d5ae5cf5892608837
 2014-10-16 20:46:05 -07:00
Arve Hjønnevåg
2db0f5f31c dumpstate: Add trusty version if driver is found 
Change-Id: I7780ea8e1d777c222a73408f70d8a6d49dee1d92
 2014-10-16 16:11:07 -07:00
Dmitriy Ivanov
2b1f2dac93 Link sigchain to surfaceflinger main executable 
And export necessary symbols to preempt calls from libart.so

Bug: 15345057
Bug: 15426766

(cherry picked from commit f3da24d8cf)

Change-Id: I03b632e0bf2cbaf4a0e68cd0af4e991f7f6b08e4
 2014-10-16 11:43:19 -07:00
The Android Automerger
5b2299bb01 merge in lmp-mr1-release history after reset to 91c395f6c3 2014-10-16 06:12:17 -07:00
Chih-hung Hsieh
108e6334c7 am e9034b45: Merge "Use LOCAL_CLANG := false for GLES wrappers for now" 
* commit 'e9034b4502ae6e693ad52fe2e435066dc969a3ab':
  Use LOCAL_CLANG := false for GLES wrappers for now
 2014-10-16 03:06:42 +00:00
Chih-hung Hsieh
82ba423f1c am e9034b45: Merge "Use LOCAL_CLANG := false for GLES wrappers for now" 
* commit 'e9034b4502ae6e693ad52fe2e435066dc969a3ab':
  Use LOCAL_CLANG := false for GLES wrappers for now
 2014-10-16 03:06:25 +00:00
Chih-hung Hsieh
e9034b4502 Merge "Use LOCAL_CLANG := false for GLES wrappers for now" 2014-10-16 02:52:35 +00:00
Robin Lee
664a72d3ac am 91c395f6: am 60fd3fee: Migrate CA certificates to all users 
* commit '91c395f6c344682f1ae5926766d4d7247dee6df4':
  Migrate CA certificates to all users
 2014-10-15 23:57:04 +00:00
Robin Lee
91c395f6c3 am 60fd3fee: Migrate CA certificates to all users 
* commit '60fd3feecab4336d964ca8e31c7c3220e1afb558':
  Migrate CA certificates to all users
 2014-10-15 23:25:00 +00:00
Dan Albert
27b780b517 am 9cc84950: Merge "Don\'t check if this == NULL." 
* commit '9cc849500df0bba42d3ed19b90c38ff1dffd2262':
  Don't check if this == NULL.
 2014-10-15 22:52:51 +00:00
Dan Albert
759115cd6d am 9cc84950: Merge "Don\'t check if this == NULL." 
* commit '9cc849500df0bba42d3ed19b90c38ff1dffd2262':
  Don't check if this == NULL.
 2014-10-15 22:52:43 +00:00
Dan Albert
9cc849500d Merge "Don't check if this == NULL." 2014-10-15 22:45:07 +00:00
Bernhard Rosenkraenzer
d3684aeda5 Use LOCAL_CLANG := false for GLES wrappers for now 
GLES wrappers built with clang currently result in crashes in libhwui,
UI doesn't come up.

Force gcc for the wrappers until this is investigated and fixed
properly.

Bug: 18003438
Change-Id: I24a17ec019409930883da8040fe2fb05b0fea0c5
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
 2014-10-15 22:23:42 +00:00
Robin Lee
0adea3b792 am 60fd3fee: Migrate CA certificates to all users 
* commit '60fd3feecab4336d964ca8e31c7c3220e1afb558':
  Migrate CA certificates to all users
 2014-10-15 19:26:36 +00:00
Robin Lee
60fd3feeca Migrate CA certificates to all users 
Copies the /data/misc/keychain/cacert-* directories to all users on
the device, whereas previously they were simply copied to user 0.

This is a shallow copy so anything that wasn't supposed to be there
will disappear.

Bug: 17811821
Change-Id: Iae5909ab8d5efdb83c9c8fdf0e10ab7060d022cc
 2014-10-15 19:04:33 +00:00