Nick Kralevich
44836221c6
Merge "Clarify SELinux service error message" am: 54a28300b7 am: 706a898cd0
...
am: 787b5038f4
2017-08-25 23:20:47 +00:00
Nick Kralevich
787b5038f4
Merge "Clarify SELinux service error message" am: 54a28300b7
...
am: 706a898cd0
2017-08-25 23:18:46 +00:00
Nick Kralevich
706a898cd0
Merge "Clarify SELinux service error message"
...
am: 54a28300b7
2017-08-25 23:16:47 +00:00
Treehugger Robot
54a28300b7
Merge "Clarify SELinux service error message"
2017-08-25 23:10:06 +00:00
Nick Kralevich
1ea19eb44d
Clarify SELinux service error message
...
1) Attempt to make the error message associated with a missing service
better.
2) Provide a link to more in-depth documentation.
Bug: 65023716
Test: code compiles.
Change-Id: Ie0f1896fb41d5afd11501f046cb51d4c8afe0a62
2017-08-25 14:01:06 -07:00
Christopher Ferris
317764f2f5
Merge "Speed up map creation." am: df3e89be94 am: 2bf9cbf233
...
am: bd048209b4
2017-08-25 19:21:01 +00:00
Christopher Ferris
bd048209b4
Merge "Speed up map creation." am: df3e89be94
...
am: 2bf9cbf233
2017-08-25 19:16:30 +00:00
Christopher Ferris
2bf9cbf233
Merge "Speed up map creation."
...
am: df3e89be94
2017-08-25 19:12:29 +00:00
Christopher Ferris
df3e89be94
Merge "Speed up map creation."
2017-08-25 19:04:14 +00:00
Max Bires
afdea51e0e
Merge "Add a feature to show which bugs are tracking which se denials" am: 06e0c704d7 am: 08e66e7796
...
am: c564cb0bec
2017-08-25 17:10:10 +00:00
Max Bires
c564cb0bec
Merge "Add a feature to show which bugs are tracking which se denials" am: 06e0c704d7
...
am: 08e66e7796
2017-08-25 17:05:14 +00:00
Max Bires
08e66e7796
Merge "Add a feature to show which bugs are tracking which se denials"
...
am: 06e0c704d7
2017-08-25 17:01:14 +00:00
Max Bires
06e0c704d7
Merge "Add a feature to show which bugs are tracking which se denials"
2017-08-25 16:54:19 +00:00
Tom Cherry
c6b2317d59
Merge "init: do not load persistent properties from temporary /data" am: b1d93a8136 am: b916f49bd7
...
am: ec9aa8ce7c
2017-08-25 16:51:21 +00:00
Alan Stokes
e751059975
Merge "Small liblog test fixes & readability improvements." am: 332370d14d am: 511cc67633
...
am: 32636f0f4c
2017-08-25 16:50:50 +00:00
Tom Cherry
ec9aa8ce7c
Merge "init: do not load persistent properties from temporary /data" am: b1d93a8136
...
am: b916f49bd7
2017-08-25 16:46:58 +00:00
Alan Stokes
32636f0f4c
Merge "Small liblog test fixes & readability improvements." am: 332370d14d
...
am: 511cc67633
2017-08-25 16:46:22 +00:00
Tom Cherry
b916f49bd7
Merge "init: do not load persistent properties from temporary /data"
...
am: b1d93a8136
2017-08-25 16:43:22 +00:00
Alan Stokes
511cc67633
Merge "Small liblog test fixes & readability improvements."
...
am: 332370d14d
2017-08-25 16:42:37 +00:00
Tom Cherry
b1d93a8136
Merge "init: do not load persistent properties from temporary /data"
2017-08-25 16:37:20 +00:00
Alan Stokes
332370d14d
Merge "Small liblog test fixes & readability improvements."
2017-08-25 16:35:55 +00:00
Alan Stokes
328ba7c8e6
Merge "Reading from logd in WRAP mode is expected to take a long time, don't abort it after 30s." am: 974ab46561 am: 9181fe6427
...
am: 50289204e5
2017-08-25 14:55:43 +00:00
Mark Salyzyn
8b2136afe0
Merge "Switch /data/misc/reboot/last_reboot_reason to persistent property" am: 13cb599536 am: 37c6015d9d
...
am: a0641b5c13
2017-08-25 14:47:51 +00:00
Alan Stokes
50289204e5
Merge "Reading from logd in WRAP mode is expected to take a long time, don't abort it after 30s." am: 974ab46561
...
am: 9181fe6427
2017-08-25 14:45:09 +00:00
Mark Salyzyn
a0641b5c13
Merge "Switch /data/misc/reboot/last_reboot_reason to persistent property" am: 13cb599536
...
am: 37c6015d9d
2017-08-25 14:37:44 +00:00
Alan Stokes
9181fe6427
Merge "Reading from logd in WRAP mode is expected to take a long time, don't abort it after 30s."
...
am: 974ab46561
2017-08-25 14:31:51 +00:00
Mark Salyzyn
37c6015d9d
Merge "Switch /data/misc/reboot/last_reboot_reason to persistent property"
...
am: 13cb599536
2017-08-25 14:24:21 +00:00
Treehugger Robot
974ab46561
Merge "Reading from logd in WRAP mode is expected to take a long time, don't abort it after 30s."
2017-08-25 14:18:29 +00:00
Mark Salyzyn
13cb599536
Merge "Switch /data/misc/reboot/last_reboot_reason to persistent property"
2017-08-25 14:16:12 +00:00
Alan Stokes
81e63d0515
Small liblog test fixes & readability improvements.
...
liblog concurrent printf tests now check every write succeeds.
logd timeout_negative tests exits as soon as one run succeeds.
Test: CTS tests till pass.
Change-Id: I9a166a0abcb8b9aa5c055c35c5dccf30616a4e24
2017-08-25 14:53:21 +01:00
Alan Stokes
64acdf77d6
Reading from logd in WRAP mode is expected to take a long time,
...
don't abort it after 30s.
Adds a new CTS test to verify the behaviour.
Bug: 64143705
Test: New and existing CTS tests pass. Manual testing with logcat.
Change-Id: Ia67175701ed8c462083e14e26123ce8ddcb226bc
2017-08-25 11:40:49 +01:00
Justin Yun
e2c3cb1634
vndk: add vendor/lib(64)/vndk for vendor namespace
...
am: 3094de9684
2017-08-25 07:35:48 +00:00
Justin Yun
3094de9684
vndk: add vendor/lib(64)/vndk for vendor namespace
...
When the vndk is extended by vendor, the libs in vendor/lib(64)/vndk
will override system/lib(64)/vndk libs. Vendor binaries will search
vndk libs in vendor/lib(64)/vndk prior to system/lib(64)/vndk.
Also, remove a workaround for libsdm-color.so
Bug: 65032513
Test: build and boot check for libsdm-color.so will be loaded on boot
Test: currently no libs exist on vendor/lib(64)/vndk. No test for it
Change-Id: I99ed37eb1a9e92c83533e2d92c9c06db11f01e97
2017-08-25 12:30:44 +09:00
Mark Salyzyn
73e6b49c0c
Switch /data/misc/reboot/last_reboot_reason to persistent property
...
Switch from /data/misc/reboot/last_reboot_reason to persistent
Android property persist.sys.boot.reason for indicating why the
device is rebooted or shutdown.
persist.sys.boot.reason has a standard as outlined in b/63736262 and
the associated investigation. Made adjustments to the values so that
we did not create a problem even before we started. Compliance is
part of the tests in boot_reason_test.sh.
Test: system/core/bootstat/boot_reason_test.sh
Bug: 64687998
Change-Id: I812c55a12faf7cb7ff92101009be058ad9958d07
2017-08-24 15:13:48 -07:00
Tom Cherry
9951b792b1
init: do not load persistent properties from temporary /data
...
With full disk encryption, a temporary /data partition is mounted to
start a minimum subset of the frameworks. Later, once /data can be
decrypted it is mounted again. load_persist_props is called both when
the temporary /data partition is mounted and again after the real
/data is mounted; this is a mistake.
This change checks to see if we're a FDE device and if so, returns the
first time load_persist_props is called.
Test: boot bullhead (FDE) with and without boot pin and check that
persistent properties are loaded
Test: boot sailfish (FBE) and check that persistent properties are loaded
Change-Id: I6ed725072bdb27d80bfa6575d0a4876b08c6a4bc
2017-08-24 14:24:59 -07:00
Dimitry Ivanov
c54362127b
Merge "Define current ABI string in android-base/macros.h" am: 2732a7e023 am: d98e5fc543
...
am: 1eafe1b47c
2017-08-24 09:50:41 +00:00
Dimitry Ivanov
1eafe1b47c
Merge "Define current ABI string in android-base/macros.h" am: 2732a7e023
...
am: d98e5fc543
2017-08-24 09:46:01 +00:00
Dimitry Ivanov
d98e5fc543
Merge "Define current ABI string in android-base/macros.h"
...
am: 2732a7e023
2017-08-24 09:42:07 +00:00
Dimitry Ivanov
2732a7e023
Merge "Define current ABI string in android-base/macros.h"
2017-08-24 09:38:34 +00:00
Dmitry Shmidt
e9b1299f74
Merge "init: Fix -DUSER_MODE_LINUX compilation" am: 9a38df3f5f am: d1821522aa
...
am: 14a60d2e19
2017-08-24 01:35:14 +00:00
Dmitry Shmidt
14a60d2e19
Merge "init: Fix -DUSER_MODE_LINUX compilation" am: 9a38df3f5f
...
am: d1821522aa
2017-08-24 01:29:29 +00:00
Dmitry Shmidt
d1821522aa
Merge "init: Fix -DUSER_MODE_LINUX compilation"
...
am: 9a38df3f5f
2017-08-24 01:23:01 +00:00
Treehugger Robot
9a38df3f5f
Merge "init: Fix -DUSER_MODE_LINUX compilation"
2017-08-24 01:14:36 +00:00
Elliott Hughes
22d9a9a249
Merge "Fix adb tcpip tests." am: d865b655d5 am: 37f256423b
...
am: 7096d47858
2017-08-24 00:59:13 +00:00
Elliott Hughes
7096d47858
Merge "Fix adb tcpip tests." am: d865b655d5
...
am: 37f256423b
2017-08-24 00:55:12 +00:00
Elliott Hughes
37f256423b
Merge "Fix adb tcpip tests."
...
am: d865b655d5
2017-08-24 00:52:03 +00:00
Treehugger Robot
d865b655d5
Merge "Fix adb tcpip tests."
2017-08-24 00:45:59 +00:00
Jin Qian
a5339dbdc0
Merge "fastboot: bail out if failed to generate fs image" into oc-mr1-dev
...
am: feee3cce8a
2017-08-24 00:11:46 +00:00
Justin Yun
60a6fc62d1
Merge "Mark the modules as VNDK-SP in Android.bp" am: bc9924ed40 am: 028664fcd3
...
am: 5982a46c40
2017-08-23 23:33:02 +00:00
Justin Yun
5982a46c40
Merge "Mark the modules as VNDK-SP in Android.bp" am: bc9924ed40
...
am: 028664fcd3
2017-08-23 23:29:25 +00:00
