ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
48,603 Commits 2 Branches 0 Tags 54 MiB
1852eb4feb
Commit Graph

48603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Root
1852eb4feb Merge "Remove copy of UniquePtr.h" 2013-09-12 18:41:19 +00:00
Kenny Root
0ae966033d Remove copy of UniquePtr.h 
The UniquePtr.h file is no longer in libcore/... so there is no need to
have this extra copy of it anymore.

Change-Id: I4ec4f86d2844e524b50441c3a9100a50a6a45b1a
 2013-09-11 14:29:20 -07:00
John Reck
05f0a81a93 Merge "Add libpng include path" 2013-08-27 16:49:46 +00:00
John Reck
e9b2dfe3fd Add libpng include path 
Forward compatibility change

Change-Id: Iae792715d9a9aea34f53cd6383981371835c4a31
 2013-08-26 16:48:46 -07:00
Jesse Hall
fc43e16a56 Merge "Graphics:Add error check when create GraphicBuffer" 2013-08-13 19:02:56 +00:00
Lingyun Zhu
2aff702548 Graphics:Add error check when create GraphicBuffer 
Change-Id: Ib0ca59bf1dfe4ae0266c29c91c1dbe3d02c0904e
Author: Lingyun Zhu <lingyun.zhu@intel.com>
Signed-off-by: Lingyun Zhu <lingyun.zhu@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 50141
 2013-08-13 11:51:48 -07:00
Jean-Baptiste Queru
046b72fc5d Merge "fix a possible deadlock when removing a layer and destroying a client" 2013-08-06 18:37:12 +00:00
Mathias Agopian
e5886d9178 fix a possible deadlock when removing a layer and destroying a client 
generally the last reference to a Layer is released in commitTransaction()
with mStateLock held. Layer itself only holds weak references to Client,
however, ~Layer() briefly promotes this weak reference -- during that time
the all other strong references to that Client go away, ~Layer is left with
the last one... then hell breaks loose as ~Client is called, which in turn
needs to acquire mStateLock.

We fix this by holding a temporary copy of the drawing state during
the transaction so that the side-effects of copying the current
state into the drawing state are seen only after mStateLock has
been released.

Bug: 9106453
Change-Id: Ic5348ac12283500ead87286a37565e8da35f1db2
 2013-08-05 14:28:46 -07:00
Wink Saville
9f476fd080 Merge "Add a symbol to represent MNC=0" 2013-07-30 19:19:41 +00:00
Johan Redestig
8df483c1fd Add a symbol to represent MNC=0 
Bug: 7170488
Change-Id: Icfd39fd0c739216e89446252ea0e7ceba6f002c6
 2013-07-26 18:39:09 +00:00
Jesse Hall
082fc1cae6 am ae961022: Merge "EGL: Fix error for eglCreateWindowSurface" 
* commit 'ae9610220b5f509687b840532f95f3638ee0146b':
  EGL: Fix error for eglCreateWindowSurface
 2013-07-17 14:10:00 -07:00
Jesse Hall
ae9610220b Merge "EGL: Fix error for eglCreateWindowSurface" 2013-07-17 21:06:54 +00:00
Jonathan Hamilton
77a9b4a6bd EGL: Fix error for eglCreateWindowSurface 
The EGL 1.4 spec section 3.5.1 states that EGL_BAD_ALLOC should be set
if the supplied window already has an associated EGLSurface, not
EGL_BAD_NATIVE_WINDOW as is currently set.

Change-Id: If1598617f4e31904f2045560ae1cdf49d8a697dc
 2013-07-17 09:52:41 -07:00
Jean-Baptiste Queru
384f55fff0 Merge "Tweaks for forward compatibility" into stage-aosp-master 2013-07-16 20:11:18 +00:00
Jean-Baptiste Queru
b6a0ca7276 Tweaks for forward compatibility 
Change-Id: Id6a96521b3fd5bd2a034fe89cfa4d3a179a66328
 2013-07-16 09:38:03 -07:00
The Android Open Source Project
65752b2b51 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: Ia73ebcebfb83a21442a31dc7280763484e47534c
 2013-07-15 09:33:20 -07:00
The Android Automerger
70421f3ee3 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-15 08:19:12 -07:00
Mathias Agopian
00aea5c5ff am ac9a96da: fix a dead-lock in sensorservice 
* commit 'ac9a96da65f6eae4513654adaad8a457d1c1575c':
  fix a dead-lock in sensorservice
 2013-07-12 13:17:05 -07:00
