Commit Graph

53476 Commits

Author SHA1 Message Date
Steve Kondik
8f0e75211f Merge branch 'm' of git://codeaurora.org/platform/frameworks/native into cm-13.0
Change-Id: I7830f596b2e7da809a759491d8115ff158c43734
2015-10-21 16:56:23 -07:00
Adrian Roos
e2f499fb73 Track ashmem memory usage in Parcel
Bug: 25004154
Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc
2015-10-21 22:32:35 +00:00
Praveen Chavan
c57c920c26 libgui: assign handle to NULL after free
to avoid use-after-free situations

Change-Id: If9c09f509bc55795856302e5ca34470df019c622
2015-10-20 19:59:12 -07:00
Flanker
5d17838ade add number constraint for samples per MotionEvent
Bug:23905002

Signed-off-by: Adam Lesinski <adamlesinski@google.com>

(cherry picked from commit 552a8a5d8d)

Change-Id: I9b7ea859889b7697bee4165a2746602212120543
2015-10-20 12:28:15 -07:00
Naveen Leekha
1d7b4fde4c am 18165848: am e2c4f4fb: am c1e6fbb5: Initialize local variables to avoid data leak am: 7534e4e63a -s ours am: 7b4863f606 am: 8121177b5e am: 7135d2768b
am: 5957172a7e

* commit '5957172a7edb83d05423d5abae0091628f0c557c':
  Initialize local variables to avoid data leak
2015-10-20 17:48:10 +00:00
Naveen Leekha
5957172a7e am 18165848: am e2c4f4fb: am c1e6fbb5: Initialize local variables to avoid data leak am: 7534e4e63a -s ours am: 7b4863f606 am: 8121177b5e
am: 7135d2768b

* commit '7135d2768bcb46603735ab9b6b4bbaa788d39179':
  Initialize local variables to avoid data leak
2015-10-20 17:25:55 +00:00
Naveen Leekha
7135d2768b am 18165848: am e2c4f4fb: am c1e6fbb5: Initialize local variables to avoid data leak am: 7534e4e63a -s ours am: 7b4863f606
am: 8121177b5e

* commit '8121177b5e8c406570f0eaf6593c6fd1db232ddf':
  Initialize local variables to avoid data leak
2015-10-20 17:02:33 +00:00
Naveen Leekha
8121177b5e am 18165848: am e2c4f4fb: am c1e6fbb5: Initialize local variables to avoid data leak am: 7534e4e63a -s ours
am: 7b4863f606

* commit '7b4863f606bdb48b188b0235447dfaba6c8c3cf0':
  Initialize local variables to avoid data leak
2015-10-20 16:54:09 +00:00
Naveen Leekha
7b4863f606 am 18165848: am e2c4f4fb: am c1e6fbb5: Initialize local variables to avoid data leak
am: 7534e4e63a  -s ours

* commit '7534e4e63afedeb826a8d8a4b0cf3f9d40d243ea':
  Initialize local variables to avoid data leak
2015-10-20 16:42:34 +00:00
Jorge Ruesga
bfcd443950 native: dock battery
Change-Id: I23eadf0361cbe25029b95dbd022ce1a2cc96e94d
Require: topic:dock_battery
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
2015-10-17 14:04:39 -07:00
nadlabak
c1c5240aa9 Support WAKE flag in keyboard layouts
This flag is used to specify the internal keyboard keys allowed
to wake the device.

Change-Id: Ic15aca1134206c9b006a4d97dded10bccae640d3
2015-10-17 14:03:58 -07:00
Steve Kondik
6b6c0cde5b input: Add option to toggle pointer icon when using stylus(3/3)
* The visible pointer icon when hovering or drawing with the stylus is
  quite annoying when trying to actually draw with it. Turn it off by
  default and add an option to turn it on.

Forward Port from CM-11.0

