Commit Graph

39990 Commits

Author SHA1 Message Date
Josh Gao d8b711e16b Merge changes I0783be05,Id8178913 am: 09d5e258ef
am: 2c1b3e9761

Change-Id: I764488803977604f85000cbf12ecf25f2c60c695
2018-02-28 01:52:39 +00:00
Josh Gao 2c1b3e9761 Merge changes I0783be05,Id8178913
am: 09d5e258ef

Change-Id: I611aab78988a959d3660c09fd5854e4f657e40b4
2018-02-28 01:41:42 +00:00
Josh Gao 09d5e258ef Merge changes I0783be05,Id8178913
* changes:
  adb: allow reentrant calls to fdevent_run_on_main_thread.
  adb: stop using quick_exit.
2018-02-28 00:14:58 +00:00
Dan Willemsen e2b6cd28f2 Mark crash_dump.policy as not supported on mips
The recent change to detect missing source files broke reading makefiles
for mips, since this didn't specify a source file.

Bug: 73904572
Test: lunch aosp_mips-eng; m nothing
Test: lunch aosp_arm-eng; m crash_dump.policy
Test: lunch aosp_arm64-eng; m crash_dump.policy
Test: lunch aosp_x86-eng; m crash_dump.policy
Test: lunch aosp_x86_64-eng; m crash_dump.policy
Change-Id: I28864b5af59267f1ab83084128f2c59b04039374
2018-02-27 15:35:11 -08:00
Josh Gao e39ccd3cbd adb: allow reentrant calls to fdevent_run_on_main_thread.
Previously, reentrant calls to fdevent_run_on_main_thread would
deadlock.

Test: adb_test on host
Change-Id: I0783be0558dcaf61ddbe76d13ac6917fc2de0be0
2018-02-27 14:50:07 -08:00
Josh Gao d51c6df1ef adb: stop using quick_exit.
We don't actually need to use quick_exit to avoid calling static
destructors, since we have -Wexit-time-destructors to guarantee we
don't actually have any, and this precludes the use of asan's exit time
leak checking, so switch back to atexit/exit.

Test: ASAN_OPTIONS=detect_leaks=1:leak_check_at_exit=1 adb server nodaemon with a manually inserted leak
Change-Id: Id8178913f64cb02c820c5073351369a9e4d8c74d
2018-02-27 14:50:07 -08:00
Luis Hector Chavez 0db4b7a95b Change the remount command to be more container-friendly
Passing in MS_REMOUNT | MS_BIND tells the kernel to only remove the
MS_RDONLY flag and keep all the other flags the same. This is also the
only kind of remount that is allowed in Linux containers (to be more
precise, within user namespaces).

This change also attempts to always run the remount command when dealing
with /, since containers will almost always run a loop device, and since
the number of the device changes, it is not convenient to put it in the
fstab. Plus, the container won't have permission to modify it, but might
be able to perform the remount.

Bug: 72178046
Test: `adb remount` works in both sailfish and Chrome OS
Change-Id: I9e8ec8afcd57f67875a312824667768b3aa89faa
2018-02-27 14:37:26 -08:00
Tom Cherry 574a081623 libprocessgroup: remove legacy C string handling and build for host
Bug: 36970783
Test: kill zygote and see that its children die correctly
Change-Id: I1b0e9a9cdb834a000fec82323d690e3bd288692d
2018-02-27 14:12:19 -08:00
Erik Kline 825f7dff47 Merge "EndsWith *suffix*" am: 73664df55e am: c4a42dd62d
am: eebc9c2446

Change-Id: I77321ded5927f149e3b1367425f5ed461d01bf99
2018-02-27 17:04:51 +00:00
Erik Kline eebc9c2446 Merge "EndsWith *suffix*" am: 73664df55e
am: c4a42dd62d

Change-Id: Iad3f81efc988383ff99d9b1a08bfaa5d80693889
2018-02-27 16:53:48 +00:00
Erik Kline c4a42dd62d Merge "EndsWith *suffix*"
am: 73664df55e

Change-Id: I7c2a04e4620ecbf1b1e539e5b6e31c1802833d51
2018-02-27 16:47:36 +00:00
Treehugger Robot 73664df55e Merge "EndsWith *suffix*" 2018-02-27 16:39:43 +00:00
Erik Kline b154d18d11 EndsWith *suffix*
Possibly an old copy and paste error.

Test: built
Change-Id: Ie86203d65b4021ed4b787d2330729ab0b1d73e9d
2018-02-27 16:12:55 +09:00
Jaegeuk Kim 41a2266c1d Merge "fs_mgr: add sysfs_path=%s to indicate a location of sysfs entry" am: badaa56639 am: 81e692c04b
am: ba5e2b2fce

