Keun-young Park
300f488037
Merge "e2fsck: drop -f when TARGET_USES_MKE2FS is enabled" am: f3780f3cc8 am: 3dccdc5ec5
...
am: ef847af8bf
Change-Id: Idfb7cfdad7c4ea1b1fe1821160878869cd33e179
2017-01-10 20:07:00 +00:00
Keun-young Park
ef847af8bf
Merge "e2fsck: drop -f when TARGET_USES_MKE2FS is enabled" am: f3780f3cc8
...
am: 3dccdc5ec5
Change-Id: I514a3d79707cf2a795beec3f12b66911981410d0
2017-01-10 20:01:27 +00:00
Keun-young Park
3dccdc5ec5
Merge "e2fsck: drop -f when TARGET_USES_MKE2FS is enabled"
...
am: f3780f3cc8
Change-Id: I6c288a2ef3b571fb6ab347468e06e15ea033363c
2017-01-10 19:55:58 +00:00
Treehugger Robot
f3780f3cc8
Merge "e2fsck: drop -f when TARGET_USES_MKE2FS is enabled"
2017-01-10 19:49:34 +00:00
Keun-young Park
22e8199175
e2fsck: drop -f when TARGET_USES_MKE2FS is enabled
...
- Drop forced (-f) e2fsck check when the product has
enabled new ext4 generation by setting TARGET_USES_MKE2FS.
- The new generation tool is supposed to give better stability,
thus justifying dropping -f.
- This should help reducing boot-up time as full check (-f) can
increase boot-up time significantly depending on amount of data.
bug: 32246772
Test: many reboots
Change-Id: I631525bf7504bbfb025e170c8d24ad9d3ef3532e
2017-01-10 10:17:57 -08:00
Hung-ying Tyan
82f542f5a1
Merge "fs_mgr: add verify_dev flag to fs_mgr_setup_verity()" am: abc26ed753 am: 7da0c3db16
...
am: 70bcce4deb
Change-Id: I7a44cc2f7a3e12d931ee116c25e0f4ce73c32e72
2017-01-10 04:16:35 +00:00
Hung-ying Tyan
70bcce4deb
Merge "fs_mgr: add verify_dev flag to fs_mgr_setup_verity()" am: abc26ed753
...
am: 7da0c3db16
Change-Id: I0f513c6e794cf5973a1e376bd10d834760ccb708
2017-01-10 04:12:04 +00:00
Hung-ying Tyan
7da0c3db16
Merge "fs_mgr: add verify_dev flag to fs_mgr_setup_verity()"
...
am: abc26ed753
Change-Id: I25ade5d260a61c4af89d370471114b320eb4fe05
2017-01-10 04:07:03 +00:00
Treehugger Robot
abc26ed753
Merge "fs_mgr: add verify_dev flag to fs_mgr_setup_verity()"
2017-01-10 04:00:19 +00:00
Tomasz Wasilczyk
098f30839e
Merge "Make metadata field mandatory for program info struct." am: e324500f3f am: a6cbd75741
...
am: 7435361107
Change-Id: Ic051cdebeeb3ff81432415f55928f44fb2fc7889
2017-01-10 01:42:54 +00:00
Tomasz Wasilczyk
7435361107
Merge "Make metadata field mandatory for program info struct." am: e324500f3f
...
am: a6cbd75741
Change-Id: I726325d06787a8a916874fb17b6627035a9b799d
2017-01-10 01:37:56 +00:00
Elliott Hughes
86e63c8ae6
Merge "Revert "Revert "android_ids: move to bionic""" am: b2375fc40c am: 5f57659030
...
am: 15f24e5df9
Change-Id: I718ecb5674a2ce85de4116ece310af404614e45c
2017-01-10 01:33:37 +00:00
Tomasz Wasilczyk
a6cbd75741
Merge "Make metadata field mandatory for program info struct."
...
am: e324500f3f
Change-Id: I21ffde4a3160cbf1d1c089a715cd0e61f977087e
2017-01-10 01:33:24 +00:00
Elliott Hughes
15f24e5df9
Merge "Revert "Revert "android_ids: move to bionic""" am: b2375fc40c
...
am: 5f57659030
Change-Id: I3a09908f05e410e899e757f3710278d3a32ed2c5
2017-01-10 01:28:11 +00:00
Tomasz Wasilczyk
e324500f3f
Merge "Make metadata field mandatory for program info struct."
2017-01-10 01:24:27 +00:00
Elliott Hughes
5f57659030
Merge "Revert "Revert "android_ids: move to bionic"""
...
am: b2375fc40c
Change-Id: Ifc69bdc6668e173517206b75f9d1f0f7f28d8095
2017-01-10 01:23:33 +00:00
Elliott Hughes
b2375fc40c
Merge "Revert "Revert "android_ids: move to bionic"""
2017-01-10 01:15:30 +00:00
Tomasz Wasilczyk
70a8148b52
Make metadata field mandatory for program info struct.
...
Also, make metadata struct aligned.
Test: VTS, manual
Change-Id: I7dbd62d36ac21475fdbc49723ba3ea6744460d21
2017-01-09 14:26:43 -08:00
Mark Salyzyn
ed5f3d8bb2
Merge "liblog: retry -ENOTCONN | -ECONNREFUSED | -ENOENT indefinitely" am: d5583867c6 am: 295f3ba442
...
am: 4935c99659
Change-Id: I43501d70194c5300b7ff347a1fb884278edeaf31
2017-01-09 17:27:21 +00:00
Mark Salyzyn
4935c99659
Merge "liblog: retry -ENOTCONN | -ECONNREFUSED | -ENOENT indefinitely" am: d5583867c6
...
am: 295f3ba442
Change-Id: Ica7b00f403b7dafcd20961d28b56365036b32566
2017-01-09 17:22:51 +00:00
Mark Salyzyn
295f3ba442
Merge "liblog: retry -ENOTCONN | -ECONNREFUSED | -ENOENT indefinitely"
...
am: d5583867c6
Change-Id: I60b71aa34c305b5af0487a512b6f63f31caaaef3
2017-01-09 17:18:20 +00:00
Treehugger Robot
d5583867c6
Merge "liblog: retry -ENOTCONN | -ECONNREFUSED | -ENOENT indefinitely"
2017-01-09 17:11:12 +00:00
Wei Wang
95d24cdefc
Merge "Restart wificond when zygote died" am: 7e6c19e8b8 am: 63c3065bdc
...
am: f44214c444
Change-Id: I17061da1b2857b9339878cd4ca027425652bcb5a
2017-01-09 16:49:18 +00:00
Wei Wang
f44214c444
Merge "Restart wificond when zygote died" am: 7e6c19e8b8
...
am: 63c3065bdc
Change-Id: I547f5fbfcf1560785a83bef56282c7ee2cbf855c
2017-01-09 16:44:48 +00:00
Wei Wang
63c3065bdc
Merge "Restart wificond when zygote died"
...
am: 7e6c19e8b8
Change-Id: If6bbfb9c68c83d7183e725818cd51ae5e9ed1573
2017-01-09 16:39:49 +00:00
Wei Wang
7e6c19e8b8
Merge "Restart wificond when zygote died"
2017-01-09 16:30:54 +00:00
Mark Salyzyn
65e1e6284c
liblog: retry -ENOTCONN | -ECONNREFUSED | -ENOENT indefinitely
...
Deal with recovering after transitory failures surrounding logd
crash or recovery. Improve the chances that the logging functions
can work in a signal handler, not officially supported, but making
sure logging is not blamed for system lockups when misused.
Reorder gTests so that setuid(AID_SYSTEM) is performed after
liblog.enoent test, and that this occurs after other tests that
like to see buffers with content in them as we stop logd.
Test: gTest liblog-unit-tests --gtest_filter=liblog.enoent
Bug: 33755074
Change-Id: I66f88599534614b7b61da6b2ae5fe099ebaced3a
2017-01-09 15:51:09 +00:00
Wei Wang
38fcd33e46
Restart wificond when zygote died
...
This helps to avoid tearDownInterfaces call from WiFiStateMachine's
constructor.
Bug: 33752168
Test: on device
(cherry picked from commit 0db195d0757e36c73b9da5a95d9b9986386f0f2e)
Change-Id: I55f56dd8daa5089073ff8dd424e92d09326c7d00
2017-01-07 19:45:42 -08:00
James Hawkins
053b0b002c
Merge "bootstat: Log ro.boottime.init timing properties." am: cdd7ec12be am: 449826ad8c
...
am: 953117a0c9
Change-Id: I24741ee49590f20743a81b5a42b7ab3dc40c902d
2017-01-07 22:28:46 +00:00
James Hawkins
953117a0c9
Merge "bootstat: Log ro.boottime.init timing properties." am: cdd7ec12be
...
am: 449826ad8c
Change-Id: If893c6b1524e093cdf28a927906cb4cf639cecfb
2017-01-07 22:24:16 +00:00
James Hawkins
449826ad8c
Merge "bootstat: Log ro.boottime.init timing properties."
...
am: cdd7ec12be
Change-Id: Ia2ae2106b2140131498dfd53df17dd3c586aeb81
2017-01-07 22:19:45 +00:00
Treehugger Robot
cdd7ec12be
Merge "bootstat: Log ro.boottime.init timing properties."
2017-01-07 22:12:46 +00:00
Mark Salyzyn
e5c506ed15
Merge "liblog: test: switch to private event structures" am: bfe1d9b83b am: a7ce596bba
...
am: 2c94374dcf
Change-Id: If791ee62d424e4ba6d20b89534f5816b8cd8a457
2017-01-06 23:21:25 +00:00
Mark Salyzyn
2c94374dcf
Merge "liblog: test: switch to private event structures" am: bfe1d9b83b
...
am: a7ce596bba
Change-Id: Ia7946fb472f00d1b87b49d247c9209ca8f7311c7
2017-01-06 23:17:24 +00:00
Mark Salyzyn
a7ce596bba
Merge "liblog: test: switch to private event structures"
...
am: bfe1d9b83b
Change-Id: I997f81725348ac6566910c2142b6f4334ab0df34
2017-01-06 23:13:24 +00:00
Treehugger Robot
bfe1d9b83b
Merge "liblog: test: switch to private event structures"
2017-01-06 23:10:52 +00:00
James Hawkins
ef0a090e6f
bootstat: Log ro.boottime.init timing properties.
...
Bug: none
Test: adb logcat | grep bootstat
Change-Id: I3375c75e8ef39be710c8001f19a9e2fb493805e9
2017-01-06 14:52:52 -08:00
Mark Salyzyn
b52f445dbb
liblog: test: switch to private event structures
...
Some tests use hard-coded offsets to interpret the binary
events buffers. Switch to using the private event structures
to access the components of common event messages.
Test: gTest liblog-unit-tests
Bug: 33755074
Change-Id: I17447814583099d5ec417a54389e962158456005
2017-01-06 22:13:34 +00:00
Dan Albert
ecb385e134
Merge "Unversion NDK stub libraries." am: 879fc83ad1 am: 5e650e53ff
...
am: 579b873088
Change-Id: I0e02f8c677182d04caeb9d44838e5c2dc252ad4d
2017-01-06 21:12:32 +00:00
Dan Albert
579b873088
Merge "Unversion NDK stub libraries." am: 879fc83ad1
...
am: 5e650e53ff
Change-Id: I64aef67c54a3cda34aaf01a5f5bbf69364a9cd70
2017-01-06 21:05:22 +00:00
Dan Albert
5e650e53ff
Merge "Unversion NDK stub libraries."
...
am: 879fc83ad1
Change-Id: Iabff159275551a9944f1e8fe39e9ef3d3f9f1079
2017-01-06 20:57:12 +00:00
Treehugger Robot
879fc83ad1
Merge "Unversion NDK stub libraries."
2017-01-06 20:49:30 +00:00
Dan Albert
9a41bcecc6
Unversion NDK stub libraries.
...
The system versions of these libraries aren't versioned yet.
Bug: https://github.com/android-ndk/ndk/issues/278
Test: make ndk
Change-Id: Icf5ff9921441d3e252771aef37002c772c08cbd0
2017-01-06 11:04:15 -08:00
Tao Bao
2443c5e990
Merge "adb: Fix the 'adb reboot sideload' for A/B devices." am: 9f59a4663c am: b26579f326
...
am: 2b5065648c
Change-Id: Ic9fbeb1fc0d9e894d3f8d7fe04f773f501d5f669
2017-01-06 17:12:28 +00:00
Tao Bao
2b5065648c
Merge "adb: Fix the 'adb reboot sideload' for A/B devices." am: 9f59a4663c
...
am: b26579f326
Change-Id: I297f0ca93ea98f520b5b492af23f598f876136b0
2017-01-06 17:08:28 +00:00
Tao Bao
b26579f326
Merge "adb: Fix the 'adb reboot sideload' for A/B devices."
...
am: 9f59a4663c
Change-Id: I9d1998124a38508a5681b0230ad7d11eba3edb60
2017-01-06 17:04:28 +00:00
Tao Bao
9f59a4663c
Merge "adb: Fix the 'adb reboot sideload' for A/B devices."
2017-01-06 16:59:39 +00:00
Tao Bao
40e0ec918e
adb: Fix the 'adb reboot sideload' for A/B devices.
...
We used to write the command file (/cache/recovery/command) to trigger
the sideload mode. A/B devices don't support that (may not have /cache
paritition). This CL switches to using libbootloader_message which
writes the command to BCB (bootloader control block) instead.
Test: "adb root && adb reboot sideload" reboots sailfish into recovery
sideload mode.
Change-Id: I158fd7cbcfa9a5d0609f1f684a2d03675217628f
2017-01-05 18:01:01 -08:00
Jaekyun Seok
da100377b0
Merge "Use shared lib of libutils, libz and libbase." am: 4bf9c82857 am: 70f6d5878e
...
am: 3b00f1cc8f
Change-Id: I2b521fd2f7b275a10d230318189704730cac8f90
2017-01-05 23:35:15 +00:00
Jaekyun Seok
3b00f1cc8f
Merge "Use shared lib of libutils, libz and libbase." am: 4bf9c82857
...
am: 70f6d5878e
Change-Id: I33d1f440eaf0aab019b0c222b44953923f255de9
2017-01-05 23:31:45 +00:00