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

49698 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arve Hjønnevåg
3c98ba77b9 am c5294424: am d1c87d37: Merge changes I3432d9d3,I90fcf538,I64398603 
* commit 'c5294424386bedad2a240074d0845999f28e662d':
  Binder: Fix some valgrind errors.
  Binder: Don't cast directly from a pointer to binder_uintptr_t
  Binder: Disable attemptIncStrongHandle
 2014-02-22 00:52:18 +00:00
Arve Hjønnevåg
c529442438 am d1c87d37: Merge changes I3432d9d3,I90fcf538,I64398603 
* commit 'd1c87d37025c49f6a47fe43328572da495ff04c1':
  Binder: Fix some valgrind errors.
  Binder: Don't cast directly from a pointer to binder_uintptr_t
  Binder: Disable attemptIncStrongHandle
 2014-02-22 00:41:31 +00:00
Arve Hjønnevåg
d1c87d3702 Merge changes I3432d9d3,I90fcf538,I64398603 
* changes:
  Binder: Fix some valgrind errors.
  Binder: Don't cast directly from a pointer to binder_uintptr_t
  Binder: Disable attemptIncStrongHandle
 2014-02-21 23:45:01 +00:00
Narayan Kamath
4622b995a8 am 25a57171: am 9076fa78: Merge "Update EGL codegen to be in sync with frameworks/base" 
* commit '25a571718ce9b8b0a1c3738845e9af4b9f3d1816':
  Update EGL codegen to be in sync with frameworks/base
 2014-02-21 16:54:17 +00:00
Narayan Kamath
9e5fa96428 am 9b0d5ffb: am f56ae199: Merge "Update GLES codegen to be in sync with frameworks/base" 
* commit '9b0d5ffbb6cc847843e7f5ae7f891000c90a5989':
  Update GLES codegen to be in sync with frameworks/base
 2014-02-21 16:54:17 +00:00
Narayan Kamath
25a571718c am 9076fa78: Merge "Update EGL codegen to be in sync with frameworks/base" 
* commit '9076fa78d2541fa14253aaf08e6445fafa17e35b':
  Update EGL codegen to be in sync with frameworks/base
 2014-02-21 16:42:50 +00:00
Narayan Kamath
9b0d5ffbb6 am f56ae199: Merge "Update GLES codegen to be in sync with frameworks/base" 
* commit 'f56ae1999948393ba8c207525d6466ee424c4467':
  Update GLES codegen to be in sync with frameworks/base
 2014-02-21 16:42:49 +00:00
Narayan Kamath
9076fa78d2 Merge "Update EGL codegen to be in sync with frameworks/base" 2014-02-21 14:27:36 +00:00
Narayan Kamath
f56ae19999 Merge "Update GLES codegen to be in sync with frameworks/base" 2014-02-21 14:27:16 +00:00
Colin Cross
d14b0c1860 am 361d9df3: am 6b4ecf31: Merge "surfaceflinger: add BoardConfig.mk variable to force 32-bit" 
* commit '361d9df38cf9760baffc863d5364a1df9cf8be6b':
  surfaceflinger: add BoardConfig.mk variable to force 32-bit
 2014-02-21 13:54:24 +00:00
Colin Cross
361d9df38c am 6b4ecf31: Merge "surfaceflinger: add BoardConfig.mk variable to force 32-bit" 
* commit '6b4ecf314461067c0e05130edaf785fb010f471a':
  surfaceflinger: add BoardConfig.mk variable to force 32-bit
 2014-02-21 00:22:18 +00:00
Colin Cross
6b4ecf3144 Merge "surfaceflinger: add BoardConfig.mk variable to force 32-bit" 2014-02-21 00:15:59 +00:00
Colin Cross
89450d45ac surfaceflinger: add BoardConfig.mk variable to force 32-bit 
Individual devices may need to force surfaceflinger to compile for
32-bit if they don't have 64-bit GL libraries.

Change-Id: I3703b2f8e36e90cf125d9ed5e6318c3506861948
 2014-02-20 15:37:14 -08:00
Arve Hjønnevåg
ee319ab1d2 am 6f286114: Revert "Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface" 
* commit '6f286114ec1d597f3dae987bba6e72dbbc404e32':
  Revert "Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface"
 2014-02-20 21:27:53 +00:00
Patrick Tjin
f72aa27a2a Merge "Add uid to sensorservice's dump of active connections" 2014-02-20 20:51:13 +00:00
Ashok Bhat
fb913cdb47 Update GLES codegen to be in sync with frameworks/base 
Patch from synergydev with commit-id 01994c79 changed
core/jni/com_google_android_gles_jni_GLImpl.cpp in the
frameworks/base. However the corresponding code snippet
in frameworks/native was not updated. This patch addresses
the issue.

Change-Id: I89c3d88de832efc8cbbe682c8a7ff7dfbef99db3
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
 2014-02-20 19:56:50 +00:00
