Commit Graph

31121 Commits

Author SHA1 Message Date
Tom Cherry fc65725cc7 Merge "init: reboot to bootloader on crash for development builds" am: ac8a3bd283 am: f0cb60083e
am: 2b3d157af5

Change-Id: If1dd58050d5dce62df33d5527c5be2739600bb74
2017-03-22 00:40:04 +00:00
Wei Wang c0049c073b Merge changes from topic 'remove_bg_cgroup' am: e941c5fa41 am: 857e716f3e
am: 5e06a34e03

Change-Id: I5ec71f69c6629ad24a8f26be58a85c299c2491dd
2017-03-22 00:34:43 +00:00
Wei Wang 33a55b3d52 init.rc: remove bg_non_interactive cgroup am: a27a91a5fd am: 20943abad0
am: 7d4d63ca18

Change-Id: I5c1d3a860c64dae63be5edcc91734805863d6f85
2017-03-22 00:34:33 +00:00
Tom Cherry 2b3d157af5 Merge "init: reboot to bootloader on crash for development builds" am: ac8a3bd283
am: f0cb60083e

Change-Id: I48e0edec7eb951bfbd368096be3d1fd4a1aec6af
2017-03-21 23:05:26 +00:00
Tom Cherry f0cb60083e Merge "init: reboot to bootloader on crash for development builds"
am: ac8a3bd283

Change-Id: Ieb55ec65e908410eb5dadc1cd0f25a9bbf37fd4a
2017-03-21 23:01:28 +00:00
Treehugger Robot ac8a3bd283 Merge "init: reboot to bootloader on crash for development builds" 2017-03-21 22:50:38 +00:00
Wei Wang 5e06a34e03 Merge changes from topic 'remove_bg_cgroup' am: e941c5fa41
am: 857e716f3e

Change-Id: Ic60ff334426dc5ab8ff08a2e054de59d50dfad5d
2017-03-21 22:27:10 +00:00
Wei Wang 7d4d63ca18 init.rc: remove bg_non_interactive cgroup am: a27a91a5fd
am: 20943abad0

Change-Id: Ia342b440dc049cc2f71eeff232128d3821b25914
2017-03-21 22:26:51 +00:00
Wei Wang 857e716f3e Merge changes from topic 'remove_bg_cgroup'
am: e941c5fa41

Change-Id: Icb9b9591ffe353dfcbf782437b4f06481a8fdf3a
2017-03-21 22:20:14 +00:00
Wei Wang 20943abad0 init.rc: remove bg_non_interactive cgroup
am: a27a91a5fd

Change-Id: I795b160f56f3ff492e312ea145948a24890e9029
2017-03-21 22:19:59 +00:00
Treehugger Robot e941c5fa41 Merge changes from topic 'remove_bg_cgroup'
* changes:
  libcutils: only change cgroup when fd is initialized
  init.rc: remove bg_non_interactive cgroup
2017-03-21 22:09:51 +00:00
TreeHugger Robot 7486e65a6c Merge "Remove retire frame event." 2017-03-21 22:07:58 +00:00
Tom Cherry 663fdfc1b2 init: reboot to bootloader on crash for development builds
Currently, if init crashes, the kernel panics.  During development, we
would like to catch this crash before the kernel panics and reboot
into bootloader. This will prevent boot looping bad configurations,
particularly desired in test labs where manual intervention would
otherwise be required to reset the devices.

Keep the existing behavior for user builds, as init crashes should be
rare for production builds and rebooting the device is the correct
behavior for end users.

Bug: 34147472
Test: Boot bullhead userdebug, force init to crash, check that the
      device is in bootloader
Test: Boot bullhead user, force init to crash, check that the kernel
      panics and the device reboots as it did previously
Change-Id: Iab3d45ed0d1f82ffaad2a0835d9ca537c0516421
2017-03-21 13:42:17 -07:00
Tom Cherry 59e766e0a5 Merge "init: Fix leaking fd and error print" am: e87a826a1d am: ff6eb509aa
am: daa0d48e59

Change-Id: Ica32d27c59e0d4068de7a60f83604315a07bb1fd
2017-03-21 20:31:52 +00:00
Tom Cherry daa0d48e59 Merge "init: Fix leaking fd and error print" am: e87a826a1d
am: ff6eb509aa

Change-Id: I053044c34e9a063eb59ae343026abced51b3c7f7
2017-03-21 20:28:12 +00:00
Tom Cherry ff6eb509aa Merge "init: Fix leaking fd and error print"
am: e87a826a1d

Change-Id: Ie807fa6321b0d0313221711999fb01897c192419
2017-03-21 20:23:47 +00:00
Treehugger Robot e87a826a1d Merge "init: Fix leaking fd and error print" 2017-03-21 20:11:09 +00:00
Christopher Ferris 5a9de22198 Merge "Use the 2 space clang format for libunwindstack." am: 4b9a555a0f am: 46d0609097
am: 4c1098fde9