Change-Id: I110479e38bcd8ada204a0e9a16b28881414f8846
2018-02-27 06:38:45 +00:00
Jaegeuk Kim ba5e2b2fce Merge "fs_mgr: add sysfs_path=%s to indicate a location of sysfs entry" am: badaa56639
am: 81e692c04b

Change-Id: I0e31e02f552cc518646e3a92bab6d1e824d3dce2
2018-02-27 06:33:47 +00:00
Jaegeuk Kim 81e692c04b Merge "fs_mgr: add sysfs_path=%s to indicate a location of sysfs entry"
am: badaa56639

Change-Id: Ia26e3e4672eb5a4c3c243c7a56f505fe61f8e9c1
2018-02-27 06:28:15 +00:00
Jaegeuk Kim badaa56639 Merge "fs_mgr: add sysfs_path=%s to indicate a location of sysfs entry" 2018-02-27 06:20:23 +00:00
Jaegeuk Kim efd3b9c28f fs_mgr: add sysfs_path=%s to indicate a location of sysfs entry
This patch adds sysfs_path=%s in fstab to get the sysfs entry path.
One example is that vold is able to conduct UFS-specific operations given the
below fstab entry.

/dev/block/bootdevice/by-name/userdata  /data f2fs  noatime,nosuid,nodev,discard
  latemount,wait,check,fileencryption=ice,quota,formattable,sysfs_path=/sys/devices/platform/soc/1d84000.ufshc

Bug: 63264275
Bug: 68721792
Change-Id: I5097873893948f12296ac5eaa0c2a59a6e6dd9e1
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
2018-02-26 15:47:09 -08:00
Tom Cherry 5ecec67257 Merge "init: Reboot after timeout passes during reboot" am: 89063827b1 am: d59fed22c5
am: 406a3e842c

Change-Id: I0bba457256f44597d76c12a2bee132e083cecbb3
2018-02-26 18:11:09 +00:00
Tom Cherry 406a3e842c Merge "init: Reboot after timeout passes during reboot" am: 89063827b1
am: d59fed22c5

Change-Id: Ibfd78b0381d3f4cccaae90af1334d21d2fe594d2
2018-02-26 18:01:50 +00:00
Tom Cherry d59fed22c5 Merge "init: Reboot after timeout passes during reboot"
am: 89063827b1

Change-Id: I8db8b48e25b086c341787fbde2d4a2c7d922001d
2018-02-26 17:52:33 +00:00
Tom Cherry 89063827b1 Merge "init: Reboot after timeout passes during reboot" 2018-02-26 17:41:11 +00:00
Steven Moreland 472010f5f6 Merge "libutils: remove subdirs" am: 876d9c3159 am: f664fbd336
am: 5eb53714eb

Change-Id: Ie9d40b1593bcd78582b8097be589d6d676915a5a
2018-02-24 01:11:24 +00:00
Josh Gao 0a3726a113 Merge "adb: switch apacket over to a std::string payload." am: 581a4ceb00 am: 4d74066425
am: ea9359a957

Change-Id: Ib9b1f7c9c3e59e3cfd3ea492360703d2b7a68119
2018-02-24 01:10:36 +00:00
Steven Moreland 5eb53714eb Merge "libutils: remove subdirs" am: 876d9c3159
am: f664fbd336

Change-Id: I9d567371c77d436acec1e7335f8d6ffaf01a2e3f
2018-02-24 01:04:53 +00:00
Josh Gao ea9359a957 Merge "adb: switch apacket over to a std::string payload." am: 581a4ceb00
am: 4d74066425

Change-Id: I15d0066c612b16b2874859c6ceaf27fcf9f2d878
2018-02-24 01:04:16 +00:00
Steven Moreland f664fbd336 Merge "libutils: remove subdirs"
am: 876d9c3159

Change-Id: Ic160753c87d7172f64c0498b5a0b9f4616c5b86c
2018-02-24 00:58:01 +00:00
Josh Gao 4d74066425 Merge "adb: switch apacket over to a std::string payload."
am: 581a4ceb00

Change-Id: I1a4504b25b189d984f29aaf2b350a473679d1a2e
2018-02-24 00:57:30 +00:00
Treehugger Robot 876d9c3159 Merge "libutils: remove subdirs" 2018-02-24 00:42:15 +00:00
Treehugger Robot 581a4ceb00 Merge "adb: switch apacket over to a std::string payload." 2018-02-24 00:40:35 +00:00
Steven Moreland 9571234e22 libutils: remove subdirs
no longer used in Android

Test/Bug: none

Change-Id: I155d5ade02527bf47893a8bf8bcbb07b0aae53d8
2018-02-23 14:44:22 -08:00
Elliott Hughes 2dd504e044 Merge "Document property expansion." am: a4644c9bc4 am: 31d17cf622
am: 54f04cc676

