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

49617 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aravind Akella
4b84704b97 Ignore flush complete events when recording last value for a sensor. 
Bug: 11822806
Change-Id: I1402d6684ed71ed413aef6a7be3aad945b331ec2
 2014-03-06 00:48:59 +00:00
Brian Carlstrom
c9e60374f5 am e19c99aa: Merge "Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags" 
* commit 'e19c99aad605c395f53bf39ae1a27e298e7e33ce':
  Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags
 2014-03-05 20:09:46 +00:00
Brian Carlstrom
e19c99aad6 Merge "Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags" 2014-03-05 20:02:00 +00:00
Michael Wright
f8da9623f3 am 1298c7e5: Merge "Parse LED mappings in keylayout files. DO NOT MERGE" into klp-modular-dev 
* commit '1298c7e527fd242a39f9c0d53aa4f35d1c9decab':
  Parse LED mappings in keylayout files. DO NOT MERGE
 2014-03-05 00:54:24 +00:00
Michael Wright
1298c7e527 Merge "Parse LED mappings in keylayout files. DO NOT MERGE" into klp-modular-dev 2014-03-05 00:51:43 +00:00
Brian Carlstrom
0ae8e39ebc Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags 
Change-Id: Ic048ed654ea0ae38c9684e5fa5b14742b6b83305
 2014-03-04 14:11:55 -08:00
Igor Murashkin
1738d4fca7 am 462fb3a8: Merge "gui: Fix return code assert in CpuConsumer_test." 
* commit '462fb3a8d597fffef3d5534544428d5cee9d8c16':
  gui: Fix return code assert in CpuConsumer_test.
 2014-03-04 21:10:33 +00:00
Igor Murashkin
462fb3a8d5 Merge "gui: Fix return code assert in CpuConsumer_test." 2014-03-04 21:05:41 +00:00
Mark Salyzyn
eac548c65c am 61d6a008: Merge "hwc test: 64-bit compilation error" 
* commit '61d6a00895d2e8b9085278d0acbf98c19e7d6ed5':
  hwc test: 64-bit compilation error
 2014-03-04 19:18:03 +00:00
Mark Salyzyn
61d6a00895 Merge "hwc test: 64-bit compilation error" 2014-03-04 19:10:29 +00:00
Mark Salyzyn
e933c0396f hwc test: 64-bit compilation error 
* cast 1u to size_t in max() argument lists

Change-Id: I02f711c89e96e4cfc348f1c7bac455339bec2fa1
 2014-03-04 09:11:04 -08:00
Simon Wilson
8ffc2346b8 am 6e79cb81: Enable OMAP4 SGX workaround for OMAP3 too 
* commit '6e79cb81d02984c9f7ac0586078f947c94c56c2a':
  Enable OMAP4 SGX workaround for OMAP3 too
 2014-03-04 00:20:43 +00:00
Michael Wright
962a108856 Parse LED mappings in keylayout files. DO NOT MERGE 
Change-Id: I2b34939cc0df256e6b872502ea93f2884b4c8334
 2014-03-03 13:59:35 -08:00
Ying Wang
0a6433749d am 6b4e5b7f: Merge "Fix misuse of ." 
* commit '6b4e5b7f856c32b75e9a22df4c3f2273ae906acb':
  Fix misuse of $(my-dir).
 2014-03-01 02:15:39 +00:00
Ying Wang
6b4e5b7f85 Merge "Fix misuse of $(my-dir)." 2014-03-01 02:10:27 +00:00
Ying Wang
a3cc7edfce Fix misuse of $(my-dir). 
Change-Id: I8b24f60826abe4b541de646cbc3df66929203301
 2014-02-28 18:05:56 -08:00
Simon Wilson
6e79cb81d0 Enable OMAP4 SGX workaround for OMAP3 too 
Change-Id: I04308d8b7435b4adf1811f75f48f9e8a07a8c8a6
 2014-02-28 14:30:39 -08:00
Narayan Kamath
ad0f05bed9 am b98c4761: Merge "Correcting include path in installd test project\'s Android.mk" 
* commit 'b98c4761e0c80a8d8138910e0a5e5fc8baff8282':
  Correcting include path in installd test project's Android.mk
 2014-02-28 16:19:30 +00:00
Narayan Kamath
b98c4761e0 Merge "Correcting include path in installd test project's Android.mk" 2014-02-28 16:00:55 +00:00
Ramin Zaghi
7400742285 Correcting include path in installd test project's Android.mk 
installd project has moved from frameworks/base to frameworks/native
 and so its test project's c_include path defined in Android.mk
 has to match the change.

