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

49486 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Murashkin
a9a80939a7 am 462fb3a8: Merge "gui: Fix return code assert in CpuConsumer_test." 
* commit '462fb3a8d597fffef3d5534544428d5cee9d8c16':
  gui: Fix return code assert in CpuConsumer_test.
 2014-03-11 18:29:24 +00:00
Mark Salyzyn
11b8885445 am 61d6a008: Merge "hwc test: 64-bit compilation error" 
* commit '61d6a00895d2e8b9085278d0acbf98c19e7d6ed5':
  hwc test: 64-bit compilation error
 2014-03-11 18:29:15 +00:00
Ying Wang
b1078ae88d am 6b4e5b7f: Merge "Fix misuse of ." 
* commit '6b4e5b7f856c32b75e9a22df4c3f2273ae906acb':
  Fix misuse of $(my-dir).
 2014-03-11 18:17:36 +00:00
Narayan Kamath
3995b20170 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-03-11 18:17:00 +00:00
Narayan Kamath
cd29bbef6d am 93e6a48b: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY" 
* commit '93e6a48b3e876708a8161a9946581f5e8ebb382f':
  AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
 2014-03-11 18:16:18 +00:00
Jesse Hall
7bc5aa8905 am c9bf3ba4: Merge "Virtual Display async mode is overridden" 
* commit 'c9bf3ba411c66dd1d977c81f1aca08109cbf8c86':
  Virtual Display async mode is overridden
 2014-03-11 17:12:15 +00:00
Narayan Kamath
8cf113a3e5 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-03-11 00:53:05 +00:00
Narayan Kamath
6622f3abc1 am e5c99bf3: Merge "Use long for pointers in opengl/EGL classes" 
* commit 'e5c99bf38001d86ca41dfc51fac337aa6a6931f4':
  Use long for pointers in opengl/EGL classes
 2014-03-11 00:53:05 +00:00
Arve Hjønnevåg
04966baf69 am ead79b83: (-s ours) Merge "Binder: Make sure binder objects do not overlap" 
* commit 'ead79b8365ea33eb0e21a817d5ca563ee1eb56be':
  Binder: Make sure binder objects do not overlap
 2014-03-11 00:52:51 +00:00
Arve Hjønnevåg
614019cd1f 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-03-10 18:06:10 +00:00
Narayan Kamath
4ef023e9eb 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-03-08 01:51:14 +00:00
Narayan Kamath
2f5a887ebf 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-03-08 01:51:14 +00:00
Colin Cross
40d580710b am 6b4ecf31: Merge "surfaceflinger: add BoardConfig.mk variable to force 32-bit" 
* commit '6b4ecf314461067c0e05130edaf785fb010f471a':
  surfaceflinger: add BoardConfig.mk variable to force 32-bit
 2014-03-07 23:19:26 +00:00
Colin Cross
9a79ba8031 am 913a17fd: Merge "libagl: support multilib build" 
* commit '913a17fd5f8cabbc73ff46db15b4b53b9aeba7b8':
  libagl: support multilib build
 2014-03-07 19:39:58 +00:00
Colin Cross
3724c30881 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-03-07 19:39:55 +00:00
Dianne Hackborn
9cc9e7cd58 am 7d86b454: Merge "frameworks/native: move idmap to frameworks/base" 
* commit '7d86b45472898373bbe3ef03286b66d71ea82b79':
  frameworks/native: move idmap to frameworks/base
 2014-03-07 19:33:38 +00:00
Aravind Akella
3eb91b7ede am 19d64819: Bug fix for SensorFusion data rate. 
* commit '19d648195673b106152610e3787c95886946460f':
  Bug fix for SensorFusion data rate.
 2014-03-07 18:30:46 +00:00
Nick Kralevich
d9da227e79 am 2044ac43: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API." 
* commit '2044ac43e53b517526b3c70dc4fbc60ffc01693f':
  Convert all selinux_android_restorecon and _setfilecon calls to new API.
 2014-03-07 02:29:31 +00:00
