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

49741 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Wilson
08d6aa9a90 am 8ffc2346: am 6e79cb81: Enable OMAP4 SGX workaround for OMAP3 too 
* commit '8ffc2346b86ef5a0d686b43229d2bbd70545a208':
  Enable OMAP4 SGX workaround for OMAP3 too
 2014-03-04 01:00:23 +00: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
Igor Murashkin
c0308d7600 Merge "gui: Surface::dequeueBuffer no locker holds mutex while blocking in binder" 2014-03-03 21:11:55 +00:00
Lajos Molnar
c26c0bee1d Merge "Adding Opus related struct definitions to OMX_Index" 2014-03-03 21:03:34 +00:00
Vignesh Venkatasubramanian
1a8b0ed985 Adding Opus related struct definitions to OMX_Index 
Adding Opus related structure and constant definitions to
OMX_Index.h

Change-Id: Iae0394c86900f0db322893ffce695f854624833a
 2014-03-03 12:01:33 -08:00
Igor Murashkin
0f1889efe7 gui: Surface::dequeueBuffer no locker holds mutex while blocking in binder 
- This also fixes a hang in the camera service when trying to shut down
  if the producer is infinitely blocked while trying to get a new buffer.

Bug: 13250382
Change-Id: I32ca82162bb8645b97dbe084e13e05ca05529a42
 2014-03-03 11:42:27 -08:00
Ying Wang
646e2fbd91 am 0a643374: am 6b4e5b7f: Merge "Fix misuse of ." 
* commit '0a6433749dcd87039f6e31c04ea662b238310b17':
  Fix misuse of $(my-dir).
 2014-03-01 02:22:55 +00: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
87eb08dc07 am ad0f05be: am b98c4761: Merge "Correcting include path in installd test project\'s Android.mk" 
* commit 'ad0f05bed95dc816a5b1e4bea23b0736458c1857':
  Correcting include path in installd test project's Android.mk
 2014-02-28 16:23:59 +00: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
622b6b28f2 Fix bad link tag in javadoc. 
Java7 javadoc tools seem to accept this without complaint
but not all targets use java7 yet.

Change-Id: Ib08be8ad0f7db2e89f38b764cce858d0e7eecd2e
 2014-02-28 14:05:52 +00:00
Narayan Kamath
f5684052f2 Merge "API changes for 64 bit platforms." 2014-02-28 13:21:07 +00:00
Xia Wang
6bc1ad7762 Merge "Build the benchmark test to /data/local/tmp/ for automated test" 2014-02-27 19:19:09 +00:00
Narayan Kamath
a90086a914 API changes for 64 bit platforms. 
EGLObjectHandle.<init>(int) and int EGLObjectHandle.getHandle()
have now been deprecated and replaced with variants that take
and return java longs.

bug: 13181704
Change-Id: Ie88e591c288d6de5655364b4cd673f61cce68d7d
 2014-02-27 14:12:55 +00:00
Narayan Kamath
2c95c57b62 am 3e599252: am 93e6a48b: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY" 
* commit '3e599252c0f5a8e70f4b8d4ab5baffb7e5b0b0e1':
  AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
 2014-02-27 13:29:42 +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
Jeff Brown
c5e2442e59 Add touch.wake IDC property to control wakeup. 
Normally we do not wake the device when the internal touch screen is
touched.  This behavior can now be configured by setting a property
in the input device configuration file.  Add the following line to
the IDC file to enable an initial touch to wake the device from sleep.

  touch.wake = 1

Change-Id: Ifd6d4f51afacd30d85f475725a66e6fcccde9cbb
 2014-02-26 18:49:36 -08:00
Xia Wang
b7925f1364 Build the benchmark test to /data/local/tmp/ for automated test 
Change-Id: I27a5ee24636ff9752a35dbab793821f6b7a79221
 2014-02-26 18:04:50 -08:00
Wonsik Kim
e4cf2f20dd Merge "Implement video plane layer" 2014-02-27 00:09:56 +00:00
Wonsik Kim
f837c93a1b Implement video plane layer 
Binding with video source will follow.

Change-Id: Ic14e9757f5b61f4055cbeda47c1bafae0a621abb
 2014-02-27 00:08:22 +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
a9d27063a1 am 9d65631f: am c9bf3ba4: Merge "Virtual Display async mode is overridden" 
* commit '9d65631f5de153b50331d9f63225fe60ba70f8bc':
  Virtual Display async mode is overridden
 2014-02-25 21:57:51 +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
d6b4e78dca am aa01ad91: am aaa27fd5: Merge "Use reinterpret_cast when an integer is cast to a pointer" 
* commit 'aa01ad91cd22304fd15810f241c67ebb59e90c04':
  Use reinterpret_cast when an integer is cast to a pointer
 2014-02-25 13:17:12 +00:00
Narayan Kamath
ab7b4fe490 am 097b5991: am e5c99bf3: Merge "Use long for pointers in opengl/EGL classes" 
* commit '097b59919f01d7b057d252d23cb96ce5fcdd9469':
  Use long for pointers in opengl/EGL classes
 2014-02-25 13:17:11 +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
580c1c5903 am fe648b4b: am ead79b83: Merge "Binder: Make sure binder objects do not overlap" 
* commit 'fe648b4bf346f837a6ff554ab44fedb203b86966':
  Binder: Make sure binder objects do not overlap
 2014-02-25 00:14:42 +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
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
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
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