Change-Id: I597125ff659f51edbd9fc95371790e2d567c78be
 2014-02-28 15:41:57 +00:00
Narayan Kamath
3e599252c0 am 93e6a48b: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY" 
* commit '93e6a48b3e876708a8161a9946581f5e8ebb382f':
  AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
 2014-02-27 13:23:09 +00:00
Narayan Kamath
93e6a48b3e Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY" 2014-02-27 13:17:58 +00:00
Ashok Bhat
d61b48c090 AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY 
This will allow eglGetDisplay(int) to work on both 32-bit
and 64-bit systems when EGL_DEFAULT_DISPLAY is passed as
a parameter.

Change-Id: I0d7e9ca5410b0dd893eacc02aac40956908e4f25
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
 2014-02-26 19:06:27 +00:00
Jesse Hall
9d65631f5d am c9bf3ba4: Merge "Virtual Display async mode is overridden" 
* commit 'c9bf3ba411c66dd1d977c81f1aca08109cbf8c86':
  Virtual Display async mode is overridden
 2014-02-25 21:51:10 +00:00
Jesse Hall
c9bf3ba411 Merge "Virtual Display async mode is overridden" 2014-02-25 21:43:09 +00:00
Narayan Kamath
aa01ad91cd am aaa27fd5: Merge "Use reinterpret_cast when an integer is cast to a pointer" 
* commit 'aaa27fd5a0bb81ac17c25c33beb2656b32100cd6':
  Use reinterpret_cast when an integer is cast to a pointer
 2014-02-25 13:10:53 +00:00
Narayan Kamath
097b59919f am e5c99bf3: Merge "Use long for pointers in opengl/EGL classes" 
* commit 'e5c99bf38001d86ca41dfc51fac337aa6a6931f4':
  Use long for pointers in opengl/EGL classes
 2014-02-25 13:10:53 +00:00
Narayan Kamath
aaa27fd5a0 Merge "Use reinterpret_cast when an integer is cast to a pointer" 2014-02-25 13:05:49 +00:00
Narayan Kamath
e5c99bf380 Merge "Use long for pointers in opengl/EGL classes" 2014-02-25 13:05:46 +00:00
Arve Hjønnevåg
fe648b4bf3 am ead79b83: Merge "Binder: Make sure binder objects do not overlap" 
* commit 'ead79b8365ea33eb0e21a817d5ca563ee1eb56be':
  Binder: Make sure binder objects do not overlap
 2014-02-25 00:06:50 +00:00
Arve Hjønnevåg
ead79b8365 Merge "Binder: Make sure binder objects do not overlap" 2014-02-25 00:01:54 +00:00
Arve Hjønnevåg
4cab0fd7f7 Binder: Make sure binder objects do not overlap 
Fixes crashing part of bug 11355082.
The driver still leaks references.

Change-Id: Ibc6a63b151c1fc1f7666237f25255ba781e02071
 2014-02-24 15:42:13 -08:00
Ashok Bhat
d8f096114d Use reinterpret_cast when an integer is cast to a pointer 
Change-Id: I5adcd59f58c029f7b2b596f4826d8ea69fb9bba6
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
 2014-02-24 14:34:16 +00:00
Ashok Bhat
ab6fc2a86f Use long for pointers in opengl/EGL classes 
EGL classes in frameworks/base have to be updated to support
64-bit platforms. Key changes in the EGL classes include

[x] EGLObjectHandle class - EGLObjectHandle class has two public
    methods (constructor and getHandle) that assume handles are
    32-bit. They have not been changed. Instead, two new hidden
    methods (EGLObjectHandle(long) and getNativeHandle) have been
    added.

[x] EG14 class - Two public methods eglGetDisplay and
    eglCreatePbufferFromClientBuffer assume that handles are 32-bit.
    They have been changed to throw unsupported operation exception
    on non 32-bit machines. Two new methods eglGetDisplay(long)
    and eglCreatePbufferFromClientBuffer(...long buffer..) have
    been added to support 64-bit handles.

To allow the above changes in frameworks/base EGL classes,
corresponding code generation mechanism in frameworks/native has
been updated.

Change-Id: I5d0a62e10c20ccf05f610d6608b8dfb6414b5116
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
 2014-02-24 14:27:44 +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
John Dong
4ee5696dfb Virtual Display async mode is overridden 
Virtual Display async setting is overridden by eglApi.c causing
stall during composition.

Set the async mode after eglCreateWindowSurface()

b/13139121

Change-Id: I336ca145552e387217cd8bea6e4b7f5f490a274d
Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
 2014-02-21 16:10:54 -08: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
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
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
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
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
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