ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
34905 commits 1 branch 0 tags 217 MiB
Commit graph

34905 commits

This branch
This branch
All branches
Author SHA1 Message Date
Keun-young Park
bedc5faea7 Merge "add "shutdown critical" to service" am: b3915d113d am: a4ad5d0328 
am: 19ec8e7bcf

Change-Id: Ide84d7f87a9884068ebc1cc9680c997507727af3
 2017-07-06 01:13:19 +00:00
Bowgo Tsai
3f10ecabf8 Merge "fs_mgr: allow no verity metadata when the device is unlocked." am: cd0c2d8962 am: 328b56585e 
am: 06c6bf67e9

Change-Id: Id1f3d275fdeadca1b23a086725b3f63aedc5a141
 2017-07-06 01:12:59 +00:00
Keun-young Park
19ec8e7bcf Merge "add "shutdown critical" to service" am: b3915d113d 
am: a4ad5d0328

Change-Id: I6467657616371e84468975e56ac086855a298efb
 2017-07-06 00:56:18 +00:00
Bowgo Tsai
06c6bf67e9 Merge "fs_mgr: allow no verity metadata when the device is unlocked." am: cd0c2d8962 
am: 328b56585e

Change-Id: Ib8602958bffa7061a11ca4450b3dfdaf462b63f6
 2017-07-06 00:56:00 +00:00
Keun-young Park
a4ad5d0328 Merge "add "shutdown critical" to service" 
am: b3915d113d

Change-Id: I25b6f42478efda7077e00141042a427245393d28
 2017-07-06 00:46:31 +00:00
Bowgo Tsai
328b56585e Merge "fs_mgr: allow no verity metadata when the device is unlocked." 
am: cd0c2d8962

Change-Id: Icebfb3c34b3c2878c4015f36dafe893c577b40c9
 2017-07-06 00:46:09 +00:00
Treehugger Robot
b3915d113d Merge "add "shutdown critical" to service" 2017-07-06 00:40:55 +00:00
Treehugger Robot
cd0c2d8962 Merge "fs_mgr: allow no verity metadata when the device is unlocked." 2017-07-06 00:29:47 +00:00
Andreas Gampe
e26f294187 Merge "Backtrace: Add libziparchive dependency" am: 69542edfbe am: 1030828a36 
am: 0e6bac40c4

Change-Id: I72302c28f80b98c8085f7fc352ad9d8828bf0ff6
 2017-07-06 00:02:21 +00:00
Andreas Gampe
0e6bac40c4 Merge "Backtrace: Add libziparchive dependency" am: 69542edfbe 
am: 1030828a36

Change-Id: I875b3b43c0aeb19aa2b975da652dba12e4d0f713
 2017-07-06 00:00:50 +00:00
Andreas Gampe
1030828a36 Merge "Backtrace: Add libziparchive dependency" 
am: 69542edfbe

Change-Id: I4514fe90b92486b2730bc453b8f4badfc9466002
 2017-07-05 23:58:51 +00:00
Wei Wang
2a38e6d119 Merge "init: Support custom shutdown actions" am: c1bc4241f8 am: 5b89535442 
am: b39890048c

Change-Id: I57a0422f47094cc061163510138e9562648fdd98
 2017-07-05 23:58:51 +00:00
Wei Wang
b39890048c Merge "init: Support custom shutdown actions" am: c1bc4241f8 
am: 5b89535442

Change-Id: I57b87dac016b4d7d6f982ee0057823eb1119bab7
 2017-07-05 23:56:50 +00:00
Treehugger Robot
69542edfbe Merge "Backtrace: Add libziparchive dependency" 2017-07-05 23:55:43 +00:00
Wei Wang
5b89535442 Merge "init: Support custom shutdown actions" 
am: c1bc4241f8

Change-Id: I6bb1789dbc5edbb10f2f4d712e9ca83e6302fdf4
 2017-07-05 23:54:56 +00:00
Treehugger Robot
c1bc4241f8 Merge "init: Support custom shutdown actions" 2017-07-05 23:49:41 +00:00
Android Build Merger (Role)
158803cd39 Merge "Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f" into stage-aosp-master am: f038ee0d82 am: 04b7493074" into oc-dr1-dev-plus-aosp 2017-07-05 23:38:46 +00:00
Tom Cherry
cb82e501d4 Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f" into stage-aosp-master am: f038ee0d82 
am: 04b7493074

Change-Id: Id4b36cb07732686dba28fd6b129ec8a05097613b
 2017-07-05 23:38:34 +00:00
Android Build Merger (Role)
501d7a1360 Merge "Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f" into stage-aosp-master am: f038ee0d82 am: 04b7493074" into oc-dr1-dev-plus-aosp 2017-07-05 23:38:24 +00:00
Android Build Merger (Role)
cdc83336bb Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f am: 6e0b51825b am: bef2bbdf62" into oc-dr1-dev-plus-aosp 2017-07-05 23:38:18 +00:00
Tom Cherry
ff1735b966 Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f" into stage-aosp-master am: f038ee0d82 
am: 04b7493074

Change-Id: I17b896b07a4d3d8d19fcd108f82da48e990a1177
 2017-07-05 23:38:07 +00:00
Tom Cherry
536766da6b Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f am: 6e0b51825b 
am: bef2bbdf62

Change-Id: I6066c897ca4dce702c96ea7c9c0127505e478bfa
 2017-07-05 23:38:01 +00:00
Android Build Merger (Role)
93e81d4775 Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f am: 6e0b51825b am: bef2bbdf62" into oc-dr1-dev-plus-aosp 2017-07-05 23:38:01 +00:00
Android Build Merger (Role)
3dcfd2e6ad Merge "Merge "init: reap zombies only after kill(-pid, ...)" am: a51c40ce35 am: 0924b32c1f am: 419a9ef8f1" into oc-dr1-dev-plus-aosp 2017-07-05 23:37:54 +00:00
Tom Cherry
07999f8677 Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f am: 6e0b51825b 
am: bef2bbdf62

Change-Id: Ice5ec0702cbdae53d7a78bceb7a24e923a488319
 2017-07-05 23:37:46 +00:00
Tom Cherry
85bccd3bd0 Merge "init: reap zombies only after kill(-pid, ...)" am: a51c40ce35 am: 0924b32c1f 
am: 419a9ef8f1

Change-Id: I3b9dcfaf7077218d011149a4218b6a582296f62f
 2017-07-05 23:37:42 +00:00
Tom Cherry
fc479afbb6 Merge "init: reap zombies only after kill(-pid, ...)" am: a51c40ce35 am: 0924b32c1f 
am: 419a9ef8f1

Change-Id: I0f2e6b2b2dfed4dab480acf2562df78da8d2f65e
 2017-07-05 23:37:21 +00:00
Tom Cherry
04b7493074 Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f" into stage-aosp-master 
am: f038ee0d82

Change-Id: I4de99eac06e1b32820a9d1e5dde645c6e26e28cd
 2017-07-05 23:02:47 +00:00
Tom Cherry
bef2bbdf62 Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f 
am: 6e0b51825b

Change-Id: Ic31e720cd9014de76f0fd999af44ce3c3ffcd482
 2017-07-05 23:01:53 +00:00
Tom Cherry
419a9ef8f1 Merge "init: reap zombies only after kill(-pid, ...)" am: a51c40ce35 
am: 0924b32c1f

Change-Id: I18a3c9a9a96a2488c7714113175f3e8115bd697f
 2017-07-05 23:01:35 +00:00
Android Build Merger (Role)
f038ee0d82 Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f" into stage-aosp-master 2017-07-05 22:50:56 +00:00
Tom Cherry
d74886ce10 Merge "ueventd: remove character device symlinks (/dev/usb/*)" 
am: f3ae82f57f

Change-Id: I50d05fbf94c6b6c7868f349ab708cb51ae25f858
 2017-07-05 22:50:46 +00:00
Tom Cherry
6e0b51825b Merge "ueventd: remove character device symlinks (/dev/usb/*)" 
am: f3ae82f57f

Change-Id: Ib601af84ed3b186705caaed05706d6b1f3c5746c
 2017-07-05 22:50:35 +00:00
Tom Cherry
0924b32c1f Merge "init: reap zombies only after kill(-pid, ...)" 
am: a51c40ce35

Change-Id: I4f1b7a05cdff1fe7851b528d0bdeda354011b599
 2017-07-05 22:50:17 +00:00
Android Build Merger (Role)
06a1ece4d4 Merge "Merge "init: rename mke2fs tools with _static suffix" into oc-dr1-dev am: 5c5c544e80" into oc-dr1-dev-plus-aosp 2017-07-05 22:41:56 +00:00
Tom Cherry
f3ae82f57f Merge "ueventd: remove character device symlinks (/dev/usb/*)" 2017-07-05 22:41:55 +00:00
Jin Qian
367baf4502 Merge "init: rename mke2fs tools with _static suffix" into oc-dr1-dev 
am: 5c5c544e80

Change-Id: Id2ca6fe04016495ebdb7b1efd7b51f16b615aaca
 2017-07-05 22:41:02 +00:00
Jin Qian
3ca00a3c98 Merge "init: rename mke2fs tools with _static suffix" into oc-dr1-dev 
am: 5c5c544e80