Change-Id: Ie4e9e6bcc48803b195d1615d83d6e36d663cc33a
2015-10-17 14:03:23 -07:00
chaochen
ac086d353e Fix for landscape thumbnail images on GLES11RenderEngine
Change-Id: If825345be2c30645c7b87258b7e24d6009f3090a
Signed-off-by: Raj Mamadgi <rmamadgi@sta.samsung.com>
2015-10-17 13:59:32 -07:00
nadlabak
437e236427 Forward port 'Swap volume buttons' (2/3)
[mikeioannina]: Adjust for 5.0 changes

Change-Id: I5ed4ae2b7e69e2ada067ed1d3524b3d3fad30e2e
2015-10-17 13:58:48 -07:00
Ricardo Cerqueira
b87c456431 surfaceflinger: Track the last surfaceview frame for latency dumps
When measuring GL latency with dumpsys, it's possible to hit a
race condition if the hardware is fast enough to complete rendering
the test cycle before the latency dump is requested, since it only
matches the latency for live layers (unless it's an animation. See
change I8bded1ea08a4cddefef0aa955401052bb9107c90)

So always save a reference to the last rendered SurfaceView frame,
and dump its values if there isn't an active one.

Change-Id: I740e9830161396ea955b5a53322bd8576b5136bc
2015-10-17 13:58:36 -07:00
Christopher N. Hesse
00888b7eee inputflinger: disable touch input while using a stylus
Android 5.0 cannot form multitouch events from multiple input
devices. So it is not possible to report one touchpoint from the
stylus position and, at the same time, another touchpoint from a
finger touch. Instead, when a new input device starts up the currently
active input is cancelled. This is highly undesirable while writing
with the pen.

The easiest solution is to ignore non-stylus touch events while the
stylus is within range (hovering) of the touchscreen. For example,
N-trig digitizers implement this in hardware. But wacom digitizers do
report pen data simultaneously with touch data. This patch disables
(non-stylus) touch input within 50ms of stylus data. On my Galaxy
Note this is necessary to make stylus input usable.

Original commit by vbraun:
b9cb296130

Change-Id: I97f26369826e96c97461c8ae188f1c64dec1b4d3
2015-10-17 13:56:31 -07:00
Ethan Chen
bd33987d72 Add GESTURE_SENSOR input source
Change-Id: If61a7e7bf2d8b2665db7ca57ed68a4462d0c1783
2015-10-17 13:53:53 -07:00
Steve Kondik
ac9d8404f1 inputflinger: Add gesture sensor support
Change-Id: Ieca4e54439c47a817aaa6a9b6fabcee750ffc0c2
2015-10-17 13:53:44 -07:00
Steve Kondik
ccf7c200ce input: Adjust priority
* Bring into the desired group to get the best result.

Change-Id: I3bd031074cd7006994736b4c22d0294b6012f662
2015-10-17 13:51:11 -07:00
Michael Gernoth
80216f6442 RenderEngine: remove warning "using EGL_IMG_context_priority"
This warning breaks the build as it is treated as an error,
so just remove it.

Change-Id: I1a6353e5960866a9302a8c00eb97d1779b35b6be
2015-10-16 14:46:08 -07:00
Ricardo Cerqueira
f4fac7e93f Support forcing all screenshots into a CPU consumer
Looks like a full GPU path is less efficient on some GPU
drivers that we're still using, and CPU is reliably faster...
(there's probably a locking condition going on somewhere, this
needs to be looked into)

Change-Id: I8878796a117d65bf2324507cf8755cadce49f6dc
2015-10-16 14:45:55 -07:00
Pawit Pornkitprasan
ff59fbd819 libEGL: allow devices to workaround Google bug 10194508
Most older blobs don't have the EGL_KHR_gl_colorspace
extension and need this workaround.

Change-Id: Ifc5d097c1a0b68275d23c2d191976ac96631b695
2015-10-16 14:45:10 -07:00
Pawit Pornkitprasan
fd1fb639a1 Bring back support for glReadPixels screenshot path
Squashed commit of the following:

