Commit graph

30601 commits

Author SHA1 Message Date
TreeHugger Robot
6048d9db5f Merge "storaged: track fsync calls" 2017-03-03 20:12:21 +00:00
Courtney Goeltzenleuchter
523b1549bb Merge "Add dataspace to match upstream EGL extension" 2017-03-03 14:44:08 +00:00
Alex Klyubin
753cc4d810 Merge "Include correct type of SELinux policy" am: 0ab93fdf3a am: 18a826024b
am: b049bdc72a

Change-Id: I5a4b6bb22a62ca8bff45ac81b116ae2fe7896613
2017-03-03 04:02:17 +00:00
Alex Klyubin
b049bdc72a Merge "Include correct type of SELinux policy" am: 0ab93fdf3a
am: 18a826024b

Change-Id: I1f6da6ef96992bd46dde751da92a4e4063616758
2017-03-03 03:59:46 +00:00
Alex Klyubin
18a826024b Merge "Include correct type of SELinux policy"
am: 0ab93fdf3a

Change-Id: I2e82f03f15767296004acee2b04887888f849e6e
2017-03-03 03:55:40 +00:00
Treehugger Robot
0ab93fdf3a Merge "Include correct type of SELinux policy" 2017-03-03 03:50:49 +00:00
Jin Qian
e83a6107c7 storaged: track fsync calls
Change-Id: Ibdb6a1703245a5de04cb4a2ee5b8ecfbed8b86fc
2017-03-02 16:16:54 -08:00
Keun-young Park
5e0a9a37ff Merge "use ro.persistent_properties.ready for persistent props ready" am: 22cc398d76 am: 37bdcfcbdb
am: 6ca378ba56

Change-Id: I46264839055316ee88decfd6081e6548557bd3e6
2017-03-02 22:48:52 +00:00
Keun-young Park
6ca378ba56 Merge "use ro.persistent_properties.ready for persistent props ready" am: 22cc398d76
am: 37bdcfcbdb

Change-Id: Ifebdb2473b434e489d7b516820a5f9ce3837178c
2017-03-02 22:46:29 +00:00
Keun-young Park
37bdcfcbdb Merge "use ro.persistent_properties.ready for persistent props ready"
am: 22cc398d76

Change-Id: Iead2f1ea10b5293ebb177292802e551e3e55bd58
2017-03-02 22:43:50 +00:00
Keun-young Park
22cc398d76 Merge "use ro.persistent_properties.ready for persistent props ready" 2017-03-02 22:41:30 +00:00
Alex Klyubin
b51f9abf45 Include correct type of SELinux policy
This makes the build system include split SELinux policy (three CIL
files and the secilc compiler needed to compile them) if
PRODUCT_FULL_TREBLE is set to true. Otherwise, the monolitic SELinux
policy is included.

Split policy currently adds around 400 ms to boot time (measured on
marlin/sailfish and bullhead) because the policy needs to be compiled
during boot. This is the main reason why we include split policy only
on devices which require it.

Test: Device boots, no additional SELinux denials. This test is
      performed on a device with PRODUCT_FULL_TREBLE set to true, and
      on a device with PRODUCT_FULL_TREBLE set to false.
Test: Device with PRODUCT_FULL_TREBLE set to true contains secilc and
      the three *.cil files, but does not contain the sepolicy file.
      Device with PRODUCT_FULL_TREBLE set to false contains sepolicy
      file but does not contain the secilc file or any *.cil files.
Bug: 31363362

Change-Id: I419aa35bad6efbc7f936bddbdc776de5633846fc
2017-03-02 13:25:17 -08:00
Marissa Wall
b89364881c Merge changes I66d4fc71,I686dce91,I31325c76 am: 497cb085c7 am: 2993cc1e07
am: 3f4c0aa72a

Change-Id: Ic6e047e9a3958db3021566dd9d6d859789d81a1a
2017-03-02 21:02:12 +00:00
Marissa Wall
3f4c0aa72a Merge changes I66d4fc71,I686dce91,I31325c76 am: 497cb085c7
am: 2993cc1e07