Change-Id: Ifee5b6516fe3aee03df845a46421753295cbc740
 2017-07-05 22:40:42 +00:00
Tom Cherry
a51c40ce35 Merge "init: reap zombies only after kill(-pid, ...)" 2017-07-05 22:39:51 +00:00
TreeHugger Robot
5c5c544e80 Merge "init: rename mke2fs tools with _static suffix" into oc-dr1-dev 2017-07-05 22:33:35 +00:00
Mark Salyzyn
0c7862b805 Merge "fs_mgr: report errno string for __mount errors" am: 6333cd0938 am: eef732555d 
am: ab6f80c350

Change-Id: I1dcef448c82402404652921f8113b2a576158f57
 2017-07-05 21:58:15 +00:00
Mark Salyzyn
ab6f80c350 Merge "fs_mgr: report errno string for __mount errors" am: 6333cd0938 
am: eef732555d

Change-Id: I1d3566cf0de8b2d695cee26effc12c04a53ae2b3
 2017-07-05 21:56:15 +00:00
Keun-young Park
cccb34fce8 add "shutdown critical" to service 
- "shutdown critical" prevents killing the service during
  shutdown. And the service will be started if not running.
- Without it, services will be killed by SIGTERM / SIGKILL during shutdown.
- Even services with "shutdown critical" will be killed if shutdown
  times out.
- Removes ueventd and vold from hard coded list. Each service's rc will
  be updated to add "shutdown critical". watchdogd is still kept in the list.

bug: 37626581
Test: reboot and check last kmsg

Change-Id: Ie8cc699d1efbc59b9a2561bdd40fec64aed5a4bb
 2017-07-05 14:55:22 -07:00
Mark Salyzyn
eef732555d Merge "fs_mgr: report errno string for __mount errors" 
am: 6333cd0938

Change-Id: Ic3c85f6ed01d5edd2bfd0a29063610b4d8159f31
 2017-07-05 21:54:17 +00:00
Wei Wang
eeab491efd init: Support custom shutdown actions 
We have been seeing panics and errors during shutdown sequence in
some vendor's platform, and it is required to disable error handling
during shutdown.

This CL separates the shutdown request to execute another "shutdown"
trigger at the beginning of shutdown stage. And vendor can use this
trigger to add custom commands needed for shutting down gracefully.

Bug: 38203024
Bug: 62084631
Test: device reboot/shutdown
Change-Id: I3fac4ed59f06667d86e477ee55ed391cf113717f
 2017-07-05 14:49:57 -07:00
Treehugger Robot
6333cd0938 Merge "fs_mgr: report errno string for __mount errors" 2017-07-05 21:41:51 +00:00
Logan Chien
b0bff4a55c Revert "Move libz to vndk-sp" 
am: f499bcdde7

Change-Id: I7f641efd4c8e88289496507c7f940db9ea60f745
 2017-07-05 13:16:22 +00:00
Bowgo Tsai
d1fe3bdbd6 fs_mgr: allow no verity metadata when the device is unlocked. 
To boot with generic system.img for project Treble, we should allow no verity
metadata when the device is unlocked. The previous fix checks system property
"ro.boot.flash.locked" but it's unavailable during first stage mount.
This CL checks "androidboot.verifiedbootstate" in kernel command line instead.

Bug: 63268209
Test: boot sailfish without metadata on /vendor

Change-Id: Ifd1dbeb2a2f09cd06903ecdd59bc94b3905a3fbd
 2017-07-05 17:22:35 +08:00
Logan Chien
f499bcdde7 Revert "Move libz to vndk-sp" 
This commit removes libz.so from the exported libs of "vndk" linker
namespace and export libz.so from "default" linker namespace instead.

We have to remove libz.so from vndk-sp because we don't have a good
mechanism to stop "classloader" linker namespace from loading
/system/lib[64]/vndk-sp/libz.so.  Other alternatives require significant
changes to dynamic linker or CTS test cases.

Let's temporarily revert the commit to fix b/62195853 for oc-dr1-dev.
The long-term solution will be discussed in b/37617391.

This reverts commit 63226400f3.

Bug: 62195853
Bug: 37617391
Test: Boot sailfish to home screen.
Change-Id: I4a97819b080f7091b633152d4a11353b24c463ee
 2017-07-05 11:18:13 +08:00
Andreas Gampe
8f0947c11f Backtrace: Add libziparchive dependency 
Bug: 37342627
Test: m
Change-Id: I2b4155bd11b315ff49eb9a69549e1ab3678d0b28
 2017-07-04 12:03:52 -07:00