OSDN Git Service
Chih-Wei Huang [Wed, 21 Sep 2016 05:14:56 +0000 (13:14 +0800)]
Merge remote-tracking branch 'cm/cm-13.0' into cm-13.0-x86
Chih-Wei Huang [Wed, 21 Sep 2016 05:12:42 +0000 (13:12 +0800)]
Merge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86
Jessica Wagantall [Wed, 7 Sep 2016 19:40:28 +0000 (12:40 -0700)]
Merge tag 'android-6.0.1_r66' into HEAD
Android 6.0.1 release 66
# gpg: Signature made Tue 06 Sep 2016 09:26:47 AM PDT using DSA key ID
9AB10E78
# gpg: Can't check signature: public key not found
Chih-Wei Huang [Wed, 7 Sep 2016 05:51:08 +0000 (13:51 +0800)]
Merge tag 'android-6.0.1_r66' into marshmallow-x86
Android 6.0.1 release 66
Amirhossein Simjour [Fri, 9 Oct 2015 14:39:48 +0000 (10:39 -0400)]
When using trackpad, mouse pointer shows instead of circle
The mouse pointer showing instead of circle for all gestures except FREEDOM.
FREEDOM gesture still is using spots to be able to show all the fingers.
Bug:
24139978
Change-Id: I91e916de02e690f6727b097345a919e536ffdc92
Jaap Jan Meijer [Fri, 2 Sep 2016 12:08:19 +0000 (14:08 +0200)]
Merge remote-tracking branch 'cm/cm-13.0' into cm-13.0-x86
Christopher N. Hesse [Fri, 29 Apr 2016 14:21:35 +0000 (16:21 +0200)]
surfaceflinger: Add support for Exynos HWC services
Change-Id: I600e946a22064d64549e266c5a3cf452d0cf6299
Abhisek Devkota [Wed, 17 Aug 2016 16:04:42 +0000 (09:04 -0700)]
Fix xxhdpi 3072 heap sizes
Bootloops on r7 with current values
Fix for
94774ac01d1953bcc7a70a7018267ee34793d3f7
Change-Id: I248a9375735a261715668494da0d0ab5a6440d42
Abhisek Devkota [Wed, 17 Aug 2016 16:04:42 +0000 (09:04 -0700)]
Fix xxxhdpi 3072 heap sizes
Bootloops on shamu with current values
Fix for
94774ac01d1953bcc7a70a7018267ee34793d3f7
Change-Id: Iade253bd8bc5074486d2d69bb9c738844615b08d
Alex Naidis [Mon, 15 Aug 2016 01:48:27 +0000 (21:48 -0400)]
dalvik: rework 3 and 4-GB dalvik heap configurations
The previous configuration sets target utilization as .25, which is geared towards
low memory devices. This path increases it to .75 and makes us pass the check:
(heaptargetutilization / 2) * heapsize = heapgrowthlimit
Example:
heapgrowthlimit: 256m
heapsize: 512m
heaptargetutilization: 0.75
0.75/2 * 512 = 192
To pass the check this has to be true:
192 = 256 (WRONG)
Check not passed.
This new configuration is optimized for higher RAM devices and passes the check:
heapgrowthlimit: 384m
heapsize: 1024m
heaptargetutilization: 0.75
0.75/2 * 1024 = 384
384 = 384 (TRUE)
Check passed.
Change-Id: I6839339382229da80546761c3746a032081ff2cd
Signed-off-by: Alex Naidis <alex.naidis@linux.com>
Namit Solanki [Fri, 29 Jul 2016 09:49:44 +0000 (15:19 +0530)]
surfaceflinger: Access s3d flags only for valid display ID.
- Check if display id is within display ID range. Negative
display ids lead to undefined behavior in CTS tests.
Change-Id: I2db8caf8d7ac65700e5bc37c180763357cc90aad
CRs-Fixed:
1043297
Jaap Jan Meijer [Mon, 8 Aug 2016 11:13:59 +0000 (13:13 +0200)]
Merge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86
Conflicts:
opengl/libs/EGL/eglApi.cpp
services/surfaceflinger/Android.mk
services/surfaceflinger/DisplayHardware/HWComposer.cpp
services/surfaceflinger/SurfaceFlinger.cpp
Jaap Jan Meijer [Mon, 8 Aug 2016 11:11:38 +0000 (13:11 +0200)]
Merge remote-tracking branch 'cm/cm-13.0' into cm-13.0-x86
FPtje [Thu, 4 Aug 2016 01:37:46 +0000 (20:37 -0500)]
Fixed stylus eraser being rejected by palm rejection
The stylus eraser appeared not to work, i.e. Android did not respond to
input from the eraser. It turned out that all input except stylus input
is rejected when palm rejection is activated. The problem was that the
eraser itself activates palm rejection when it hovers. The solution is
to allow the eraser during palm rejection. This solution makes sense
because the eraser input works in the exact same way as normal stylus
input.
Change-Id: I9c7451112ce7dbca14a1e1694eedca2d4ed041a1
Steve Kondik [Wed, 3 Aug 2016 22:28:43 +0000 (15:28 -0700)]
surfaceflinger: Fix uninitialized variable
* And don't try to reinit the lib after a failure.
Change-Id: Ic055a48670ed8cf01e27b16c5d4ddf214db53d20
Steve Kondik [Wed, 3 Aug 2016 22:02:31 +0000 (15:02 -0700)]
surfaceflinger: Unbreak casting and other use cases
* If QCOM WFD isn't in use, we'll get -1 here. Don't try and
dig into the array because we'll get some random memory back.
Change-Id: Ib14642fea760dc0e659473bb183c5e0116622302
Anjaneya Prasad Musunuri [Tue, 5 Jul 2016 05:05:59 +0000 (10:35 +0530)]
surfaceflinger: Add check for number of queued buffers
Pop buffer item from shadow queue only when
number of queued buffer items is greater than zero.
Change-Id: I039bc133842293c29e3e130efd65f521ef0049c6
CRs-Fixed:
1009466
Chih-Wei Huang [Wed, 3 Aug 2016 07:27:01 +0000 (15:27 +0800)]
Merge tag 'android-6.0.1_r61' into marshmallow-x86
Android 6.0.1 Release 61 (MOB30Z)
Jessica Wagantall [Tue, 2 Aug 2016 18:02:18 +0000 (11:02 -0700)]
Merge tag 'android-6.0.1_r61' into HEAD
Android 6.0.1 Release 61 (MOB30Z)
Change-Id: I581a4bc571ffe74fe33956018ffd93df05263755
dianlujitao [Tue, 2 Aug 2016 12:11:17 +0000 (20:11 +0800)]
sf: Fix compliation for non-8996 platforms
Change-Id: I3edad5934ef9d9ec523e091fa2c959bbc9770f29
Steve Kondik [Mon, 1 Aug 2016 20:21:58 +0000 (13:21 -0700)]
surfaceflinger: Isolate S3D code to msm8996 only
Change-Id: Ie4b77b55eb306c795b452c59d8ae3383bd2804bc
Steve Kondik [Mon, 1 Aug 2016 08:31:00 +0000 (01:31 -0700)]
surfaceflinger: Cleanups for blur
* Dynamically load it so no direct linkage or headers are required.
Change-Id: I4eba035f527ae4f0fa2485e24a8586145baf0adc
Tatenda Chipeperekwa [Mon, 18 Apr 2016 23:26:19 +0000 (16:26 -0700)]
sf: Allow HWC composition of virtual displays for HDMI primary
Allow HWC composition of virtual displays for HDMI primary only
when the output pixel format of the HDMI display is RGB.
CRs-Fixed:
1007249
Change-Id: I9680b162d844e9e6397f919e8dcc1b1a948d182c
feifanz [Wed, 27 Apr 2016 04:23:28 +0000 (12:23 +0800)]
SF: Add support to draw S3D framebuffer target
Add support to draw S3D framebuffer target in case HWC driver
can not handle due to resource or capability issue.
Change-Id: I536fa4a03e246d51891045b692d5dc5be88f2adf
CRs-fixed: 999055
Chih-Wei Huang [Wed, 20 Jan 2016 18:25:52 +0000 (02:25 +0800)]
SF: support higher resolutions
Add support for Surface Pro 4.
Chih-Wei Huang [Sat, 1 Nov 2014 17:21:12 +0000 (01:21 +0800)]
InputReader: add 5-point calibration
Updated for Android 5.0.
Chih-Wei Huang [Sun, 26 Oct 2014 07:39:53 +0000 (15:39 +0800)]
auto determine the density if not provided in surfaceflinger
We hope to support tablet UI for different resolutions.
So adjust the density according to the resolution.
Chih-Wei Huang [Sun, 26 Oct 2014 07:38:15 +0000 (15:38 +0800)]
enable console management
The console management was removed since ICS. But it's useful for debugging.
Re-implement it based on the original class ConsoleManagerThread of class
DisplayHardwareBase.
Praveena Pachipulusu [Thu, 21 Nov 2013 13:27:31 +0000 (18:57 +0530)]
SurfaceFlinger: Add NULL check for buffer handling
Add buffer handling NULL check in dequeueBuffer and
verify whether the output data from binder is not NULL
in queueBuffer and connect api's to avoid SF crash
CRs-Fixed: 573088
CRs-Fixed: 572315
Change-Id: I41cebbc0cbcbbb0fd5ecb38db7ec7b0c91cdffe9
Rama Vaddula [Thu, 12 Sep 2013 21:09:32 +0000 (14:09 -0700)]
Surface: Initialize variable and add a defensive check
Initialize buf variable and make sure to check for return
value of dequeueBuffer() before sending to the client.
Change-Id: I0569f2d45825fab0e5d0f38fc91a07990f57c7ab
(cherry picked from commit
a6bd7106a7305208f187fbf0a48f14139e33c9d6)
(cherry picked from commit
e5d7662d68c5be2b282edd58d4feb68a4d476182)
(cherry picked from commit
885c146144480d4371a0a97df89b8e77f53d3d94)
Lynus Vaz [Tue, 23 Jul 2013 12:49:02 +0000 (18:19 +0530)]
Check fence is not NULL before dereferencing it
If the fence obtained in dequeueBuffer is NULL, don't dereference it.
This will avoid a crash in surfaceflinger.
CRs-fixed: 516300
Change-Id: I3054dc37087103f3addae7884bb03460484a1eec
(cherry picked from commit
ddf4adb487dc76ccb75fe2432772d6fc575ed77c)
(cherry picked from commit
c6ae5271f9ced9a747e1481c2ef875ba03674172)
(cherry picked from commit
cdad709878601eb694acbce7d3ae9f7a74bf14f3)
Chih-Wei Huang [Sun, 6 Jan 2013 08:56:00 +0000 (16:56 +0800)]
disables hardware acceleration if debug.egl.hw=0
Edward Peek [Tue, 3 Apr 2012 18:17:00 +0000 (06:17 +1200)]
Added option to disable touchscreen pressure sensitivity from idc files
DanielK [Tue, 20 Mar 2012 06:28:43 +0000 (14:28 +0800)]
Support old single-touch touchscreens with BTN_LEFT
Byron Gardner [Mon, 3 Nov 2014 23:54:28 +0000 (15:54 -0800)]
Enable 64-bit support in libs/gui/Sensor.cpp
Change-Id: Iaaa112bd821a6a0e3234461df8f7b6acc47b254e
Orig-Change-Id: I04c22e6f2c6f4271ca451b775c8d7f86e4c97c38
Tracked-On: https://jira01.devtools.intel.com/browse/IMINAN-9998
Category: aosp improvement
Domain: SENSORS.VIRT-Common
Origin: internal
Upstream-Candidate: yes
Signed-off-by: Byron Gardner <byron.gardner@intel.com>
Reviewed-on: https://android.intel.com:443/296325
Wang, Yue A [Tue, 21 Jan 2014 09:42:13 +0000 (17:42 +0800)]
SurfaceFlinger: disable VSync thread if no clients requiring.
In EventThread, 2 VSYNCs are needed to do composition and update
the client status. So, a 30FPS video may leads to 60FPS VSYNC,
which means the DispSync thread would be waked 60FPS. This is a
unexpected behavior which takes more power consumption. Now we
update the SF status soon after the first VSYNC, which means no
extra VSYNC needed, and the DispSync could be awaked as expected,
and consequently power get saved.
Change-Id: If486eb9b87f109a71f71b510768f15dd733f1233
Orig-Change-Id: I1d3b166021e15a81b2ad770b039761fc2c15fddf
Tracked-On: https://jira01.devtools.intel.com/browse/IMINAN-12211
Category: aosp improvement
Domain: Graphics-SF
Origin: internal
Upstream-Candidate: yes
Signed-off-by: Wang, Yue A <yue.a.wang@intel.com>
Reviewed-on: https://android.intel.com:443/238344
juntingwang [Fri, 1 Mar 2013 08:02:56 +0000 (16:02 +0800)]
Set PS2 Keyboard controller as not a ketboard type
The Eventhub detects the platforms built-in PS/2 keyboard controller
as a physical keyboard. So the system will not display the software
keyboard by default. Modify it device type in Keyboard-less tablets,
so that ActivityManager will not ignore the PS/2 controller.
Issue: AXIA-1875
Change-Id: Ia5b7592e82aaf1970066bab5e9ca5f46ac83ab1c
Signed-off-by: juntingwang <Junting.Wang@windriver.com>
Andy Ross [Tue, 19 Feb 2013 22:39:34 +0000 (14:39 -0800)]
binder: Fix service initialization race vs. service manager
The framework relies on the global IServiceManager running before a
BinderService object is instantiated. But there was no detection of
the error condition when it was not (specifically: mediaserver can be
initialized before system_server), and in fact the default error
behavior (kill the proxy object) ensured that the process would never
be able to add services again. Retry the addService() code, and allow
transient binder failures for the special case of the service manager
proxy.
Issue: AXIA-1706
Change-Id: Icac10bb0f47a2fe33ac9605a13633b83afa3ebff
Signed-off-by: Andy Ross <andy.ross@windriver.com>
Daniel Leung [Thu, 13 Sep 2012 20:43:41 +0000 (13:43 -0700)]
Prevent EventHub from adding input device twice
When Android first starts up, it scans /dev/input for input devices.
In some rare instances, the EventHub gets another notification that
some device nodes are created. It then proceeds to add the same
input device again. This causes the system to get two events per
touch or key stroke.
This adds a check to prevent adding the same device if the operation
is triggerd by inotify.
Issue: AXIA-858
Change-Id: I68b02594f1c7f14067611735db0b3763378ec7ea
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
Daniel Charles [Fri, 13 Jul 2012 23:11:49 +0000 (16:11 -0700)]
egl_extensions: remove force of extension not supported
This problem was introduced by commit
48d438d05f14c.
When the extension GL_EXT_debug_marker is not supported by h/w
the dummy version is used already. Whenever the h/w is ready
to support the extension it will show up and be used by the
OpenGLRenderer.
Change-Id: Iddb58859b187d872a9a3a2986d30f24b8f83e76b
Signed-off-by: Daniel Charles <daniel.charles@intel.com>
Paul Drews [Wed, 18 Jan 2012 19:01:49 +0000 (11:01 -0800)]
Pre-test native window pointer for validity
This fixes a segfault in the oglconform tests when running
the test:
adb shell /data/app/oglconform -v 4 -minFmt -es -test egl-basic negative.drawables.winSurfBadWin
According the the egl specification this should return
EGL_BAD_NATIVE_WINDOW. The segfault was resulting from the
fact that the window handle is a (cast to opaque) pointer,
and there are not straightforward ways of pre-testing a
pointer for validity. The fix implemented here is:
() Take advantage of the msync() system-call logic to test
pre-test basic pointer validity
() Once confirmed that we can reference through the
pointer, look for the "magic" value dropped in by the
implementation to mark this type at runtime.
Change-Id: Id7d21c822c8a416e45caba25c63d7076d1e547a5
Original-Change-Id: I3c8df8ef5ece5c0fa71c47417766b5453c355f8b
Signed-off-by: Russell Webb <russell.webb@intel.com>
Signed-off-by: Paul Drews <paul.drews@intel.com>
Pauli Nieminen [Wed, 4 Jan 2012 14:25:10 +0000 (16:25 +0200)]
egl: Add NULL check for eglGetconfigs num_config parameter
EGL 1.4 specification says in 3.4.1:
"An EGL_BAD_PARAMETER error is generated if num config is NULL."
We have to check for the condition and return the required error to
application.
Change-Id: Ib42709f0420161ce661536394d4c0779bc62be57
Original-Change-Id: I4fe670c4362f4ae494f91d69ae105e29ccf3c769
Signed-off-by: Pauli Nieminen <pauli.nieminen@linux.intel.com>
Pauli Nieminen [Tue, 15 Nov 2011 18:33:05 +0000 (20:33 +0200)]
Fix build problem when including hal and egl to same c file
If including hal and egl headers to same c file compilation files
because ANativeWindow type is defined in two headers. In HC egl didn't
include system/core/include/system/window.h which hid the type conflict.
Change-Id: Icaf7b29f913f3d7fa8f6d70bb196585d22e7d05c
Original-Change-Id: Icd37329d80fb4e8b9baf9015c9b00e43ebc4f76b
Signed-off-by: Pauli Nieminen <pauli.nieminen@linux.intel.com>
Steve Kondik [Sun, 24 Jul 2016 23:19:39 +0000 (16:19 -0700)]
surfaceflinger: Fix the fix of the opaque check fix
* Use the right define.
Change-Id: I78e2aea4bf4ff933ec828cffee1a3e925622ad31
Pablo Ceballos [Wed, 13 Jul 2016 21:11:57 +0000 (14:11 -0700)]
Region: Detect malicious overflow in unflatten
Bug
29983260
Change-Id: Ib6e1cb8ae279010c5e9960aaa03513f55b7d873b
Ramkumar Radhakrishnan [Thu, 19 May 2016 01:56:05 +0000 (18:56 -0700)]
SF: Fix NULL pointer dereferencing in dumpDrawCycle()
Check for NULL before dereferencing a pointer in dumpDrawCycle()
Change-Id: I1f06214577d0065c988877acb0f1b4378080690f
CRs-Fixed:
1018335
Saurabh Shah [Tue, 22 Mar 2016 00:25:23 +0000 (17:25 -0700)]
SF: Add support for all flips of panel mount
Add support for all flips of panel mount, H, V, HV (180). Property
persist.panel.mountflip can be set to 1 for H-Flip, 2 for V-Flip,
3 for HV-Flip (180 / inverse mount).
Change-Id: Ide7b8378ad6a423e5d7335fedc27d480a25b53ae
CRs-fixed: 990622
Nick Kralevich [Wed, 7 Oct 2015 23:38:42 +0000 (16:38 -0700)]
DO NOT MERGE: dumpstate: execute procrank using su
procrank is a setuid binary which only exists on userdebug/eng
builds. Instead of executing the setuid binary, run the binary using
the su command. This eliminates one more setuid binary, and allows
the tightening of the SELinux policy.
Bug:
18342188
(cherry picked from commit
2b1f88b6ac78e330ff006da6fecf8bc9d976ec67)
Bug:
25951005
Change-Id: I90c86f89974b3878273a29277b2a5d5d7c4b81c7
Haixia Shi [Wed, 28 Oct 2015 23:19:01 +0000 (16:19 -0700)]
SF: more DispSync improvements.
Pass the reference time to DispSyncThread. Since the phase offset is calculated
using timestamps relative to the reference time, we must also adjust the phase
offset by the same reference time when computing the next refresh time.
Always reset phase offset to zero when updating the reference time because the
reference time equals the first timestamp.
After beginResync() we need to keep HW vsync enabled until the model is updated.
Bug:
25113115
Change-Id: I8eae227bee91c24a99bf8e57fbebceb98d29c77d
Test: check in systrace that app/sf vsync events have correct phase
Haixia Shi [Wed, 28 Oct 2015 20:22:22 +0000 (13:22 -0700)]
SF: use first sample timestamp as reference.
Do not use the absolute 64-bit nsecs_t timestamp directly in phase
and error calculations. Compared to the estimated vsync period, the
timestamp tend to many orders of magnitudes larger, and consequently
the integer modulo operation used to calculate phase and error can
be very sensitive to tiny fluctuation in vsync period.
Bug:
25113115
Test: set kTraceDetailedInfo=true; see Phase and Error are stable in systrace
Change-Id: I687703eec31b1072c606898c0424a96c0a8ca033
Arne Coucheron [Tue, 19 Jul 2016 22:46:07 +0000 (00:46 +0200)]
sf: Fix blending mode for legacy BSP
* After
0c5f3af, glitches when blending is observed on
A family devices. Modify ifdef to not include QCOM_BSP_LEGACY.
Change-Id: Ibb53df5709abbb0e7132065aec23a14f7accf4b3
Mark Salyzyn [Tue, 2 Feb 2016 18:27:03 +0000 (10:27 -0800)]
system_server BINDER_TYPE_FD driver ashmem accessors
check if device matches the ashmem rdev, before calling
ashmem_get_size_region. This eliminates making this call
when associated with other driver file descriptors.
Bug:
26374183
Bug:
26918423
Bug:
26871259
Change-Id: I1f88c2c93ea35a73c8e14125f3d1a6c67fa4f15b
Mark Salyzyn [Wed, 27 Jan 2016 16:02:48 +0000 (08:02 -0800)]
system_server BINDER_TYPE_FD sockets using ashmem accessors
check if device is a character device, before calling
ashmem_get_size_region. We do not check if the st_rdev
matches /dev/ashmem. So this at least eliminates making
this call when associated with a socket.
Bug:
26374183
Change-Id: I68ed9d1c2cd4c47228ed065e3e18eb4151f038f4
Mark Salyzyn [Wed, 27 Jan 2016 16:02:48 +0000 (08:02 -0800)]
Parcel: file descriptor leak
Resolve a file descriptor leak when a request for
ashmem size adjustment is not filed.
Change-Id: I4ebccfd096ec5313725fd99dc3e025f9561d061f
radhakrishna [Fri, 31 Oct 2014 10:18:14 +0000 (15:48 +0530)]
sf: Make sure HWC_BLENDING_NONE is set for opaque layer
Before configuring the layers to HWC, make sure
HWC_BLENDING_NONE is set if the layer is opaque
Change-Id: Ie84aa9d93e98a244692a0cffc2de653a9079f8b4
Crs-fixed: 957373
Chih-Wei Huang [Fri, 8 Jul 2016 11:05:26 +0000 (19:05 +0800)]
Merge tag 'android-6.0.1_r52' into marshmallow-x86
Android 6.0.1 Release 52 (MOB30R)
Jessica Wagantall [Thu, 7 Jul 2016 18:51:12 +0000 (11:51 -0700)]
Merge remote-tracking branch 'remotes/android-6.0.1_r52' into HEAD
Ticket: CYNGNOS-3020
Change-Id: I13076de5caf1546b8eef44417ee83cd9b2cb9d62
Pablo Ceballos [Thu, 26 May 2016 22:35:55 +0000 (15:35 -0700)]
Add FrameStats default constructor
Bug
28592402
Change-Id: I857e46c9ab3ffae0d96923d665d13a4128a6cafa
Christopher N. Hesse [Fri, 17 Jun 2016 14:10:21 +0000 (16:10 +0200)]
sf: Only apply hwrotation to primary displays
Change-Id: Ib51030cec5ce7609f12be9a5e46310f75442b680
Jessica Wagantall [Tue, 7 Jun 2016 17:10:09 +0000 (10:10 -0700)]
Merge tag 'android-6.0.1_r46' into HEAD
Android 6.0.1 release 46
# gpg: Signature made Mon 06 Jun 2016 10:38:23 AM PDT using DSA key ID
9AB10E78
# gpg: Can't check signature: public key not found
Chih-Wei Huang [Tue, 7 Jun 2016 00:21:48 +0000 (08:21 +0800)]
Merge tag 'android-6.0.1_r46' into marshmallow-x86
Android 6.0.1 release 46
Louis Popi [Wed, 4 May 2016 18:17:24 +0000 (20:17 +0200)]
Add dalvik heap/hwui overrides for xxxhdpi phone with 4096MB RAM
Change-Id: I8e7bd9b520c20e0cd07c9b17d74e4ae79f2769b4
Marco Nelissen [Tue, 26 Apr 2016 15:44:09 +0000 (08:44 -0700)]
Correctly handle dup() failure in Parcel::readNativeHandle
bail out if dup() fails, instead of creating an invalid native_handle_t
Bug:
28395952
Change-Id: Ia1a6198c0f45165b9c6a55a803e5f64d8afa0572
Scott Mertz [Wed, 25 May 2016 22:50:02 +0000 (15:50 -0700)]
dumpstate: add CM version to output
Change-Id: Ibd804872d7d32ac1d26efaf30927a2359d2da287
Louis Popi [Wed, 11 May 2016 20:48:52 +0000 (22:48 +0200)]
Add dalvik heap/hwui overrides for xxhdpi phone with 3072MB RAM
Change-Id: I0ebf2033341e8f09004c1e2dec5f4438aa52e5dc
Danesh M [Fri, 6 May 2016 07:11:27 +0000 (00:11 -0700)]
SurfaceFlinger : Ensure position changes are drawn with correct buffer size
If a single transaction has both positional and size changes, ensure we don't draw
any frames using the incorrect buffer size using the updated position. Wait for the correct
buffer size and then proceed.
Change-Id: I8e25f21f17e0936e66bb5053f85f8336c8464c7b
Chih-Wei Huang [Wed, 20 Jan 2016 18:25:52 +0000 (02:25 +0800)]
SF: support higher resolutions
Add support for Surface Pro 4.
Chih-Wei Huang [Mon, 23 Nov 2015 17:08:11 +0000 (01:08 +0800)]
libEGL: select pixel format by EGL_NATIVE_VISUAL_ID
We need this workaround until Mesa supports HAL_PIXEL_FORMAT_RGBA_8888.
Chih-Wei Huang [Thu, 5 May 2016 17:57:27 +0000 (01:57 +0800)]
Merge branch 'android-ia' into marshmallow-x86
Chih-Wei Huang [Sat, 1 Nov 2014 17:21:12 +0000 (01:21 +0800)]
InputReader: add 5-point calibration
Updated for Android 5.0.
Chih-Wei Huang [Sun, 26 Oct 2014 07:39:53 +0000 (15:39 +0800)]
auto determine the density if not provided in surfaceflinger
We hope to support tablet UI for different resolutions.
So adjust the density according to the resolution.
Chih-Wei Huang [Sun, 26 Oct 2014 07:38:15 +0000 (15:38 +0800)]
enable console management
The console management was removed since ICS. But it's useful for debugging.
Re-implement it based on the original class ConsoleManagerThread of class
DisplayHardwareBase.
Praveena Pachipulusu [Thu, 21 Nov 2013 13:27:31 +0000 (18:57 +0530)]
SurfaceFlinger: Add NULL check for buffer handling
Add buffer handling NULL check in dequeueBuffer and
verify whether the output data from binder is not NULL
in queueBuffer and connect api's to avoid SF crash
CRs-Fixed: 573088
CRs-Fixed: 572315
Change-Id: I41cebbc0cbcbbb0fd5ecb38db7ec7b0c91cdffe9
Naseer Ahmed [Tue, 19 Nov 2013 19:11:26 +0000 (14:11 -0500)]
surfaceflinger: Set max acquired buffer count
If triple framebuffers are enabled, the number of acquired
buffers isn't increased by default. Set the count to one less
than the max buffers to make sure all three buffers come into
play.
Change-Id: I65054ed4004607f5be68c893f6f621e821cfbf1c
Rama Vaddula [Thu, 12 Sep 2013 21:09:32 +0000 (14:09 -0700)]
Surface: Initialize variable and add a defensive check
Initialize buf variable and make sure to check for return
value of dequeueBuffer() before sending to the client.
Change-Id: I0569f2d45825fab0e5d0f38fc91a07990f57c7ab
(cherry picked from commit
a6bd7106a7305208f187fbf0a48f14139e33c9d6)
(cherry picked from commit
e5d7662d68c5be2b282edd58d4feb68a4d476182)
(cherry picked from commit
885c146144480d4371a0a97df89b8e77f53d3d94)
Lynus Vaz [Tue, 23 Jul 2013 12:49:02 +0000 (18:19 +0530)]
Check fence is not NULL before dereferencing it
If the fence obtained in dequeueBuffer is NULL, don't dereference it.
This will avoid a crash in surfaceflinger.
CRs-fixed: 516300
Change-Id: I3054dc37087103f3addae7884bb03460484a1eec
(cherry picked from commit
ddf4adb487dc76ccb75fe2432772d6fc575ed77c)
(cherry picked from commit
c6ae5271f9ced9a747e1481c2ef875ba03674172)
(cherry picked from commit
cdad709878601eb694acbce7d3ae9f7a74bf14f3)
Chih-Wei Huang [Sun, 6 Jan 2013 08:56:00 +0000 (16:56 +0800)]
disables hardware acceleration if debug.egl.hw=0
Edward Peek [Tue, 3 Apr 2012 18:17:00 +0000 (06:17 +1200)]
Added option to disable touchscreen pressure sensitivity from idc files
DanielK [Tue, 20 Mar 2012 06:28:43 +0000 (14:28 +0800)]
Support old single-touch touchscreens with BTN_LEFT
Byron Gardner [Mon, 3 Nov 2014 23:54:28 +0000 (15:54 -0800)]
Enable 64-bit support in libs/gui/Sensor.cpp
Change-Id: Iaaa112bd821a6a0e3234461df8f7b6acc47b254e
Orig-Change-Id: I04c22e6f2c6f4271ca451b775c8d7f86e4c97c38
Tracked-On: https://jira01.devtools.intel.com/browse/IMINAN-9998
Category: aosp improvement
Domain: SENSORS.VIRT-Common
Origin: internal
Upstream-Candidate: yes
Signed-off-by: Byron Gardner <byron.gardner@intel.com>
Reviewed-on: https://android.intel.com:443/296325
Wang, Yue A [Tue, 21 Jan 2014 09:42:13 +0000 (17:42 +0800)]
SurfaceFlinger: disable VSync thread if no clients requiring.
In EventThread, 2 VSYNCs are needed to do composition and update
the client status. So, a 30FPS video may leads to 60FPS VSYNC,
which means the DispSync thread would be waked 60FPS. This is a
unexpected behavior which takes more power consumption. Now we
update the SF status soon after the first VSYNC, which means no
extra VSYNC needed, and the DispSync could be awaked as expected,
and consequently power get saved.
Change-Id: If486eb9b87f109a71f71b510768f15dd733f1233
Orig-Change-Id: I1d3b166021e15a81b2ad770b039761fc2c15fddf
Tracked-On: https://jira01.devtools.intel.com/browse/IMINAN-12211
Category: aosp improvement
Domain: Graphics-SF
Origin: internal
Upstream-Candidate: yes
Signed-off-by: Wang, Yue A <yue.a.wang@intel.com>
Reviewed-on: https://android.intel.com:443/238344
Tapani Pälli [Thu, 16 May 2013 12:03:48 +0000 (15:03 +0300)]
use HAL_PIXEL_FORMAT_BGRA_8888 with hwc 1.1
this is the format supported by our framebuffer
Change-Id: Ic2906f237e1141a970115a44078922c037224040
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Acked-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
juntingwang [Fri, 1 Mar 2013 08:02:56 +0000 (16:02 +0800)]
Set PS2 Keyboard controller as not a ketboard type
The Eventhub detects the platforms built-in PS/2 keyboard controller
as a physical keyboard. So the system will not display the software
keyboard by default. Modify it device type in Keyboard-less tablets,
so that ActivityManager will not ignore the PS/2 controller.
Issue: AXIA-1875
Change-Id: Ia5b7592e82aaf1970066bab5e9ca5f46ac83ab1c
Signed-off-by: juntingwang <Junting.Wang@windriver.com>
Andy Ross [Tue, 19 Feb 2013 22:39:34 +0000 (14:39 -0800)]
binder: Fix service initialization race vs. service manager
The framework relies on the global IServiceManager running before a
BinderService object is instantiated. But there was no detection of
the error condition when it was not (specifically: mediaserver can be
initialized before system_server), and in fact the default error
behavior (kill the proxy object) ensured that the process would never
be able to add services again. Retry the addService() code, and allow
transient binder failures for the special case of the service manager
proxy.
Issue: AXIA-1706
Change-Id: Icac10bb0f47a2fe33ac9605a13633b83afa3ebff
Signed-off-by: Andy Ross <andy.ross@windriver.com>
Daniel Leung [Thu, 13 Sep 2012 20:43:41 +0000 (13:43 -0700)]
Prevent EventHub from adding input device twice
When Android first starts up, it scans /dev/input for input devices.
In some rare instances, the EventHub gets another notification that
some device nodes are created. It then proceeds to add the same
input device again. This causes the system to get two events per
touch or key stroke.
This adds a check to prevent adding the same device if the operation
is triggerd by inotify.
Issue: AXIA-858
Change-Id: I68b02594f1c7f14067611735db0b3763378ec7ea
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
Daniel Charles [Fri, 13 Jul 2012 23:11:49 +0000 (16:11 -0700)]
egl_extensions: remove force of extension not supported
This problem was introduced by commit
48d438d05f14c.
When the extension GL_EXT_debug_marker is not supported by h/w
the dummy version is used already. Whenever the h/w is ready
to support the extension it will show up and be used by the
OpenGLRenderer.
Change-Id: Iddb58859b187d872a9a3a2986d30f24b8f83e76b
Signed-off-by: Daniel Charles <daniel.charles@intel.com>
Paul Drews [Wed, 18 Jan 2012 19:01:49 +0000 (11:01 -0800)]
Pre-test native window pointer for validity
This fixes a segfault in the oglconform tests when running
the test:
adb shell /data/app/oglconform -v 4 -minFmt -es -test egl-basic negative.drawables.winSurfBadWin
According the the egl specification this should return
EGL_BAD_NATIVE_WINDOW. The segfault was resulting from the
fact that the window handle is a (cast to opaque) pointer,
and there are not straightforward ways of pre-testing a
pointer for validity. The fix implemented here is:
() Take advantage of the msync() system-call logic to test
pre-test basic pointer validity
() Once confirmed that we can reference through the
pointer, look for the "magic" value dropped in by the
implementation to mark this type at runtime.
Change-Id: Id7d21c822c8a416e45caba25c63d7076d1e547a5
Original-Change-Id: I3c8df8ef5ece5c0fa71c47417766b5453c355f8b
Signed-off-by: Russell Webb <russell.webb@intel.com>
Signed-off-by: Paul Drews <paul.drews@intel.com>
Pauli Nieminen [Wed, 4 Jan 2012 14:25:10 +0000 (16:25 +0200)]
egl: Add NULL check for eglGetconfigs num_config parameter
EGL 1.4 specification says in 3.4.1:
"An EGL_BAD_PARAMETER error is generated if num config is NULL."
We have to check for the condition and return the required error to
application.
Change-Id: Ib42709f0420161ce661536394d4c0779bc62be57
Original-Change-Id: I4fe670c4362f4ae494f91d69ae105e29ccf3c769
Signed-off-by: Pauli Nieminen <pauli.nieminen@linux.intel.com>
Pauli Nieminen [Tue, 15 Nov 2011 18:33:05 +0000 (20:33 +0200)]
Fix build problem when including hal and egl to same c file
If including hal and egl headers to same c file compilation files
because ANativeWindow type is defined in two headers. In HC egl didn't
include system/core/include/system/window.h which hid the type conflict.
Change-Id: Icaf7b29f913f3d7fa8f6d70bb196585d22e7d05c
Original-Change-Id: Icd37329d80fb4e8b9baf9015c9b00e43ebc4f76b
Signed-off-by: Pauli Nieminen <pauli.nieminen@linux.intel.com>
Jessica Wagantall [Tue, 3 May 2016 18:38:50 +0000 (11:38 -0700)]
Merge tag 'android-6.0.1_r43' into HEAD
Ticket: CYNGNOS-2373
Android 6.0.1 release 43 (MOB30J)
Change-Id: I1d6a9cc67ded5dd7d0ee1f17773e326ac0ae87ce
Christopher N. Hesse [Sun, 24 Apr 2016 17:30:35 +0000 (19:30 +0200)]
surfaceflinger: Add support for Exynos BGRA mixer
Change-Id: Ibc9f784b35a7bd6d8cc6b13ff68b12418cce98c5
Michael Wright [Tue, 22 Mar 2016 23:52:13 +0000 (16:52 -0700)]
Add new MotionEvent flag for partially obscured windows.
Due to more complex window layouts resulting in lots of overlapping
windows, the policy around FLAG_WINDOW_IS_OBSCURED has changed to
only be set when the point at which the window was touched is
obscured. Unfortunately, this doesn't prevent tapjacking attacks that
overlay the dialog's text, making a potentially dangerous operation
seem innocuous. To avoid this on particularly sensitive dialogs,
introduce a new flag that really does tell you when your window is
being even partially overlapped.
We aren't exposing this as API since we plan on making the original
flag more robust. This is really a workaround for system dialogs
since we generally know their layout and screen position, and that
they're unlikely to be overlapped by other applications.
Bug:
26677796
Change-Id: I9e336afe90f262ba22015876769a9c510048fd47
Khalid Zubair [Wed, 20 Apr 2016 21:13:35 +0000 (14:13 -0700)]
sensorservice: fix an invalid format string
Change-Id: Ib41bca95e6be7831c5ce77bceaf6a3d9f8b37d41
Khalid Zubair [Tue, 19 Apr 2016 17:46:48 +0000 (10:46 -0700)]
sensorservice: add power usage to dumpsys
Include each sensor's power usage info in the per-sensor dumpsys
info section.
Change-Id: If10535d1e7fe6a35d9385ce2e6083a4c5188a06d
Jessica Wagantall [Mon, 18 Apr 2016 18:14:35 +0000 (11:14 -0700)]
Merge tag 'android-6.0.1_r30' into HEAD
Ticket: RM-234
Android 6.0.1 release 30
Steve Kondik [Tue, 12 Apr 2016 20:14:26 +0000 (13:14 -0700)]
surfaceflinger: Add support for secondary color matrix
* Add a new binder transaction for applying a secondary color matrix
using RenderEngine. This stacks with the primary color matrix
(if set for a11y) to enable GPU-based display calibration.
Change-Id: I766455bfb5212e2dcc8ad0cb8ebdddbda87af732
Jessica Wagantall [Tue, 5 Apr 2016 19:31:30 +0000 (12:31 -0700)]
Merge tag 'android-6.0.1_r24' into HEAD
Ticket: CYNGNOS-2213
Android 6.0.1 release 24
Dianne Hackborn [Mon, 21 Mar 2016 17:36:54 +0000 (10:36 -0700)]
Fix issue #
27252896: Security Vulnerability -- weak binder
Sending transaction to freed BBinder through weak handle
can cause use of a (mostly) freed object. We need to try to
safely promote to a strong reference first.
Change-Id: Ic9c6940fa824980472e94ed2dfeca52a6b0fd342
(cherry picked from commit
c11146106f94e07016e8e26e4f8628f9a0c73199)
Pablo Ceballos [Wed, 16 Mar 2016 01:10:49 +0000 (18:10 -0700)]
BQ: fix some uninitialized variables
Bug
27555981
Bug
27556038
Change-Id: I436b6fec589677d7e36c0e980f6e59808415dc0e
The Android Automerger [Tue, 22 Mar 2016 22:47:49 +0000 (15:47 -0700)]
merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev