Sean Wan
fb3e63fcc7
am 7869e224
: CW on L: Fix a SIGSEGV crash in sensor service.
...
* commit '7869e224aaaf717b5ab86df00b60fd5be5a0996c':
CW on L: Fix a SIGSEGV crash in sensor service.
2014-07-15 18:50:12 +00:00
Riley Spahn
2f15fa66b4
am 2a0e4094
: Add MAC for remaining service_manager functionality.
...
* commit '2a0e40945b5f7adf2055b2f439b3ba4c6389ddc3':
Add MAC for remaining service_manager functionality.
2014-07-15 18:49:26 +00:00
Sean Wan
7869e224aa
CW on L: Fix a SIGSEGV crash in sensor service.
...
This is to fix b/16189080.
BUG: 16189080
Change-Id: I78d44e82f797c0808891acde609040c46745a0bb
2014-07-15 11:10:44 -07:00
Riley Spahn
2a0e40945b
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.
(cherry picked from commit c67e6307ca
)
Change-Id: Iaf14b21346822a6b544091a0f4a9949117934b9a
2014-07-15 10:11:33 -07: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
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
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
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
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
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
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
Nick Kralevich
7113978314
Merge "service_manager: check binder passed lengths"
2014-07-14 15:58:16 +00:00
Nick Kralevich
7d42a3c31b
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
Change-Id: I78a401d55b84f382ab83911be32b8d501998aa82
2014-07-12 16:34:01 -07:00
Sreeram Ramachandran
224bcea7b4
Remove unnecessary code and APIs.
...
This stuff has been replaced by setNetworkForUser() in NetdClient.
Change-Id: If525ee259b74314191d1913f7c2a3e828e05c38f
2014-07-11 17:43:51 -07:00
Yuncheol Heo
96a68d45f5
Merge "Add HDMI-CEC feature xml."
2014-07-10 21:52:20 +00:00
Yuncheol Heo
ab82390e1f
Add HDMI-CEC feature xml.
...
Change-Id: I51af146550cd72564e89874c867c181326d15f2c
2014-07-11 15:37:33 +09:00
Robin Lee
16cec83a66
am 8098af6e
: am 7c5be65f
: Merge "Rename \'mkuser\' command to \'mkuserconfig\'"
...
* commit '8098af6ea29e9d28a6314d12963cef3107de9c18':
Rename 'mkuser' command to 'mkuserconfig'
2014-07-09 17:36:12 +00:00
Robin Lee
8098af6ea2
am 7c5be65f
: Merge "Rename \'mkuser\' command to \'mkuserconfig\'"
...
* commit '7c5be65f2819bf0328715bc405483788dd7a81f2':
Rename 'mkuser' command to 'mkuserconfig'
2014-07-09 17:31:58 +00:00
Brian Carlstrom
fe91d89b4f
am d441dbc6
: am cbb9d0d7
: Merge "Make dex2oat heap size product configurable [frameworks/native]"
...
* commit 'd441dbc6436dbf8cb13f0b784c7d16f022b7586e':
Make dex2oat heap size product configurable [frameworks/native]
2014-07-09 15:07:38 +00:00
Sreeram Ramachandran
c88da7cc21
resolved conflicts for merge of 928e05b1
to master
...
Change-Id: I1d1e623a1f95baa4375a87242ce71ea789884649
2014-07-09 08:05:04 -07:00
Brian Carlstrom
d441dbc643
am cbb9d0d7
: Merge "Make dex2oat heap size product configurable [frameworks/native]"
...
* commit 'cbb9d0d74008e460963a3c3094f654c50a04a295':
Make dex2oat heap size product configurable [frameworks/native]
2014-07-09 12:36:58 +00:00
Sreeram Ramachandran
928e05b12b
am 0d2bee0c
: Merge "Dump all the correct routing tables."
...
* commit '0d2bee0c0baec56ec98867d7e044602097525248':
Dump all the correct routing tables.
2014-07-09 00:13:15 +00:00
Joe LaPenna
46a86a9bbf
Add ethernet feature xml.
...
BUG: 15143878
Change-Id: I15dbac6a7e73a94960e76669120792724fbd8acb
2014-07-08 11:38:14 -07:00
Nick Kralevich
0830ce19ae
resolved conflicts for merge of 1aa9565c
to master
...
Change-Id: I30582926ab2d2e2b97cb95aaedcd54ba51832aba
2014-07-07 16:27:42 -07:00
Nick Kralevich
1aa9565ce1
am f9cfae24
: Merge "Remove inline access control in service_manager."
...
* commit 'f9cfae24123bae199a07bee2dd1c307906c6e6d0':
Remove inline access control in service_manager.
2014-07-07 23:09:27 +00:00
Brian Carlstrom
cbb9d0d740
Merge "Make dex2oat heap size product configurable [frameworks/native]"
2014-07-07 17:50:18 +00:00
Brian Carlstrom
e46a75a0f6
Make dex2oat heap size product configurable [frameworks/native]
...
Bug: 15919420
Change-Id: I0e629ff4f7541f0dde7380e0dbc8dab1c13df7bd
2014-07-08 15:12:07 -07:00
Sreeram Ramachandran
0d2bee0c0b
Merge "Dump all the correct routing tables."
2014-07-05 03:01:43 +00:00
Sreeram Ramachandran
2b3bba34ae
Dump all the correct routing tables.
...
The list of tables is maintained in /data/misc/net/rt_tables by netd.
Change-Id: I55475c08c5e43bcf61af916210e680c47480ac32
2014-07-08 16:29:45 -07:00