Mathias Agopian
ac9a96da65 fix a dead-lock in sensorservice 
sensorservice would deadlock if for some reason
a sensor failed to enable.

simplifed the code a bit, and made it behave a little
closer to mr1.1 -- I couldn't convince myself that
some changes in how locks were used were correct.

Bug: 9794362
Change-Id: I6110f5dbb67e543f1c71d127de2299232badb36a
 2013-07-12 02:08:06 -07:00
The Android Open Source Project
9201798cd9 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: I5445989fd1dd6e851d3efe060cf3fc4ae1d104fb
 2013-07-10 08:35:04 -07:00
The Android Automerger
176c0fdd5b merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-10 05:55:26 -07:00
The Android Open Source Project
47f31b1981 Reconcile with jb-mr2-release - do not merge 
Change-Id: Id26b917342f6ee70c32c2713d07944dae1c10e01
 2013-07-09 17:13:32 -07:00
Jesse Hall
439b197dbe Find non-extension GLES wrappers in eglGetProcAddress 
This allows apps to find OpenGL ES 3.0 functions using
eglGetProcAddress() instead of dlopen/dlsym.

Bug: 9681677
Change-Id: I7ce6e1636bc47d6b0bf20a4e46bd67235714d129
 2013-07-09 16:32:40 -07:00
Elliott Hughes
54d97c88b5 am 9da67a94: am 67481607: Merge "Revert "Second try at adding a compatibility symbol for the MemoryBase constructor."" 
* commit '9da67a9427f695128b5da61c8f987fd9198a5e05':
  Revert "Second try at adding a compatibility symbol for the MemoryBase constructor."
 2013-07-09 15:35:33 -07:00
Elliott Hughes
9da67a9427 am 67481607: Merge "Revert "Second try at adding a compatibility symbol for the MemoryBase constructor."" 
* commit '674816078588d0951c3c9bdaf26ecc9e9b3f2e0a':
  Revert "Second try at adding a compatibility symbol for the MemoryBase constructor."
 2013-07-09 15:30:48 -07:00
Elliott Hughes
6748160785 Merge "Revert "Second try at adding a compatibility symbol for the MemoryBase constructor."" 2013-07-09 22:27:17 +00:00
Elliott Hughes
2dccfdcd26 Revert "Second try at adding a compatibility symbol for the MemoryBase constructor." 
This reverts commit ddd286301b, because the third-party library in question has now been fixed.

Change-Id: Ic195a913f90b36268ed9d6e60be520decb4e198d
 2013-07-09 22:15:42 +00:00
Jesse Hall
5477d0e4e8 am c07b5206: Find non-extension GLES wrappers in eglGetProcAddress 
* commit 'c07b52060acd627c8510c1a9151e0753fce76330':
  Find non-extension GLES wrappers in eglGetProcAddress
 2013-07-09 10:54:20 -07:00
Jesse Hall
c07b52060a Find non-extension GLES wrappers in eglGetProcAddress 
This allows apps to find OpenGL ES 3.0 functions using
eglGetProcAddress() instead of dlopen/dlsym.

Bug: 9681677
Change-Id: I7ce6e1636bc47d6b0bf20a4e46bd67235714d129
 2013-07-04 12:08:16 -07:00
Jean-Baptiste Queru
8b9319162d am f4f2bd21: Tweak for forward compatibility 
* commit 'f4f2bd21d5b57f1598172ddbc44817c10785bdb3':
  Tweak for forward compatibility
 2013-07-02 12:33:15 -07:00
Jean-Baptiste Queru
f4f2bd21d5 Tweak for forward compatibility 
Change-Id: I6be78b607789c469f4ffad849a493d78e2539450
 2013-07-02 11:33:43 -07:00
Jean-Baptiste Queru
db8c267ec2 am 3c0425cd: am 0ecf0b8d: Merge "Additional parameter validation for EGL functions" 
* commit '3c0425cd95a7918d1dbfecf32aef3b238bf236a5':
  Additional parameter validation for EGL functions
 2013-06-25 15:37:44 -07:00