Ashok Bhat
8e472fb443 Update EGL codegen to be in sync with frameworks/base 
Patch from Takeshi Aimi with commit-id f9337377 changed
core/jni/android_opengl_EGL14.cpp in the frameworks/base.
However the corresponding code snippet in frameworks/
native was not updated. This patch addresses the issue.

Change-Id: I40bcc43d36d7ab4e0db4a73556a4f7480c7431c1
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
 2014-02-20 19:33:15 +00:00
Arve Hjønnevåg
5febeff15f am 9b5c3b91: am d5a354c6: am d06f6b00: am 67903293: Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface 
* commit '9b5c3b9132831ba9078fc7c4001821bcfe8dd39d':
  Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
 2014-02-20 14:59:14 +00:00
Arve Hjønnevåg
6f286114ec Revert "Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface" 
This branch has the new driver interface so it should not have this change.

This reverts commit 6790329358.

Change-Id: I9b6d0d653d98dbdb521ef964c5e7c2f14859d340
 2014-02-19 20:42:41 -08:00
Dan Stoza
fb83d84694 Merge "Fix calls to captureScreen" 2014-02-20 02:43:37 +00:00
Dan Stoza
8d7599633f Fix calls to captureScreen 
Change-Id: Ic0ff47afa29f143131906082dff79d4e907b7143
 2014-02-19 18:35:30 -08:00
Dan Stoza
da03fe4bfc Merge "Allow disabling layer rotation during screenshots" 2014-02-20 00:56:34 +00:00
Arve Hjønnevåg
9b5c3b9132 am d5a354c6: am d06f6b00: am 67903293: Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface 
* commit 'd5a354c6b7f2ae0b93e018f3024a2fca5f6543a1':
  Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
 2014-02-20 00:52:13 +00:00
Arve Hjønnevåg
d5a354c6b7 am d06f6b00: am 67903293: Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface 
* commit 'd06f6b001484c28a6ede3f1ad83d23dcb9ad3ccf':
  Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
 2014-02-20 00:04:44 +00:00
Arve Hjønnevåg
d06f6b0014 am 67903293: Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface 
* commit '6790329358d1c84af2fe9ba093bcfc1c6176e758':
  Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
 2014-02-20 00:00:49 +00:00
Arve Hjønnevåg
6790329358 Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface 
DO NOT MERGE into any branch that uses the new interface

Change-Id: Id54308a89327e69a389ac5916c052ad97f57cb28
 2014-02-19 15:35:52 -08:00
Arve Hjønnevåg
79aa621330 am 7cc5b880: am e45636a8: am d437364e: am f50b9eaa: Binder: Make sure binder objects do not overlap 
* commit '7cc5b8800c22790b0db9ea0af62fcad2cc998303':
  Binder: Make sure binder objects do not overlap
 2014-02-19 22:06:09 +00:00
Arve Hjønnevåg
7cc5b8800c am e45636a8: am d437364e: am f50b9eaa: Binder: Make sure binder objects do not overlap 
* commit 'e45636a8674b9cbb9305648e21316210e1daf920':
  Binder: Make sure binder objects do not overlap
 2014-02-19 21:50:15 +00:00
Arve Hjønnevåg
e45636a867 am d437364e: am f50b9eaa: Binder: Make sure binder objects do not overlap 
* commit 'd437364ec156e07c5fbe3fa27a7cd55e5450e9f6':
  Binder: Make sure binder objects do not overlap
 2014-02-19 21:47:35 +00:00
Arve Hjønnevåg
d437364ec1 am f50b9eaa: Binder: Make sure binder objects do not overlap 
* commit 'f50b9eaaeeaeae16981f11b05d3f3a6fb0dea30d':
  Binder: Make sure binder objects do not overlap
 2014-02-19 21:45:25 +00:00
Andy McFadden
382f1cc1f1 Merge "Hide three malformed GL bindings" 2014-02-19 19:15:20 +00:00
Andy McFadden
50166d1173 Hide three malformed GL bindings 
They were replaced with correct bindings a while back, but the
broken methods weren't hidden.

Also, pick up two changes that were made to the generated code
rather than the source.

Bug 6006380

Change-Id: Ibfe9a5f2e13e745f8d82116d1b4d8c2d025ac830
 2014-02-19 10:27:24 -08:00
Arve Hjønnevåg
07fd0f195d Binder: Fix some valgrind errors. 
When using 64 bit binder pointers, only initializing the 32 bit
handle, in a stack allocated struct, will pass uninitialized stack
data to the kernel and other processes.

Change-Id: I3432d9d36bb251d8ddb0a863661aeb80aabb3d92
 2014-02-18 21:14:41 -08:00
Arve Hjønnevåg
87b30d0447 Binder: Don't cast directly from a pointer to binder_uintptr_t 
When using the 64 bit binder interface from a 32 bit process the
pointer may get sign extended and cause the kernel to fail to read
from it.

Change-Id: I90fcf53880e2aa92e230a9723f9b3f7696170e32
 2014-02-18 21:14:39 -08:00
