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
2018-02-26 18:11:09 +00:00
Tom Cherry
406a3e842c
Merge "init: Reboot after timeout passes during reboot" am: 89063827b1
...
am: d59fed22c5
2018-02-26 18:01:50 +00:00
Tom Cherry
d59fed22c5
Merge "init: Reboot after timeout passes during reboot"
...
am: 89063827b1
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
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
2018-02-24 01:10:36 +00:00
Steven Moreland
5eb53714eb
Merge "libutils: remove subdirs" am: 876d9c3159
...
am: f664fbd336
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
2018-02-24 01:04:16 +00:00
Steven Moreland
f664fbd336
Merge "libutils: remove subdirs"
...
am: 876d9c3159
2018-02-24 00:58:01 +00:00
Josh Gao
4d74066425
Merge "adb: switch apacket over to a std::string payload."
...
am: 581a4ceb00
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
2018-02-23 21:53:26 +00:00
Elliott Hughes
54f04cc676
Merge "Document property expansion." am: a4644c9bc4
...
am: 31d17cf622
2018-02-23 21:38:05 +00:00
Elliott Hughes
31d17cf622
Merge "Document property expansion."
...
am: a4644c9bc4
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
2018-02-23 20:24:40 +00:00
Josh Gao
9af8648f6a
Merge "debuggerd_fallback: don't recursively abort." am: e0068770e3
...
am: 47bee24270
2018-02-23 20:18:33 +00:00
Josh Gao
47bee24270
Merge "debuggerd_fallback: don't recursively abort."
...
am: e0068770e3
2018-02-23 20:11:48 +00:00
David Srbecky
bc71ffd42d
Merge "Modify the offline handling interface." am: bc8446992f am: c6f7a32ada
...
am: 4b4c251aaf
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
2018-02-23 19:53:20 +00:00
David Srbecky
c6f7a32ada
Merge "Modify the offline handling interface."
...
am: bc8446992f
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
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
2018-02-23 18:10:48 +00:00
David Srbecky
1f2daf1b79
Merge "Adjust DEX file reading to follow layout changes in ART."
...
am: 8fbdbba9f5
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
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
Robert Sesek
b13b9e0d55
Merge "Remove fs_config entries for webview_zygote." am: 47354e76eb
...
am: 19fafd1ae9
2018-02-23 17:43:32 +00:00
TreeHugger Robot
336fab3633
Merge "Revert "Restore "Add UID parameter to authentication token"""
2018-02-23 17:42:46 +00:00
Robert Sesek
19fafd1ae9
Merge "Remove fs_config entries for webview_zygote."
...
am: 47354e76eb
2018-02-23 17:33:07 +00:00
Christopher Ferris
432981b905
Modify the offline handling interface.
...
- Add a new function Backtrace::UnwindOffline that takes the stack data.
- Modify BacktraceMap::CreateOffline so it doesn't take the stack data.
This makes it easier to reuse the map object created this way.
Reusing the map object increases simpleperf speed (unwinds per second) by 50%.
Test: backtrace_test libunwindstack_test
Change-Id: I90cfbae9e50d95d8a0e3cd394b33ba36d65d45f7
2018-02-23 09:14:06 -08:00
Treehugger Robot
47354e76eb
Merge "Remove fs_config entries for webview_zygote."
2018-02-23 17:12:17 +00:00
Brian Young
388ff6bb7b
Revert "Restore "Add UID parameter to authentication token""
...
This reverts commit 9e62f3ee11
2018-02-23 01:31:12 +00:00
Josh Gao
70adac6a8a
debuggerd_fallback: don't recursively abort.
...
Calls to abort() will always result in our signal handler being called,
because abort will manually unblock SIGABRT before raising it. This
can lead to deadlock when handling address space exhaustion in the
fallback handler. To fix this, switch our mutex to a recursive mutex,
and manually keep track of our lock count.
Bug: http://b/72929749
Test: debuggerd_test --gtest_filter="CrasherTest.seccomp_crash_oom"
Change-Id: I609f263ce93550350b17757189326b627129d4a7
2018-02-22 16:31:38 -08:00
Rajeev Kumar
92b659ba9a
Fix variable name in log statement and initialize memory_stat before using it.
...
Bug: 72177881
Test: Tested manually
Change-Id: Icbf948dd0e40eaa6c660d55f5cd72182436da086
2018-02-22 10:57:18 -08:00
Christopher Ferris
8539d58fc1
Merge "Change the GetAdjustedRelPc to GetPcAdjustment." am: cdf778f5d9 am: 241481eb7e
...
am: 46bcf44d65
2018-02-22 18:15:11 +00:00
Christopher Ferris
46bcf44d65
Merge "Change the GetAdjustedRelPc to GetPcAdjustment." am: cdf778f5d9
...
am: 241481eb7e
2018-02-22 18:06:34 +00:00
Christopher Ferris
241481eb7e
Merge "Change the GetAdjustedRelPc to GetPcAdjustment."
...
am: cdf778f5d9
2018-02-22 17:58:03 +00:00
Christopher Ferris
cdf778f5d9
Merge "Change the GetAdjustedRelPc to GetPcAdjustment."
2018-02-22 17:44:19 +00:00
Tom Cherry
a7e5e7a01e
Merge "init: log control messages along with the process that sent them" am: 0f8a67d6a8 am: 76583e1637
...
am: 7ad6bed77b
2018-02-22 16:53:22 +00:00
Tom Cherry
7ad6bed77b
Merge "init: log control messages along with the process that sent them" am: 0f8a67d6a8
...
am: 76583e1637
2018-02-22 16:44:09 +00:00
Tom Cherry
76583e1637
Merge "init: log control messages along with the process that sent them"
...
am: 0f8a67d6a8
2018-02-22 16:36:31 +00:00
Tom Cherry
0f8a67d6a8
Merge "init: log control messages along with the process that sent them"
2018-02-22 16:21:05 +00:00
