Michael Lentine
659c015d94
Merge "Modified SurfaceFlinger to implment setActiveConfig and getActiveConfig."
2014-07-14 23:51:50 +00:00
Ruben Brunk
01201fb71c
am 8de3c193
: am 2ad9d8a6
: Merge "Add sticky transform to surfaceflinger." into lmp-dev
...
* commit '8de3c193925281ec3ee0aac4089608317405b4ba':
Add sticky transform to surfaceflinger.
2014-07-14 23:29:33 +00:00
Jesse Hall
368b369597
am a7744676
: am b7d559be
: Merge "surfaceflinger: Make all sources depend on Android.mk" into lmp-dev
...
* commit 'a774467619f73654d6e3e94878d880e93da04a32':
surfaceflinger: Make all sources depend on Android.mk
2014-07-14 23:29:33 +00:00
Ruben Brunk
8de3c19392
am 2ad9d8a6
: Merge "Add sticky transform to surfaceflinger." into lmp-dev
...
* commit '2ad9d8a6e71f80b373c3ed0fece26b286d846292':
Add sticky transform to surfaceflinger.
2014-07-14 23:10:58 +00:00
Jesse Hall
a774467619
am b7d559be
: Merge "surfaceflinger: Make all sources depend on Android.mk" into lmp-dev
...
* commit 'b7d559be1f931585c444a54637cd49cda248a8fb':
surfaceflinger: Make all sources depend on Android.mk
2014-07-14 23:10:57 +00:00
Matthew Xie
46c414e7a3
am bdf01e81
: (-s ours) am f3381cf1
: dump bluedroid kernel status do not merge
...
* commit 'bdf01e81c9f30612d1890a498ec9e937c49cff5e':
dump bluedroid kernel status do not merge
2014-07-14 23:04:58 +00:00
Michael Lentine
2651fa9463
Modified SurfaceFlinger to implment setActiveConfig and getActiveConfig.
...
This can be used to change the current display mode of the device.
Change-Id: Icdc3fb58389b861dc77b68102083da6f7a96eccb
Tested: None
2014-07-14 16:03:38 -07:00
Matthew Xie
bdf01e81c9
am f3381cf1
: dump bluedroid kernel status do not merge
...
* commit 'f3381cf1a645f857dccad9a4369ae23054e9d7d4':
dump bluedroid kernel status do not merge
2014-07-14 22:24:21 +00:00
Jesse Hall
fe602f65be
am 987ca0ec
: (-s ours) am b154c42c
: Improve memory coherence management in screenshot code [DO NOT MERGE]
...
* commit '987ca0ecc01b6d98cf371247e37fd5c6300112dd':
Improve memory coherence management in screenshot code [DO NOT MERGE]
2014-07-14 21:49:16 +00:00
Jesse Hall
70c8a5d0ea
am e38f5fc2
: (-s ours) am 24cd98ee
: Compile libsurfaceflinger with Clang and -std=c++11 [DO NOT MERGE]
...
* commit 'e38f5fc2b0326480f74e8914b86afb703c0d4c56':
Compile libsurfaceflinger with Clang and -std=c++11 [DO NOT MERGE]
2014-07-14 21:49:15 +00:00
Nick Kralevich
478171a924
am 2ba30617
: resolved conflicts for merge of 652c4854
to lmp-dev-plus-aosp
...
* commit '2ba30617596dfe91a75348f98f9716c0d72d7671':
service_manager: check binder passed lengths
2014-07-14 21:40:25 +00:00
Jesse Hall
987ca0ecc0
am b154c42c
: Improve memory coherence management in screenshot code [DO NOT MERGE]
...
* commit 'b154c42c39c1499c26d88fff8ca642cd86f91098':
Improve memory coherence management in screenshot code [DO NOT MERGE]
2014-07-14 21:39:12 +00:00
Jesse Hall
e38f5fc2b0
am 24cd98ee
: Compile libsurfaceflinger with Clang and -std=c++11 [DO NOT MERGE]
...
* commit '24cd98eef88ac93f80c327f8d74f0a1ae0aceee4':
Compile libsurfaceflinger with Clang and -std=c++11 [DO NOT MERGE]
2014-07-14 21:39:12 +00:00
Nick Kralevich
2ba3061759
resolved conflicts for merge of 652c4854
to lmp-dev-plus-aosp
2014-07-14 14:35:20 -07:00
Nick Kralevich
63f492dde9
am fa050b96
: am 721fdd3a
: Merge "Add MAC for remaining service_manager functionality."
...
* commit 'fa050b96e15fe63675ab5a01c32ae3b0b5493f65':
Add MAC for remaining service_manager functionality.
2014-07-14 20:55:03 +00:00
Matthew Xie
f3381cf1a6
dump bluedroid kernel status do not merge
...
Change-Id: I4617f770088f86ceda2caf58bd1fdae81b3e31df
(cherry picked from commit ed3b9a0977
)
2014-07-14 20:53:32 +00:00
Nick Kralevich
fa050b96e1
am 721fdd3a
: Merge "Add MAC for remaining service_manager functionality."
...
* commit '721fdd3a6a6851079c1984ea7a8267bdaaf53c80':
Add MAC for remaining service_manager functionality.
2014-07-14 20:46:46 +00:00
Yuncheol Heo
5af1699d83
am c3fec1e6
: am 96a68d45
: Merge "Add HDMI-CEC feature xml."
...
* commit 'c3fec1e6ee776dfc82523c16f422d6d44d2669ab':
2014-07-14 20:06:15 +00:00
Sreeram Ramachandran
502689682e
am b5e85e1d
: am 224bcea7
: Remove unnecessary code and APIs.
...
* commit 'b5e85e1dc16929339d43855afdd48d232a121d08':
2014-07-14 20:06:14 +00:00
Robin Lee
5010a53125
am 71fdeb3f
: am 16cec83a
: am 8098af6e
: am 7c5be65f
: Merge "Rename \'mkuser\' command to \'mkuserconfig\'"
...
* commit '71fdeb3fa2d38881bd0c036c4771f59b4bf6cd0b':
2014-07-14 20:06:13 +00:00
Brian Carlstrom
c4498cd207
am de528b29
: am fe91d89b
: am d441dbc6
: am cbb9d0d7
: Merge "Make dex2oat heap size product configurable [frameworks/native]"
...
* commit 'de528b291b434cfd1432795031b2f329aa9e0c4d':
2014-07-14 20:06:12 +00:00
Sreeram Ramachandran
680ddc07ad
am 5b717fc3
: am c88da7cc
: resolved conflicts for merge of 928e05b1
to master
...
* commit '5b717fc3ef65472e0fef3305790cfa154780db70':
2014-07-14 20:06:12 +00:00
Joe LaPenna
32470cd18d
am aa862d06
: am 46a86a9b
: Add ethernet feature xml.
...
* commit 'aa862d064381e99cac380a87f88c2f69532edc90':
2014-07-14 20:06:11 +00:00
Ben Clayton
d06036ada6
am 352eb9b3
: am 6d96ab19
: Merge "Add data capturing of glCompressedTexImage2D and glCompressedTexSubImage2D calls."
...
* commit '352eb9b3d05bb30f1b2ae9e0b56f0177b147ebd4':
2014-07-14 20:06:10 +00:00
Jesse Hall
b154c42c39
Improve memory coherence management in screenshot code [DO NOT MERGE]
...
The existing code worked in practice, but wasn't quite correct in
theory and relied on implementation details of other code. It's still
somewhat unusual and subtle, but now is correct-in-theory (I believe)
and a little better documented.
Bug: 16044767
Change-Id: I22b01d6640f0b7beca7cbfc74981795a3218b064
(cherry picked from commit c61576794e
)
2014-07-14 19:29:09 +00:00
Jesse Hall
24cd98eef8
Compile libsurfaceflinger with Clang and -std=c++11 [DO NOT MERGE]
...
This is necessary to use C11/C++11 stdlib atomics, which the next
change will do. This change also fixes a couple bits of syntax that
both GCC and Clang refuse to compile in -std=c++11 mode.
Change-Id: Ia14d9d6b537a3bb106c23e19a277e48be180754c
2014-07-14 12:18:00 -07:00
Yuncheol Heo
c3fec1e6ee
am 96a68d45
: Merge "Add HDMI-CEC feature xml."
...
* commit '96a68d45f5f36504130eb4bbb6f3faef3df8b66f':
Add HDMI-CEC feature xml.
2014-07-14 19:10:46 +00:00
Sreeram Ramachandran
b5e85e1dc1
am 224bcea7
: Remove unnecessary code and APIs.
...
* commit '224bcea7b4f8bc0f1edb0c3303d30fedfcabe0f4':
Remove unnecessary code and APIs.
2014-07-14 19:10:45 +00:00
Robin Lee
71fdeb3fa2
am 16cec83a
: am 8098af6e
: am 7c5be65f
: Merge "Rename \'mkuser\' command to \'mkuserconfig\'"
...
* commit '16cec83a6604777ffdf89b72d9fc474f0c0b73b5':
2014-07-14 19:10:44 +00:00
Brian Carlstrom
de528b291b
am fe91d89b
: am d441dbc6
: am cbb9d0d7
: Merge "Make dex2oat heap size product configurable [frameworks/native]"
...
* commit 'fe91d89b4f33f753b8b20049221609af7b552b9d':
2014-07-14 19:10:44 +00:00
Sreeram Ramachandran
5b717fc3ef
am c88da7cc
: resolved conflicts for merge of 928e05b1
to master
...
* commit 'c88da7cc21c61b9ac8fcac11aa812f647ffb181c':
2014-07-14 19:10:43 +00:00
Joe LaPenna
aa862d0643
am 46a86a9b
: Add ethernet feature xml.
...
* commit '46a86a9bbf31fafc7ab635b9503c77f329a2f445':
Add ethernet feature xml.
2014-07-14 19:10:43 +00:00
Ben Clayton
352eb9b3d0
am 6d96ab19
: Merge "Add data capturing of glCompressedTexImage2D and glCompressedTexSubImage2D calls."
...
* commit '6d96ab194a278d4e06ce3e9a26a5658f3992e91c':
Add data capturing of glCompressedTexImage2D and glCompressedTexSubImage2D calls.
2014-07-14 19:10:42 +00:00
Nick Kralevich
21c160c055
am c5496b6c
: am 71139783
: Merge "service_manager: check binder passed lengths"
...
* commit 'c5496b6c1fc25bb72654fff99936a7e150358a7c':
service_manager: check binder passed lengths
2014-07-14 18:52:55 +00:00
Jesse Hall
b7d559be1f
Merge "surfaceflinger: Make all sources depend on Android.mk" into lmp-dev
2014-07-14 18:38:02 +00:00
Jesse Hall
e9b23b6588
surfaceflinger: Make all sources depend on Android.mk
...
This forces all SurfaceFlinger sources to be recompiled when the
Makefile changes; that's overkill sometimes but makes sure everything
gets recompiled when compile options (or similar) changes.
Change-Id: I2b3c3090fc1c35078e13c77fbb1a78d447c39158
2014-07-14 15:32:59 -07:00
Ruben Brunk
2ad9d8a6e7
Merge "Add sticky transform to surfaceflinger." into lmp-dev
2014-07-14 18:37:51 +00:00
Ruben Brunk
1681d95989
Add sticky transform to surfaceflinger.
...
Bug: 15116722
- Adds a sticky transform field that can be set from a
SurfaceFlinger client Surface. This transform is
added to any transform applied to the Surface.
Change-Id: Idaa4311dfd027b2d2b8ea5e2c6cba2da5779d753
2014-07-14 22:14:32 +00:00
Nick Kralevich
c5496b6c1f
am 71139783
: Merge "service_manager: check binder passed lengths"
...
* commit '7113978314a217f1fd2c1dd3d9bc25f516fb71a8':
service_manager: check binder passed lengths
2014-07-14 18:18:04 +00:00
Robin Lee
c5984d7950
am 6729f6a7
: am 7c5be65f
: Merge "Rename \'mkuser\' command to \'mkuserconfig\'"
...
* commit '6729f6a76e73952b65b5867c9128f35af83daa89':
2014-07-14 18:07:54 +00:00
Brian Carlstrom
f5969939a8
am bd7db85c
: am cbb9d0d7
: Merge "Make dex2oat heap size product configurable [frameworks/native]"
...
* commit 'bd7db85c26aa5a80305ff53ecb18b490f0913815':
2014-07-14 18:07:53 +00:00
Sreeram Ramachandran
3b6c705157
am a055fd35
: resolved conflicts for merge of 0d2bee0c
to lmp-dev-plus-aosp
...
* commit 'a055fd358bd64f5d49e7957fc8aeb83b170787e9':
2014-07-14 18:01:55 +00:00
Robin Lee
6729f6a76e
am 7c5be65f
: Merge "Rename \'mkuser\' command to \'mkuserconfig\'"
...
* commit '7c5be65f2819bf0328715bc405483788dd7a81f2':
Rename 'mkuser' command to 'mkuserconfig'
2014-07-14 17:48:25 +00:00
Brian Carlstrom
bd7db85c26
am cbb9d0d7
: Merge "Make dex2oat heap size product configurable [frameworks/native]"
...
* commit 'cbb9d0d74008e460963a3c3094f654c50a04a295':
Make dex2oat heap size product configurable [frameworks/native]
2014-07-14 17:48:23 +00:00
Sreeram Ramachandran
a055fd358b
resolved conflicts for merge of 0d2bee0c
to lmp-dev-plus-aosp
...
Change-Id: If782ce04be50e2154cec232c9e9d60fe38f41831
2014-07-14 10:45:26 -07:00
Nick Kralevich
652c485467
service_manager: check binder passed lengths
...
1) Pass length through to str8 function.
2) Fix implicit function definition warning.
3) Check for NULL from bio_get_string16 functions.
Bug: 15886919
Bug: 15888753
(cherry picked from commit 7d42a3c31b
)
Change-Id: I1f826b88826561ea126d811c087ba30623141511
2014-07-14 10:19:55 -07:00
Nick Kralevich
721fdd3a6a
Merge "Add MAC for remaining service_manager functionality."
2014-07-14 17:12:08 +00:00
Riley Spahn
c67e6307ca
Add MAC for remaining service_manager functionality.
...
Add SELinux MAC for the list and find functionality
to service_manager. By default the list action uses
the service_manager_type attribute as its target
object.
Change-Id: I7630f21a9f3232ae3d6d8b9a1119230b40899aef
2014-07-14 12:35:23 -07:00
Matthew Xie
a38cf5e97e
Merge "dump bluedroid kernel status"
2014-07-14 16:02:26 +00:00
Nick Kralevich
7113978314
Merge "service_manager: check binder passed lengths"
2014-07-14 15:58:16 +00:00