Andy McFadden
35571a41b3 am 22a5c8b2: (-s ours) am 44c35ec4: Allow "opaque" flag to be updated. DO NOT MERGE 
* commit '22a5c8b2e3c232a7cbe452759f20fc3c8382add7':
  Allow "opaque" flag to be updated. DO NOT MERGE
 2014-02-19 00:05:51 +00:00
Andy McFadden
22a5c8b2e3 am 44c35ec4: Allow "opaque" flag to be updated. DO NOT MERGE 
* commit '44c35ec4a94eb33f7ee0df085c5d2d56d99962cf':
  Allow "opaque" flag to be updated. DO NOT MERGE
 2014-02-18 23:59:43 +00:00
Andy McFadden
44c35ec4a9 Allow "opaque" flag to be updated. DO NOT MERGE 
Moves the "opaque layer" from Layer to Layer::State.  This allows
it to be updated as part of a transaction.

Bug 12387406

Change-Id: I0a114ce6adf77cd12fb08f96e0691b76c475768d
 2014-02-18 15:55:42 -08:00
Colin Cross
0380d5279b am 7a66f7af: am 913a17fd: Merge "libagl: support multilib build" 
* commit '7a66f7afd1b6a975ab3b99b4765781a0d66958c8':
  libagl: support multilib build
 2014-02-18 21:39:56 +00:00
Colin Cross
7a66f7afd1 am 913a17fd: Merge "libagl: support multilib build" 
* commit '913a17fd5f8cabbc73ff46db15b4b53b9aeba7b8':
  libagl: support multilib build
 2014-02-18 21:35:25 +00:00
Colin Cross
913a17fd5f Merge "libagl: support multilib build" 2014-02-18 21:29:50 +00:00
Colin Cross
505350b150 am 8a9a2e24: am d5fe844b: Merge "Use /(vendor|system)/lib64/egl for 64-bit EGL libraries" 
* commit '8a9a2e24db868fba404049d700ae704b0982e5f3':
  Use /(vendor|system)/lib64/egl for 64-bit EGL libraries
 2014-02-18 20:25:54 +00:00
Colin Cross
8a9a2e24db am d5fe844b: Merge "Use /(vendor|system)/lib64/egl for 64-bit EGL libraries" 
* commit 'd5fe844b41778bf87101fc0a0e4e37e779678c50':
  Use /(vendor|system)/lib64/egl for 64-bit EGL libraries
 2014-02-18 20:21:35 +00:00
Colin Cross
d5fe844b41 Merge "Use /(vendor|system)/lib64/egl for 64-bit EGL libraries" 2014-02-18 20:14:41 +00:00
Dan Willemsen
8edb8f5f2d Use /(vendor|system)/lib64/egl for 64-bit EGL libraries 
Change-Id: Ie64806bfe4ba60a3167b84685cf983d4ada1042d
 2014-02-16 10:29:40 -08:00
Arve Hjønnevåg
11cfdccfd3 Binder: Disable attemptIncStrongHandle 
The driver does not support BC_ATTEMPT_ACQUIRE and will return an error.
IPCThreadState does not handle driver errors, and will resend the failed
command blocking all other commands.

Change-Id: I643986037341821b27b62dc82df933844f4842b8
 2014-02-14 20:18:13 -08:00
Arve Hjønnevåg
f50b9eaaee Binder: Make sure binder objects do not overlap 
Fixes crashing part of bug 11355082.
The driver still leaks references.

Change-Id: Ibc6a63b151c1fc1f7666237f25255ba781e02071
 2014-02-15 03:44:17 +00:00
Colin Cross
ff75a8000c libagl: support multilib build 
Use LOCAL_SRC_FILES_arch and LOCAL_CFLAGS_arch to support building
for multiple architectures.

Change-Id: I829c1bea880739bf8184df4006d0a481ffccc5c2
 2014-02-14 17:29:22 -08:00
Dan Stoza
c701401f8c Allow disabling layer rotation during screenshots 
Add the ability to ignore layers' transformation matrices during
screenshot capture, which will allow the window manager to capture
unrotated images for recents during the device rotation animation.

Bug: 11805195
Change-Id: I854d87bc84ca06ef9a054a454af1c080ee66fbb8
 2014-02-14 23:10:42 +00:00
Dianne Hackborn
20c7adbfaa am b37b312b: am 7d86b454: Merge "frameworks/native: move idmap to frameworks/base" 
* commit 'b37b312b829c7ab5107c2f96d0a95a557f67a831':
  frameworks/native: move idmap to frameworks/base
 2014-02-14 02:00:17 +00:00
Dianne Hackborn
b37b312b82 am 7d86b454: Merge "frameworks/native: move idmap to frameworks/base" 
* commit '7d86b45472898373bbe3ef03286b66d71ea82b79':
  frameworks/native: move idmap to frameworks/base
 2014-02-14 01:54:37 +00:00