Change-Id: I65a08bed13c477193c38ac6770b5a92cef3ccca9
2017-03-02 21:00:40 +00:00
Marissa Wall
2993cc1e07 Merge changes I66d4fc71,I686dce91,I31325c76
am: 497cb085c7

Change-Id: I4a8ada072f2a131db3ff0e8abb6d7aaba9ccf501
2017-03-02 20:57:50 +00:00
Treehugger Robot
497cb085c7 Merge changes I66d4fc71,I686dce91,I31325c76
* changes:
  libadfhwc: Fix adf_hwc_close
  libadfhwc: add adf_set_active_config_hwc2 support
  libadfhwc: support hwc2 display attributes
2017-03-02 20:54:44 +00:00
TreeHugger Robot
701120d319 Merge "libmemtrack: check return value for getMemory()" 2017-03-02 20:03:49 +00:00
Bo Hu
78328f0f1f Merge "DO NOT MERGE ANYWHERE Qemu-pipe: refactor qemu_pipe.h into libqemu_pipe" am: 8c35491151 -s ours am: 21e2e90eb8 -s ours
am: f71bf5345f  -s ours

Change-Id: If88ad0cb8283ef3d4d74a1f2443499403deb5997
2017-03-02 18:15:28 +00:00
bohu
feb82d68f9 DO NOT MERGE ANYWHERE Qemu-pipe: refactor qemu_pipe.h into libqemu_pipe am: 294d44be33 -s ours am: cb95cfa1f4 -s ours
am: 8d00827b1f  -s ours

Change-Id: I7288dc6fcf903fe475226cc726831404b55d5795
2017-03-02 18:14:37 +00:00
Bo Hu
f71bf5345f Merge "DO NOT MERGE ANYWHERE Qemu-pipe: refactor qemu_pipe.h into libqemu_pipe" am: 8c35491151 -s ours
am: 21e2e90eb8  -s ours

Change-Id: I2f4e7716ecac5d8b2d6b3ec0cfca3e37212054b9
2017-03-02 18:13:27 +00:00
bohu
8d00827b1f DO NOT MERGE ANYWHERE Qemu-pipe: refactor qemu_pipe.h into libqemu_pipe am: 294d44be33 -s ours
am: cb95cfa1f4  -s ours

Change-Id: I14390fd41a1f6879c8ff6d35d68e1a408b64ba91
2017-03-02 18:12:36 +00:00
Bo Hu
21e2e90eb8 Merge "DO NOT MERGE ANYWHERE Qemu-pipe: refactor qemu_pipe.h into libqemu_pipe"
am: 8c35491151  -s ours

Change-Id: Id963d9bb263e5bc2553f16497ddf8a08bb1fd77f
2017-03-02 18:10:31 +00:00
bohu
cb95cfa1f4 DO NOT MERGE ANYWHERE Qemu-pipe: refactor qemu_pipe.h into libqemu_pipe
am: 294d44be33  -s ours

Change-Id: I50c8def74e6bec2e1071000e0530ffb9920a14a6
2017-03-02 18:09:36 +00:00
Bo Hu
8c35491151 Merge "DO NOT MERGE ANYWHERE Qemu-pipe: refactor qemu_pipe.h into libqemu_pipe" 2017-03-02 18:03:30 +00:00
Marissa Wall
956f1f64a1 libadfhwc: Fix adf_hwc_close
The adf hwc event thread now responds to pthread_kill which
allows adf_hwc_close to succeed.

Test: Call "adb shell stop" and check if thread exits.
      This change will allow testing of libadfhwc in future patches.

Change-Id: I66d4fc71a058db42af8d42b5d6193378a8b5d972
2017-03-02 17:40:16 +00:00
Marissa Wall
b4f0041421 libadfhwc: add adf_set_active_config_hwc2 support
Add the necessary set mode support to enable HWC2's set_active_config

