Naseer Ahmed
b9127bdbe3
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: I8fae1b5564fbea598e415a86b0a21c3449c92d87
2015-11-07 01:21:36 -08:00
Linux Build Service Account
ea9f37a30c
Merge "native: add ambient temperature & relative humidity sensor features"
2015-11-06 07:35:38 -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
Satya Durga Srinivasu Prabhala
84f1b431b2
native: add ambient temperature & relative humidity sensor features
...
Adding ambient temperature & relative humidity hardware sensor
features as they are missing and causing CTS failures.
Change-Id: I4f07db8e77cb77c5b2c1bb7ed80a26f68c91c23e
2015-11-04 12:28:21 -08:00
Steve Kondik
5e78568dab
Merge branch 'LA.BF64.1.2.2_rb4.6' of git://codeaurora.org/platform/frameworks/native into cm-13.0
2015-11-04 10:26:51 -08:00
Ricardo Cerqueira
60c26d1f27
Android 6.0.0 release 5
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEABECAAYFAlYyZAgACgkQ6K0/gZqxDng/ZgCfUJK3qqr1BvYmWlGZsQ4+taVP
6NEAnRLWjoF9kSyraCa/VG+w2tUrS80Y
=xUfb
-----END PGP SIGNATURE-----
Merge tag 'android-6.0.0_r5' into cm-13.0
Android 6.0.0 release 5
2015-11-03 23:27:50 +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
Christopher N. Hesse
f3f3949b32
binder: MemoryHeapIon: fix unused parameters
...
Using the __attribute__((unused)) preprocessor directive
Change-Id: I29d27fd7eacb962ffa06ccd81ee48b48f3743243
(cherry picked from commit 047c69bb8e17eab6f3432fae200fe94f7e119755)
2015-11-02 17:30:14 +01: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
Manoj Kumar AVM
f8ea9b5796
sf: vds: Avoid HWC for certain scenarios
...
Reserve HWC for VDS for WFD use case. During WFD usecase, sink usage
will contain GRALLOC_USAGE_PRIVATE_WFD flag.
When HWC is avoided, all virtual displays are composed using GLES.
This means that GLES composes directly into the sink buffer and
signals the consumer. Furthermore, it is expected that any color
conversion will be handled on the consumer side.
CRs-Fixed: 908380
Change-Id: I93ff54c79ece788b6caf3f4172835d8ac1362f62
2015-11-02 08:15:21 -08:00
Praveen Chavan
c784dfc39f
libgui: assign handle to NULL after free
...
to avoid use-after-free situations
Change-Id: If9c09f509bc55795856302e5ca34470df019c622
2015-10-31 03:19:42 -07:00
Ricardo Cerqueira
d15d2252b0
installd: Run all of the appt setup operations in the child process
...
Change-Id: Ifc18741380d7f922540d04ef622f17edfd87dbdf
2015-10-30 18:36:57 +00:00
Peng Xu
e4db21f4b8
Merge "Avoiding flush on-change sensors at subscription" into mnc-dr-dev am: a78c2e65e1
...
am: ffb07f645e
2015-10-29 16:46:18 +00:00
d34d
716c2cf34a
installd: Call pipe() before forking
...
Change-Id: Ideef9387c503a25dadb2afb4e4b394a2e61cd8e9
2015-10-28 18:35:09 -07:00
d34d
66a1d0d715
installd: Use -f (force overwrite) for aapt
...
When re-creating resource apks for themes, aapt will fail if the
apk already exists unless we use -f
Change-Id: If2c3a634aa3ca061009aa6892530d643f8f67e9f
2015-10-28 14:11:01 -07:00
Peng Xu
ffb07f645e
Merge "Avoiding flush on-change sensors at subscription" into mnc-dr-dev
...
am: a78c2e65e1
2015-10-27 22:31:50 +00:00
Peng Xu
a78c2e65e1
Merge "Avoiding flush on-change sensors at subscription" into mnc-dr-dev
2015-10-27 22:23:21 +00:00
Peng Xu
20483c4937
Avoiding flush on-change sensors at subscription
...
Initial sensor flush at subscription is a mechanism to avoid sensors
to get stale samples before subscription happens. However, there is a
slight chance that a most recent sample will be lost during the flush
process. This is OK for continuous sensors but problematic in
on-change sensor as on-change event does not come continuously and
a lost event can cause inconsistent state in client. Flush at
subscription of on-change sensor is disabled in this CL to avoid new
important on-change event to be discarded during the initial flush
process.
Bugs: b/24647069
b/25241873
b/24804819
Change-Id: Ibda099c6b9f5fb6e200f13cf13a850b0026e9e7c
2015-10-27 21:46:40 +00:00
d34d
2a7b426c03
Themes: Restructure resource cache [2/2]
...
Change-Id: Ib62081e0551e572680b92c0a587bdc7bbee9b62b
2015-10-26 18:34:55 -07:00
Clark Scheff
ea0c03875f
Themes: Port to CM13 [2/3]
...
Themes: Forward port installd
Id: I5c03bdca30d55f252d486ddac0355f41623ba8d5
Themes: Remove legacy theme support
Id: I6823a6f2735f07f8e4a25a9c0f6f297577a554ab
Access Themed ResTables from compiled theme apk [2/2]
Before this patch the ResTable for a theme/app was created and
accessed seperate from the compiled APK. Since the compiled APK
has its own copy of the resources.arsc, we can just reuse the table
in the APK instead
Id: Ib7916eba5663db5d077d33fc02623748e8a9f10c
Send target sdk version to aapt [2/2]
If vector drawables are used in a theme we must have a minSdkVersion of 21 passed
to aapt or else aapt will Segfault.
Id: Ib5ffa6d12c91d465f3a603e03b09ab03b02715c7
Change-Id: Ie14322b7efb40b270abd3d4ca1b7c5f97bf4b5ca
2015-10-26 16:00:55 -07:00
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#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#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#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