commit 012d3fe41d1d6cd38a0858b59145e9a4447641fa
Author: Hashcode <hashcode0f@gmail.com>
Date:   Sun Dec 8 19:36:50 2013 +0000

    sf: Always use opengles for screen capture

    Go back to the usage of GRALLOC_USAGE_HW_TEXTURE and GRALLOC_USAGE_HW_RENDERER
    in captureScreenImplLocked regardless of useReadPixels value

    This fixes the EGL_NO_IMAGE_KHR error returned from
    eglCreateImageKHR (blank images returned from screenshot path)

    Change-Id: I62fe90a081607b9e89c67f3dcfd34c84efc89d35

commit 4866ddf98ac98d8e22a1cd6a21894bb17f274588
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Thu Oct 31 03:53:39 2013 +0000

    Revert "remove support for glReadPixels screenshot path"

    This reverts commit 3ca76f416b.

    Conflicts:
    	include/gui/ISurfaceComposer.h
    	libs/gui/ISurfaceComposer.cpp
    	libs/gui/SurfaceComposerClient.cpp
    	services/surfaceflinger/SurfaceFlinger.cpp
    	services/surfaceflinger/SurfaceFlinger.h

    Change-Id: I8c239e533757af770e418dbb198f5a86c736961f

Change-Id: I8c239e533757af770e418dbb198f5a86c736961f
2015-10-16 14:45:10 -07:00
Ethan Chen
bcce313fea Revert "egl: Remove old tuna BGRA vs RGBA workaround."
This reverts commit 733a807547.

Change-Id: Ifb41720ed020489892a667914ea3bd3f1ac6504e
2015-10-16 20:20:32 +02:00
Ricardo Cerqueira
e3fc10fbb7 exynos4: getphys implementation on buffermanager for samsung omx
Change-Id: I73d9633e1a7b3316ede28dd1369f8f069609cbb0
2015-10-15 11:35:09 -07:00
Aravind Akella
263b020b6e am 6427e719: am 2ac7405b: Merge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-dev
* commit '6427e7190bbd83a29169e6ae4b5e3cff263f6937':
  Set DATA_INJECTION mode flag for sensors.
2015-10-14 21:13:41 +00:00
Aravind Akella
6427e7190b am 2ac7405b: Merge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-dev
* commit '2ac7405bda4f621f07cbcc0b562d16f7a9611c7b':
  Set DATA_INJECTION mode flag for sensors.
2015-10-14 21:08:15 +00:00
Aravind Akella
2ac7405bda Merge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-dev 2015-10-14 21:03:07 +00:00
Jesse Hall
0983618f0a am a518d5ad: am 312d7555: egl: Remove window disconnect before calling driver eglDestroySurface
* commit 'a518d5ad0c0c6a661471a8cd2c962612943ca667':
  egl: Remove window disconnect before calling driver eglDestroySurface
2015-10-14 20:26:57 +00:00
Jesse Hall
a518d5ad0c am 312d7555: egl: Remove window disconnect before calling driver eglDestroySurface
* commit '312d7555cb71ce7fb73bc758b9e30653e223b2f3':
  egl: Remove window disconnect before calling driver eglDestroySurface
2015-10-14 20:14:55 +00:00
Jesse Hall
312d7555cb egl: Remove window disconnect before calling driver eglDestroySurface
This was originally added for b/14445579. An in-development app was
attempting to render to a window as an EGLSurface, then tear that
down, change some window properties, and create a new EGLSurface. The
second eglCreateWindowSurface failed because the window was already
connected. This change went in, but it turned out the real problem was
that the app still (unintentionally) had the surface current. After
the app bug was fixed, nobody revisited whether this change was
actually needed.

Turns out it wasn't needed. After an EGLSurface is both destroyed
*AND* not current (basically refcount==0), we were already
disconnecting the window in ~egl_surface_t().

Apart from being unnecessary and redundant, disconnecting the window
here is wrong for two reasons:

(a) The surface may still be in use after eglDestroySurface, if it was
still current. Rendering is undefined in that case, but disconnecting
the window leads to more catastrophic results than necessary.

(b) It's being called before calling the driver's eglDestroySurface.
The driver will almost definitely have a buffer dequeued that it needs
to cancel, and by disconnecting first we turn that into an error that
they don't have a graceful way to deal with.