Test: run gtests located in frameworks/native/services/surfaceflinger/tests/hwc2
Change-Id: I686dce91a2d8fe86db13c66d22f81960c2f8e8f2
2017-03-02 17:40:09 +00:00
Marissa Wall
9dcd750d81 libadfhwc: support hwc2 display attributes
adf_getDisplayAttributes_hwc2 gets the display attributes using the updated
enums from HWC2

Test: run gtests located in frameworks/native/services/surfaceflinger/tests/hwc2
Change-Id: I31325c764ccaf65c6d970727b56327d24c7b16d8
2017-03-02 17:40:02 +00:00
Courtney Goeltzenleuchter
7ab0579800 Add dataspace to match upstream EGL extension
EGL's EGL_EXT_gl_colorspace_bt2020_pq extension
supports a bt2020 color space with a ST2084
transfer function (Dolby Perceptual Quantizer)
Test: make
Change-Id: Ibdacb00ce48189b1faf16fb8dd071caff2ec2a98
2017-03-01 18:25:15 -07:00
Alex Klyubin
e310332227 Merge "Use split SELinux policy at boot, if available" am: 056eca201b am: a3ccbe6abc
am: 9000f0f868

Change-Id: Ic04767bd6ad22abe98556f0da17c7d820f9ae61c
2017-03-02 01:18:23 +00:00
Alex Klyubin
9000f0f868 Merge "Use split SELinux policy at boot, if available" am: 056eca201b
am: a3ccbe6abc

Change-Id: If5325bc1a9de07becf72eed295116889323055c2
2017-03-02 01:13:52 +00:00
Alex Klyubin
a3ccbe6abc Merge "Use split SELinux policy at boot, if available"
am: 056eca201b

Change-Id: Ib56a7c0f50babf6eaa70bea083610ff484d784d9
2017-03-02 01:08:21 +00:00
Treehugger Robot
056eca201b Merge "Use split SELinux policy at boot, if available" 2017-03-02 01:02:15 +00:00
bohu
294d44be33 DO NOT MERGE ANYWHERE Qemu-pipe: refactor qemu_pipe.h into libqemu_pipe
Traditionally, qemu_pipe has both the declaration and implentation of each
function in one header file--qemu_pipe.h, and it is getting incovenient to
maintain.

This CL separates the implementation of functions from the header file,
and makes qemu_pipe a static library for other modules to link to.

Note that the interface and implementation of qemu_pipe are kept unchanged,
and future CLs will enhance the implementation to make it more reliable and
more compatible with old and new API levels.

Following projects are affected by this refactoring, and they are modified
accordingly:

device/generic/goldfish
device/generic/goldfish-opengl
hardware/ril/reference-ril

Change-Id: I541ecbf0cc7eadeef9d4e37ffd9ca7bfcc5c94c0
2017-03-01 16:33:44 -08:00
Mark Salyzyn
c90abae8c6 Merge "liblogcat: -v and ${ANDROID_PRINTF_LOG} support comma separated list" am: a02a42ecb1 am: 7fa61d6878
am: 2a9ce60dc6

Change-Id: Id7b1ee4272bb690da63a5fc99fd10d00cc61b977
2017-03-02 00:07:25 +00:00
Mark Salyzyn
d6f27f3eb1 Merge "liblogcat: replace NULL with nullptr" am: 7826f853bc am: dcf6021ee1
am: fe4e8518cb

Change-Id: I88685d92b9ba905d8f04bae001ac6840e1e620c3
2017-03-02 00:07:14 +00:00
Mark Salyzyn
2a9ce60dc6 Merge "liblogcat: -v and ${ANDROID_PRINTF_LOG} support comma separated list" am: a02a42ecb1
am: 7fa61d6878

Change-Id: I9d2c583e3b675bebb6909bf14c9c78cf8188de41
2017-03-02 00:02:50 +00:00
Mark Salyzyn
fe4e8518cb Merge "liblogcat: replace NULL with nullptr" am: 7826f853bc
am: dcf6021ee1