Change-Id: I03a0e1652be13090287ad8b669940cef6a70a09a
2018-02-23 21:53:26 +00:00
Elliott Hughes 54f04cc676 Merge "Document property expansion." am: a4644c9bc4
am: 31d17cf622

Change-Id: I47f0c5cb4cd6b1a6740a8f95c843c823ae00aed7
2018-02-23 21:38:05 +00:00
Elliott Hughes 31d17cf622 Merge "Document property expansion."
am: a4644c9bc4

Change-Id: I3dfaee7ccfcbe77cc5ae7cb02bf51551cbcc2f4b
2018-02-23 21:28:04 +00:00
Treehugger Robot a4644c9bc4 Merge "Document property expansion." 2018-02-23 20:41:36 +00:00
Josh Gao 73b3798afb Merge "debuggerd_fallback: don't recursively abort." am: e0068770e3 am: 47bee24270
am: 9af8648f6a

Change-Id: I288ee738b355c4054fe7e831cda7b5df76c8af32
2018-02-23 20:24:40 +00:00
Josh Gao 9af8648f6a Merge "debuggerd_fallback: don't recursively abort." am: e0068770e3
am: 47bee24270

Change-Id: I2f8d366cb875a596909f731b298b1d6141e3a8f5
2018-02-23 20:18:33 +00:00
Josh Gao 47bee24270 Merge "debuggerd_fallback: don't recursively abort."
am: e0068770e3

Change-Id: Icd587c111d9b1713fdad5622971008b4437b1719
2018-02-23 20:11:48 +00:00
David Srbecky bc71ffd42d Merge "Modify the offline handling interface." am: bc8446992f am: c6f7a32ada
am: 4b4c251aaf

Change-Id: I4da3da1f8a618b8d46c2bbb622408e095361f5ac
2018-02-23 19:59:38 +00:00
Treehugger Robot e0068770e3 Merge "debuggerd_fallback: don't recursively abort." 2018-02-23 19:58:59 +00:00
David Srbecky 4b4c251aaf Merge "Modify the offline handling interface." am: bc8446992f
am: c6f7a32ada

Change-Id: I4331d9771f13bb87ef30b6aef7bd958cea62d9f4
2018-02-23 19:53:20 +00:00
David Srbecky c6f7a32ada Merge "Modify the offline handling interface."
am: bc8446992f

Change-Id: If934f7a4c8244544a2f7dfa71d213122f5d37137
2018-02-23 19:42:42 +00:00
David Srbecky bc8446992f Merge "Modify the offline handling interface." 2018-02-23 19:25:02 +00:00
Tom Cherry c9fec9d2be init: Reboot after timeout passes during reboot
There is currently a timeout for reboot, however if the system gets
stuck, particularly during file system operations, there is no safety
mechanism that guarantees the system will still reboot.

This change does all of the optional reboot steps in a separate thread
and waits for this thread with a timeout, such that if the reboot
steps get hung, the system is guaranteed to still reboot.

This is specific to 'reboot'.  Shutdown continues to run unbounded to
run fsck.

Bug: 72781711
Test: Reboot devices hitting and not hitting this timeout
Change-Id: Id5e1b3693bab00602177e28b9b662e1499c32961
2018-02-23 11:03:01 -08:00
Elliott Hughes 7e469ce60c Document property expansion.
Bug: N/A
Test: N/A
Change-Id: I54b9d2d08d98d83060b54981b1c5dc9660b93e8f
2018-02-23 10:40:53 -08:00
David Srbecky 4f86e27aef Merge "Adjust DEX file reading to follow layout changes in ART." am: 8fbdbba9f5 am: 1f2daf1b79
am: 24d5a1e8a4

Change-Id: I575b302a2d34367a7428c0585dfb03929ff99d20
2018-02-23 18:19:12 +00:00
David Srbecky 24d5a1e8a4 Merge "Adjust DEX file reading to follow layout changes in ART." am: 8fbdbba9f5
am: 1f2daf1b79

Change-Id: I25c5d81c5803b920f7e4d68cc6aebe023b439ea6
2018-02-23 18:10:48 +00:00
David Srbecky 1f2daf1b79 Merge "Adjust DEX file reading to follow layout changes in ART."
am: 8fbdbba9f5

Change-Id: I550ee4892c6c9ec83695ea861af9953fdb5c53fb
2018-02-23 18:05:06 +00:00
Robert Sesek f29ce0ff7c Merge "Remove fs_config entries for webview_zygote." am: 47354e76eb am: 19fafd1ae9
am: b13b9e0d55

Change-Id: I970fb49989763bde055922f8f6c59e89450a83ee
2018-02-23 17:55:05 +00:00
David Srbecky 8fbdbba9f5 Merge "Adjust DEX file reading to follow layout changes in ART." 2018-02-23 17:53:23 +00:00