Bug: 24524053
Change-Id: Ib063134413d25d3526f794aafb5e333e3417ea42
2015-10-14 11:21:25 -07:00
Steve Kondik
3141dc73b6 surfaceflinger: Clean up use of QC extended API
Change-Id: I1256605e63e90f3baaa213453246fb0e44e0c770
2015-10-12 23:36:09 -07:00
Steve Kondik
0bef28f4e6 native: Use project pathmap
Change-Id: I81752c2c433752c02ab2a922f974f363e10d8def
2015-10-12 23:36:09 -07:00
Diogo Ferreira
373899a2a6 native: Restore VM memory overrides
This change adds back the property overrides for several device
types as we had in CM 11.

It contains a squished commit of the following:

commit 5b9240927f8af0b26c406835df33b2d999496434
Author: Steve Kondik <shade@chemlab.org>
Date:   Thu Nov 6 14:40:44 2014 -0800

    Add hdpi-2048 tunings

commit ed579d8be17fb52ef92a1dc9c83843879f396fa1
Author: Steve Kondik <shade@chemlab.org>
Date:   Sat Jan 4 12:12:00 2014 -0800

    Update HWUI config for xxhdpi/2GB devices

commit 386f220e174f9ed5aad487867223033fd5d986c6
Author: Steve Kondik <shade@chemlab.org>
Date:   Tue Aug 6 02:53:19 2013 -0700

    hwui: Update configuration for 2GB/1080p devices

commit b7392d113d8ae6c3c07990bbb3f2621bef490d11
Author: Steve Kondik <shade@chemlab.org>
Date:   Sat Jun 1 14:51:17 2013 +0200

    provide overrides for hwui memory limits for xxhdpi phones

commit 247b3c635b1d6776ffedf3cd61a936546c2f6603
Author: Steve Kondik <shade@chemlab.org>
Date:   Fri May 17 13:10:19 2013 -0700

    Add heap configuration for 1080p phones with 2048m

     * Increase heap start size to 16m to minimize GC with larger bitmaps

commit 9856e93970fd6def1349e564f17d42f505904eba
Author: Andrew Bartholomew <andrewb03@gmail.com>
Date:   Thu Apr 25 13:48:21 2013 -0400

    build/phone-xhdpi-1024-dalvik-heap.mk Revert AOSP heapgrowthlimit change from 64 to 96

    This reverts part of AOSP change at

    https://android.googlesource.com/platform/frameworks/native/+/c84e9844d621223d14178be521

    Possible performance issues have arisen because of it. Discussion at

    http://code.google.com/p/android/issues/detail?id=40961

    Patch Set 2: Clean up commit message

commit bd7fb4be323f6f868a886b22e93cf203944af9a6
Author: Bhargav Upperla <bhargavuln@codeaurora.org>
Date:   Thu May 23 12:50:15 2013 -0700

    Configure dalvik heap parameters for low memory devices

    Reduces after boot memory footprint by about 5-8MB
    Note: This is for low memory based devices only (~512MB RAM
    or less)

Change-Id: Id7e1967d18227359ad9631139bfd47e61e494829
2015-10-12 23:36:09 -07:00
bmc08gt
0e58546c2a Add dalvik heap override for xxxhdpi phone
Change-Id: Ib2649f55327775bbd4d94012952b4301536391ed
Signed-off-by: bmc08gt <brandon.mcansh@gmail.com>
2015-10-12 23:36:09 -07:00
bmc08gt
8e3dceb7ed Add HWUI overrides for xxxhdpi phone
Change-Id: I4393ef0a5f6f1e9775b5d40b094da3f74ed3ae35
Signed-off-by: bmc08gt <brandon.mcansh@gmail.com>
2015-10-12 23:36:08 -07:00
Adam Lesinski
5bba4236a8 am 76fc5f18: am 16b0ae10: Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev
* commit '76fc5f18e6a0271a1f04db54924653faac73912e':
  add number constraint for samples per MotionEvent
2015-10-12 22:30:10 +00:00
Adam Lesinski
76fc5f18e6 am 16b0ae10: Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev
* commit '16b0ae105e4e94ff09d1517b68f7c66f2022a19e':
  add number constraint for samples per MotionEvent
