Jessica Wagantall
2ab013db02
Android 6.0.1 Release 61 (MOB30Z)
...
-----BEGIN PGP SIGNATURE-----
iEYEABECAAYFAlefxC4ACgkQ6K0/gZqxDngITwCeMdmdcGa6c+PuQ9bNxd6MfVYf
/nIAoIItBcjf6ZMHmwfz7OZZQ1ixeszf
=IRN9
-----END PGP SIGNATURE-----
Merge tag 'android-6.0.1_r61' into HEAD
Android 6.0.1 Release 61 (MOB30Z)
Change-Id: I581a4bc571ffe74fe33956018ffd93df05263755
2016-08-02 11:37:44 -07:00
Pablo Ceballos
3bcf0caa8c
Add FrameStats default constructor
...
Bug 28592402
Change-Id: I857e46c9ab3ffae0d96923d665d13a4128a6cafa
2016-06-23 15:06:26 -07:00
Jessica Wagantall
508eb7749a
Android 6.0.1 release 46
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEABECAAYFAldVtQ8ACgkQ6K0/gZqxDnhIVgCfWRMpjlr3RQ8yoizXrd1JT2e8
M6kAn2lFAPOBl7D6M28oTaPBQpLrZMdF
=kdz+
-----END PGP SIGNATURE-----
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
2016-06-07 10:10:09 -07:00
Michael Wright
03a53d1c77
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
2016-04-21 19:11:18 -07:00
Steve Kondik
a98331d1ae
Android 6.0.1 release 22
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEABECAAYFAlbd4TYACgkQ6K0/gZqxDnjOhgCfYccuq5Zsd00z9ml+jdBXyBqa
WQwAnRujr2d4u9bKGKGcUbAJC54CXsM9
=YI3s
-----END PGP SIGNATURE-----
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/frameworks/native into cm-13.0
Android 6.0.1 release 22
2016-03-10 18:17:45 -08:00
Prashant Malani
d983fd11d4
Revert "inputflinger: Initial support for rotary encoders."
...
This reverts commit ac72bbf4e4
2016-01-13 01:00:25 -08:00
Abhisek Devkota
8af4e664d9
Revert "Revert "gui: only support tertiary display if QTI_BSP is defined""
...
This reverts commit fd95bb1c24
2016-01-09 17:50:43 -08:00
Abhisek Devkota
fd95bb1c24
Revert "gui: only support tertiary display if QTI_BSP is defined"
...
This reverts commit cbd3e07921
2016-01-07 21:29:13 -08:00
Abhisek Devkota
cbd3e07921
gui: only support tertiary display if QTI_BSP is defined
...
Non-caf display HALs crap out with this
Change-Id: I9db8a74e262e674335cd993a5365e05d3715d1e8
2015-12-20 17:22:49 -08:00
forkbomb
7cacf26abb
libbinder: allow devices to disable ashmem size tracking
...
The addition of ashmem size tracking can lead to parcel objects
overwriting other values on the stack in old binary blobs.
Change-Id: Ife8514be1ba639c4061de38b59794c46bcc2d7f8
2015-12-10 10:15:49 +11:00
Prashant Malani
68fca5a176
Merge "inputflinger: Initial support for rotary encoders." into cw-e-dev
2015-12-08 01:27:17 +00:00
Steve Kondik
4951bcc16e
Android 6.0.1 release 3
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEABECAAYFAlZmBAkACgkQ6K0/gZqxDnhgbQCdFLtubCHWtlKUuIEKAVwzv2M3
2jMAoI4UhN3nLb2Nf6BizcMSF3xo1pKO
=NS5T
-----END PGP SIGNATURE-----
Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/frameworks/native into cm-13.0
Android 6.0.1 release 3
Change-Id: I437aaf148d440a8144afe1454948980fc3b40cca
2015-12-07 17:07:16 -08:00
forkbomb
53602ffde5
libbinder: allow devices to disable ashmem size tracking
...
The addition of ashmem size tracking can lead to parcel objects
overwriting other values on the stack in old binary blobs.
Change-Id: Ida52cec851a6f9d5a57c8f9130a5875c03dcb094
2015-12-04 15:42:51 +11:00
Ben Fennema
8c3e55f414
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
...
This reverts commit d4db70a7b8
2015-12-02 01:04:40 +00:00
Jani Suonpera
d4db70a7b8
DO NOT MERGE ANYWHERE Add new interface for sensor physical data
...
This is special solution only for emerald branch.
Changes including new const char* value/interface for sensor physical data. Sensor service and manager does not take care of content, structure or other
details of string. Sensor HAL is taking care of parsing data from string and setting values to Sensor HW.
Change-Id: I3abc3ddc7c6adc4b32a40b9a43f2a94c5af7b2b0
Signed-off-by: Ben Fennema <fennema@google.com>
2015-11-30 21:27:27 -08:00
Lajos Molnar
8abb053a2e
Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev am: f1de4547c1
...
am: 37b8c1f77c
2015-11-13 00:11:57 +00:00
Lajos Molnar
37b8c1f77c
Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev
...
am: f1de4547c1
2015-11-13 00:07:04 +00:00
Lajos Molnar
f1de4547c1
Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev
2015-11-13 00:00:19 +00:00
Byunghun Jeon
987034b563
SurfaceFlinger: Native changes to add blur effect
...
Native changes to add blur-behind and blur mask effect
Change-Id: I54faf82d750e8299de6d261f6a893ab26d08df84
SurfaceFlinger: Adding template for LayerBlur files
Change-Id: I444009113b7bdd6c5284863fd1f56358e67d9fe6
SurfaceFlinger: Featurize libuiblur module for OSS build
Change-Id: Ifdc176e699434125d17b111c044b8ba954cf717c
2015-11-08 01:07:13 -08:00
Ricardo Cerqueira
1cdd1b5ad2
Android 6.0.0 release 26
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEABECAAYFAlYxAgIACgkQ6K0/gZqxDnjCqACfbBT6VOiUFQvRn7w1SAa+4rjF
1IwAn2rBUqWo0dOKVwF1DDfFmGZXc8SB
=1BqV
-----END PGP SIGNATURE-----
Merge tag 'android-6.0.0_r26' into HEAD
Android 6.0.0 release 26
Conflicts:
include/android/input.h
Change-Id: Ifa374c6d3055be3b8a5d60967f8b4c0043da739b
2015-11-05 01:41:42 +00:00
Roman Birg
4dcf7868e3
update app ops
...
Change-Id: Id189866c1868e6340b1b01ca94c06983fbcc242d
Signed-off-by: Roman Birg <roman@cyngn.com>
2015-11-02 11:51:17 -08:00
codeworkx
af2d946f2d
binder: Squashed commit of MemoryHeapBaseIon
...
Source:
http://git.insignal.co.kr/samsung/exynos/android/platform/frameworks/native/commit/?h=exynos-jb&id=dc4cd25cc41e4358debd0c7d1a2706d208a58df6
Change-Id: Ib06cc37a2a25c78a061ee2bad48eec2d01b07833
binder: update MemoryHeapIon
* Update from ODROID-XU 09232013 BSP release
Change-Id: I5245c8a9f783e8902bf91a0ee23e60ebeb335b27
binder: update MemoryHeapIon
* Update from ODROID-XU 04212014 BSP
Change-Id: Ifc2664bcde37a71d855e05e7c9e50288a4508892
binder: Fixed new CM SLSI build variant
Change-Id: Icfff592cf705af660c7318b08fce75dbbf42103c
(cherry picked from commit 014ad5eee0a7de70c4a9f66e8f5ce7b32f4ecb16)
2015-11-02 17:29:40 +01: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
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
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
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
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
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
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
a0c1be2617
Track ashmem memory usage in Parcel
...
am: e2f499fb73
2015-10-22 00:49:15 +00:00
Adrian Roos
e2f499fb73
Track ashmem memory usage in Parcel
...
Bug: 25004154
Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc
2015-10-21 22:32:35 +00: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
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
Ethan Chen
bd33987d72
Add GESTURE_SENSOR input source
...
Change-Id: If61a7e7bf2d8b2665db7ca57ed68a4462d0c1783
2015-10-17 13:53:53 -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
2015-10-16 14:45:10 -07:00
Ricardo Cerqueira
e3fc10fbb7
exynos4: getphys implementation on buffermanager for samsung omx
...
Change-Id: I73d9633e1a7b3316ede28dd1369f8f069609cbb0
2015-10-15 11:35:09 -07: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
