Nick Kralevich
574145ea31
DO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c -s ours am: dbc9a47831 -s ours am: a2685ebb1e am: 1d94a1d036 -s ours
...
am: bce101e79b#2
2015-10-23 21:22:14 +00:00
Adrian Roos
bcc709b94d
Merge changes from topic \'parcel-v2\' into mnc-dr-dev am: cf33d50d25
...
am: 0c11f9918c
2015-10-23 17:32:40 +00:00
Adrian Roos
0c11f9918c
Merge changes from topic \'parcel-v2\' into mnc-dr-dev
...
am: cf33d50d25
2015-10-23 17:28:42 +00:00
Adrian Roos
cf33d50d25
Merge changes from topic 'parcel-v2' into mnc-dr-dev
...
* changes:
Maintain Parcel ABI
Revert "Revert "Track ashmem memory usage in Parcel""
2015-10-23 17:21:23 +00:00
Nick Kralevich
bce101e79b
DO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c -s ours am: dbc9a47831 -s ours am: a2685ebb1e
...
am: 1d94a1d036#2
2015-10-23 04:36:16 +00:00
Nick Kralevich
1d94a1d036
DO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c -s ours am: dbc9a47831 -s ours
...
am: a2685ebb1e#2
2015-10-23 04:32:47 +00:00
Nick Kralevich
69b8174c5e
resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7 am: 9ec978732f am: 1b28b05d2e am: 0370a03b6e am: 18e7c64ea8
...
am: 6eac97d4ba
2015-10-23 04:26:07 +00:00
Nick Kralevich
a2685ebb1e
DO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c -s ours
...
am: dbc9a47831#2
2015-10-23 04:26:03 +00:00
Flanker
cd9aad3a95
add number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a01 am: 9964d83869 am: 90dc6dc825 am: 9830f11dc6 am: a82ace99f7 am: 711c7becb0
...
am: 928a4879e4
2015-10-23 04:26:03 +00:00
Nick Kralevich
6eac97d4ba
resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7 am: 9ec978732f am: 1b28b05d2e am: 0370a03b6e
...
am: 18e7c64ea8
2015-10-23 04:23:35 +00:00
Flanker
928a4879e4
add number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a01 am: 9964d83869 am: 90dc6dc825 am: 9830f11dc6 am: a82ace99f7
...
am: 711c7becb0
2015-10-23 04:23:24 +00:00
Nick Kralevich
18e7c64ea8
resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7 am: 9ec978732f am: 1b28b05d2e
...
am: 0370a03b6e
2015-10-23 04:19:58 +00:00
Nick Kralevich
dbc9a47831
DO NOT MERGE: fix build try #2 am: 778b6f4902
...
am: 034bc1799c#2
2015-10-23 04:19:51 +00:00
Flanker
711c7becb0
add number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a01 am: 9964d83869 am: 90dc6dc825 am: 9830f11dc6
...
am: a82ace99f7
2015-10-23 04:19:51 +00:00
Nick Kralevich
0370a03b6e
resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7 am: 9ec978732f
...
am: 1b28b05d2e
2015-10-23 04:15:24 +00:00
Nick Kralevich
034bc1799c
DO NOT MERGE: fix build try #2
...
am: 778b6f4902#2
2015-10-23 04:15:21 +00:00
Nick Kralevich
1b28b05d2e
resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7
...
am: 9ec978732f
2015-10-23 02:02:42 +00:00
Nick Kralevich
9ec978732f
resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65
...
am: fa632f6ad7
2015-10-23 01:52:34 +00:00
Nick Kralevich
fa632f6ad7
resolve merge conflicts of 834ac204ce to klp-modular-dev.
...
am: 7f1ea80d65
2015-10-23 01:44:26 +00:00
Adrian Roos
6bb3114246
Maintain Parcel ABI
...
Makes sure we don't change the memory layout of the Parcel class
to maintain binary compatibility with prebuilts linking against
libbinder.
Bug: 25004154
Change-Id: I656687497f08bb85cefda796aafa2341e601e30a
2015-10-22 17:48:16 -07:00
Adrian Roos
cbf3726357
Revert "Revert "Track ashmem memory usage in Parcel""
...
This reverts commit 6880307e8e
2015-10-22 17:47:27 -07:00
Nick Kralevich
7f1ea80d65
resolve merge conflicts of 834ac204ce to klp-modular-dev.
...
Bug: 23905002
Change-Id: Ic7262861af91a8fff27692c0f68761cb3ab12aa3
2015-10-22 17:26:28 -07:00
Ian Pedowitz
7a2643cd77
Revert "Track ashmem memory usage in Parcel" am: 6880307e8e
...
am: 159a5c3372
2015-10-22 22:33:58 +00:00
Ian Pedowitz
159a5c3372
Revert "Track ashmem memory usage in Parcel"
...
am: 6880307e8e
2015-10-22 22:32:07 +00:00
Flanker
a82ace99f7
add number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a01 am: 9964d83869 am: 90dc6dc825
...
am: 9830f11dc6
2015-10-22 22:28:01 +00:00
Ian Pedowitz
6880307e8e
Revert "Track ashmem memory usage in Parcel"
...
This reverts commit e2f499fb73
2015-10-22 22:09:16 +00:00
Nick Kralevich
778b6f4902
DO NOT MERGE: fix build try #2
...
On klp-dev, UINT16_MAX isn't available unless __STDINT_LIMITS
is defined, which it's not for this code. This isn't relevant
for later branches due to bionic commit
e2a292d278b94fec3d078b1f1b27c1f89942c276
Don't use UINT16_MAX when we can just hardcode 65535.
Bug: 23905002
Change-Id: Ia1fd0f749cb7a4d19866075abc28ed6960424e54
2015-10-22 14:50:53 -07:00
Nick Kralevich
834ac204ce
DO NOT MERGE: fix build breakage
...
fix klp-dev only build breakage.
frameworks/native/libs/input/Input.cpp: In member function 'android::status_t android::MotionEvent::readFromParcel(android::Parcel*)':
frameworks/native/libs/input/Input.cpp:494:47: error: 'UINT16_MAX' was not declared in this scope
Bug: 23905002
Change-Id: I4b6b864ca64d39a8873d045a61e0ddaea2ab9109
2015-10-22 07:09:23 -07:00
Flanker
9830f11dc6
add number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a01 am: 9964d83869
...
am: 90dc6dc825
2015-10-22 02:15:13 +00:00
Flanker
90dc6dc825
add number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a01
...
am: 9964d83869
2015-10-22 02:10:12 +00:00
Flanker
9964d83869
add number constraint for samples per MotionEvent am: 5d17838ade
...
am: 72c8ca4a01
2015-10-22 02:04:55 +00:00
Flanker
72c8ca4a01
add number constraint for samples per MotionEvent
...
am: 5d17838ade
2015-10-22 02:02:46 +00:00
Adrian Roos
cb09f2c82f
Track ashmem memory usage in Parcel am: e2f499fb73
...
am: a0c1be2617
2015-10-22 00:52:32 +00:00
Adrian Roos
a0c1be2617
Track ashmem memory usage in Parcel
...
am: e2f499fb73
2015-10-22 00:49:15 +00:00
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
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
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
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
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
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
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
2015-10-17 13:56:31 -07:00