2015-10-12 22:23:05 +00:00
Adam Lesinski
16b0ae105e Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev 2015-10-12 22:15:50 +00:00
Flanker
552a8a5d8d add number constraint for samples per MotionEvent
Bug:23905002
Change-Id: Ifd24802977c3dcdd1dbc5120a78aac41beae4603

Signed-off-by: Adam Lesinski <adamlesinski@google.com>
2015-10-12 11:22:37 -07:00
Jason Parks
7b2b968db4 am 33c3c1bd: Merge "Revert "do not dumpstate raft BUG: 24159112"" into cw-e-dev
* commit '33c3c1bd71de8a903b6a07f0b1c4f2f670313778':
  Revert "do not dumpstate raft BUG: 24159112"
2015-10-12 15:39:58 +00:00
Jason Parks
33c3c1bd71 Merge "Revert "do not dumpstate raft BUG: 24159112"" into cw-e-dev 2015-10-12 15:34:47 +00:00
Jason Parks
31baf8d3c2 Revert "do not dumpstate raft BUG: 24159112"
This reverts commit 05c862252d.

Change-Id: Ib5984796734d2a0e33f47e0fb4e446b787e0d14f
2015-10-12 15:27:10 +00:00
Puneet Kumar
98d740d7d2 am 94973aeb: am a2f78b44: Merge "Inputflinger: hook up key event replacement processing" into mnc-dr-dev
* commit '94973aeb1961c5a07a5288ec56c7f79ab658bb8d':
  Inputflinger: hook up key event replacement processing
2015-10-08 09:15:33 +00:00
Puneet Kumar
b916390540 am ec1323db: am 2f3c3eb4: Merge "Allow defining replacement key events in keymap" into mnc-dr-dev
* commit 'ec1323dbd4558f9d4ff422c8547334fe13242ad0':
  Allow defining replacement key events in keymap
2015-10-08 09:15:32 +00:00
Puneet Kumar
94973aeb19 am a2f78b44: Merge "Inputflinger: hook up key event replacement processing" into mnc-dr-dev
* commit 'a2f78b44ee30839e2c047d07525dd6bc4fe50f1d':
  Inputflinger: hook up key event replacement processing
2015-10-08 09:08:32 +00:00
Puneet Kumar
ec1323dbd4 am 2f3c3eb4: Merge "Allow defining replacement key events in keymap" into mnc-dr-dev
* commit '2f3c3eb4e47d7cb6ef67e0fd2063e4b93e38e9ec':
  Allow defining replacement key events in keymap
2015-10-08 09:08:31 +00:00
Puneet Kumar
a2f78b44ee Merge "Inputflinger: hook up key event replacement processing" into mnc-dr-dev 2015-10-08 08:16:58 +00:00
Puneet Kumar
2f3c3eb4e4 Merge "Allow defining replacement key events in keymap" into mnc-dr-dev 2015-10-08 08:16:31 +00:00
Baldev Sahu
dfab0ee254 SurfaceFlinger: Add support for MDP3
This change is porting of following commits related to MDP3

1) SurfaceFlinger: Change to support framebuffer flip for 2D blitters
- Surfaceflinger does not flip framebuffers when there are
  no layers marked for HWC_FRAMEBUFFER
- This change checks for the HWC_BLIT flag and will request a flip
  to a new FB_TARGET buffer even if there are no FRAMEBUFFER layers

  "Change-Id: I1cb44389a05c9ec049d7f0d39c288feccb11a91c"

2) SF: Avoid wormhole clear for BLIT calls
- Do not call GPU clear from SF when composition
  type is BLIT as it'll be taken care in HAL.

  "Change-Id: Ia613eb9b824c6484ecc8c8fa4ee883545d8541b8"

3) surfaceflinger: Allow gpu to render widevine level3
- Allow gpu to render widevine level3 but keep
  blocking screen shots.

  "Change-Id: I914232a062acbb7b17901dbf2b414973230e59d9"

Change-Id: I35eef9eb1597af21c195e07d5fe4c0c73ab3a269
2015-10-07 02:52:17 -07:00