Change-Id: I27396f9a401d3ff0b0ed16c4651a0917c511ecdc
2017-03-21 18:41:32 +00:00
Mark Salyzyn 9e16f964fe Merge "libcutils: fs_config() add check /oem/etc/fs_config_*" am: c530045850 am: 6b5913a8b6
am: 8876fffd08

Change-Id: I07ea126a8fae279e888322c88a400d38aad3f381
2017-03-21 18:41:11 +00:00
Christopher Ferris 4c1098fde9 Merge "Use the 2 space clang format for libunwindstack." am: 4b9a555a0f
am: 46d0609097

Change-Id: Ica72a35de96d7cf376086809022cdb8e5a671ac1
2017-03-21 18:30:41 +00:00
Mark Salyzyn 8876fffd08 Merge "libcutils: fs_config() add check /oem/etc/fs_config_*" am: c530045850
am: 6b5913a8b6

Change-Id: I77bf1476f5565e05d7b30ccdb0481e389f8a49ba
2017-03-21 18:30:28 +00:00
Christopher Ferris 46d0609097 Merge "Use the 2 space clang format for libunwindstack."
am: 4b9a555a0f

Change-Id: Ifb0a52a2f99ddd69b4fe7196b749a985b7851be5
2017-03-21 18:25:03 +00:00
Mark Salyzyn 6b5913a8b6 Merge "libcutils: fs_config() add check /oem/etc/fs_config_*"
am: c530045850

Change-Id: Idbe297f1402adb73bfa6e7bf82c39a0214752178
2017-03-21 18:24:49 +00:00
Christopher Ferris 4b9a555a0f Merge "Use the 2 space clang format for libunwindstack." 2017-03-21 18:21:19 +00:00
Treehugger Robot c530045850 Merge "libcutils: fs_config() add check /oem/etc/fs_config_*" 2017-03-21 18:13:31 +00:00
Christopher Ferris adda674466 Use the 2 space clang format for libunwindstack.
Test: NA
Change-Id: Ibf321931d1e7ac5bbe4e8479c9d706576f55e8ac
2017-03-21 10:41:45 -07:00
Mark Salyzyn 74b0b50bbe Merge changes I4077bd6a,I92c4090e,Iff579600 am: e9539eb02f am: 122310429f
am: c232220ff0

Change-Id: I60b0aa1f9c5dba88426fefbc415366d507aeacf6
2017-03-21 17:02:03 +00:00
Mark Salyzyn c232220ff0 Merge changes I4077bd6a,I92c4090e,Iff579600 am: e9539eb02f
am: 122310429f

Change-Id: I86b4bca4a314f8f3d093ca000e3253a453522122
2017-03-21 16:57:31 +00:00
Mark Salyzyn 122310429f Merge changes I4077bd6a,I92c4090e,Iff579600
am: e9539eb02f

Change-Id: I28748a1f0a3e797ddd4bc76adc19f2ea308a70c8
2017-03-21 16:53:33 +00:00
Mark Salyzyn e9539eb02f Merge changes I4077bd6a,I92c4090e,Iff579600
* changes:
  libcutils: fs_config() add check /vendor/etc/fs_config_*
  libcutils: fs_config: sort files
  libcutils: fs_config: sort dirs
2017-03-21 16:49:53 +00:00
Mark Salyzyn cfcc1dfa93 Merge "fs_mgr: remove private/android_filesystem_config.h" am: f5ee213a5c am: ba9d88ebab
am: 8f9a187785

Change-Id: Ib9cbcd36021cc80202f04162a4aa555142a46ea6
2017-03-21 15:28:57 +00:00
Mark Salyzyn 8f9a187785 Merge "fs_mgr: remove private/android_filesystem_config.h" am: f5ee213a5c
am: ba9d88ebab

Change-Id: Ic9cd62b685dbc40f5e61bd8072cffba3cb2aff37
2017-03-21 15:24:55 +00:00
Mark Salyzyn ba9d88ebab Merge "fs_mgr: remove private/android_filesystem_config.h"
am: f5ee213a5c

Change-Id: I78230fad7c5f910433a00f96e87d26c4c8b9be0d
2017-03-21 15:20:25 +00:00
Mark Salyzyn 62c701e174 libcutils: fs_config() add check /oem/etc/fs_config_*
Add reading of vendor file-system config files
/oem/etc/fs_config_dirs and /oem/etc/fs_config_files.

Order of interpretation (for dirs and files respectively):
- /system/etc/fs_config_dirs or /system/etc/fs_config_files
- /vendor/etc/fs_config_dirs or /vendor/etc/fs_config_files
- /oem/etc/fs_config_dirs or /oem/etc/fs_config_files
- internal android_dirs[] or android_files[] structures.

No restrictions are placed on the oem file-system config files,
although the developer is advised to restrict the scope to the /oem
file-system since the intent is to provide support only for
customized portions of oem.img.