Change-Id: I553c77d877e18424566bb14111bad2adbfa2cf1e
2017-03-02 00:02:39 +00:00
Mark Salyzyn
7fa61d6878 Merge "liblogcat: -v and ${ANDROID_PRINTF_LOG} support comma separated list"
am: a02a42ecb1

Change-Id: Ib840fe387efc669aec8aa61ec5b6dfa6b25726d8
2017-03-01 23:57:50 +00:00
Mark Salyzyn
dcf6021ee1 Merge "liblogcat: replace NULL with nullptr"
am: 7826f853bc

Change-Id: Ic2e33c1c81cbbb83b459359403739cd98fdab2e7
2017-03-01 23:57:39 +00:00
Treehugger Robot
a02a42ecb1 Merge "liblogcat: -v and ${ANDROID_PRINTF_LOG} support comma separated list" 2017-03-01 23:52:54 +00:00
Treehugger Robot
7826f853bc Merge "liblogcat: replace NULL with nullptr" 2017-03-01 23:50:01 +00:00
Josh Gao
970177a313 Merge "debuggerd: remove obsolete dumpable check." am: b038995d29 am: ec172b5f36
am: 05930f7179

Change-Id: I5ca838f564a83a81e68054fedb0d68cf9e3ac468
2017-03-01 23:22:55 +00:00
Keun-young Park
404906d59a use ro.persistent_properties.ready for persistent props ready
- for security reason, only notify ready state instead of
   passing time info to hidl clients

Bug: 35178781
Bug: 34274385
Test: reboot

Change-Id: I2d64bd6da81139945bd0224079af9376f1d90da7
2017-03-01 23:16:10 +00:00
Josh Gao
05930f7179 Merge "debuggerd: remove obsolete dumpable check." am: b038995d29
am: ec172b5f36

Change-Id: I5e64c85a0e634c008bc77bf03b9317268e862eb1
2017-03-01 23:09:35 +00:00
Josh Gao
ec172b5f36 Merge "debuggerd: remove obsolete dumpable check."
am: b038995d29

Change-Id: Ib120244b965f10ff88c917885beca011ee28a223
2017-03-01 23:05:06 +00:00
Josh Gao
b038995d29 Merge "debuggerd: remove obsolete dumpable check." 2017-03-01 22:59:01 +00:00
Alex Klyubin
16696e201b Use split SELinux policy at boot, if available
This modifies init's loading of SELinux policy into the kernel to
load the split (platform/system vs non-platform/vendor) policy if it's
present. If the split policy is not present, the usual monolithic
policy is loaded into the kernel, same as before.

Split policy is loaded by first compiling it from CIL form using
secilc compiler into the conventional monolithic/compiled form which
is then loaded into the kernel.

The build system has not yet been modified to place split policy onto
devices. Thus, this commit currently has no effect. For testing split
policy, build plat_sepolicy.cil, nonplat_sepolicy.cil, and
mapping_sepolicy.cil, and place them into the root directory of the
device.

The following tests were performed for a device with monolithic policy
and for the same device with split policy.

Test: Device boots, no new denials
Test: Play Movies plays back movies
Test: Load ip6.me im Chrome
Bug: 31363362
Change-Id: I9a75a48ac88f3392abc36669f91b0803e88cd147
2017-03-01 14:07:40 -08:00
TreeHugger Robot
b7b9f71024 Merge "Update graphics-base.h makefile." 2017-03-01 20:46:15 +00:00
Josh Gao
981761bbb2 debuggerd: remove obsolete dumpable check.
PR_SET_DUMPABLE is ignored now.

Bug: http://b/35872161
Test: debuggerd -b `pidof surfaceflinger`
Change-Id: Iefd090f2b762d454d1e6ce8061ff5f992974267c
2017-03-01 11:55:16 -08:00
Bowgo Tsai
9cce616cea Merge "init: skip early mount in recovery mode" am: 8951c1313d am: 6befc485c7
am: f00d05610b

Change-Id: I8a7dd60f99cfcda88b01892c129af24e3f61a3aa
2017-03-01 18:36:48 +00:00