Dianne Hackborn
c43da752a7 am 6c14f0ad: Merge "Runtime resource overlay, iteration 2" 
* commit '6c14f0ad82be418c742e56fe586657ea0f394b05':
  Runtime resource overlay, iteration 2
 2014-03-07 02:27:06 +00:00
Dianne Hackborn
8fb86e7d45 am 340aa8cb: Merge "New command line tool \'idmap\'" 
* commit '340aa8cbd4afbb68b16f369336cc1c202582f021':
  New command line tool 'idmap'
 2014-03-07 02:27:02 +00:00
Colin Cross
8ff043d3fb am 74be0f7b: Merge "binder: fix all warnings" 
* commit '74be0f7be35e7b40a322fa9a407cb49265333a0b':
  binder: fix all warnings
 2014-03-07 02:23:38 +00:00
Andrew Hsieh
01769ef9e0 am 055dac1b: Merge "Fixed apparent copy/paste mistake Bug: 11634373" 
* commit '055dac1b54af46a0608b32e83fcae45e75a4a8f0':
  Fixed apparent copy/paste mistake Bug: 11634373
 2014-03-07 02:23:17 +00:00
Siva Velusamy
11ba57f7d5 am fd6a3ff4: Merge "GLES_trace: fix compile errors on 64 bit architectures" 
* commit 'fd6a3ff4b4dda34f8e6e03989dd7466e4cbd8b0e':
  GLES_trace: fix compile errors on 64 bit architectures
 2014-03-07 01:35:47 +00:00
Arve Hjønnevåg
72e7ac9ba4 am 4e7fd950: Merge "Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set." 
* commit '4e7fd9506103dcc9750788caf1f94b8d1348f37b':
  Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set.
 2014-03-07 01:35:23 +00:00
Arve Hjønnevåg
eea5b29842 am 58242fc2: Merge changes Ib0e5a037,I1bd7c38e,Icfc67c2a,I96c64312,I59528054, ... 
* commit '58242fc29881cf29d56ee6e5fde6d73b16d0b67c':
  ServiceManager: Implement PING_TRANSACTION
  ServiceManager: Use 32/64 bit types from new binder header
  Binder: Use 64 bit pointers in 32 processes if selected by the target
  Add BINDER_IPC_32BIT to CFLAGS unless TARGET_USES_64_BIT_BINDER is true
  Binder: Make binder portable
  ServiceManager: Fix the binder interface
  ServiceManager: Store handles in uint32_t instead of void *
  ServiceManager: Generic Fixes
  ServiceManager: Add extra error handling
  ServiceManager: Fix Android.mk
  ServiceManager: Make use of kernel exported structures
 2014-03-07 01:34:26 +00:00
Brian Carlstrom
08732ff438 am af3efe8c: Merge "frameworks/native: Rename persist.sys.dalvik.vm.lib to allow new default" 
* commit 'af3efe8ce7e2eeb7a98552af5cf38d8a9720f018':
  frameworks/native: Rename persist.sys.dalvik.vm.lib to allow new default
 2014-03-07 00:37:20 +00:00
Aravind Akella
19d6481956 Bug fix for SensorFusion data rate. 
SensorFusion is always returning data at the slowest possible sampling rate (5 Hz). batch() is getting called twice, first time with the requested rate and second time with the slowest rate (which overwrites the requested rate). Fix batch call in SensorFusion::activate()

Bug: 12064319
Change-Id: If62f3e514233f69810336fd22b136b4395b667d3
(cherry picked from commit 8850909038)
 2014-03-06 19:07:18 +00:00
Aravind Akella
ffac23b210 am 4b84704b: Ignore flush complete events when recording last value for a sensor. 
* commit '4b84704b97300eff3ebfab85652e64d54149d205':
  Ignore flush complete events when recording last value for a sensor.
 2014-03-06 02:18:29 +00:00
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
Igor Murashkin
462fb3a8d5 Merge "gui: Fix return code assert in CpuConsumer_test." 2014-03-04 21:05:41 +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
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
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
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
c9bf3ba411 Merge "Virtual Display async mode is overridden" 2014-02-25 21:43:09 +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
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
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
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
6b4ecf3144 Merge "surfaceflinger: add BoardConfig.mk variable to force 32-bit" 2014-02-21 00:15:59 +00:00