Test: full build and install smoke test and inspection
Bug: 36071012
Change-Id: I56f3fed5efa44d622a9a110937dbc949083d44ae
2017-03-21 08:15:58 -07:00
Mark Salyzyn 9ceadcb0c4 libcutils: fs_config() add check /vendor/etc/fs_config_*
Add reading of vendor file-system config files
/vendor/etc/fs_config_dirs and /vendor/etc/fs_config_files.

Order of interpretation (for dirs and files respectively):
- /system/etc/fs_config_dirs or /system/etc/fs_config_files
- /vendor/etc/fs_config_dirs or /vendor/etc/fs_config_files
- internal android_dirs[] or android_files[] structures.

No restrictions are placed on the vendor file-system config files,
although the developer is advised to restrict the scope to the /vendor
file-system since the intent is to provide support only for
customized portions of vendor.img.

Test: full build and install smoke test and inspection
Bug: 36071012
Change-Id: I4077bd6afcda2ee16189b2eb3c322af15205bbb9
2017-03-21 08:14:42 -07:00
Mark Salyzyn a45eae93f6 libcutils: fs_config: sort files
Sort android_files[] first by requirements, grouping, specificity and
finally by alphanumeric order.

Test: full build and install smoke test and inspection
Bug: 36071012
Change-Id: I92c4090eac0067e0327ac7c8dde229747893d585
2017-03-21 08:14:42 -07:00
Mark Salyzyn c4f9f4c216 libcutils: fs_config: sort dirs
Sort android_dirs[] first by requirements, grouping, specificity and
finally by alphanumeric order.

Test: full build and install smoke test and inspection
Bug: 36071012
Change-Id: Iff579600b05d7b2a0b9fc7d9e9d897e0bb69aebd
2017-03-21 08:14:42 -07:00
Mark Salyzyn f5ee213a5c Merge "fs_mgr: remove private/android_filesystem_config.h" 2017-03-21 15:14:31 +00:00
Mark Salyzyn 02d5aa9c4b Merge "libcutils: fs_config.c code compliance" am: b501400a76 am: 679942bf0d
am: a02ef7ca54

Change-Id: I30352abb637c8410c94650a9f03d41a12d0595c8
2017-03-21 15:00:54 +00:00
Mark Salyzyn a02ef7ca54 Merge "libcutils: fs_config.c code compliance" am: b501400a76
am: 679942bf0d

Change-Id: I822cb6c50d1a47b76f4c249d59742f50452167a8
2017-03-21 14:56:23 +00:00
Mark Salyzyn 679942bf0d Merge "libcutils: fs_config.c code compliance"
am: b501400a76

Change-Id: Ia6188feca0185192b41259cb4be41d3f4385b17d
2017-03-21 14:51:53 +00:00
Mark Salyzyn b501400a76 Merge "libcutils: fs_config.c code compliance" 2017-03-21 14:48:32 +00:00
Wei Wang 97957fc420 libcutils: only change cgroup when fd is initialized
This is to avoid failues on setting non-exist cgroup

Bug: 34193533
Test: on marlin
Change-Id: I619dcba332fda9ec421df811745cf10311beddd3
2017-03-20 22:13:22 -07:00
Wei Wang a27a91a5fd init.rc: remove bg_non_interactive cgroup
We have seen cases when threads in this cgroup not scheduled for more than
a few seconds in heavy workload situation and causing device freeze.
In Linux, multiple threads placed in ROOT cgroup cause the CPU resource to
be split per thread, rather than per group.
Currently we have many threads in ROOT cgroup, which makes threads in
bg_non_interactive cgroup to have "tiny" CPU resource other than 5%
quota defined.

Bug: 34193533
Test: on marlin
Change-Id: I7721f6196560fbedf6265e8b6db130cec9edefd7
2017-03-20 22:13:07 -07:00
Felipe Leme 5e3c6dd44a Merge "Don't display bugreport progress when it recedes." am: 450c44052c am: 70fd64ec05
am: fa4c2e86d3

Change-Id: I392250c7903aca1e01b934d4683377b84c452814
2017-03-21 02:12:11 +00:00
TreeHugger Robot 38e6b16d0b Merge "Add new EpollController class." 2017-03-21 02:11:25 +00:00
Felipe Leme fa4c2e86d3 Merge "Don't display bugreport progress when it recedes." am: 450c44052c
am: 70fd64ec05

Change-Id: I495e727c4fd8ca853350969d74bdeb0cad8a34c3
2017-03-21 02:08:34 +00:00
Felipe Leme 70fd64ec05 Merge "Don't display bugreport progress when it recedes."
am: 450c44052c

Change-Id: Ieff977589b4c41687727099868b548e0072469f8
2017-03-21 02:05:04 +00:00
Treehugger Robot 450c44052c Merge "Don't display bugreport progress when it recedes." 2017-03-21 01:58:12 +00:00
Daniel Rosenberg 609617b1af Merge "Make sdcardfs the default" 2017-03-21 01:13:05 +00:00