Jean-Baptiste Queru
3c0425cd95 am 0ecf0b8d: Merge "Additional parameter validation for EGL functions" 
* commit '0ecf0b8db74682222bf095a235e28edefff871a5':
  Additional parameter validation for EGL functions
 2013-06-25 15:35:05 -07:00
Jean-Baptiste Queru
0ecf0b8db7 Merge "Additional parameter validation for EGL functions" 2013-06-25 22:31:13 +00:00
The Android Open Source Project
03c06bc9f4 Reconcile with jb-mr2-release - do not merge 
Change-Id: Ib28265f84583e4c1c8860f359145f38737817e99
 2013-06-12 18:04:25 -07:00
Jeff Tinker
0c9a590efa Prevent IPCThreadState::joinThreadPool from spinning on unexpected error 
Adds logging to help determine what is happening to the /dev/binder
fd and dump the process state when it happens.

bug: 8912673
Change-Id: I2aa0c66fc499e91e0bf9ee4ae20404bec35adc82
 2013-06-12 14:29:31 -07:00
The Android Open Source Project
cd9482d961 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: I02e004028811a3efad8c010ed19e216bb87814d7
 2013-06-12 07:23:36 -07:00
The Android Automerger
e082dd6df2 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-12 05:56:00 -07:00
Jeff Tinker
de836890ab am ef07386e: Prevent IPCThreadState::joinThreadPool from spinning on unexpected error 
* commit 'ef07386e2fca73680214ececc3c9c0ecbb0f6d88':
  Prevent IPCThreadState::joinThreadPool from spinning on unexpected error
 2013-06-11 20:09:27 -07:00
Jeff Tinker
ef07386e2f Prevent IPCThreadState::joinThreadPool from spinning on unexpected error 
Adds logging to help determine what is happening to the /dev/binder
fd and dump the process state when it happens.

bug: 8912673
Change-Id: I2aa0c66fc499e91e0bf9ee4ae20404bec35adc82
 2013-06-11 18:03:01 -07:00
Jeff Brown
255405eb19 am 86b2ecdd: Merge "fix mem leak on error handling" 
* commit '86b2ecdd311fca2e1e4a3504bf96bb23c5630492':
  fix mem leak on error handling
 2013-05-29 19:01:17 -07:00
Jeff Brown
86b2ecdd31 Merge "fix mem leak on error handling" 2013-05-30 01:58:45 +00:00
Andrew Hsieh
75765d3af5 am 1c45dc66: Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event" 
* commit '1c45dc66c77f0ddb246a55d780206a183740ff7f':
  Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event
 2013-05-29 18:33:33 -07:00
Andrew Hsieh
1c45dc66c7 Merge "Fix AMotionEvent_getHistorical* to take const AInputEvent* motion_event" 2013-05-30 01:30:48 +00:00
Hyejin Kim
3f727c0ea3 fix mem leak on error handling 
Change-Id: I40d8e371c46184aa701fa676246201a9d8f6e27d
 2013-05-28 18:39:02 -07:00
jp abgrall
4b2b0a7494 am 74bd799e: Merge "Exit dumpstate on SIGPIPE to avoid cascading child crashes" 
* commit '74bd799ec20d2420459fa382533b1cc39ca9a54c':
  Exit dumpstate on SIGPIPE to avoid cascading child crashes
 2013-05-28 15:46:14 -07:00
Jeff Brown
31ab96fcc1 am 135e4dbd: Merge "utils: Allow non android namespaces to use ALOGD_IF_SLOW" 
* commit '135e4dbd65d49730fbd6f830de7b303e01d20d5f':
  utils: Allow non android namespaces to use ALOGD_IF_SLOW
 2013-05-28 15:46:03 -07:00
jp abgrall
74bd799ec2 Merge "Exit dumpstate on SIGPIPE to avoid cascading child crashes" 2013-05-28 21:18:59 +00:00
Jeff Brown
135e4dbd65 Merge "utils: Allow non android namespaces to use ALOGD_IF_SLOW" 2013-05-28 20:20:15 +00:00
John Michelau
885f888c55 Exit dumpstate on SIGPIPE to avoid cascading child crashes 
When dumpstate ignores SIGPIPE it can lead to a cascade of tombstones /
coredumps since many of its children don't handle or ignore it.  It's
best to just exit dumpstate once the pipe is broken.

Change-Id: Ic0c57ecf4171f0c0a07837e51c41cb1876e1350c
 2013-05-28 14:20:59 -05:00