Arun Kumar K.R
81c57b3149
SurfaceFlinger: Disable rotation animation on Secondary displays
...
- Add support to set animating layer for HWCLayers
- After hwc_prepare, dont override the compType of a layer to
HWC_FRAMEBUFFER if its for non-primary displays
Change-Id: Iac462778ce5fb9016290846146e62f80dcfafd5c
CRs-fixed: 922304
2015-10-26 14:20:43 -07:00
Ethan Chen
846c7e9329
input: Disable debug again
...
Change-Id: I3adadd69b8b3a42bcb384cac7ccff98ef0ca9c65
2015-10-26 13:58:49 -07:00
Nick Kralevich
fd84a642ff
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
am: 574145ea31
...
am: 5ce90247a2
* commit '5ce90247a20536091505b449a4d386c21034d842':
DO NOT MERGE: fix build try #2
2015-10-23 21:40:03 +00:00
Nick Kralevich
5ce90247a2
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
...
am: 574145ea31
* commit '574145ea31171a80c45f86eb231f55a2106826c4':
DO NOT MERGE: fix build try #2
2015-10-23 21:35:13 +00:00
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
* commit 'bce101e79b5ee9715a8329db8fd760f7ba829de1':
DO NOT MERGE: fix build try #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
* commit '0c11f9918c6f834f12d97315ef0247c08f8fef63':
Maintain Parcel ABI
Revert "Revert "Track ashmem memory usage in Parcel""
2015-10-23 17:32:40 +00:00
Adrian Roos
0c11f9918c
Merge changes from topic \'parcel-v2\' into mnc-dr-dev
...
am: cf33d50d25
* commit 'cf33d50d25c5660bf1d4325c11433fb281bc31cb':
Maintain Parcel ABI
Revert "Revert "Track ashmem memory usage in Parcel""
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
-s ours
* commit '1d94a1d036cb4bc8d9b178f56fa3bbddc81b7f10':
DO NOT MERGE: fix build try #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
* commit 'a2685ebb1ec5ed523fb4800d2593f2ae0c10ed22':
DO NOT MERGE: fix build try #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
* commit '6eac97d4baf77954c7d862e7bf35ed3763543491':
DO NOT MERGE: fix build breakage
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
-s ours
* commit 'dbc9a478311e8728c8148a80abb103fca697891d':
DO NOT MERGE: fix build try #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
* commit '928a4879e4a2b996bccf007d390f7f2719e9a901':
add number constraint for samples per MotionEvent
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
* commit '18e7c64ea82e002978ef069884d195e02e7302df':
DO NOT MERGE: fix build breakage
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
* commit '711c7becb01eec79d8335f335fab6e00a9164b00':
add number constraint for samples per MotionEvent
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
* commit '0370a03b6e74e40d5110b83fed2243bf072aee73':
DO NOT MERGE: fix build breakage
2015-10-23 04:19:58 +00:00
Nick Kralevich
dbc9a47831
DO NOT MERGE: fix build try #2 am: 778b6f4902
...
am: 034bc1799c
-s ours
* commit '034bc1799cbbc4184aa507eba181573c0a3b9b35':
DO NOT MERGE: fix build try #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
* commit 'a82ace99f76ed815e16ab64eae2e9e55871a8b8f':
add number constraint for samples per MotionEvent
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
* commit '1b28b05d2edf11f49717b53cd49a9161892f0388':
DO NOT MERGE: fix build breakage
2015-10-23 04:15:24 +00:00
Nick Kralevich
034bc1799c
DO NOT MERGE: fix build try #2
...
am: 778b6f4902
* commit '778b6f4902ad824d5fc62071caaa837bb47deee5':
DO NOT MERGE: fix build try #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
* commit '9ec978732f8dd82e7adef3e37097eaca3fbd65f0':
DO NOT MERGE: fix build breakage
2015-10-23 02:02:42 +00:00
Nick Kralevich
9ec978732f
resolve merge conflicts of 834ac204ce
to klp-modular-dev. am: 7f1ea80d65
...
am: fa632f6ad7
* commit 'fa632f6ad7be6b1f488dd3d1b825a82456db5097':
DO NOT MERGE: fix build breakage
2015-10-23 01:52:34 +00:00
Nick Kralevich
fa632f6ad7
resolve merge conflicts of 834ac204ce
to klp-modular-dev.
...
am: 7f1ea80d65
* commit '7f1ea80d65996ab687ff56a884da915535cdc176':
DO NOT MERGE: fix build breakage
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
.
Bug: 25004154
Change-Id: I9b432d1ebc39f3bbcd7afdefc403f0fb6ced8158
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
* commit '159a5c337250613c166ae45b2811861f70c733bd':
Revert "Track ashmem memory usage in Parcel"
2015-10-22 22:33:58 +00:00
Ian Pedowitz
159a5c3372
Revert "Track ashmem memory usage in Parcel"
...
am: 6880307e8e
* commit '6880307e8e35a6c484942443fb4ddd6173126152':
Revert "Track ashmem memory usage in Parcel"
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
* commit '9830f11dc6b6aa4001c79147966fdb9eaa71c2f2':
add number constraint for samples per MotionEvent
2015-10-22 22:28:01 +00:00
Ian Pedowitz
6880307e8e
Revert "Track ashmem memory usage in Parcel"
...
This reverts commit e2f499fb73
.
Bug: 25169267
Bug: 25191602
Bug: 25004154
Change-Id: I24bb0da4e8739ee5a0c251e4adac9904827144e0
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
* commit '90dc6dc825ebd1f0f4c9474fad887cd7eac8e9bd':
add number constraint for samples per MotionEvent
2015-10-22 02:15:13 +00:00
Flanker
90dc6dc825
add number constraint for samples per MotionEvent am: 5d17838ade
am: 72c8ca4a01
...
am: 9964d83869
* commit '9964d83869565cf4dda432129cfe50f6ede19338':
add number constraint for samples per MotionEvent
2015-10-22 02:10:12 +00:00
Flanker
9964d83869
add number constraint for samples per MotionEvent am: 5d17838ade
...
am: 72c8ca4a01
* commit '72c8ca4a0191827fd3265c0820b685a6cf420be1':
add number constraint for samples per MotionEvent
2015-10-22 02:04:55 +00:00
Flanker
72c8ca4a01
add number constraint for samples per MotionEvent
...
am: 5d17838ade
* commit '5d17838adef13062717322e79d4db0b9bb6b2395':
add number constraint for samples per MotionEvent
2015-10-22 02:02:46 +00:00
Adrian Roos
cb09f2c82f
Track ashmem memory usage in Parcel am: e2f499fb73
...
am: a0c1be2617
* commit 'a0c1be26177d554ef9c5d61b8a564bb03d402a04':
Track ashmem memory usage in Parcel
2015-10-22 00:52:32 +00:00
Adrian Roos
a0c1be2617
Track ashmem memory usage in Parcel
...
am: e2f499fb73
* commit 'e2f499fb734bc30a1e1c947112caa0727349b6ed':
Track ashmem memory usage in Parcel
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
)
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